GoogleChrome · Apr 13, 2021 · Apr 15, 2021 · Apr 22, 2021 · Apr 22, 2021 · Apr 27, 2021
diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,7 @@ firebase-debug.log
 # Generated TypeScript files and build data
 tsconfig.tsbuildinfo
 packages/workbox-*/**/*.d.ts
-!packages/workbox-cli/src/index.d.ts
+!packages/workbox-*/src/**/*.d.ts
 packages/workbox-*/**/*.js
 !packages/workbox-build/**/*.js
 !packages/workbox-webpack-plugin/**/*.js

diff --git a/.ncurc.js b/.ncurc.js
@@ -8,8 +8,5 @@ module.exports = {
     // See https://github.com/GoogleChrome/workbox/issues/2479
     '@octokit/rest',
     'service-worker-mock',
-    // See https://github.com/GoogleChrome/workbox/issues/2602
-    '@typescript-eslint/eslint-plugin',
-    '@typescript-eslint/parser',
   ],
 };
diff --git a/demos/src/workbox-background-sync-demo/sw.js b/demos/src/workbox-background-sync-demo/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 // Note: Ignore the error that Glitch raises about workbox being undefined.
 workbox.setConfig({

diff --git a/demos/src/workbox-broadcast-update-demo/sw.js b/demos/src/workbox-broadcast-update-demo/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 workbox.setConfig({
   debug: true,

diff --git a/demos/src/workbox-cacheable-response/sw.js b/demos/src/workbox-cacheable-response/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 workbox.setConfig({
   debug: true,

diff --git a/demos/src/workbox-core/sw.js b/demos/src/workbox-core/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 // Note: Ignore the error that Glitch raises about workbox being undefined.
 workbox.setConfig({

diff --git a/demos/src/workbox-expiration/sw.js b/demos/src/workbox-expiration/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 // Note: Ignore the error that Glitch raises about workbox being undefined.
 workbox.setConfig({

diff --git a/demos/src/workbox-google-analytics/sw.js b/demos/src/workbox-google-analytics/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 workbox.setConfig({
   debug: true,

diff --git a/demos/src/workbox-navigation-preload/sw.js b/demos/src/workbox-navigation-preload/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 workbox.setConfig({
   debug: true,

diff --git a/demos/src/workbox-precaching/sw-1.js b/demos/src/workbox-precaching/sw-1.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 workbox.setConfig({
   debug: true,

diff --git a/demos/src/workbox-precaching/sw-2.js b/demos/src/workbox-precaching/sw-2.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 workbox.setConfig({
   debug: true,

diff --git a/demos/src/workbox-range-requests/sw.js b/demos/src/workbox-range-requests/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 workbox.setConfig({
   debug: true,

diff --git a/demos/src/workbox-routing/sw.js b/demos/src/workbox-routing/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 workbox.setConfig({
   debug: true,

diff --git a/demos/src/workbox-strategies/sw.js b/demos/src/workbox-strategies/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 // To avoid async issues, we load strategies before we call it in the event listener
 workbox.loadModule('workbox-strategies');
 // Note: Ignore the error that Glitch raises about workbox being undefined.

diff --git a/demos/src/workbox-streams/sw.js b/demos/src/workbox-streams/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 workbox.setConfig({
   debug: true,

diff --git a/demos/src/workbox-sw/sw.js b/demos/src/workbox-sw/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 // Note: Ignore the error that Glitch raises about workbox being undefined.
 workbox.setConfig({

diff --git a/demos/src/workbox-window/sw.js b/demos/src/workbox-window/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-sw.js');
 
 workbox.setConfig({
   debug: true,

diff --git a/gulp-tasks/build-node-packages.js b/gulp-tasks/build-node-packages.js
@@ -8,6 +8,8 @@
 
 const {parallel} = require('gulp');
 const execa = require('execa');
+const fse = require('fs-extra');
+const TJS = require('typescript-json-schema');
 const upath = require('upath');
 
 const constants = require('./utils/constants');
@@ -28,7 +30,51 @@ async function buildNodePackage(packagePath) {
   ], {preferLocal: true});
 }
 
+async function generateWorkboxBuildJSONSchema(packagePath) {
+  const program = TJS.programFromConfig(upath.join(packagePath,
+      'tsconfig.json'));
+  const generator = TJS.buildGenerator(program, {
+    noExtraProps: true,
+    required: true,
+  });
+  const optionTypes = [
+    'GenerateSWOptions',
+    'GetManifestOptions',
+    'InjectManifestOptions',
+    'WebpackGenerateSWOptions',
+    'WebpackInjectManifestOptions',
+  ];
+  for (const optionType of optionTypes) {
+    const schema = generator.getSchemaForSymbol(optionType);
+
+    if (schema.properties.manifestTransforms) {
+      schema.properties.manifestTransforms.items = {};
+    }
+
+    if (schema.properties.exclude) {
+      schema.properties.exclude.items = {};
+    }
+
+    if (schema.properties.include) {
+      schema.properties.include.items = {};
+    }
+
+    if (schema.definitions.RouteMatchCallback) {
+      schema.definitions.RouteMatchCallback = {};
+    }
+
+    await fse.writeJSON(upath.join(packagePath, 'src', 'schema',
+        `${optionType}.json`), schema, {spaces: 2});
+  }
+}
+
 async function buildNodeTSPackage(packagePath) {
+  // Hardcode special logic for workbox-build, as it's the only package
+  // that requires JSON schema generation.
+  if (packagePath.endsWith('workbox-build')) {
+    await generateWorkboxBuildJSONSchema(packagePath);
+  }
+
   await execa('tsc', ['-b', packagePath], {preferLocal: true});
 }
 

diff --git a/gulp-tasks/build-packages.js b/gulp-tasks/build-packages.js
@@ -23,9 +23,11 @@ async function cleanPackage(packagePath) {
   if (await fse.pathExists(upath.join(packagePath, 'src', 'index.ts'))) {
     // Store the list of deleted files, so we can delete directories after.
     const deletedPaths = await del([
-      upath.join(packagePath, '**/*.+(js|mjs|d.ts)'),
+      `${packagePath}/**/*.+(js|mjs|d.ts)`,
       // Don't delete files in node_modules.
-      '!**/node_modules', '!**/node_modules/**/*',
+      '!**/node_modules/**/*',
+      // Don't delete anything under src.
+      `!${packagePath}/src/**/*`,
     ]);
 
     // Any directories in `deletedPaths` that are top-level directories to the
@@ -57,12 +59,12 @@ module.exports = {
   build_packages_clean: cleanSequence(),
   build_packages: series(
       cleanSequence(),
+      // This needs to be a series, not in parallel, so that there isn't a
+      // race condition with the terser nameCache.
+      series(build_sw_packages, build_window_packages),
       parallel(
           build_node_packages,
           build_node_ts_packages,
-          // This needs to be a series, not in parallel, so that there isn't a
-          // race condition with the terser nameCache.
-          series(build_sw_packages, build_window_packages),
       ),
   ),
 };
diff --git a/gulp-tasks/lint.js b/gulp-tasks/lint.js
@@ -28,5 +28,6 @@ async function lint_ts() {
 module.exports = {
   lint_js,
   lint_ts,
+  // Temporarily disable lint_ts until we upgrade our ESLint dependencies.
   lint: parallel(lint_js, lint_ts),
 };
diff --git a/gulp-tasks/utils/constants.js b/gulp-tasks/utils/constants.js
@@ -14,8 +14,8 @@ module.exports = {
   GENERATED_RELEASE_FILES_DIRNAME: 'generated-release-files',
 
   // This is used in the publish-bundle step to avoid doing anything
-  // with tags < v4.0.0.
-  MIN_RELEASE_TAG_TO_PUBLISH: 'v6.1.1',
+  // with tags that have known issues.
+  MIN_RELEASE_TAG_TO_PUBLISH: 'v6.1.5',
   GITHUB_OWNER: 'GoogleChrome',
   GITHUB_REPO: 'workbox',
 

diff --git a/gulp-tasks/utils/versioned-cdn-url.js b/gulp-tasks/utils/versioned-cdn-url.js
@@ -6,8 +6,8 @@
   https://opensource.org/licenses/MIT.
 */
 
-const {getCDNOrigin} = require(
-    '../../packages/workbox-build/src/lib/cdn-utils');
+const cdn = require('../../packages/workbox-build/src/cdn-details.json');
 const lernaPkg = require('../../lerna.json');
 
-module.exports = () => `${getCDNOrigin()}/${lernaPkg.version}`;
+module.exports = () => `${cdn.origin}/${cdn.bucketName}/${cdn.releasesDir}` +
+    `/${lernaPkg.version}`;
diff --git a/infra/testing/server/routes/sw-bundle.js b/infra/testing/server/routes/sw-bundle.js
@@ -40,7 +40,7 @@ async function handler(req, res) {
       plugins: [
         multiEntry(),
         nodeResolve({
-          moduleDirectories: ['packages'],
+          moduleDirectories: ['packages', 'node_modules'],
         }),
         // TODO(philipwalton): some of our shared testing helpers use commonjs
         // so we have to support this for the time being.

diff --git a/infra/testing/validator/service-worker-runtime.js b/infra/testing/validator/service-worker-runtime.js
@@ -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) {

diff --git a/infra/testing/webpack-build-check.js b/infra/testing/webpack-build-check.js
@@ -7,7 +7,7 @@
 */
 
 function joinMessages(errorsOrWarnings) {
-  if ('message' in errorsOrWarnings[0]) {
+  if (errorsOrWarnings[0].message) {
     return errorsOrWarnings.map((item) => item.message).join('\n');
   } else {
     return errorsOrWarnings.join('\n');

diff --git a/lerna.json b/lerna.json
@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "6.1.5"
+  "version": "6.2.0"
 }