From 64898a0283074ef07b267f443ccc6c6ec38d0b46 Mon Sep 17 00:00:00 2001
From: Matt Gaunt <matt@gauntface.co.uk>
Date: Tue, 14 Nov 2017 10:43:33 -0800
Subject: [PATCH 1/2] Renaming workbox-runtime-caching to workbox-strategies

---
 demos/functions/index.js                         |  2 +-
 ...untime-caching.hbs => workbox-strategies.hbs} |  2 +-
 .../sw.hbs                                       | 16 ++++++++--------
 .../cache-first.txt                              |  0
 .../network-first.txt                            |  0
 .../network-only.txt                             |  0
 .../stale-while-revalidate.txt                   |  0
 gulp-tasks/demos.js                              |  1 +
 infra/pr-bot/aggregate-size-plugin.js            |  2 +-
 packages/workbox-build/package.json              |  2 +-
 packages/workbox-cli/package-lock.json           |  4 +---
 packages/workbox-google-analytics/_default.mjs   |  4 ++--
 packages/workbox-google-analytics/package.json   |  2 +-
 packages/workbox-runtime-caching/_version.mjs    |  1 -
 .../CacheFirst.mjs                               |  2 +-
 .../CacheOnly.mjs                                |  2 +-
 .../NetworkFirst.mjs                             |  4 ++--
 .../NetworkOnly.mjs                              |  2 +-
 .../StaleWhileRevalidate.mjs                     |  2 +-
 .../_default.mjs                                 |  0
 .../_public.mjs                                  |  0
 .../_types.mjs                                   |  0
 packages/workbox-strategies/_version.mjs         |  1 +
 .../browser.mjs                                  |  0
 .../index.mjs                                    |  0
 .../package.json                                 |  6 +++---
 .../plugins/cacheOkAndOpaquePlugin.mjs           |  0
 .../utils/messages.mjs                           |  0
 .../utils/pluginBuilder.mjs                      |  0
 packages/workbox-sw/controllers/WorkboxSW.mjs    |  2 +-
 test/workbox-build/node/dependency-check.js      |  2 +-
 .../node/entry-points/generate-sw.js             |  8 ++++----
 .../workbox-google-analytics/node/test-index.mjs |  2 +-
 .../node/test-CacheFirst.mjs                     |  4 ++--
 .../node/test-CacheOnly.mjs                      |  4 ++--
 .../node/test-NetworkFirst.mjs                   |  6 +++---
 .../node/test-NetworkOnly.mjs                    |  4 ++--
 .../node/test-StaleWhileRevalidate.mjs           |  4 ++--
 .../node/test-UsageWithRouter.mjs                | 12 ++++++------
 .../node/test-cacheOkAndOpaquePlugin.mjs         |  4 ++--
 .../node/test-default.mjs                        |  6 +++---
 test/workbox-sw/node/test-WorkboxSW.mjs          |  2 +-
 42 files changed, 57 insertions(+), 58 deletions(-)
 rename demos/functions/views/demo/{workbox-runtime-caching.hbs => workbox-strategies.hbs} (97%)
 rename demos/functions/views/demo/{workbox-runtime-caching => workbox-strategies}/sw.hbs (73%)
 rename demos/public/demo/{workbox-runtime-caching => workbox-strategies}/cache-first.txt (100%)
 rename demos/public/demo/{workbox-runtime-caching => workbox-strategies}/network-first.txt (100%)
 rename demos/public/demo/{workbox-runtime-caching => workbox-strategies}/network-only.txt (100%)
 rename demos/public/demo/{workbox-runtime-caching => workbox-strategies}/stale-while-revalidate.txt (100%)
 delete mode 100644 packages/workbox-runtime-caching/_version.mjs
 rename packages/{workbox-runtime-caching => workbox-strategies}/CacheFirst.mjs (98%)
 rename packages/{workbox-runtime-caching => workbox-strategies}/CacheOnly.mjs (98%)
 rename packages/{workbox-runtime-caching => workbox-strategies}/NetworkFirst.mjs (98%)
 rename packages/{workbox-runtime-caching => workbox-strategies}/NetworkOnly.mjs (98%)
 rename packages/{workbox-runtime-caching => workbox-strategies}/StaleWhileRevalidate.mjs (99%)
 rename packages/{workbox-runtime-caching => workbox-strategies}/_default.mjs (100%)
 rename packages/{workbox-runtime-caching => workbox-strategies}/_public.mjs (100%)
 rename packages/{workbox-runtime-caching => workbox-strategies}/_types.mjs (100%)
 create mode 100644 packages/workbox-strategies/_version.mjs
 rename packages/{workbox-runtime-caching => workbox-strategies}/browser.mjs (100%)
 rename packages/{workbox-runtime-caching => workbox-strategies}/index.mjs (100%)
 rename packages/{workbox-runtime-caching => workbox-strategies}/package.json (83%)
 rename packages/{workbox-runtime-caching => workbox-strategies}/plugins/cacheOkAndOpaquePlugin.mjs (100%)
 rename packages/{workbox-runtime-caching => workbox-strategies}/utils/messages.mjs (100%)
 rename packages/{workbox-runtime-caching => workbox-strategies}/utils/pluginBuilder.mjs (100%)

