From acdd3487eda889e984bcf6d8909bee1cb9bb90de Mon Sep 17 00:00:00 2001 From: Ian Sutherland Date: Tue, 16 Jan 2018 10:57:00 -0700 Subject: [PATCH 1/6] WIP disable service worker by default (#2554) --- packages/react-scripts/template/src/index.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/react-scripts/template/src/index.js b/packages/react-scripts/template/src/index.js index fae3e3500cf..ec5099512e9 100644 --- a/packages/react-scripts/template/src/index.js +++ b/packages/react-scripts/template/src/index.js @@ -2,7 +2,16 @@ import React from 'react'; import ReactDOM from 'react-dom'; import './index.css'; import App from './App'; -import registerServiceWorker from './registerServiceWorker'; +import registerServiceWorker, { + unregister as unregisterServiceWorker, +} from './registerServiceWorker'; ReactDOM.render(, document.getElementById('root')); -registerServiceWorker(); + +// By default we make sure that no service worker is registered. If you would +// like to enable service worker uncomment the call to registerServiceWorker() +// and comment out the call to unregisterServiceWorker(). +// See http://bit.ly/2vJdu84 for more information. + +// registerServiceWorker(); +unregisterServiceWorker(); From 5e15920cafc0d5d30d205f05c00438374442c949 Mon Sep 17 00:00:00 2001 From: Ian Sutherland Date: Tue, 16 Jan 2018 12:32:09 -0700 Subject: [PATCH 2/6] Updated service worker registration --- packages/react-scripts/template/src/index.js | 12 +++++------- .../{registerServiceWorker.js => serviceWorker.js} | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) rename packages/react-scripts/template/src/{registerServiceWorker.js => serviceWorker.js} (99%) diff --git a/packages/react-scripts/template/src/index.js b/packages/react-scripts/template/src/index.js index ec5099512e9..f5023c1abcb 100644 --- a/packages/react-scripts/template/src/index.js +++ b/packages/react-scripts/template/src/index.js @@ -2,16 +2,14 @@ import React from 'react'; import ReactDOM from 'react-dom'; import './index.css'; import App from './App'; -import registerServiceWorker, { - unregister as unregisterServiceWorker, -} from './registerServiceWorker'; +import * as serviceWorker from './registerServiceWorker'; ReactDOM.render(, document.getElementById('root')); // By default we make sure that no service worker is registered. If you would -// like to enable service worker uncomment the call to registerServiceWorker() -// and comment out the call to unregisterServiceWorker(). +// like to enable service worker uncomment the call to serviceWorker.register() +// and comment out the call to serviceWorker.unregister(). // See http://bit.ly/2vJdu84 for more information. -// registerServiceWorker(); -unregisterServiceWorker(); +// serviceWorker.register(); +serviceWorker.unregister(); diff --git a/packages/react-scripts/template/src/registerServiceWorker.js b/packages/react-scripts/template/src/serviceWorker.js similarity index 99% rename from packages/react-scripts/template/src/registerServiceWorker.js rename to packages/react-scripts/template/src/serviceWorker.js index a3e6c0cfc10..2edbdd420ea 100644 --- a/packages/react-scripts/template/src/registerServiceWorker.js +++ b/packages/react-scripts/template/src/serviceWorker.js @@ -18,7 +18,7 @@ const isLocalhost = Boolean( ) ); -export default function register() { +export function register() { if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { // The URL constructor is available in all browsers that support SW. const publicUrl = new URL(process.env.PUBLIC_URL, window.location); From c6f3ca27b4ba13c376202ecfacac6220a0f84e9d Mon Sep 17 00:00:00 2001 From: Ian Sutherland Date: Tue, 16 Jan 2018 12:38:16 -0700 Subject: [PATCH 3/6] Readd default export in registerServiceWorker.js --- .../template/src/{serviceWorker.js => registerServiceWorker.js} | 2 ++ 1 file changed, 2 insertions(+) rename packages/react-scripts/template/src/{serviceWorker.js => registerServiceWorker.js} (99%) diff --git a/packages/react-scripts/template/src/serviceWorker.js b/packages/react-scripts/template/src/registerServiceWorker.js similarity index 99% rename from packages/react-scripts/template/src/serviceWorker.js rename to packages/react-scripts/template/src/registerServiceWorker.js index 2edbdd420ea..12f62e37a5f 100644 --- a/packages/react-scripts/template/src/serviceWorker.js +++ b/packages/react-scripts/template/src/registerServiceWorker.js @@ -115,3 +115,5 @@ export function unregister() { }); } } + +export default register; From 3402a41f30c19c16ee604600be6d9129c4e52216 Mon Sep 17 00:00:00 2001 From: Ian Sutherland Date: Tue, 16 Jan 2018 13:18:01 -0700 Subject: [PATCH 4/6] Updated comments about using Service Worker --- packages/react-scripts/template/src/index.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/react-scripts/template/src/index.js b/packages/react-scripts/template/src/index.js index f5023c1abcb..692589204ef 100644 --- a/packages/react-scripts/template/src/index.js +++ b/packages/react-scripts/template/src/index.js @@ -6,10 +6,7 @@ import * as serviceWorker from './registerServiceWorker'; ReactDOM.render(, document.getElementById('root')); -// By default we make sure that no service worker is registered. If you would -// like to enable service worker uncomment the call to serviceWorker.register() -// and comment out the call to serviceWorker.unregister(). -// See http://bit.ly/2vJdu84 for more information. - -// serviceWorker.register(); +// If you want your app to work offline and load faster, you can change +// unregister() to register() below. Note this comes with some pitfalls. +// Learn more about service workers: http://bit.ly/2vJdu84 serviceWorker.unregister(); From 184cec480cbcf4764f7915faf91985883d8ab7d0 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 19 Jan 2018 00:13:04 +0000 Subject: [PATCH 5/6] Call it serviceWorker --- packages/react-scripts/template/src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/template/src/index.js b/packages/react-scripts/template/src/index.js index 692589204ef..59410291118 100644 --- a/packages/react-scripts/template/src/index.js +++ b/packages/react-scripts/template/src/index.js @@ -2,7 +2,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import './index.css'; import App from './App'; -import * as serviceWorker from './registerServiceWorker'; +import * as serviceWorker from './serviceWorker'; ReactDOM.render(, document.getElementById('root')); From da2dce088eddc0640c3b300a14c834f685666503 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 19 Jan 2018 00:13:22 +0000 Subject: [PATCH 6/6] Nits --- .../template/src/{registerServiceWorker.js => serviceWorker.js} | 2 -- 1 file changed, 2 deletions(-) rename packages/react-scripts/template/src/{registerServiceWorker.js => serviceWorker.js} (99%) diff --git a/packages/react-scripts/template/src/registerServiceWorker.js b/packages/react-scripts/template/src/serviceWorker.js similarity index 99% rename from packages/react-scripts/template/src/registerServiceWorker.js rename to packages/react-scripts/template/src/serviceWorker.js index 12f62e37a5f..2edbdd420ea 100644 --- a/packages/react-scripts/template/src/registerServiceWorker.js +++ b/packages/react-scripts/template/src/serviceWorker.js @@ -115,5 +115,3 @@ export function unregister() { }); } } - -export default register;