Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Promote Canary releases to master #2180

Merged
merged 37 commits into from Apr 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
5ca92f6
chore: update all rollup dependencies to run CI with
Westbrook Feb 10, 2023
8aedddb
Force module consumption in Mocha runner
Westbrook Feb 22, 2023
f993752
Force type the TS consumption
Westbrook Feb 24, 2023
da99633
test: take snapshot updates in rollup-plugin-polyfills-loader
Westbrook Mar 15, 2023
f7cba8f
test: take snapshot updates in rollup-plugin-import-meta
Westbrook Mar 15, 2023
1cac35c
test: update rollup-plugin-html test values
Westbrook Mar 15, 2023
f7017c9
test: update dev-server-rollup test values
Westbrook Mar 15, 2023
1492497
chore: format
Westbrook Mar 15, 2023
e1b4ea2
Changeset
Westbrook Mar 16, 2023
ca9c156
Configure for expected CJS importing
Westbrook Mar 17, 2023
99a5a10
chore: bump node ci to 18/20
43081j Mar 21, 2023
ce3cb5e
test (dev-server-import-maps): loosen assertion to account for diff i…
43081j Mar 21, 2023
f1cc026
feat (dev-server-core): upgrade lru-cache
43081j Mar 20, 2023
0113d49
feat (test-runner-coverage-v8): use lru cache for istanbul converters
43081j Mar 20, 2023
527d728
chore: add changeset
43081j Mar 20, 2023
4e7f30b
chore (dev-server-core): fix lru-cache semver
43081j Mar 21, 2023
46b109c
chore: run format
43081j Mar 24, 2023
0da755a
fix: specify maxsize
43081j Mar 24, 2023
9be8fdf
Deprecate node 14
koddsson Mar 31, 2023
7c9eae5
Add a changeset
koddsson Mar 31, 2023
42641aa
Update version bumps in changeset
koddsson Apr 1, 2023
7134155
Bump `@web/rollup-plugin-workbox`
koddsson Apr 3, 2023
9c85d73
Update .changeset/fuzzy-terms-push.md
koddsson Apr 4, 2023
067150a
Update to mocha@10 in `test-runner-commands`
koddsson Mar 28, 2023
06798f8
Update to `mocha@10` in `test-runner-visual-regression`
koddsson Mar 28, 2023
2d07bd5
Update to `mocha@10` in `test-runner-mocha`
koddsson Mar 28, 2023
6715aa8
Update to `mocha@10` in project root.
koddsson Apr 7, 2023
344592f
Actually just import mocha
koddsson Apr 14, 2023
18b92cf
Maybe fix imports?
koddsson Apr 14, 2023
8e2537f
Get mocha from window
koddsson Apr 15, 2023
a48cce2
Install mocha in `dev-server-rollup`
koddsson Apr 15, 2023
fe4b51c
Try fixing mocha imports once more
koddsson Apr 15, 2023
3b521ea
Update stacktrace in expected XML
koddsson Apr 15, 2023
ac0bfe3
Add a changeset
koddsson Apr 15, 2023
ca6db9d
Fix yarn.lock
koddsson Apr 15, 2023
a89c8ad
Upgrade TypeScript to version 4.2
koddsson Apr 16, 2023
e707f6a
Update hash in test snapshot
koddsson Apr 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/eleven-mayflies-drive.md
@@ -0,0 +1,6 @@
---
'@web/test-runner-coverage-v8': minor
'@web/dev-server-core': patch
---

Upgrade lru-cache dependency & add a file cache for v8-to-istanbul conversions
36 changes: 36 additions & 0 deletions .changeset/fuzzy-terms-push.md
@@ -0,0 +1,36 @@
---
'@web/browser-logs': minor
'@web/config-loader': minor
'@web/dev-server': minor
'@web/dev-server-core': minor
'@web/dev-server-esbuild': minor
'@web/dev-server-hmr': minor
'@web/dev-server-import-maps': minor
'@web/dev-server-legacy': major
'@web/dev-server-rollup': minor
'@web/dev-server-storybook': minor
'@web/parse5-utils': major
'@web/polyfills-loader': major
'@web/rollup-plugin-copy': minor
'@web/rollup-plugin-html': major
'@web/rollup-plugin-import-meta-assets': major
'@web/rollup-plugin-polyfills-loader': major
'rollup-plugin-workbox': minor
'@web/test-runner': minor
'@web/test-runner-browserstack': minor
'@web/test-runner-chrome': minor
'@web/test-runner-cli': minor
'@web/test-runner-commands': minor
'@web/test-runner-core': minor
'@web/test-runner-coverage-v8': minor
'@web/test-runner-junit-reporter': minor
'@web/test-runner-mocha': minor
'@web/test-runner-playwright': minor
'@web/test-runner-puppeteer': minor
'@web/test-runner-saucelabs': minor
'@web/test-runner-selenium': minor
'@web/test-runner-visual-regression': minor
'@web/test-runner-webdriver': minor
---

