Skip to content

Commit

Permalink
Merge branch 'BrowserSync:master' into fix-ui-external-url
Browse files Browse the repository at this point in the history
  • Loading branch information
qdirks committed Sep 30, 2023
2 parents ae8bf51 + d787281 commit b107ba8
Show file tree
Hide file tree
Showing 19 changed files with 3,444 additions and 8,400 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,18 +28,13 @@ jobs:
- name: Setup Node.js environment
uses: actions/[email protected]
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
Expand Down
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
30 changes: 30 additions & 0 deletions examples/options.snippetOptions.js
Original file line number Diff line number Diff line change
@@ -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;
},
},
},
});
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"packages": [
"packages/*"
],
"version": "2.29.1"
"version": "2.29.3"
}
19 changes: 19 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": [
"build"
]
}
}
},
"targetDefaults": {
"build": {
"dependsOn": [
"^build"
]
}
}
}
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -15,5 +14,6 @@
"crossbow": "^4.6.0",
"cypress": "^9.5.1",
"rxjs": "^7.5.4"
}
},
"nx": {}
}
16 changes: 8 additions & 8 deletions packages/browser-sync-client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/browser-sync-client/package.json
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
"repository": {
Expand Down
Loading

0 comments on commit b107ba8

Please sign in to comment.