Skip to content

Commit 27fa10f

Browse files
committed
Merge branch 'master' of github.com:modernweb-dev/web into test/unskip-selenium
2 parents 26cb393 + 6ed7100 commit 27fa10f

File tree

162 files changed

+6234
-4447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+6234
-4447
lines changed

.changeset/red-waves-obey.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@web/browser-logs": patch
3+
"@web/dev-server-hmr": patch
4+
"@web/dev-server": patch
5+
"@web/test-runner-puppeteer": patch
6+
"@web/test-runner": patch
7+
---
8+
9+
chore(deps): bump puppeteer from 19.8.2 to 19.9.0

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "npm" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"
12+
day: "thursday"

.github/workflows/canary.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jobs:
1919
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
2020
fetch-depth: 0
2121

22-
- name: Setup Node.js 12
22+
- name: Setup Node.js
2323
uses: actions/setup-node@v3
2424
env:
2525
FORCE_COLOR: 0
2626
with:
27-
node-version: 12.x
28-
registry-url: 'https://registry.npmjs.org'
27+
node-version: '16'
2928
cache: 'yarn'
29+
registry-url: 'https://registry.npmjs.org'
3030

3131
- name: Install Dependencies
3232
run: yarn --frozen-lockfile

.github/workflows/verify-browserstack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v3
1717

18-
- name: Setup Node 14
18+
- name: Setup Node 16
1919
uses: actions/setup-node@v3
2020
env:
2121
FORCE_COLOR: 0
2222
with:
23-
node-version: '14'
23+
node-version: '16'
2424
cache: 'yarn'
2525

2626
- name: Install dependencies

.github/workflows/verify-node.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
strategy:
1313
matrix:
1414
node-version:
15-
- '14'
1615
- '16'
1716
- '18'
17+
- '19'
1818

1919
steps:
2020
- uses: actions/checkout@v3

.github/workflows/verify-saucelabs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v3
1717

18-
- name: Setup Node 14
18+
- name: Setup Node 16
1919
uses: actions/setup-node@v3
2020
env:
2121
FORCE_COLOR: 0
2222
with:
23-
node-version: '14'
23+
node-version: '16'
2424
cache: 'yarn'
2525

2626
- name: Install dependencies

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<p align="center">
1010
<a href="https://github.com/modernweb-dev/web/actions"
1111
><img
12-
src="https://img.shields.io/github/workflow/status/modernweb-dev/web/Release/master?label=workflow&style=flat-square"
12+
src="https://img.shields.io/github/actions/workflow/status/modernweb-dev/web/release.yml?branch=master&label=workflow&style=flat-square"
1313
alt="GitHub Actions workflow status"
1414
/></a>
1515
<a href="https://twitter.com/modern_web_dev"

docs/docs/building/rollup-plugin-html.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ npm install --save-dev @web/rollup-plugin-html
1515
If you have a single HTML page, you can set it as rollup input. This will be used by the HTML plugin as input for the plugin.
1616

1717
```js
18-
import html from '@web/rollup-plugin-html';
18+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
1919

2020
export default {
2121
input: 'index.html',
@@ -29,7 +29,7 @@ export default {
2929
If all pages share the same config, you can use a glob pattern to match multiple HTML files.
3030

3131
```js
32-
import html from '@web/rollup-plugin-html';
32+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
3333

