-
Notifications
You must be signed in to change notification settings - Fork 331
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
Upgrade to nwb 0.11.0 & fixes #39 (concat vendor/app scripts) #46
Closed
+291
−32
Closed
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e528ef8
package.json: upgrade to nwb 0.11.0 & update binary name
addyosmani 10865e9
nwb.config.js: add vendorBundle & move webpack plugins up
addyosmani 9542810
index.ejs: update to single async bundle
addyosmani 867a316
index-static: update to single async bundle
addyosmani cfef93d
package.json fixes and tweaks
insin 8d89e34
Update to master, fix conflicts, linting
addyosmani File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,260 @@ | ||
| // This file is intentionally without code. | ||
| // It's present so that service worker registration will work when serving from the 'public' directory. | ||
| /** | ||
| * Copyright 2016 Google Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| // This generated service worker JavaScript will precache your site's resources. | ||
| // The code needs to be saved in a .js file at the top-level of your site, and registered | ||
| // from your pages in order to be used. See | ||
| // https://github.com/googlechrome/sw-precache/blob/master/demo/app/js/service-worker-registration.js | ||
| // for an example of how you can register this script and handle various service worker events. | ||
|
|
||
| /* eslint-env worker, serviceworker */ | ||
| /* eslint-disable indent, no-unused-vars, no-multiple-empty-lines, max-nested-callbacks, space-before-function-paren */ | ||
| 'use strict'; | ||
|
|
||
|
|
||
|
|
||
|
|
||
| importScripts("sw-toolbox.js","runtime-caching.js"); | ||
|
|
||
|
|
||
| /* eslint-disable quotes, comma-spacing */ | ||
| var PrecacheConfig = [["build/app.js","87d612533f111eaf83845d0539eac14a"],["build/index.html","99132d32f8d9df4eb45c5e84cb1c065b"],["css/style.css","ebd9bc483b1656c536c56c3035432bdd"],["img/android-chrome-144x144.png","31f44c8f8845e41196b389f2fdae392d"],["img/android-chrome-192x192.png","7c3470aa18f85e4454a35ef3ff8b8f6e"],["img/android-chrome-36x36.png","fc5a14316848badbd501e198f8607088"],["img/android-chrome-48x48.png","f8576bca4be18a4367e4847a09fc6945"],["img/android-chrome-72x72.png","6b26a8a135b07174d298489cc010083a"],["img/android-chrome-96x96.png","04cda150a70eb58221af3fdd4f7d4a6f"],["img/apple-touch-icon-114x114.png","e18affb685f0457672283a88c04084c9"],["img/apple-touch-icon-120x120.png","cd14469c7457cfc6d3aaf15d34faeddf"],["img/apple-touch-icon-144x144.png","95a8cb7d006c59252dd68ba73d31632a"],["img/apple-touch-icon-152x152.png","15dd03590ff7289c09cf10027597e699"],["img/apple-touch-icon-180x180.png","0b101591e8e263c6bff9133c7772194a"],["img/apple-touch-icon-57x57.png","628a477075d84a8d0996392aa6dec37c"],["img/apple-touch-icon-60x60.png","6b9fe001bc9e35320f9bb4eb28b1e6f1"],["img/apple-touch-icon-72x72.png","5830f2a4f9249b3bc3998481cc00825d"],["img/apple-touch-icon-76x76.png","812e9eb119b6bdd8f465a2d1118465b9"],["img/apple-touch-icon-precomposed.png","e45a9a06a4a9b850e3089c4e6e3ebc8d"],["img/apple-touch-icon.png","0b101591e8e263c6bff9133c7772194a"],["img/browserconfig.xml","f337354b6f80663075e7b32058c65149"],["img/favicon-16x16.png","9d784dc3f4da5477156423f5f106c1c6"],["img/favicon-32x32.png","21ea2cf9cd43cdc1f808cca76a1f6fa4"],["img/favicon-96x96.png","11e36fff4c95b572ffaeef9a848da568"],["img/favicon.ico","eaa33e22fc5dab05262d316b59160a45"],["img/logo.png","930a492dadf1ccb881bd91d424c8bf9e"],["img/mstile-144x144.png","3e9a3c273f9ac3b7a158132445534860"],["img/mstile-150x150.png","b0af3ec429e6828dc0606d8bb8e1421f"],["img/mstile-310x150.png","499b08d0d170e6ed89491d7e9691a8e8"],["img/mstile-310x310.png","625111493ee72a39db1420c9c235dfb3"],["img/mstile-70x70.png","4cdf64d2b55d8116c4ce8dd361a95772"],["img/safari-pinned-tab.svg","9bfe87bb482c5d6facab0d0084ce1e80"],["img/splashscreen-icon-384x384.png","e3080842f30a9137e1464f01ffb97e71"],["index-static.html","9dcb533066aa8d34e60decc0617b0cdb"],["manifest.json","88a82e030fa45aee1ea68a4f0a3811bb"],["runtime-caching.js","87003e567d298b1b58cf2f57b4fb0ee2"],["sw-toolbox.js","66531e5962e4dccb0526a2b4cd6364a4"]]; | ||
| /* eslint-enable quotes, comma-spacing */ | ||
| var CacheNamePrefix = 'sw-precache-v1-sw-precache-' + (self.registration ? self.registration.scope : '') + '-'; | ||
|
|
||
|
|
||
| var IgnoreUrlParametersMatching = [/^utm_/]; | ||
|
|
||
|
|
||
|
|
||
| var addDirectoryIndex = function (originalUrl, index) { | ||
| var url = new URL(originalUrl); | ||
| if (url.pathname.slice(-1) === '/') { | ||
| url.pathname += index; | ||
| } | ||
| return url.toString(); | ||
| }; | ||
|
|
||
| var getCacheBustedUrl = function (url, param) { | ||
| param = param || Date.now(); | ||
|
|
||
| var urlWithCacheBusting = new URL(url); | ||
| urlWithCacheBusting.search += (urlWithCacheBusting.search ? '&' : '') + | ||
| 'sw-precache=' + param; | ||
|
|
||
| return urlWithCacheBusting.toString(); | ||
| }; | ||
|
|
||
| var isPathWhitelisted = function (whitelist, absoluteUrlString) { | ||
| // If the whitelist is empty, then consider all URLs to be whitelisted. | ||
| if (whitelist.length === 0) { | ||
| return true; | ||
| } | ||
|
|
||
| // Otherwise compare each path regex to the path of the URL passed in. | ||
| var path = (new URL(absoluteUrlString)).pathname; | ||
| return whitelist.some(function(whitelistedPathRegex) { | ||
| return path.match(whitelistedPathRegex); | ||
| }); | ||
| }; | ||
|
|
||
| var populateCurrentCacheNames = function (precacheConfig, | ||
| cacheNamePrefix, baseUrl) { | ||
| var absoluteUrlToCacheName = {}; | ||
| var currentCacheNamesToAbsoluteUrl = {}; | ||
|
|
||
| precacheConfig.forEach(function(cacheOption) { | ||
| var absoluteUrl = new URL(cacheOption[0], baseUrl).toString(); | ||
| var cacheName = cacheNamePrefix + absoluteUrl + '-' + cacheOption[1]; | ||
| currentCacheNamesToAbsoluteUrl[cacheName] = absoluteUrl; | ||
| absoluteUrlToCacheName[absoluteUrl] = cacheName; | ||
| }); | ||
|
|
||
| return { | ||
| absoluteUrlToCacheName: absoluteUrlToCacheName, | ||
| currentCacheNamesToAbsoluteUrl: currentCacheNamesToAbsoluteUrl | ||
| }; | ||
| }; | ||
|
|
||
| var stripIgnoredUrlParameters = function (originalUrl, | ||
| ignoreUrlParametersMatching) { | ||
| var url = new URL(originalUrl); | ||
|
|
||
| url.search = url.search.slice(1) // Exclude initial '?' | ||
| .split('&') // Split into an array of 'key=value' strings | ||
| .map(function(kv) { | ||
| return kv.split('='); // Split each 'key=value' string into a [key, value] array | ||
| }) | ||
| .filter(function(kv) { | ||
| return ignoreUrlParametersMatching.every(function(ignoredRegex) { | ||
| return !ignoredRegex.test(kv[0]); // Return true iff the key doesn't match any of the regexes. | ||
| }); | ||
| }) | ||
| .map(function(kv) { | ||
| return kv.join('='); // Join each [key, value] array into a 'key=value' string | ||
| }) | ||
| .join('&'); // Join the array of 'key=value' strings into a string with '&' in between each | ||
|
|
||
| return url.toString(); | ||
| }; | ||
|
|
||
|
|
||
| var mappings = populateCurrentCacheNames(PrecacheConfig, CacheNamePrefix, self.location); | ||
| var AbsoluteUrlToCacheName = mappings.absoluteUrlToCacheName; | ||
| var CurrentCacheNamesToAbsoluteUrl = mappings.currentCacheNamesToAbsoluteUrl; | ||
|
|
||
| function deleteAllCaches() { | ||
| return caches.keys().then(function(cacheNames) { | ||
| return Promise.all( | ||
| cacheNames.map(function(cacheName) { | ||
| return caches.delete(cacheName); | ||
| }) | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
| self.addEventListener('install', function(event) { | ||
| event.waitUntil( | ||
| // Take a look at each of the cache names we expect for this version. | ||
| Promise.all(Object.keys(CurrentCacheNamesToAbsoluteUrl).map(function(cacheName) { | ||
| return caches.open(cacheName).then(function(cache) { | ||
| // Get a list of all the entries in the specific named cache. | ||
| // For caches that are already populated for a given version of a | ||
| // resource, there should be 1 entry. | ||
| return cache.keys().then(function(keys) { | ||
| // If there are 0 entries, either because this is a brand new version | ||
| // of a resource or because the install step was interrupted the | ||
| // last time it ran, then we need to populate the cache. | ||
| if (keys.length === 0) { | ||
| // Use the last bit of the cache name, which contains the hash, | ||
| // as the cache-busting parameter. | ||
| // See https://github.com/GoogleChrome/sw-precache/issues/100 | ||
| var cacheBustParam = cacheName.split('-').pop(); | ||
| var urlWithCacheBusting = getCacheBustedUrl( | ||
| CurrentCacheNamesToAbsoluteUrl[cacheName], cacheBustParam); | ||
|
|
||
| var request = new Request(urlWithCacheBusting, | ||
| {credentials: 'same-origin'}); | ||
| return fetch(request).then(function(response) { | ||
| if (response.ok) { | ||
| return cache.put(CurrentCacheNamesToAbsoluteUrl[cacheName], | ||
| response); | ||
| } | ||
|
|
||
| console.error('Request for %s returned a response status %d, ' + | ||
| 'so not attempting to cache it.', | ||
| urlWithCacheBusting, response.status); | ||
| // Get rid of the empty cache if we can't add a successful response to it. | ||
| return caches.delete(cacheName); | ||
| }); | ||
| } | ||
| }); | ||
| }); | ||
| })).then(function() { | ||
| return caches.keys().then(function(allCacheNames) { | ||
| return Promise.all(allCacheNames.filter(function(cacheName) { | ||
| return cacheName.indexOf(CacheNamePrefix) === 0 && | ||
| !(cacheName in CurrentCacheNamesToAbsoluteUrl); | ||
| }).map(function(cacheName) { | ||
| return caches.delete(cacheName); | ||
| }) | ||
| ); | ||
| }); | ||
| }).then(function() { | ||
| if (typeof self.skipWaiting === 'function') { | ||
| // Force the SW to transition from installing -> active state | ||
| self.skipWaiting(); | ||
| } | ||
| }) | ||
| ); | ||
| }); | ||
|
|
||
| if (self.clients && (typeof self.clients.claim === 'function')) { | ||
| self.addEventListener('activate', function(event) { | ||
| event.waitUntil(self.clients.claim()); | ||
| }); | ||
| } | ||
|
|
||
| self.addEventListener('message', function(event) { | ||
| if (event.data.command === 'delete_all') { | ||
| console.log('About to delete all caches...'); | ||
| deleteAllCaches().then(function() { | ||
| console.log('Caches deleted.'); | ||
| event.ports[0].postMessage({ | ||
| error: null | ||
| }); | ||
| }).catch(function(error) { | ||
| console.log('Caches not deleted:', error); | ||
| event.ports[0].postMessage({ | ||
| error: error | ||
| }); | ||
| }); | ||
| } | ||
| }); | ||
|
|
||
|
|
||
| self.addEventListener('fetch', function(event) { | ||
| if (event.request.method === 'GET') { | ||
| var urlWithoutIgnoredParameters = stripIgnoredUrlParameters(event.request.url, | ||
| IgnoreUrlParametersMatching); | ||
|
|
||
| var cacheName = AbsoluteUrlToCacheName[urlWithoutIgnoredParameters]; | ||
| var directoryIndex = 'index.html'; | ||
| if (!cacheName && directoryIndex) { | ||
| urlWithoutIgnoredParameters = addDirectoryIndex(urlWithoutIgnoredParameters, directoryIndex); | ||
| cacheName = AbsoluteUrlToCacheName[urlWithoutIgnoredParameters]; | ||
| } | ||
|
|
||
| var navigateFallback = ''; | ||
| // Ideally, this would check for event.request.mode === 'navigate', but that is not widely | ||
| // supported yet: | ||
| // https://code.google.com/p/chromium/issues/detail?id=540967 | ||
| // https://bugzilla.mozilla.org/show_bug.cgi?id=1209081 | ||
| if (!cacheName && navigateFallback && event.request.headers.has('accept') && | ||
| event.request.headers.get('accept').includes('text/html') && | ||
| /* eslint-disable quotes, comma-spacing */ | ||
| isPathWhitelisted([], event.request.url)) { | ||
| /* eslint-enable quotes, comma-spacing */ | ||
| var navigateFallbackUrl = new URL(navigateFallback, self.location); | ||
| cacheName = AbsoluteUrlToCacheName[navigateFallbackUrl.toString()]; | ||
| } | ||
|
|
||
| if (cacheName) { | ||
| event.respondWith( | ||
| // Rely on the fact that each cache we manage should only have one entry, and return that. | ||
| caches.open(cacheName).then(function(cache) { | ||
| return cache.keys().then(function(keys) { | ||
| return cache.match(keys[0]).then(function(response) { | ||
| if (response) { | ||
| return response; | ||
| } | ||
| // If for some reason the response was deleted from the cache, | ||
| // raise and exception and fall back to the fetch() triggered in the catch(). | ||
| throw Error('The cache ' + cacheName + ' is empty.'); | ||
| }); | ||
| }); | ||
| }).catch(function(e) { | ||
| console.warn('Couldn\'t serve response for "%s" from cache: %O', event.request.url, e); | ||
| return fetch(event.request); | ||
| }) | ||
| ); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
|
|
||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I may have needed to use these paths to get the Node on GAE deploys happy again. I'll try it out with these changes and see if we run into any trouble at all.