Set node 16 as the minimum version.
9 changes: 9 additions & 0 deletions .changeset/lucky-penguins-destroy.md
@@ -0,0 +1,9 @@
---
'@web/dev-server-rollup': minor
'@web/test-runner-commands': minor
'@web/test-runner-junit-reporter': minor
'@web/test-runner-mocha': minor
'@web/test-runner-visual-regression': minor
---

Update mocha from version 8.2.0 to version 10.2.0
13 changes: 13 additions & 0 deletions .changeset/tender-jokes-destroy.md
@@ -0,0 +1,13 @@
---
"@web/dev-server-rollup": minor
"@web/dev-server-storybook": minor
"@web/dev-server": minor
"@web/rollup-plugin-html": major
"@web/rollup-plugin-import-meta-assets": major
"@web/rollup-plugin-polyfills-loader": major
"rollup-plugin-workbox": major
"@web/test-runner-mocha": minor
"@web/test-runner": minor
---

Require Rollup@v3.x and update all Rollup related dependencies to latest.
4 changes: 2 additions & 2 deletions .github/workflows/verify-browserstack.yml
Expand Up @@ -15,12 +15,12 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Setup Node 14
- name: Setup Node 16
uses: actions/setup-node@v3
env:
FORCE_COLOR: 0
with:
node-version: '14'
node-version: '16'
cache: 'yarn'

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-node.yml
Expand Up @@ -12,9 +12,9 @@ jobs:
strategy:
matrix:
node-version:
- '14'
- '16'
- '18'
- '19'

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify-saucelabs.yml
Expand Up @@ -15,12 +15,12 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Setup Node 14
- name: Setup Node 16
uses: actions/setup-node@v3
env:
FORCE_COLOR: 0
with:
node-version: '14'
node-version: '16'
cache: 'yarn'

