Skip to content

Commit b107ba8

Browse files
authored
Merge branch 'BrowserSync:master' into fix-ui-external-url
2 parents ae8bf51 + d787281 commit b107ba8

File tree

19 files changed

+3444
-8400
lines changed

19 files changed

+3444
-8400
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@ on:
1111

1212
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1313
jobs:
14-
# This workflow contains a single job called "build" boo2
14+
# This workflow contains a single job called "build"
1515
build:
1616
# The type of runner that the job will run on
1717
runs-on: ubuntu-latest
1818

19+
strategy:
20+
matrix:
21+
node-version: [16, 18, 20]
22+
1923
# Steps represent a sequence of tasks that will be executed as part of the job
2024
steps:
2125
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -24,18 +28,13 @@ jobs:
2428
- name: Setup Node.js environment
2529
uses: actions/[email protected]
2630
with:
27-
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
28-
node-version: 16
29-
# Used to specify a package manager for caching in the default directory. Supported values: npm, yarn, pnpm
31+
node-version: ${{ matrix.node-version }}
3032
cache: npm
31-
# Used to specify the path to a dependency file: package-lock.json, yarn.lock, etc. Supports wildcards or a list of file names for caching multiple dependencies.
3233
cache-dependency-path: package-lock.json
3334

3435
# Runs a single command using the runners shell
3536
- name: Install
3637
run: npm ci
37-
- name: Build
38-
run: npm run build
3938
- name: Test
4039
run: npm test
4140
- name: Test E2E

README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
<p align="center">
2-
<a href="https://travis-ci.org/BrowserSync/browser-sync" title="Travis branch">
3-
<img src="https://img.shields.io/travis/BrowserSync/browser-sync/master.svg?style=flat-square&label=linux" />
4-
</a><a href="https://www.npmjs.com/package/browser-sync">
5-
<img src="https://img.shields.io/npm/dm/browser-sync.svg?style=flat-square" />
6-
</a>
7-
</p>
8-
<p align="center">
92
<a href="https://www.npmjs.com/package/browser-sync" title="NPM version">
103
<img src="https://img.shields.io/npm/v/browser-sync.svg?style=flat-square" />
114
</a>
5+
<a href="https://www.npmjs.com/package/browser-sync">
6+
<img src="https://img.shields.io/npm/dm/browser-sync.svg?style=flat-square" />
7+
</a>
128
</p>
139
<p align="center"><a href="https://www.browsersync.io"><img src="https://raw.githubusercontent.com/BrowserSync/browsersync.github.io/master/public/img/logo-gh.png" /></a></p>
1410
<p align="center">Keep multiple browsers & devices in sync when building websites.</p>

examples/options.snippetOptions.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/**
2+
*
3+
* Install:
4+
* npm install browser-sync
5+
*
6+
* Run:
7+
* node <yourfile.js>
8+
*
9+
* This example shows how you can place the snippet anywhere.
10+
*/
11+
12+
"use strict";
13+
14+
var path = require("path");
15+
var browserSync = require("../packages/browser-sync").create();
16+
var cwd = path.join(__dirname, "..");
17+
var fixtures_dir = path.join(cwd, "packages/browser-sync/test/fixtures");
18+
19+
browserSync.init({
20+
files: [path.join(fixtures_dir, "css/*.css")],
21+
server: fixtures_dir,
22+
snippetOptions: {
23+
rule: {
24+
match: /<\/head>/i,
25+
fn: function (snippet, match) {
26+
return snippet + match;
27+
},
28+
},
29+
},
30+
});

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"packages": [
33
"packages/*"
44
],
5-
"version": "2.29.1"
5+
"version": "2.29.3"
66
}

nx.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"tasksRunnerOptions": {
3+
"default": {
4+
"runner": "nx/tasks-runners/default",
5+
"options": {
6+
"cacheableOperations": [
7+
"build"
8+
]
9+
}
10+
}
11+
},
12+
"targetDefaults": {
13+
"build": {
14+
"dependsOn": [
15+
"^build"
16+
]
17+
}
18+
}
19+
}

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
"scripts": {
55
"bootstrap": "lerna bootstrap",
66
"postinstall": "npm run bootstrap",
7-
"build": "lerna run build",
8-
"test": "npm run build && lerna run test --scope browser-sync",
7+
"test": "lerna run build && lerna run test --scope browser-sync",
98
"test:e2e": "cb cy:file-reloading cy:ui-remote-debug cy:connection-notify"
109
},
1110
"devDependencies": {
@@ -15,5 +14,6 @@
1514
"crossbow": "^4.6.0",
1615
"cypress": "^9.5.1",
1716
"rxjs": "^7.5.4"
18-
}
17+
},
18+
"nx": {}
1919
}

packages/browser-sync-client/package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/browser-sync-client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "browser-sync-client",
33
"description": "Client-side scripts for BrowserSync",
4-
"version": "2.29.1",
4+
"version": "2.29.3",
55
"homepage": "https://github.com/shakyshane/browser-sync-client",
66
"author": "Shane Osbourne <[email protected]>",
77
"repository": {

0 commit comments

Comments
 (0)