Merge branch 'BrowserSync:master' into fix-ui-external-url

BrowserSync · Sep 30, 2023 · b107ba8 · b107ba8
2 parents ae8bf51 + d787281
commit b107ba8
Show file tree

Hide file tree

Showing 19 changed files with 3,444 additions and 8,400 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,11 +11,15 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build" boo2
+  # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        node-version: [16, 18, 20]
+
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -24,18 +28,13 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v2.5.0
         with:
-          # Version Spec of the version to use.  Examples: 12.x, 10.15.1, >=10.15.0
-          node-version: 16
-          # Used to specify a package manager for caching in the default directory. Supported values: npm, yarn, pnpm
+          node-version: ${{ matrix.node-version }}
           cache: npm
-          # 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.
           cache-dependency-path: package-lock.json
 
       # Runs a single command using the runners shell
       - name: Install
         run: npm ci
-      - name: Build
-        run: npm run build
       - name: Test
         run: npm test
       - name: Test E2E

diff --git a/README.md b/README.md
@@ -1,14 +1,10 @@
 <p align="center">
-<a href="https://travis-ci.org/BrowserSync/browser-sync" title="Travis branch">
- <img src="https://img.shields.io/travis/BrowserSync/browser-sync/master.svg?style=flat-square&label=linux" />
-</a><a href="https://www.npmjs.com/package/browser-sync">
- <img src="https://img.shields.io/npm/dm/browser-sync.svg?style=flat-square" />
-</a>
-</p>
-<p align="center">
 <a href="https://www.npmjs.com/package/browser-sync" title="NPM version">
  <img src="https://img.shields.io/npm/v/browser-sync.svg?style=flat-square" />
 </a>
+<a href="https://www.npmjs.com/package/browser-sync">
+ <img src="https://img.shields.io/npm/dm/browser-sync.svg?style=flat-square" />
+</a>
 </p>
 <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>
 <p align="center">Keep multiple browsers & devices in sync when building websites.</p>

diff --git a/examples/options.snippetOptions.js b/examples/options.snippetOptions.js
@@ -0,0 +1,30 @@
+/**
+ *
+ * Install:
+ *      npm install browser-sync
+ *
+ * Run:
+ *      node <yourfile.js>
+ *
+ * This example shows how you can place the snippet anywhere.
+ */
+
+"use strict";
+
+var path = require("path");
+var browserSync = require("../packages/browser-sync").create();
+var cwd = path.join(__dirname, "..");
+var fixtures_dir = path.join(cwd, "packages/browser-sync/test/fixtures");
+
+browserSync.init({
+    files: [path.join(fixtures_dir, "css/*.css")],
+    server: fixtures_dir,
+    snippetOptions: {
+        rule: {
+            match: /<\/head>/i,
+            fn: function (snippet, match) {
+                return snippet + match;
+            },
+        },
+    },
+});
diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "2.29.1"
+  "version": "2.29.3"
 }
diff --git a/nx.json b/nx.json
@@ -0,0 +1,19 @@
+{
+  "tasksRunnerOptions": {
+    "default": {
+      "runner": "nx/tasks-runners/default",
+      "options": {
+        "cacheableOperations": [
+          "build"
+        ]
+      }
+    }
+  },
+  "targetDefaults": {
+    "build": {
+      "dependsOn": [
+        "^build"
+      ]
+    }
+  }
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,8 +4,7 @@
 	"scripts": {
 		"bootstrap": "lerna bootstrap",
 		"postinstall": "npm run bootstrap",
-		"build": "lerna run build",
-		"test": "npm run build && lerna run test --scope browser-sync",
+		"test": "lerna run build && lerna run test --scope browser-sync",
 		"test:e2e": "cb cy:file-reloading cy:ui-remote-debug cy:connection-notify"
 	},
 	"devDependencies": {
@@ -15,5 +14,6 @@
 		"crossbow": "^4.6.0",
 		"cypress": "^9.5.1",
 		"rxjs": "^7.5.4"
-	}
+	},
+  "nx": {}
 }
diff --git a/packages/browser-sync-client/package-lock.json b/packages/browser-sync-client/package-lock.json
diff --git a/packages/browser-sync-client/package.json b/packages/browser-sync-client/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "browser-sync-client",
 	"description": "Client-side scripts for BrowserSync",
-	"version": "2.29.1",
+	"version": "2.29.3",
 	"homepage": "https://github.com/shakyshane/browser-sync-client",
 	"author": "Shane Osbourne <shane.osbourne8@gmail.com>",
 	"repository": {