- name: Install dependencies
Expand Down
14 changes: 7 additions & 7 deletions package.json
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/modernweb-dev/web.git"
},
"engines": {
"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
"node": ">=16.0.0"
},
"scripts": {
"build": "rimraf --glob packages/*/tsconfig.tsbuildinfo && tsc --build",
Expand Down Expand Up @@ -47,10 +47,10 @@
},
"devDependencies": {
"@changesets/cli": "^2.16.0",
"@rollup/plugin-node-resolve": "^11.0.1",
"@rollup/plugin-typescript": "^8.3.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-typescript": "^11.0.0",
"@types/chai": "^4.2.22",
"@types/mocha": "^8.2.0",
"@types/mocha": "^10.0.1",
"@types/node": "*",
"@types/node-fetch": "^2.5.8",
"@typescript-eslint/eslint-plugin": "^5.3.0",
Expand All @@ -65,15 +65,15 @@
"hanbi": "^1.0.1",
"husky": "^8.0.1",
"lint-staged": "^13.0.3",
"mocha": "^8.2.1",
"mocha": "^10.2.0",
"nanocolors": "^0.2.1",
"prettier": "^2.4.1",
"prettier-plugin-package": "^1.3.0",
"rimraf": "^4.4.1",
"rollup": "^2.66.1",
"rollup": "^3.15.0",
"rollup-plugin-terser": "^7.0.2",
"ts-node": "^10.4.0",
"typescript": "4.1.3"
"typescript": "4.2.4"
},
"resolutions": {
"@lion/accordion": "^0.11.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/browser-logs/package.json
Expand Up @@ -21,7 +21,7 @@
}
},
"engines": {
"node": ">=10.0.0"
"node": ">=16.0.0"
},
"scripts": {
"build": "tsc",
Expand Down
2 changes: 1 addition & 1 deletion packages/config-loader/package.json
Expand Up @@ -15,7 +15,7 @@
"homepage": "https://github.com/modernweb-dev/web/tree/master/packages/config-loader",
"main": "src/index.js",
"engines": {
"node": ">=10.0.0"
"node": ">=16.0.0"
},
"scripts": {
"build": "tsc",
Expand Down
5 changes: 2 additions & 3 deletions packages/dev-server-core/package.json
Expand Up @@ -28,7 +28,7 @@
}
},
"engines": {
"node": ">=10.0.0"
"node": ">=16.0.0"
},
"scripts": {
"build": "tsc",
Expand Down Expand Up @@ -69,7 +69,7 @@
"koa-etag": "^4.0.0",
"koa-send": "^5.0.1",
"koa-static": "^5.0.0",
"lru-cache": "^6.0.0",
"lru-cache": "^8.0.4",
"mime-types": "^2.1.27",
"parse5": "^6.0.1",
"picomatch": "^2.2.2",
Expand All @@ -79,7 +79,6 @@
"@types/clone": "^2.1.0",
"@types/koa-etag": "^3.0.0",
"@types/koa-static": "^4.0.1",
"@types/lru-cache": "^5.1.0",
"@types/parse5": "^6.0.1",
"abort-controller": "^3.0.0",
"nanoid": "^3.1.25",
Expand Down
10 changes: 5 additions & 5 deletions packages/dev-server-core/src/middleware/PluginTransformCache.ts
Expand Up @@ -30,11 +30,11 @@ export class PluginTransformCache {
private lruCache: LRUCache<string, CacheEntry>;

constructor(private fileWatcher: FSWatcher, private rootDir: string) {
this.lruCache = new LRUCache({
length: (e, key) => e.body.length + (key ? key.length : 0),
max: 52428800,
this.lruCache = new LRUCache<string, CacheEntry>({
sizeCalculation: (e, key) => e.body.length + (key ? key.length : 0),
maxSize: 52428800,
noDisposeOnSet: true,
dispose: cacheKey => {
dispose: (_value, cacheKey) => {
// remove file path -> url mapping when we are no longer caching it
for (const [filePath, cacheKeysForFilePath] of this.cacheKeysPerFilePath.entries()) {
if (cacheKeysForFilePath.has(cacheKey)) {
Expand All @@ -50,7 +50,7 @@ export class PluginTransformCache {
const cacheKeys = this.cacheKeysPerFilePath.get(filePath);
if (cacheKeys) {
for (const cacheKey of cacheKeys) {
this.lruCache.del(cacheKey);
this.lruCache.delete(cacheKey);
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-esbuild/package.json
Expand Up @@ -21,7 +21,7 @@
}
},
"engines": {
"node": ">=10.0.0"
"node": ">=16.0.0"
},
"scripts": {
"build": "tsc",
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-hmr/package.json
Expand Up @@ -21,7 +21,7 @@
}
},
"engines": {
"node": ">=10.0.0"
"node": ">=16.0.0"
},
"scripts": {
"build": "tsc",
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-import-maps/package.json
Expand Up @@ -21,7 +21,7 @@
}
},
"engines": {
"node": ">=10.0.0"
"node": ">=16.0.0"
},
"scripts": {
"build": "tsc",
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-import-maps/test/resolving.test.ts
Expand Up @@ -382,7 +382,7 @@ describe('resolving imports', () => {
expect(loggerSpies.warn.callCount).to.equal(1);
const warning = loggerSpies.warn.getCall(0).args[0];
expectIncludes(warning, 'Failed to parse import map in "');
expectIncludes(warning, `test${path.sep}index.html": Unexpected end of JSON input`);
expectIncludes(warning, `test${path.sep}index.html": `);
server.stop();
});

Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-legacy/package.json
Expand Up @@ -21,7 +21,7 @@
}
},
"engines": {
"node": ">=10.0.0"
"node": ">=16.0.0"
},
"scripts": {
"build": "tsc",
Expand Down
13 changes: 7 additions & 6 deletions packages/dev-server-rollup/package.json
Expand Up @@ -21,7 +21,7 @@
}
},
"engines": {
"node": ">=10.0.0"
"node": ">=16.0.0"
},
"scripts": {
"test": "mocha \"test/node/**/*.test.ts\" --require ts-node/register",
Expand All @@ -47,26 +47,27 @@
"transform"
],
"dependencies": {
"@rollup/plugin-node-resolve": "^13.0.4",
"@rollup/plugin-node-resolve": "^15.0.1",
"@web/dev-server-core": "^0.4.1",
"nanocolors": "^0.2.1",
"parse5": "^6.0.1",
"rollup": "^2.67.0",
"rollup": "^3.15.0",
"whatwg-url": "^11.0.0"
},
"devDependencies": {
"@babel/plugin-transform-template-literals": "^7.12.1",
"@rollup/plugin-alias": "^3.1.1",
"@rollup/plugin-alias": "^4.0.3",
"@rollup/plugin-babel": "^6.0.3",
"@rollup/plugin-commonjs": "^18.0.0",
"@rollup/plugin-commonjs": "^24.0.1",
"@rollup/plugin-replace": "^5.0.2",
"@types/parse5": "^6.0.1",
"@types/whatwg-url": "^11.0.0",
"@web/test-runner-chrome": "^0.12.1",
"@web/test-runner-core": "^0.10.29",
"chai": "^4.2.0",
"mocha": "^10.2.0",
"node-fetch": "3.0.0-beta.9",
"postcss": "^8.0.0",
"rollup-plugin-postcss": "^4.0.0"
"rollup-plugin-postcss": "^4.0.2"
}
}
Expand Up @@ -27,7 +27,7 @@ export function createRollupPluginContextAdapter<
return {
...pluginContext,

getModuleInfo(id: string): ModuleInfo {
getModuleInfo(id: string): Partial<ModuleInfo> {
return {
id,
code: context.body as string,
Expand Down