3434
export default {
3535
input: 'pages/*.html',
@@ -41,7 +41,7 @@ export default {
4141
If your pages cannot be matched with a single glob you can set the input directly on HTML plugin.
4242

4343
```js
44-
import html from '@web/rollup-plugin-html';
44+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
4545

4646
export default {
4747
output: { dir: 'dist' },
@@ -52,7 +52,7 @@ export default {
5252
If each input should be bundled with a different config, you can create multiple instances of the HTML plugin.
5353

5454
```js
55-
import html from '@web/rollup-plugin-html';
55+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
5656

5757
export default {
5858
output: { dir: 'dist' },
@@ -69,7 +69,7 @@ export default {
6969
If your HTML file does not exist on disk, you can provide it as a string as well.
7070

7171
```js
72-
import html from '@web/rollup-plugin-html';
72+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
7373

7474
export default {
7575
output: { dir: 'dist' },
@@ -88,7 +88,7 @@ export default {
8888
This can also be set as an array:
8989

9090
```js
91-
import html from '@web/rollup-plugin-html';
91+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
9292

9393
export default {
9494
output: { dir: 'dist' },
@@ -112,7 +112,7 @@ By default rollup will hash the asset filenames, enabling long term caching. You
112112
To turn off bundling assets completely, set the `extractAssets` option to false:
113113

114114
```js
115-
import html from '@web/rollup-plugin-html';
115+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
116116

117117
export default {
118118
input: 'index.html',
@@ -130,7 +130,7 @@ export default {
130130
If your HTML file contains any absolute paths they will be resolved against the current working directory. You can set a different root directory in the config. Input paths will be resolved relative to this root directory as well.
131131

132132
```js
133-
import html from '@web/rollup-plugin-html';
133+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
134134

135135
export default {
136136
input: 'index.html',
@@ -159,7 +159,7 @@ Will be output as:
159159
- `dist/pages/bar/page-c.html`
160160

161161
```js
162-
import html from '@web/rollup-plugin-html';
162+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
163163

164164
export default {
165165
input: 'pages/**/*.html',
@@ -176,7 +176,7 @@ export default {
176176
You can add transform functions to modify the HTML page and assets in the build, for example to inject scripts or minification.
177177

178178
```js
179-
import html from '@web/rollup-plugin-html';
179+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
180180

181181
export default {
182182
input: 'index.html',
@@ -206,7 +206,7 @@ export default {
206206
Set the minify option to do default HTML minificiation. If you need custom options, you can implement your own minifier using the `transformHtml` option.
207207

208208
```js
209-
import html from '@web/rollup-plugin-html';
209+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
210210

211211
export default {
212212
input: 'index.html',
@@ -226,7 +226,7 @@ Some social media tags require full absolute URLs (e.g. https://domain.com/guide
226226
By providing an `absoluteBaseUrl` the plugin can make sure all appropriate URLs are processed.
227227

228228
```js
229-
import html from '@web/rollup-plugin-html';
229+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
230230

231231
export default {
232232
input: 'index.html',
@@ -261,7 +261,7 @@ In order to enable PWA support you can enable the injection of a service worker
261261
Note: This does not create the service worker
262262

263263
```js
264-
import html from '@web/rollup-plugin-html';
264+
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
265265

266266
export default {
267267
input: 'index.html',

docs/docs/dev-server/cli-and-configuration.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ interface DevServerConfig {
8686
open?: 'string' | boolean;
8787
// index HTML to use for SPA routing / history API fallback
8888
appIndex?: string;
89-
// run in watch mode, reloading when files change
89+
// reload the brower on file changes.
9090
watch?: boolean;
9191
// resolve bare module imports
9292
nodeResolve?: boolean | RollupNodeResolveOptions;
@@ -124,6 +124,10 @@ interface DevServerConfig {
124124
sslKey?: string;
125125
// path to SSL certificate
126126
sslCert?: string;
127+
128+
// Whether to watch and rebuild served files.
129+
// Useful when you want more control over when files are build (e.g. when doing a test run using @web/test-runner).
130+
disableFileWatcher?: boolean;
127131
}
128132
```
129133

docs/docs/dev-server/writing-plugins/hooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ export default {
258258
name: 'my-plugin',
259259
transform(context) {
260260
if (context.path === '/index.html') {
261-
context.set('X-My-Custom-Header', 'hello, world';
261+
context.set('X-My-Custom-Header', 'hello, world');
262262
}
263263
},
264264
},

0 commit comments

Comments
 (0)