hanzoai/workbox
2
0
Fork 0
mirror of https://github.com/hanzoai/workbox.git synced 2026-09-24 17:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix quotation chars when eval-cheap-source-map is used (#2847)

Browse Source 
* Fix some quotation characters

* Don't use ?.

* Linying
This commit is contained in:
Jeffrey Posnick
2021-06-02 08:11:18 -07:00
committed by GitHub
parent e9f6ef4c1f
commit 259418c754
8 changed files with 214 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
infra/testing/validator/service-worker-runtime.js
+3 -1
View File
@@ -198,7 +198,9 @@ module.exports = async ({
vm.runInNewContext(swString, context);
validateMethodCalls({methodsToSpies, expectedMethodCalls, context});
if (expectedMethodCalls) {
validateMethodCalls({methodsToSpies, expectedMethodCalls, context});
}
// Optionally check the usage of addEventListener().
if (addEventListenerValidation) {
package-lock.json
Generated
+2 -1
View File
@@ -10867,7 +10867,8 @@
"idb": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/idb/-/idb-6.0.0.tgz",
"integrity": "sha512-+M367poGtpzAylX4pwcrZIa7cFQLfNkAOlMMLN2kw/2jGfJP6h+TB/unQNSVYwNtP8XqkLYrfuiVnxLQNP1tjA=="
"integrity": "sha512-+M367poGtpzAylX4pwcrZIa7cFQLfNkAOlMMLN2kw/2jGfJP6h+TB/unQNSVYwNtP8XqkLYrfuiVnxLQNP1tjA==",
"dev": true
},
"ieee754": {
"version": "1.2.1",
package.json
+2 -2
View File
@@ -5,10 +5,10 @@
},
"scripts": {
"version": "gulp build && git add -A packages",
"gulp": "gulp",
"gulp": "gulp",
"build": "gulp build",
"lint": "gulp lint",
"test_server" : "gulp test_server",
"test_server": "gulp test_server",
"test_node": "gulp test_node",
"test_integration": "gulp test_integration"
},
packages/workbox-expiration/package-lock.json
Generated
-5
View File
@@ -8,11 +8,6 @@
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/idb/-/idb-6.0.0.tgz",
"integrity": "sha512-+M367poGtpzAylX4pwcrZIa7cFQLfNkAOlMMLN2kw/2jGfJP6h+TB/unQNSVYwNtP8XqkLYrfuiVnxLQNP1tjA=="
},
"workbox-core": {
"version": "6.1.5",
"resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.1.5.tgz",
"integrity": "sha512-9SOEle7YcJzg3njC0xMSmrPIiFjfsFm9WjwGd5enXmI8Lwk8wLdy63B0nzu5LXoibEmS9k+aWF8EzaKtOWjNSA=="
}
}
}
packages/workbox-webpack-plugin/src/inject-manifest.js
+8 -1
View File
@@ -317,7 +317,14 @@ class InjectManifest {
compilation, config);
let manifestString = stringify(sortedEntries);
if (this.config.compileSrc) {
if (this.config.compileSrc &&
// See https://github.com/GoogleChrome/workbox/issues/2729
// (TODO: Switch to ?. once our linter supports it.)
!(compilation.options &&
compilation.options.devtool === 'eval-cheap-source-map' &&
compilation.options.optimization &&
compilation.options.optimization.minimize)
) {
// See https://github.com/GoogleChrome/workbox/issues/2263
manifestString = manifestString.replace(/"/g, `'`);
}
test/workbox-webpack-plugin/node/v4/inject-manifest.js
+94
View File
@@ -691,6 +691,100 @@ describe(`[workbox-webpack-plugin] InjectManifest with webpack v4`, function() {
}
});
});
// See https://github.com/GoogleChrome/workbox/issues/2729
it(`should produce valid JavaScript when eval-cheap-source-map and minimization are used`, function(done) {
const outputDir = tempy.directory();
const config = {
mode: 'development',
entry: upath.join(SRC_DIR, WEBPACK_ENTRY_FILENAME),
output: {
filename: WEBPACK_ENTRY_FILENAME,
path: outputDir,
},
devtool: 'eval-cheap-source-map',
optimization: {
minimize: true,
},
plugins: [
new InjectManifest({
swSrc: upath.join(__dirname, '..', '..', 'static', 'module-import-sw.js'),
swDest: 'service-worker.js',
}),
],
};
const compiler = webpack(config);
compiler.run(async (webpackError, stats) => {
const swFile = upath.join(outputDir, 'service-worker.js');
try {
webpackBuildCheck(webpackError, stats);
const files = await globby('**', {cwd: outputDir});
expect(files).to.have.length(2);
await validateServiceWorkerRuntime({
swFile,
entryPoint: 'injectManifest',
// We can't verify expectedMethodCalls here, since we're using
// a compiled ES module import, not the workbox-sw interfaces.
// This test just confirms that the compilation produces valid JS.
});
done();
} catch (error) {
done(error);
}
});
});
// See https://github.com/GoogleChrome/workbox/issues/2729
it(`should produce valid JavaScript when eval-cheap-source-map is used without minimization`, function(done) {
const outputDir = tempy.directory();
const config = {
mode: 'development',
entry: upath.join(SRC_DIR, WEBPACK_ENTRY_FILENAME),
output: {
filename: WEBPACK_ENTRY_FILENAME,
path: outputDir,
},
devtool: 'eval-cheap-source-map',
optimization: {
minimize: false,
},
plugins: [
new InjectManifest({
swSrc: upath.join(__dirname, '..', '..', 'static', 'module-import-sw.js'),
swDest: 'service-worker.js',
}),
],
};
const compiler = webpack(config);
compiler.run(async (webpackError, stats) => {
const swFile = upath.join(outputDir, 'service-worker.js');
try {
webpackBuildCheck(webpackError, stats);
const files = await globby('**', {cwd: outputDir});
expect(files).to.have.length(2);
await validateServiceWorkerRuntime({
swFile,
entryPoint: 'injectManifest',
// We can't verify expectedMethodCalls here, since we're using
// a compiled ES module import, not the workbox-sw interfaces.
// This test just confirms that the compilation produces valid JS.
});
done();
} catch (error) {
done(error);
}
});
});
});
describe(`[workbox-webpack-plugin] Filtering via include/exclude`, function() {
test/workbox-webpack-plugin/node/v5/inject-manifest.js
+94
View File
@@ -694,6 +694,100 @@ describe(`[workbox-webpack-plugin] InjectManifest with webpack v5`, function() {
}
});
});
// See https://github.com/GoogleChrome/workbox/issues/2729
it(`should produce valid JavaScript when eval-cheap-source-map and minimization are used`, function(done) {
const outputDir = tempy.directory();
const config = {
mode: 'development',
entry: upath.join(SRC_DIR, WEBPACK_ENTRY_FILENAME),
output: {
filename: WEBPACK_ENTRY_FILENAME,
path: outputDir,
},
devtool: 'eval-cheap-source-map',
optimization: {
minimize: true,
},
plugins: [
new InjectManifest({
swSrc: upath.join(__dirname, '..', '..', 'static', 'module-import-sw.js'),
swDest: 'service-worker.js',
}),
],
};
const compiler = webpack(config);
compiler.run(async (webpackError, stats) => {
const swFile = upath.join(outputDir, 'service-worker.js');
try {
webpackBuildCheck(webpackError, stats);
const files = await globby('**', {cwd: outputDir});
expect(files).to.have.length(4);
await validateServiceWorkerRuntime({
swFile,
entryPoint: 'injectManifest',
// We can't verify expectedMethodCalls here, since we're using
// a compiled ES module import, not the workbox-sw interfaces.
// This test just confirms that the compilation produces valid JS.
});
done();
} catch (error) {
done(error);
}
});
});
// See https://github.com/GoogleChrome/workbox/issues/2729
it(`should produce valid JavaScript when eval-cheap-source-map is used without minimization`, function(done) {
const outputDir = tempy.directory();
const config = {
mode: 'development',
entry: upath.join(SRC_DIR, WEBPACK_ENTRY_FILENAME),
output: {
filename: WEBPACK_ENTRY_FILENAME,
path: outputDir,
},
devtool: 'eval-cheap-source-map',
optimization: {
minimize: false,
},
plugins: [
new InjectManifest({
swSrc: upath.join(__dirname, '..', '..', 'static', 'module-import-sw.js'),
swDest: 'service-worker.js',
}),
],
};
const compiler = webpack(config);
compiler.run(async (webpackError, stats) => {
const swFile = upath.join(outputDir, 'service-worker.js');
try {
webpackBuildCheck(webpackError, stats);
const files = await globby('**', {cwd: outputDir});
expect(files).to.have.length(2);
await validateServiceWorkerRuntime({
swFile,
entryPoint: 'injectManifest',
// We can't verify expectedMethodCalls here, since we're using
// a compiled ES module import, not the workbox-sw interfaces.
// This test just confirms that the compilation produces valid JS.
});
done();
} catch (error) {
done(error);
}
});
});
});
describe(`[workbox-webpack-plugin] Filtering via include/exclude`, function() {
test/workbox-webpack-plugin/static/module-import-sw.js
+11
View File
@@ -0,0 +1,11 @@
/*
Copyright 2018 Google LLC
Use of this source code is governed by an MIT-style
license that can be found in the LICENSE file or at
https://opensource.org/licenses/MIT.
*/
import {precacheAndRoute} from '../../../packages/workbox-precaching';
precacheAndRoute(self.__WB_MANIFEST);