diff --git a/demos/functions/index.js b/demos/functions/index.js
index 369c081cc..4b4d00cf0 100644
--- a/demos/functions/index.js
+++ b/demos/functions/index.js
@@ -16,7 +16,7 @@ const workboxModules = [
   'workbox-precaching',
   'workbox-range-requests',
   'workbox-routing',
-  'workbox-runtime-caching',
+  'workbox-strategies',
   'workbox-sw',
 ];
 
diff --git a/demos/functions/views/demo/workbox-runtime-caching.hbs b/demos/functions/views/demo/workbox-strategies.hbs
similarity index 97%
rename from demos/functions/views/demo/workbox-runtime-caching.hbs
rename to demos/functions/views/demo/workbox-strategies.hbs
index 202235d25..7fca0f01d 100644
--- a/demos/functions/views/demo/workbox-runtime-caching.hbs
+++ b/demos/functions/views/demo/workbox-strategies.hbs
@@ -26,7 +26,7 @@
 </section>
 
 <script>
-  navigator.serviceWorker.register('/demo/workbox-runtime-caching/sw.js');
+  navigator.serviceWorker.register('/demo/workbox-strategies/sw.js');
 
   const cacheOnlyEmpty = document.querySelector('.cache-only-empty-cache');
   cacheOnlyEmpty.addEventListener('click', () => {
diff --git a/demos/functions/views/demo/workbox-runtime-caching/sw.hbs b/demos/functions/views/demo/workbox-strategies/sw.hbs
similarity index 73%
rename from demos/functions/views/demo/workbox-runtime-caching/sw.hbs
rename to demos/functions/views/demo/workbox-strategies/sw.hbs
index 5e81c08df..50d5774f7 100644
--- a/demos/functions/views/demo/workbox-runtime-caching/sw.hbs
+++ b/demos/functions/views/demo/workbox-strategies/sw.hbs
@@ -2,31 +2,31 @@
 
 self.addEventListener('fetch', (event) => {
   switch (new URL(event.request.url).pathname) {
-    case '/demo/workbox-runtime-caching/cache-only-empty-cache.txt':
+    case '/demo/workbox-strategies/cache-only-empty-cache.txt':
       const cacheOnlyEmpty = new workbox.strategies.CacheOnly();
       event.respondWith(cacheOnlyEmpty.handle({event}));
       break;
-    case '/demo/workbox-runtime-caching/cache-only-populated-cache':
+    case '/demo/workbox-strategies/cache-only-populated-cache':
       const cacheOnlyPopulated = new workbox.strategies.CacheOnly();
       event.respondWith(cacheOnlyPopulated.handle({event}));
       break;
-    case '/demo/workbox-runtime-caching/cache-first.txt':
+    case '/demo/workbox-strategies/cache-first.txt':
       const cacheFirst = new workbox.strategies.CacheFirst();
       event.respondWith(cacheFirst.handle({event}));
       break;
-    case '/demo/workbox-runtime-caching/network-only.txt':
+    case '/demo/workbox-strategies/network-only.txt':
       const networkOnly = new workbox.strategies.NetworkOnly();
       event.respondWith(networkOnly.handle({event}));
       break;
-    case '/demo/workbox-runtime-caching/network-first.txt':
+    case '/demo/workbox-strategies/network-first.txt':
       const networkFirst = new workbox.strategies.NetworkFirst();
       event.respondWith(networkFirst.handle({event}));
       break;
-    case '/demo/workbox-runtime-caching/network-first-404.txt':
+    case '/demo/workbox-strategies/network-first-404.txt':
       const networkFirstInvalid = new workbox.strategies.NetworkFirst();
       event.respondWith(networkFirstInvalid.handle({event}));
       break;
-    case '/demo/workbox-runtime-caching/stale-while-revalidate.txt':
+    case '/demo/workbox-strategies/stale-while-revalidate.txt':
       const staleWhileRevalidate = new workbox.strategies.StaleWhileRevalidate();
       event.respondWith(staleWhileRevalidate.handle({event}));
       break;
@@ -44,7 +44,7 @@ self.addEventListener('install', (event) => {
     caches.open(workbox.core.cacheNames.runtime)
     .then((cache) => {
       return cache.put(
-        new Request('/demo/workbox-runtime-caching/cache-only-populated-cache'),
+        new Request('/demo/workbox-strategies/cache-only-populated-cache'),
         new Response('Hello from the populated cache.')
       );
     })
diff --git a/demos/public/demo/workbox-runtime-caching/cache-first.txt b/demos/public/demo/workbox-strategies/cache-first.txt
similarity index 100%
rename from demos/public/demo/workbox-runtime-caching/cache-first.txt
rename to demos/public/demo/workbox-strategies/cache-first.txt
diff --git a/demos/public/demo/workbox-runtime-caching/network-first.txt b/demos/public/demo/workbox-strategies/network-first.txt
similarity index 100%
rename from demos/public/demo/workbox-runtime-caching/network-first.txt
rename to demos/public/demo/workbox-strategies/network-first.txt
diff --git a/demos/public/demo/workbox-runtime-caching/network-only.txt b/demos/public/demo/workbox-strategies/network-only.txt
similarity index 100%
rename from demos/public/demo/workbox-runtime-caching/network-only.txt
rename to demos/public/demo/workbox-strategies/network-only.txt
diff --git a/demos/public/demo/workbox-runtime-caching/stale-while-revalidate.txt b/demos/public/demo/workbox-strategies/stale-while-revalidate.txt
similarity index 100%
rename from demos/public/demo/workbox-runtime-caching/stale-while-revalidate.txt
rename to demos/public/demo/workbox-strategies/stale-while-revalidate.txt
diff --git a/gulp-tasks/demos.js b/gulp-tasks/demos.js
index 50822916d..756f4b82c 100644
--- a/gulp-tasks/demos.js
+++ b/gulp-tasks/demos.js
@@ -14,6 +14,7 @@ gulp.task('demos:groupBuildFiles', async () => {
 
   const localBuildPath = path.join(__dirname, '..', 'demos', 'public',
     constants.LOCAL_BUILDS_DIR);
+  await fs.remove(localBuildPath);
   await fs.ensureDir(localBuildPath);
 
   // Copy files from the source code and move into the grouped build
diff --git a/infra/pr-bot/aggregate-size-plugin.js b/infra/pr-bot/aggregate-size-plugin.js
index ef93a9330..5296b1885 100644
--- a/infra/pr-bot/aggregate-size-plugin.js
+++ b/infra/pr-bot/aggregate-size-plugin.js
@@ -21,7 +21,7 @@ class AggregateSizePlugin extends PluginInterface {
       `workbox-core`,
       `workbox-precaching`,
       `workbox-routing`,
-      `workbox-runtime-caching`,
+      `workbox-strategies`,
       `workbox-sw`,
     ];
     const files = packagesToAggregate.map((pkgName) => {
diff --git a/packages/workbox-build/package.json b/packages/workbox-build/package.json
index 49fce67a9..303bf8971 100644
--- a/packages/workbox-build/package.json
+++ b/packages/workbox-build/package.json
@@ -30,7 +30,7 @@
     "workbox-core": "^3.0.0-alpha.24",
     "workbox-precaching": "^3.0.0-alpha.24",
     "workbox-routing": "^3.0.0-alpha.24",
-    "workbox-runtime-caching": "^3.0.0-alpha.24",
+    "workbox-strategies": "^3.0.0-alpha.24",
     "workbox-sw": "^3.0.0-alpha.24"
   },
   "main": "build/index.js",
diff --git a/packages/workbox-cli/package-lock.json b/packages/workbox-cli/package-lock.json
index 586dd4a59..b69f8636b 100644
--- a/packages/workbox-cli/package-lock.json
+++ b/packages/workbox-cli/package-lock.json
@@ -1,8 +1,6 @@
 {
-	"name": "workbox-cli",
-	"version": "3.0.0-alpha.18",
-	"lockfileVersion": 1,
 	"requires": true,
+	"lockfileVersion": 1,
 	"dependencies": {
 		"ansi-align": {
 			"version": "2.0.0",
diff --git a/packages/workbox-google-analytics/_default.mjs b/packages/workbox-google-analytics/_default.mjs
index 035e5b588..34f994cac 100644
--- a/packages/workbox-google-analytics/_default.mjs
+++ b/packages/workbox-google-analytics/_default.mjs
@@ -18,8 +18,8 @@ import {QueuePlugin} from 'workbox-background-sync/QueuePlugin.mjs';
 import {cacheNames} from 'workbox-core/_private/cacheNames.mjs';
 import {Route} from 'workbox-routing/Route.mjs';
 import {Router} from 'workbox-routing/Router.mjs';
-import {NetworkFirst} from 'workbox-runtime-caching/NetworkFirst.mjs';
-import {NetworkOnly} from 'workbox-runtime-caching/NetworkOnly.mjs';
+import {NetworkFirst} from 'workbox-strategies/NetworkFirst.mjs';
+import {NetworkOnly} from 'workbox-strategies/NetworkOnly.mjs';
 import {
   QUEUE_NAME,
   MAX_RETENTION_TIME,
diff --git a/packages/workbox-google-analytics/package.json b/packages/workbox-google-analytics/package.json
index 078adb8eb..5fc53c9e1 100644
--- a/packages/workbox-google-analytics/package.json
+++ b/packages/workbox-google-analytics/package.json
@@ -31,6 +31,6 @@
     "workbox-background-sync": "^3.0.0-alpha.24",
     "workbox-core": "^3.0.0-alpha.24",
     "workbox-routing": "^3.0.0-alpha.24",
-    "workbox-runtime-caching": "^3.0.0-alpha.24"
+    "workbox-strategies": "^3.0.0-alpha.24"
   }
 }
diff --git a/packages/workbox-runtime-caching/_version.mjs b/packages/workbox-runtime-caching/_version.mjs
deleted file mode 100644
index 59c873aa0..000000000
--- a/packages/workbox-runtime-caching/_version.mjs
+++ /dev/null
@@ -1 +0,0 @@
-try{self.workbox.v['workbox:runtime-caching:3.0.0-alpha.24']=1;}catch(e){} // eslint-disable-line
\ No newline at end of file
diff --git a/packages/workbox-runtime-caching/CacheFirst.mjs b/packages/workbox-strategies/CacheFirst.mjs
similarity index 98%
rename from packages/workbox-runtime-caching/CacheFirst.mjs
rename to packages/workbox-strategies/CacheFirst.mjs
index b2aaf27d3..0c755344b 100644
--- a/packages/workbox-runtime-caching/CacheFirst.mjs
+++ b/packages/workbox-strategies/CacheFirst.mjs
@@ -62,7 +62,7 @@ class CacheFirst {
     const logs = [];
     if (process.env.NODE_ENV !== 'production') {
       assert.isInstance(event, FetchEvent, {
-        moduleName: 'workbox-runtime-caching',
+        moduleName: 'workbox-strategies',
         className: 'CacheFirst',
         funcName: 'handle',
         paramName: 'event',
diff --git a/packages/workbox-runtime-caching/CacheOnly.mjs b/packages/workbox-strategies/CacheOnly.mjs
similarity index 98%
rename from packages/workbox-runtime-caching/CacheOnly.mjs
rename to packages/workbox-strategies/CacheOnly.mjs
index e910420a2..2457c3a6b 100644
--- a/packages/workbox-runtime-caching/CacheOnly.mjs
+++ b/packages/workbox-strategies/CacheOnly.mjs
@@ -61,7 +61,7 @@ class CacheOnly {
   async handle({event}) {
     if (process.env.NODE_ENV !== 'production') {
       assert.isInstance(event, FetchEvent, {
-        moduleName: 'workbox-runtime-caching',
+        moduleName: 'workbox-strategies',
         className: 'CacheOnly',
         funcName: 'handle',
         paramName: 'event',
diff --git a/packages/workbox-runtime-caching/NetworkFirst.mjs b/packages/workbox-strategies/NetworkFirst.mjs
similarity index 98%
rename from packages/workbox-runtime-caching/NetworkFirst.mjs
rename to packages/workbox-strategies/NetworkFirst.mjs
index ac5c0952e..9c47023ba 100644
--- a/packages/workbox-runtime-caching/NetworkFirst.mjs
+++ b/packages/workbox-strategies/NetworkFirst.mjs
@@ -70,7 +70,7 @@ class NetworkFirst {
     if (process.env.NODE_ENV !== 'production') {
       if (this._networkTimeoutSeconds) {
         assert.isType(this._networkTimeoutSeconds, 'number', {
-          moduleName: 'workbox-runtime-caching',
+          moduleName: 'workbox-strategies',
           className: 'NetworkFirst',
           funcName: 'constructor',
           paramName: 'networkTimeoutSeconds',
@@ -93,7 +93,7 @@ class NetworkFirst {
     const logs = [];
     if (process.env.NODE_ENV !== 'production') {
       assert.isInstance(event, FetchEvent, {
-        moduleName: 'workbox-runtime-caching',
+        moduleName: 'workbox-strategies',
         className: 'NetworkFirst',
         funcName: 'handle',
         paramName: 'event',
diff --git a/packages/workbox-runtime-caching/NetworkOnly.mjs b/packages/workbox-strategies/NetworkOnly.mjs
similarity index 98%
rename from packages/workbox-runtime-caching/NetworkOnly.mjs
rename to packages/workbox-strategies/NetworkOnly.mjs
index 15d244b27..a06d473bf 100644
--- a/packages/workbox-runtime-caching/NetworkOnly.mjs
+++ b/packages/workbox-strategies/NetworkOnly.mjs
@@ -60,7 +60,7 @@ class NetworkOnly {
   async handle({event}) {
     if (process.env.NODE_ENV !== 'production') {
       assert.isInstance(event, FetchEvent, {
-        moduleName: 'workbox-runtime-caching',
+        moduleName: 'workbox-strategies',
         className: 'NetworkOnly',
         funcName: 'handle',
         paramName: 'event',
diff --git a/packages/workbox-runtime-caching/StaleWhileRevalidate.mjs b/packages/workbox-strategies/StaleWhileRevalidate.mjs
similarity index 99%
rename from packages/workbox-runtime-caching/StaleWhileRevalidate.mjs
rename to packages/workbox-strategies/StaleWhileRevalidate.mjs
index 36c13dddb..5bc3257e4 100644
--- a/packages/workbox-runtime-caching/StaleWhileRevalidate.mjs
+++ b/packages/workbox-strategies/StaleWhileRevalidate.mjs
@@ -82,7 +82,7 @@ class StaleWhileRevalidate {
     const logs = [];
     if (process.env.NODE_ENV !== 'production') {
       assert.isInstance(event, FetchEvent, {
-        moduleName: 'workbox-runtime-caching',
+        moduleName: 'workbox-strategies',
         className: 'StaleWhileRevalidate',
         funcName: 'handle',
         paramName: 'event',
diff --git a/packages/workbox-runtime-caching/_default.mjs b/packages/workbox-strategies/_default.mjs
similarity index 100%
rename from packages/workbox-runtime-caching/_default.mjs
rename to packages/workbox-strategies/_default.mjs
diff --git a/packages/workbox-runtime-caching/_public.mjs b/packages/workbox-strategies/_public.mjs
similarity index 100%
rename from packages/workbox-runtime-caching/_public.mjs
rename to packages/workbox-strategies/_public.mjs
diff --git a/packages/workbox-runtime-caching/_types.mjs b/packages/workbox-strategies/_types.mjs
similarity index 100%
rename from packages/workbox-runtime-caching/_types.mjs
rename to packages/workbox-strategies/_types.mjs
diff --git a/packages/workbox-strategies/_version.mjs b/packages/workbox-strategies/_version.mjs
new file mode 100644
index 000000000..bb9f6d38f
--- /dev/null
+++ b/packages/workbox-strategies/_version.mjs
@@ -0,0 +1 @@
+try{self.workbox.v['workbox:strategies:3.0.0-alpha.24']=1;}catch(e){} // eslint-disable-line
\ No newline at end of file
diff --git a/packages/workbox-runtime-caching/browser.mjs b/packages/workbox-strategies/browser.mjs
similarity index 100%
rename from packages/workbox-runtime-caching/browser.mjs
rename to packages/workbox-strategies/browser.mjs
diff --git a/packages/workbox-runtime-caching/index.mjs b/packages/workbox-strategies/index.mjs
similarity index 100%
rename from packages/workbox-runtime-caching/index.mjs
rename to packages/workbox-strategies/index.mjs
diff --git a/packages/workbox-runtime-caching/package.json b/packages/workbox-strategies/package.json
similarity index 83%
rename from packages/workbox-runtime-caching/package.json
rename to packages/workbox-strategies/package.json
index afd25ac5b..94d3f59be 100644
--- a/packages/workbox-runtime-caching/package.json
+++ b/packages/workbox-strategies/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "workbox-runtime-caching",
+  "name": "workbox-strategies",
   "version": "3.0.0-alpha.24",
   "license": "Apache-2.0",
   "author": "Google's Web DevRel Team",
@@ -16,7 +16,7 @@
     "routing"
   ],
   "scripts": {
-    "build": "gulp build-packages --package workbox-runtime-caching",
+    "build": "gulp build-packages --package workbox-strategies",
     "version": "npm run build",
     "prepare": "npm run build"
   },
@@ -24,7 +24,7 @@
     "browserNamespace": "workbox.strategies",
     "packageType": "browser"
   },
-  "main": "build/workbox-runtime-caching.prod.js",
+  "main": "build/workbox-strategies.prod.js",
   "module": "index.mjs",
   "dependencies": {
     "workbox-cache-expiration": "^3.0.0-alpha.24",
diff --git a/packages/workbox-runtime-caching/plugins/cacheOkAndOpaquePlugin.mjs b/packages/workbox-strategies/plugins/cacheOkAndOpaquePlugin.mjs
similarity index 100%
rename from packages/workbox-runtime-caching/plugins/cacheOkAndOpaquePlugin.mjs
rename to packages/workbox-strategies/plugins/cacheOkAndOpaquePlugin.mjs
diff --git a/packages/workbox-runtime-caching/utils/messages.mjs b/packages/workbox-strategies/utils/messages.mjs
similarity index 100%
rename from packages/workbox-runtime-caching/utils/messages.mjs
rename to packages/workbox-strategies/utils/messages.mjs
diff --git a/packages/workbox-runtime-caching/utils/pluginBuilder.mjs b/packages/workbox-strategies/utils/pluginBuilder.mjs
similarity index 100%
rename from packages/workbox-runtime-caching/utils/pluginBuilder.mjs
rename to packages/workbox-strategies/utils/pluginBuilder.mjs
diff --git a/packages/workbox-sw/controllers/WorkboxSW.mjs b/packages/workbox-sw/controllers/WorkboxSW.mjs
index e79ed7ce0..7fc47c8d8 100644
--- a/packages/workbox-sw/controllers/WorkboxSW.mjs
+++ b/packages/workbox-sw/controllers/WorkboxSW.mjs
@@ -25,7 +25,7 @@ const MODULE_KEY_TO_NAME_MAPPING = {
   core: 'core',
   expiration: 'cache-expiration',
   googleAnalytics: 'google-analytics',
-  strategies: 'runtime-caching',
+  strategies: 'strategies',
   precaching: 'precaching',
   routing: 'routing',
 };
diff --git a/test/workbox-build/node/dependency-check.js b/test/workbox-build/node/dependency-check.js
index c182d606e..83f9df05a 100644
--- a/test/workbox-build/node/dependency-check.js
+++ b/test/workbox-build/node/dependency-check.js
@@ -16,7 +16,7 @@ describe(`[workbox-build] Test Dependencies`, function() {
         'workbox-core',
         'workbox-precaching',
         'workbox-routing',
-        'workbox-runtime-caching',
+        'workbox-strategies',
         'workbox-sw',
       ],
     }, (unusedDeps) => {
diff --git a/test/workbox-build/node/entry-points/generate-sw.js b/test/workbox-build/node/entry-points/generate-sw.js
index e90ad3748..7b7d30ea7 100644
--- a/test/workbox-build/node/entry-points/generate-sw.js
+++ b/test/workbox-build/node/entry-points/generate-sw.js
@@ -165,10 +165,10 @@ describe(`[workbox-build] entry-points/generate-sw.js (End to End)`, function()
         'workbox-routing.dev.js.map',
         'workbox-routing.prod.js',
         'workbox-routing.prod.js.map',
-        'workbox-runtime-caching.dev.js',
-        'workbox-runtime-caching.dev.js.map',
-        'workbox-runtime-caching.prod.js',
-        'workbox-runtime-caching.prod.js.map',
+        'workbox-strategies.dev.js',
+        'workbox-strategies.dev.js.map',
+        'workbox-strategies.prod.js',
+        'workbox-strategies.prod.js.map',
         'workbox-sw.js',
         'workbox-sw.js.map',
       ]);
diff --git a/test/workbox-google-analytics/node/test-index.mjs b/test/workbox-google-analytics/node/test-index.mjs
index 92edfb7eb..59e42cb34 100644
--- a/test/workbox-google-analytics/node/test-index.mjs
+++ b/test/workbox-google-analytics/node/test-index.mjs
@@ -19,7 +19,7 @@ import {reset as iDBReset} from 'shelving-mock-indexeddb';
 import {eventsDoneWaiting, resetEventListeners} from '../../../infra/testing/sw-env-mocks/event-listeners.js';
 import {Queue} from '../../../packages/workbox-background-sync/Queue.mjs';
 import {cacheNames} from '../../../packages/workbox-core/_private/cacheNames.mjs';
-import {NetworkFirst, NetworkOnly} from '../../../packages/workbox-runtime-caching/index.mjs';
+import {NetworkFirst, NetworkOnly} from '../../../packages/workbox-strategies/index.mjs';
 import * as googleAnalytics from '../../../packages/workbox-google-analytics/index.mjs';
 import {
   MAX_RETENTION_TIME,
diff --git a/test/workbox-runtime-caching/node/test-CacheFirst.mjs b/test/workbox-runtime-caching/node/test-CacheFirst.mjs
index 1a0699022..7f953ae2a 100644
--- a/test/workbox-runtime-caching/node/test-CacheFirst.mjs
+++ b/test/workbox-runtime-caching/node/test-CacheFirst.mjs
@@ -18,9 +18,9 @@ import {expect} from 'chai';
 import {_private} from '../../../packages/workbox-core/index.mjs';
 import {compareResponses} from '../utils/response-comparisons.mjs';
 
-import {CacheFirst} from '../../../packages/workbox-runtime-caching/CacheFirst.mjs';
+import {CacheFirst} from '../../../packages/workbox-strategies/CacheFirst.mjs';
 
-describe(`[workbox-runtime-caching] CacheFirst`, function() {
+describe(`[workbox-strategies] CacheFirst`, function() {
   let sandbox = sinon.sandbox.create();
 
   beforeEach(async function() {
diff --git a/test/workbox-runtime-caching/node/test-CacheOnly.mjs b/test/workbox-runtime-caching/node/test-CacheOnly.mjs
index 9f1dff551..aa4edd168 100644
--- a/test/workbox-runtime-caching/node/test-CacheOnly.mjs
+++ b/test/workbox-runtime-caching/node/test-CacheOnly.mjs
@@ -19,9 +19,9 @@ import {expect} from 'chai';
 import {_private} from '../../../packages/workbox-core/index.mjs';
 import {compareResponses} from '../utils/response-comparisons.mjs';
 
-import {CacheOnly} from '../../../packages/workbox-runtime-caching/CacheOnly.mjs';
+import {CacheOnly} from '../../../packages/workbox-strategies/CacheOnly.mjs';
 
-describe(`[workbox-runtime-caching] CacheOnly`, function() {
+describe(`[workbox-strategies] CacheOnly`, function() {
   let sandbox = sinon.sandbox.create();
 
   beforeEach(async function() {
diff --git a/test/workbox-runtime-caching/node/test-NetworkFirst.mjs b/test/workbox-runtime-caching/node/test-NetworkFirst.mjs
index e501beb42..65fac2e26 100644
--- a/test/workbox-runtime-caching/node/test-NetworkFirst.mjs
+++ b/test/workbox-runtime-caching/node/test-NetworkFirst.mjs
@@ -20,9 +20,9 @@ import {devOnly} from '../../../infra/testing/env-it';
 import {_private} from '../../../packages/workbox-core/index.mjs';
 import {compareResponses} from '../utils/response-comparisons.mjs';
 
-import {NetworkFirst} from '../../../packages/workbox-runtime-caching/NetworkFirst.mjs';
+import {NetworkFirst} from '../../../packages/workbox-strategies/NetworkFirst.mjs';
 
-describe(`[workbox-runtime-caching] NetworkFirst`, function() {
+describe(`[workbox-strategies] NetworkFirst`, function() {
   let sandbox = sinon.sandbox.create();
 
   beforeEach(async function() {
@@ -128,7 +128,7 @@ describe(`[workbox-runtime-caching] NetworkFirst`, function() {
     return expectError(() => new NetworkFirst({networkTimeoutSeconds: 'invalid'}), 'incorrect-type', (err) => {
       expect(err.details.paramName).to.deep.equal('networkTimeoutSeconds');
       expect(err.details.expectedType).to.deep.equal('number');
-      expect(err.details.moduleName).to.deep.equal('workbox-runtime-caching');
+      expect(err.details.moduleName).to.deep.equal('workbox-strategies');
       expect(err.details.className).to.deep.equal('NetworkFirst');
       expect(err.details.funcName).to.deep.equal('constructor');
     });
diff --git a/test/workbox-runtime-caching/node/test-NetworkOnly.mjs b/test/workbox-runtime-caching/node/test-NetworkOnly.mjs
index 2320c7f59..49916f4f6 100644
--- a/test/workbox-runtime-caching/node/test-NetworkOnly.mjs
+++ b/test/workbox-runtime-caching/node/test-NetworkOnly.mjs
@@ -18,9 +18,9 @@ import {expect} from 'chai';
 
 import {_private} from '../../../packages/workbox-core/index.mjs';
 
-import {NetworkOnly} from '../../../packages/workbox-runtime-caching/NetworkOnly.mjs';
+import {NetworkOnly} from '../../../packages/workbox-strategies/NetworkOnly.mjs';
 
-describe(`[workbox-runtime-caching] NetworkOnly`, function() {
+describe(`[workbox-strategies] NetworkOnly`, function() {
   let sandbox = sinon.sandbox.create();
 
   beforeEach(async function() {
diff --git a/test/workbox-runtime-caching/node/test-StaleWhileRevalidate.mjs b/test/workbox-runtime-caching/node/test-StaleWhileRevalidate.mjs
index 61a009d58..dddb5a20d 100644
--- a/test/workbox-runtime-caching/node/test-StaleWhileRevalidate.mjs
+++ b/test/workbox-runtime-caching/node/test-StaleWhileRevalidate.mjs
@@ -19,9 +19,9 @@ import {expect} from 'chai';
 import {_private} from '../../../packages/workbox-core/index.mjs';
 import {compareResponses} from '../utils/response-comparisons.mjs';
 
-import {StaleWhileRevalidate} from '../../../packages/workbox-runtime-caching/StaleWhileRevalidate.mjs';
+import {StaleWhileRevalidate} from '../../../packages/workbox-strategies/StaleWhileRevalidate.mjs';
 
-describe(`[workbox-runtime-caching] StaleWhileRevalidate`, function() {
+describe(`[workbox-strategies] StaleWhileRevalidate`, function() {
   let sandbox = sinon.sandbox.create();
 
   beforeEach(async function() {
diff --git a/test/workbox-runtime-caching/node/test-UsageWithRouter.mjs b/test/workbox-runtime-caching/node/test-UsageWithRouter.mjs
index 5e6a6b87f..6371491c1 100644
--- a/test/workbox-runtime-caching/node/test-UsageWithRouter.mjs
+++ b/test/workbox-runtime-caching/node/test-UsageWithRouter.mjs
@@ -1,12 +1,12 @@
-import {CacheFirst} from '../../../packages/workbox-runtime-caching/CacheFirst.mjs';
-import {CacheOnly} from '../../../packages/workbox-runtime-caching/CacheOnly.mjs';
-import {NetworkFirst} from '../../../packages/workbox-runtime-caching/NetworkFirst.mjs';
-import {NetworkOnly} from '../../../packages/workbox-runtime-caching/NetworkOnly.mjs';
-import {StaleWhileRevalidate} from '../../../packages/workbox-runtime-caching/StaleWhileRevalidate.mjs';
+import {CacheFirst} from '../../../packages/workbox-strategies/CacheFirst.mjs';
+import {CacheOnly} from '../../../packages/workbox-strategies/CacheOnly.mjs';
+import {NetworkFirst} from '../../../packages/workbox-strategies/NetworkFirst.mjs';
+import {NetworkOnly} from '../../../packages/workbox-strategies/NetworkOnly.mjs';
+import {StaleWhileRevalidate} from '../../../packages/workbox-strategies/StaleWhileRevalidate.mjs';
 import {Router} from '../../../packages/workbox-routing/Router.mjs';
 import {Route} from '../../../packages/workbox-routing/Route.mjs';
 
-describe(`[workbox-runtime-caching] Usages with Router`, function() {
+describe(`[workbox-strategies] Usages with Router`, function() {
   [CacheFirst, CacheOnly, NetworkFirst, NetworkOnly, StaleWhileRevalidate].forEach((StrategyClass) => {
     it(`should show Router and '${StrategyClass.name}' will work together`, function() {
       const router = new Router();
diff --git a/test/workbox-runtime-caching/node/test-cacheOkAndOpaquePlugin.mjs b/test/workbox-runtime-caching/node/test-cacheOkAndOpaquePlugin.mjs
index b3a46dc71..a16b94929 100644
--- a/test/workbox-runtime-caching/node/test-cacheOkAndOpaquePlugin.mjs
+++ b/test/workbox-runtime-caching/node/test-cacheOkAndOpaquePlugin.mjs
@@ -1,7 +1,7 @@
 import {expect} from 'chai';
-import plugin from '../../../packages/workbox-runtime-caching/plugins/cacheOkAndOpaquePlugin.mjs';
+import plugin from '../../../packages/workbox-strategies/plugins/cacheOkAndOpaquePlugin.mjs';
 
-describe(`[workbox-runtime-caching] cacheOkAndOpaquePlugin`, function() {
+describe(`[workbox-strategies] cacheOkAndOpaquePlugin`, function() {
   it(`should return null if status is not ok and status is not opaque`, function() {
     const response = new Response('Hello', {
       status: 404,
diff --git a/test/workbox-runtime-caching/node/test-default.mjs b/test/workbox-runtime-caching/node/test-default.mjs
index 1f308382a..e49513325 100644
--- a/test/workbox-runtime-caching/node/test-default.mjs
+++ b/test/workbox-runtime-caching/node/test-default.mjs
@@ -1,9 +1,9 @@
 import {expect} from 'chai';
-import {CacheFirst, CacheOnly, NetworkFirst, NetworkOnly, StaleWhileRevalidate} from '../../../packages/workbox-runtime-caching/_public.mjs';
-import strategies from '../../../packages/workbox-runtime-caching/_default.mjs';
+import {CacheFirst, CacheOnly, NetworkFirst, NetworkOnly, StaleWhileRevalidate} from '../../../packages/workbox-strategies/_public.mjs';
+import strategies from '../../../packages/workbox-strategies/_default.mjs';
 import {CacheExpirationPlugin} from '../../../packages/workbox-cache-expiration/CacheExpirationPlugin.mjs';
 
-describe(`[workbox-runtime-caching] Default Export`, function() {
+describe(`[workbox-strategies] Default Export`, function() {
   const CUSTOM_PLUGIN = {};
   describe(`cacheFirst()`, function() {
     it(`should return a CacheFirst instance`, function() {
diff --git a/test/workbox-sw/node/test-WorkboxSW.mjs b/test/workbox-sw/node/test-WorkboxSW.mjs
index 8a8604340..380ebe376 100644
--- a/test/workbox-sw/node/test-WorkboxSW.mjs
+++ b/test/workbox-sw/node/test-WorkboxSW.mjs
@@ -38,7 +38,7 @@ describe(`[workbox-sw] WorkboxSW`, function() {
       if (url.includes('workbox-precaching')) {
         self.workbox.precaching = fakeWorkbox.precaching;
       }
-      if (url.includes('workbox-runtime-caching')) {
+      if (url.includes('workbox-strategies')) {
         self.workbox.strategies = fakeWorkbox.strategies;
       }
     });

From 69dcd78ad52b52eebe128d6925a6342bbec77aad Mon Sep 17 00:00:00 2001
From: Matt Gaunt <matt@gauntface.co.uk>
Date: Wed, 15 Nov 2017 10:31:58 -0800
Subject: [PATCH 2/2] Changing name

---
 .../node/test-CacheFirst.mjs                                      | 0
 .../node/test-CacheOnly.mjs                                       | 0
 .../node/test-NetworkFirst.mjs                                    | 0
 .../node/test-NetworkOnly.mjs                                     | 0
 .../node/test-StaleWhileRevalidate.mjs                            | 0
 .../node/test-UsageWithRouter.mjs                                 | 0
 .../node/test-cacheOkAndOpaquePlugin.mjs                          | 0
 .../node/test-default.mjs                                         | 0
 .../utils/response-comparisons.mjs                                | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename test/{workbox-runtime-caching => workbox-strategies}/node/test-CacheFirst.mjs (100%)
 rename test/{workbox-runtime-caching => workbox-strategies}/node/test-CacheOnly.mjs (100%)
 rename test/{workbox-runtime-caching => workbox-strategies}/node/test-NetworkFirst.mjs (100%)
 rename test/{workbox-runtime-caching => workbox-strategies}/node/test-NetworkOnly.mjs (100%)
 rename test/{workbox-runtime-caching => workbox-strategies}/node/test-StaleWhileRevalidate.mjs (100%)
 rename test/{workbox-runtime-caching => workbox-strategies}/node/test-UsageWithRouter.mjs (100%)
 rename test/{workbox-runtime-caching => workbox-strategies}/node/test-cacheOkAndOpaquePlugin.mjs (100%)
 rename test/{workbox-runtime-caching => workbox-strategies}/node/test-default.mjs (100%)
 rename test/{workbox-runtime-caching => workbox-strategies}/utils/response-comparisons.mjs (100%)

diff --git a/test/workbox-runtime-caching/node/test-CacheFirst.mjs b/test/workbox-strategies/node/test-CacheFirst.mjs
similarity index 100%
rename from test/workbox-runtime-caching/node/test-CacheFirst.mjs
rename to test/workbox-strategies/node/test-CacheFirst.mjs
diff --git a/test/workbox-runtime-caching/node/test-CacheOnly.mjs b/test/workbox-strategies/node/test-CacheOnly.mjs
similarity index 100%
rename from test/workbox-runtime-caching/node/test-CacheOnly.mjs
rename to test/workbox-strategies/node/test-CacheOnly.mjs
diff --git a/test/workbox-runtime-caching/node/test-NetworkFirst.mjs b/test/workbox-strategies/node/test-NetworkFirst.mjs
similarity index 100%
rename from test/workbox-runtime-caching/node/test-NetworkFirst.mjs
rename to test/workbox-strategies/node/test-NetworkFirst.mjs
diff --git a/test/workbox-runtime-caching/node/test-NetworkOnly.mjs b/test/workbox-strategies/node/test-NetworkOnly.mjs
similarity index 100%
rename from test/workbox-runtime-caching/node/test-NetworkOnly.mjs
rename to test/workbox-strategies/node/test-NetworkOnly.mjs
diff --git a/test/workbox-runtime-caching/node/test-StaleWhileRevalidate.mjs b/test/workbox-strategies/node/test-StaleWhileRevalidate.mjs
similarity index 100%
rename from test/workbox-runtime-caching/node/test-StaleWhileRevalidate.mjs
rename to test/workbox-strategies/node/test-StaleWhileRevalidate.mjs
diff --git a/test/workbox-runtime-caching/node/test-UsageWithRouter.mjs b/test/workbox-strategies/node/test-UsageWithRouter.mjs
similarity index 100%
rename from test/workbox-runtime-caching/node/test-UsageWithRouter.mjs
rename to test/workbox-strategies/node/test-UsageWithRouter.mjs
diff --git a/test/workbox-runtime-caching/node/test-cacheOkAndOpaquePlugin.mjs b/test/workbox-strategies/node/test-cacheOkAndOpaquePlugin.mjs
similarity index 100%
rename from test/workbox-runtime-caching/node/test-cacheOkAndOpaquePlugin.mjs
rename to test/workbox-strategies/node/test-cacheOkAndOpaquePlugin.mjs
diff --git a/test/workbox-runtime-caching/node/test-default.mjs b/test/workbox-strategies/node/test-default.mjs
similarity index 100%
rename from test/workbox-runtime-caching/node/test-default.mjs
rename to test/workbox-strategies/node/test-default.mjs
diff --git a/test/workbox-runtime-caching/utils/response-comparisons.mjs b/test/workbox-strategies/utils/response-comparisons.mjs
similarity index 100%
rename from test/workbox-runtime-caching/utils/response-comparisons.mjs
rename to test/workbox-strategies/utils/response-comparisons.mjs