From 4f3beb271e9d0552d77201eefc697ac4342f2631 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Sat, 19 Oct 2019 09:04:38 +0200
Subject: [PATCH 01/27] Add --webextension option to command line

The --webextension option will automatically add webextension-polyfill to your extension by default.
---
 index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.js b/index.js
index d349726..54b5a9b 100755
--- a/index.js
+++ b/index.js
@@ -28,6 +28,7 @@ const program = new commander.Command(packageFile.name)
     'override default page like New Tab, Bookmarks, or History page'
   )
   .option('--devtools', 'add features to Chrome Developer Tools')
+  .option('--webextension', `create a cross-rowser compatible WebExtension with ${chalk.blue(webextension-polyfill)}`)
   .on('--help', () => {
     console.log(`    Only ${chalk.green('<project-directory>')} is required.`);
   })

From 43c7e4c63ac046a1169b32c7d8df96c143391b2c Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Mon, 21 Oct 2019 18:00:37 +0200
Subject: [PATCH 02/27] Add webextension-polyfill to package.json

---
 package-lock.json | 8 +++++++-
 package.json      | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 10a84a8..32b9e70 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "chrome-extension-cli",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -138,6 +138,12 @@
         "builtins": "^1.0.3"
       }
     },
+    "webextension-polyfill": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/webextension-polyfill/-/webextension-polyfill-0.5.0.tgz",
+      "integrity": "sha512-aFrl38x43t1bTboX/paCT8I97+idzX/TY0+fuM52hrIkCpYfROEF9kSn0BXuEIi3J9LTYt2ZZKkhx9NB1qF3nA==",
+      "dev": true
+    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
diff --git a/package.json b/package.json
index cea496e..89b7618 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "prettier": "^1.18.2"
+    "prettier": "^1.18.2",
+    "webextension-polyfill": "^0.5.0"
   }
 }

From 069d6a01ee735883fa89c4c771d2780b47c27755 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Mon, 21 Oct 2019 18:18:32 +0200
Subject: [PATCH 03/27] Modify webpack.common conifg to automatically include
 browser-polyfill.js in builds

---
 config/webpack.common.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/webpack.common.js b/config/webpack.common.js
index 52b29a5..239bb21 100644
--- a/config/webpack.common.js
+++ b/config/webpack.common.js
@@ -48,6 +48,12 @@ const common = {
   plugins: [
     // Print file sizes
     new SizePlugin(),
+    // Copy browser-polyfill.js for cross browser compability
+    new CopyWebpackPlugin([
+      {
+        from: 'node_modules/webextension-polyfill/dist/browser-polyfill.js'
+      }
+    ]),
     // Copy static assets from `public` folder to `build` folder
     new CopyWebpackPlugin([
       {

From 16fe0cfdafc2529e9c58c41cd420615942e7129a Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Mon, 21 Oct 2019 18:19:29 +0200
Subject: [PATCH 04/27] Modify generated Manifest file to include
 browser-polyfill.js

---
 index.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/index.js b/index.js
index 54b5a9b..54598ae 100755
--- a/index.js
+++ b/index.js
@@ -28,7 +28,7 @@ const program = new commander.Command(packageFile.name)
     'override default page like New Tab, Bookmarks, or History page'
   )
   .option('--devtools', 'add features to Chrome Developer Tools')
-  .option('--webextension', `create a cross-rowser compatible WebExtension with ${chalk.blue(webextension-polyfill)}`)
+  .option('--webextension', `create a cross-rowser compatible WebExtension with ${chalk.blue('webextension-polyfill')}`)
   .on('--help', () => {
     console.log(`    Only ${chalk.green('<project-directory>')} is required.`);
   })
@@ -149,7 +149,8 @@ function createExtension(name, { overridePage, devtools }) {
     'size-plugin',
     'mini-css-extract-plugin',
     'css-loader',
-    'file-loader'
+    'file-loader',
+    'webextension-polyfill'
   );
 
   console.log('Installing packages. This might take a couple of minutes.');
@@ -236,7 +237,7 @@ function createExtension(name, { overridePage, devtools }) {
         {
           matches: ['<all_urls>'],
           run_at: 'document_idle',
-          js: ['contentScript.js'],
+          js: ['browser-polyfill.js', 'contentScript.js'],
         },
       ],
     };

From c212731ec8ed828be912bbb4fb238a067bcae991 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Wed, 23 Oct 2019 17:01:13 +0200
Subject: [PATCH 05/27] Modify --webextension option to --no-cross-browser

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 54598ae..46ac934 100755
--- a/index.js
+++ b/index.js
@@ -28,7 +28,7 @@ const program = new commander.Command(packageFile.name)
     'override default page like New Tab, Bookmarks, or History page'
   )
   .option('--devtools', 'add features to Chrome Developer Tools')
-  .option('--webextension', `create a cross-rowser compatible WebExtension with ${chalk.blue('webextension-polyfill')}`)
+  .option('--no-cross-browser', `the generated project will not be cross-browser compatible`)
   .on('--help', () => {
     console.log(`    Only ${chalk.green('<project-directory>')} is required.`);
   })

From 157171cfd112f8f41edc4f34ca7df7cd85d36f26 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Wed, 23 Oct 2019 17:09:34 +0200
Subject: [PATCH 06/27] Modiy static html pages to include browser-polyfill.js

---
 templates/devtools/public/devtools.html   | 1 +
 templates/devtools/public/panel.html      | 1 +
 templates/override-page/public/index.html | 1 +
 templates/popup/public/popup.html         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/templates/devtools/public/devtools.html b/templates/devtools/public/devtools.html
index 02c9464..24bbeaa 100644
--- a/templates/devtools/public/devtools.html
+++ b/templates/devtools/public/devtools.html
@@ -5,6 +5,7 @@
   <title>Chrome DevTools</title>
 </head>
 <body>
+  <script type="application/javascript" src="browser-polyfill.js"></script>
   <script src="devtools.js"></script>
 
   <!--
diff --git a/templates/devtools/public/panel.html b/templates/devtools/public/panel.html
index 6eabc39..be72bba 100644
--- a/templates/devtools/public/panel.html
+++ b/templates/devtools/public/panel.html
@@ -17,6 +17,7 @@
     </main>
   </div>
 
+  <script type="application/javascript" src="browser-polyfill.js"></script>
   <script src="panel.js"></script>
 
   <!--
diff --git a/templates/override-page/public/index.html b/templates/override-page/public/index.html
index 39a1891..4ccc50b 100644
--- a/templates/override-page/public/index.html
+++ b/templates/override-page/public/index.html
@@ -15,6 +15,7 @@
     <p class="title">Chrome Extension is Ready!</p>
     <p class="subtitle">Start by updating <code>index.html</code></p>
   </div>
+  <script type="application/javascript" src="browser-polyfill.js"></script>
   <script src="app.js"></script>
 
   <!--
diff --git a/templates/popup/public/popup.html b/templates/popup/public/popup.html
index 0aa0a89..55ebed1 100644
--- a/templates/popup/public/popup.html
+++ b/templates/popup/public/popup.html
@@ -20,6 +20,7 @@
     <p class="subtitle">Start by updating <code>popup.html</code></p>
   </div>
 
+  <script type="application/javascript" src="browser-polyfill.js"></script>
   <script src="popup.js"></script>
 
   <!--

From f6e1c7f7e25be76cfbfec8a1b9fa0c525d0c68ee Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Wed, 23 Oct 2019 17:09:57 +0200
Subject: [PATCH 07/27] Modify manifest background scripts section to include
 browser-polyfill.js

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 46ac934..0269086 100755
--- a/index.js
+++ b/index.js
@@ -208,7 +208,7 @@ function createExtension(name, { overridePage, devtools }) {
       128: 'icons/icon_128.png',
     },
     background: {
-      scripts: ['background.js'],
+      scripts: ['browser-polyfill.js', 'background.js'],
       persistent: false,
     },
   };

From c574e5da55c7ddc6c989f4da9d6972a0f0415c6c Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Mon, 28 Oct 2019 18:09:43 +0100
Subject: [PATCH 08/27] Update index.js to generate projects according to the
 --no-cross-browser setting

---
 index.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/index.js b/index.js
index 0269086..0be98a2 100755
--- a/index.js
+++ b/index.js
@@ -12,6 +12,7 @@ const packageFile = require('./package.json');
 const { checkAppName, prettifyAppName } = require('./utils/name');
 const generateReadme = require('./scripts/readme');
 const tryGitInit = require('./scripts/git-init');
+const browserPolyfillFilename = 'browser-polyfill.js';
 
 let projectName;
 const OVERRIDE_PAGES = ['newtab', 'bookmarks', 'history'];
@@ -91,7 +92,7 @@ function logOptionsConflictError() {
   process.exit(1);
 }
 
-function createExtension(name, { overridePage, devtools }) {
+function createExtension(name, { overridePage, devtools, crossBrowser }) {
   const root = path.resolve(name);
   let overridePageName;
 
@@ -127,8 +128,8 @@ function createExtension(name, { overridePage, devtools }) {
 
   appPackage.scripts = {
     watch:
-      'webpack --mode=development --watch --config config/webpack.config.js',
-    build: 'webpack --mode=production --config config/webpack.config.js',
+      `webpack --mode=development --env.CROSS_BROWSER=${crossBrowser} --watch --config config/webpack.config.js`,
+    build: `webpack --mode=production --env.CROSS_BROWSER=${crossBrowser} --config config/webpack.config.js`,
   };
 
   // Create package file in project directory
@@ -208,7 +209,7 @@ function createExtension(name, { overridePage, devtools }) {
       128: 'icons/icon_128.png',
     },
     background: {
-      scripts: ['browser-polyfill.js', 'background.js'],
+      scripts: ['background.js'],
       persistent: false,
     },
   };
@@ -237,12 +238,19 @@ function createExtension(name, { overridePage, devtools }) {
         {
           matches: ['<all_urls>'],
           run_at: 'document_idle',
-          js: ['browser-polyfill.js', 'contentScript.js'],
+          js: ['contentScript.js'],
         },
       ],
     };
   }
 
+  if(crossBrowser) {
+    appManifest.background.scripts = [browserPolyfillFilename, ...appManifest.background.scripts];
+    if(appManifest.content_scripts) {
+      appManifest.content_scripts.forEach(i => i.js.unshift(browserPolyfillFilename));
+    }
+  }
+
   // Create manifest file in project directory
   fs.writeFileSync(
     path.join(root, 'public', 'manifest.json'),
@@ -286,4 +294,5 @@ function createExtension(name, { overridePage, devtools }) {
 createExtension(projectName, {
   overridePage: program.overridePage,
   devtools: program.devtools,
+  crossBrowser: program.crossBrowser
 });

From 111ac050b5a84ff198161402e5bcc7dc6105fbd2 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Mon, 28 Oct 2019 18:16:24 +0100
Subject: [PATCH 09/27] Update config/webpack.common.js to generate new
 projects according to --no-cross-browser

In more detail:
- if the  crossBrowser env variable is true, browser-polyfill.js will be copied to the build folder. In order to get the env variable from webpack the exported common config object is converted to a function. All other webpack configs that use the common config have to explicitly call this function (with the env param) to get the common config object.

- also, .html files now have a  <%= polyfill => template, which gets replaced on build time. If crossBrowser is true, the browser-polyfill.js file gets included in the html file. Otherwise an empty string will replace the <%= polyfill => template
---
 config/webpack.common.js                      | 134 ++++++++++--------
 templates/devtools/config/webpack.config.js   |  22 +--
 .../override-page/config/webpack.config.js    |  20 +--
 templates/popup/config/webpack.config.js      |  22 +--
 4 files changed, 109 insertions(+), 89 deletions(-)

diff --git a/config/webpack.common.js b/config/webpack.common.js
index 239bb21..1612875 100644
--- a/config/webpack.common.js
+++ b/config/webpack.common.js
@@ -6,66 +6,86 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 const PATHS = require('./paths');
 
-// To re-use webpack configuration across templates,
-// CLI maintains a common webpack configuration file - `webpack.common.js`.
-// Whenever user creates an extension, CLI adds `webpack.common.js` file
-// in template's `config` folder
-const common = {
-  output: {
-    // the build folder to output bundles and assets in.
-    path: PATHS.build,
-    // the filename template for entry chunks
-    filename: '[name].js',
-  },
-  devtool: 'source-map',
-  stats: {
-    all: false,
-    errors: true,
-    builtAt: true,
-  },
-  module: {
-    rules: [
-      // Help webpack in understanding CSS files imported in .js files
-      {
-        test: /\.css$/,
-        use: [MiniCssExtractPlugin.loader, 'css-loader'],
-      },
-      // Check for images imported in .js files and
-      {
-        test: /\.(png|jpe?g|gif)$/i,
-        use: [
-          {
-            loader: 'file-loader',
-            options: {
-              outputPath: 'images',
-              name: '[name].[ext]',
+module.exports = env => {
+  // To re-use webpack configuration across templates,
+  // CLI maintains a common webpack configuration file - `webpack.common.js`.
+  // Whenever user creates an extension, CLI adds `webpack.common.js` file
+  // in template's `config` folder
+  const crossBrowser = (env.CROSS_BROWSER === 'true');
+  const common = {
+    output: {
+      // the build folder to output bundles and assets in.
+      path: PATHS.build,
+      // the filename template for entry chunks
+      filename: '[name].js',
+    },
+    devtool: 'source-map',
+    stats: {
+      all: false,
+      errors: true,
+      builtAt: true,
+    },
+    module: {
+      rules: [
+        // Help webpack in understanding CSS files imported in .js files
+        {
+          test: /\.css$/,
+          use: [MiniCssExtractPlugin.loader, 'css-loader'],
+        },
+        // Check for images imported in .js files and
+        {
+          test: /\.(png|jpe?g|gif)$/i,
+          use: [
+            {
+              loader: 'file-loader',
+              options: {
+                outputPath: 'images',
+                name: '[name].[ext]',
+              },
             },
-          },
-        ],
-      },
+          ],
+        },
+      ],
+    },
+    plugins: [
+      // Print file sizes
+      new SizePlugin(),
+      // Copy static assets from `public` folder to `build` folder, except .html files
+      new CopyWebpackPlugin([
+        {
+          from: '**/*',
+          context: 'public',
+          ignore: ['*.html']
+        },
+      ]),
+      // copy static .html files from `public` folder to `build` folder, and replace the `<%= polyfill %>` variable depending on config
+      new CopyWebpackPlugin([
+        {
+          from: '**/*.html',
+          context: 'public',
+          transform: (content) => {
+            const polyfill = '<script type="application/javascript" src="browser-polyfill.js"></script>';
+            if(crossBrowser) {
+              return content.toString().replace('<%= polyfill %>', polyfill);
+            }
+            return content.toString().replace('<%= polyfill %>', '');
+          }
+        },
+      ]),
+      // Extract CSS into separate files
+      new MiniCssExtractPlugin({
+        filename: '[name].css',
+      }),
     ],
-  },
-  plugins: [
-    // Print file sizes
-    new SizePlugin(),
+  };
+
+  if(crossBrowser) {
     // Copy browser-polyfill.js for cross browser compability
-    new CopyWebpackPlugin([
+    common.plugins.unshift(new CopyWebpackPlugin([
       {
         from: 'node_modules/webextension-polyfill/dist/browser-polyfill.js'
       }
-    ]),
-    // Copy static assets from `public` folder to `build` folder
-    new CopyWebpackPlugin([
-      {
-        from: '**/*',
-        context: 'public',
-      },
-    ]),
-    // Extract CSS into separate files
-    new MiniCssExtractPlugin({
-      filename: '[name].css',
-    }),
-  ],
-};
-
-module.exports = common;
+    ]));
+  }
+  return common;
+}
diff --git a/templates/devtools/config/webpack.config.js b/templates/devtools/config/webpack.config.js
index 158346f..ef2d025 100644
--- a/templates/devtools/config/webpack.config.js
+++ b/templates/devtools/config/webpack.config.js
@@ -2,16 +2,16 @@
 
 const merge = require('webpack-merge');
 
-const common = require('./webpack.common.js');
+const getCommonConfig = require('./webpack.common.js');
 const PATHS = require('./paths');
 
-// Merge webpack configuration files
-const config = merge(common, {
-  entry: {
-    devtools: PATHS.src + '/devtools.js',
-    panel: PATHS.src + '/panel.js',
-    background: PATHS.src + '/background.js',
-  },
-});
-
-module.exports = config;
+module.exports = env => {
+  // Merge webpack configuration files
+  return merge(getCommonConfig(env), {
+    entry: {
+      devtools: PATHS.src + '/devtools.js',
+      panel: PATHS.src + '/panel.js',
+      background: PATHS.src + '/background.js',
+    },
+  });
+}
diff --git a/templates/override-page/config/webpack.config.js b/templates/override-page/config/webpack.config.js
index 1780d68..3389ac1 100644
--- a/templates/override-page/config/webpack.config.js
+++ b/templates/override-page/config/webpack.config.js
@@ -2,15 +2,15 @@
 
 const merge = require('webpack-merge');
 
-const common = require('./webpack.common.js');
+const getCommonConfig = require('./webpack.common.js');
 const PATHS = require('./paths');
 
-// Merge webpack configuration files
-const config = merge(common, {
-  entry: {
-    app: PATHS.src + '/app.js',
-    background: PATHS.src + '/background.js',
-  },
-});
-
-module.exports = config;
+module.exports = env => {
+  // Merge webpack configuration files
+  return merge(getCommonConfig(env), {
+    entry: {
+      app: PATHS.src + '/app.js',
+      background: PATHS.src + '/background.js',
+    },
+  });
+}
diff --git a/templates/popup/config/webpack.config.js b/templates/popup/config/webpack.config.js
index 1bee694..93c0793 100644
--- a/templates/popup/config/webpack.config.js
+++ b/templates/popup/config/webpack.config.js
@@ -2,16 +2,16 @@
 
 const merge = require('webpack-merge');
 
-const common = require('./webpack.common.js');
+const getCommonConfig = require('./webpack.common.js');
 const PATHS = require('./paths');
 
-// Merge webpack configuration files
-const config = merge(common, {
-  entry: {
-    popup: PATHS.src + '/popup.js',
-    contentScript: PATHS.src + '/contentScript.js',
-    background: PATHS.src + '/background.js',
-  },
-});
-
-module.exports = config;
+module.exports = env => {
+  // Merge webpack configuration files
+  return merge(getCommonConfig(env), {
+    entry: {
+      popup: PATHS.src + '/popup.js',
+      contentScript: PATHS.src + '/contentScript.js',
+      background: PATHS.src + '/background.js',
+    },
+  });
+}

From c68d3e12bb1e84fdd626328b81cd5077f9e89c07 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Mon, 28 Oct 2019 18:16:50 +0100
Subject: [PATCH 10/27] Insert <%= polyfill => variable to the html templates

---
 templates/devtools/public/devtools.html   | 2 +-
 templates/devtools/public/panel.html      | 2 +-
 templates/override-page/public/index.html | 2 +-
 templates/popup/public/popup.html         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/devtools/public/devtools.html b/templates/devtools/public/devtools.html
index 24bbeaa..96dbde1 100644
--- a/templates/devtools/public/devtools.html
+++ b/templates/devtools/public/devtools.html
@@ -5,7 +5,7 @@
   <title>Chrome DevTools</title>
 </head>
 <body>
-  <script type="application/javascript" src="browser-polyfill.js"></script>
+  <%= polyfill %>
   <script src="devtools.js"></script>
 
   <!--
diff --git a/templates/devtools/public/panel.html b/templates/devtools/public/panel.html
index be72bba..56b80f0 100644
--- a/templates/devtools/public/panel.html
+++ b/templates/devtools/public/panel.html
@@ -17,7 +17,7 @@
     </main>
   </div>
 
-  <script type="application/javascript" src="browser-polyfill.js"></script>
+  <%= polyfill %>
   <script src="panel.js"></script>
 
   <!--
diff --git a/templates/override-page/public/index.html b/templates/override-page/public/index.html
index 4ccc50b..81e7301 100644
--- a/templates/override-page/public/index.html
+++ b/templates/override-page/public/index.html
@@ -15,7 +15,7 @@
     <p class="title">Chrome Extension is Ready!</p>
     <p class="subtitle">Start by updating <code>index.html</code></p>
   </div>
-  <script type="application/javascript" src="browser-polyfill.js"></script>
+  <%= polyfill %>
   <script src="app.js"></script>
 
   <!--
diff --git a/templates/popup/public/popup.html b/templates/popup/public/popup.html
index 55ebed1..0543515 100644
--- a/templates/popup/public/popup.html
+++ b/templates/popup/public/popup.html
@@ -20,7 +20,7 @@
     <p class="subtitle">Start by updating <code>popup.html</code></p>
   </div>
 
-  <script type="application/javascript" src="browser-polyfill.js"></script>
+  <%= polyfill %>
   <script src="popup.js"></script>
 
   <!--

From 5466a7b78eb1dedc547f59b83754bab26be2be8a Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Mon, 28 Oct 2019 18:17:24 +0100
Subject: [PATCH 11/27] Update README.md: add `--no-cross-browser` option

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 882f96a..b43bb59 100644
--- a/README.md
+++ b/README.md
@@ -171,6 +171,10 @@ chrome-extension-cli my-extension --override-page=history      // Override Histo
 
 Creates a Panel inside developer tools.
 
+#### `chrome-extension-cli my-extension  --no-cross-browser`
+
+The generated project will not be cross-browser compatible by default.
+
 ## Contributing
 
 See the [contribution guide](CONTRIBUTING.md) and join the contributors!

From 1afe5faf3ddca0f2521c8a55a873075189fa0e6f Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Tue, 29 Oct 2019 13:55:30 +0100
Subject: [PATCH 12/27] Update index.js

If the webextenstion support is not enabled, we need to copy the template files with .nocrosbbrowser.js ending.

After that, these files are renamed and the .nocrosbbrowser extension is removed.
---
 index.js | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 0be98a2..06b9b1e 100755
--- a/index.js
+++ b/index.js
@@ -179,7 +179,32 @@ function createExtension(name, { overridePage, devtools, crossBrowser }) {
     templateName = 'popup';
   }
 
-  fs.copySync(path.resolve(__dirname, 'templates', templateName), root);
+  const files = [];
+  fs.copySync(path.resolve(__dirname, 'templates', templateName), root, {
+    filter: filename => {
+      if(!filename.match(/\.js$/)) return true; // copy all files that aren't .js files
+      if(!!filename.match(/^webpack\.config\.js$/)) return true; // explcitly copy webpack.config.js all the time
+      if(!crossBrowser && filename.indexOf('.nocrossbrowser') > -1) {
+        files.push(filename);
+        return true;
+      } else if(crossBrowser && filename.indexOf('.nocrossbrowser') < 0) {
+        return true;
+      }
+      return false;
+    }
+  });
+
+  // if the webextenstion support is not enabled, we need to copy the files with .nocrosbbrowser.js ending
+  // but after that, these files are renamed and the .nocrosbbrowser extension is removed
+  if(!crossBrowser) {
+    files.forEach(file => {
+      const { base } = path.parse(file);
+      let srcPath = path.resolve(root, 'src', base);
+      let destPath = path.resolve(root, 'src', base.replace('.nocrossbrowser', ''));
+      console.log(srcPath, destPath);
+      fs.moveSync(srcPath, destPath);
+    });
+  }
 
   // Copy common webpack configuration file
   fs.copySync(path.resolve(__dirname, 'config'), path.join(root, 'config'));

From 87ca968cd76462adb79350ab36f53dd168a505dc Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Tue, 29 Oct 2019 13:56:26 +0100
Subject: [PATCH 13/27] Create .nocrossbrowser.js template files for the popup
 template, also update the original .js files to use the WebExtensions
 standard

---
 templates/popup/src/background.js             |   9 +-
 .../popup/src/background.nocrossbrowser.js    |  21 ++++
 templates/popup/src/contentScript.js          |  11 +-
 .../popup/src/contentScript.nocrossbrowser.js |  43 +++++++
 templates/popup/src/popup.js                  |  24 ++--
 templates/popup/src/popup.nocrossbrowser.js   | 112 ++++++++++++++++++
 6 files changed, 194 insertions(+), 26 deletions(-)
 create mode 100644 templates/popup/src/background.nocrossbrowser.js
 create mode 100644 templates/popup/src/contentScript.nocrossbrowser.js
 create mode 100644 templates/popup/src/popup.nocrossbrowser.js

diff --git a/templates/popup/src/background.js b/templates/popup/src/background.js
index ac2e505..2034d16 100644
--- a/templates/popup/src/background.js
+++ b/templates/popup/src/background.js
@@ -5,7 +5,7 @@
 // For more information on background script,
 // See https://developer.chrome.com/extensions/background_pages
 
-chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+browser.runtime.onMessage.addListener((request, sender) => {
   if (request.type === 'GREETINGS') {
     const message = `Hi ${
       sender.tab ? 'Con' : 'Pop'
@@ -13,9 +13,8 @@ chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
 
     // Log message coming from the `request` parameter
     console.log(request.payload.message);
-    // Send a response message
-    sendResponse({
-      message,
-    });
+    // Send a response message using a Promise
+    // See: https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/onMessage
+    return Promise.resolve({ message });
   }
 });
diff --git a/templates/popup/src/background.nocrossbrowser.js b/templates/popup/src/background.nocrossbrowser.js
new file mode 100644
index 0000000..ac2e505
--- /dev/null
+++ b/templates/popup/src/background.nocrossbrowser.js
@@ -0,0 +1,21 @@
+'use strict';
+
+// With background scripts you can communicate with popup
+// and contentScript files.
+// For more information on background script,
+// See https://developer.chrome.com/extensions/background_pages
+
+chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+  if (request.type === 'GREETINGS') {
+    const message = `Hi ${
+      sender.tab ? 'Con' : 'Pop'
+    }, my name is Bac. I am from Background. It's great to hear from you.`;
+
+    // Log message coming from the `request` parameter
+    console.log(request.payload.message);
+    // Send a response message
+    sendResponse({
+      message,
+    });
+  }
+});
diff --git a/templates/popup/src/contentScript.js b/templates/popup/src/contentScript.js
index 53087c5..54e4d95 100644
--- a/templates/popup/src/contentScript.js
+++ b/templates/popup/src/contentScript.js
@@ -18,26 +18,25 @@ console.log(
 );
 
 // Communicate with background file by sending a message
-chrome.runtime.sendMessage(
+browser.runtime.sendMessage(
   {
     type: 'GREETINGS',
     payload: {
       message: 'Hello, my name is Con. I am from ContentScript.',
     },
-  },
-  response => {
+  }).then(response => {
     console.log(response.message);
   }
 );
 
 // Listen for message
-chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+browser.runtime.onMessage.addListener((request, sender) => {
   if (request.type === 'COUNT') {
     console.log(`Current count is ${request.payload.count}`);
   }
 
   // Send an empty response
   // See https://github.com/mozilla/webextension-polyfill/issues/130#issuecomment-531531890
-  sendResponse({});
-  return true;
+  // See: https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/onMessage
+  return Promise.resolve({});
 });
diff --git a/templates/popup/src/contentScript.nocrossbrowser.js b/templates/popup/src/contentScript.nocrossbrowser.js
new file mode 100644
index 0000000..53087c5
--- /dev/null
+++ b/templates/popup/src/contentScript.nocrossbrowser.js
@@ -0,0 +1,43 @@
+'use strict';
+
+// Content script file will run in the context of web page.
+// With content script you can manipulate the web pages using
+// Document Object Model (DOM).
+// You can also pass information to the parent extension.
+
+// We execute this script by making an entry in manifest.json file
+// under `content_scripts` property
+
+// For more information on Content Scripts,
+// See https://developer.chrome.com/extensions/content_scripts
+
+// Log `title` of current active web page
+const pageTitle = document.head.getElementsByTagName('title')[0].innerHTML;
+console.log(
+  `Page title is: '${pageTitle}' - evaluated by Chrome extension's 'contentScript.js' file`
+);
+
+// Communicate with background file by sending a message
+chrome.runtime.sendMessage(
+  {
+    type: 'GREETINGS',
+    payload: {
+      message: 'Hello, my name is Con. I am from ContentScript.',
+    },
+  },
+  response => {
+    console.log(response.message);
+  }
+);
+
+// Listen for message
+chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+  if (request.type === 'COUNT') {
+    console.log(`Current count is ${request.payload.count}`);
+  }
+
+  // Send an empty response
+  // See https://github.com/mozilla/webextension-polyfill/issues/130#issuecomment-531531890
+  sendResponse({});
+  return true;
+});
diff --git a/templates/popup/src/popup.js b/templates/popup/src/popup.js
index 10a6325..d19888c 100644
--- a/templates/popup/src/popup.js
+++ b/templates/popup/src/popup.js
@@ -12,19 +12,15 @@ import './popup.css';
   // https://developer.chrome.com/extensions/declare_permissions
   const counterStorage = {
     get: cb => {
-      chrome.storage.sync.get(['count'], result => {
+      browser.storage.sync.get(['count']).then(result => {
         cb(result.count);
       });
     },
     set: (value, cb) => {
-      chrome.storage.sync.set(
+      browser.storage.sync.set(
         {
           count: value,
-        },
-        () => {
-          cb();
-        }
-      );
+        }).then(cb);
     },
   };
 
@@ -61,21 +57,20 @@ import './popup.css';
 
         // Communicate with content script of
         // active tab by sending a message
-        chrome.tabs.query({ active: true, currentWindow: true }, tabs => {
+        browser.tabs.query({ active: true, currentWindow: true }).then(tabs => {
           const tab = tabs[0];
 
-          chrome.tabs.sendMessage(
+          browser.tabs.sendMessage(
             tab.id,
             {
               type: 'COUNT',
               payload: {
                 count: newCount,
               },
-            },
-            response => {
+            }).then(response => {
               console.log('Current count value passed to contentScript file');
             }
-          );
+          ).catch(console.error);
         });
       });
     });
@@ -98,14 +93,13 @@ import './popup.css';
   document.addEventListener('DOMContentLoaded', restoreCounter);
 
   // Communicate with background file by sending a message
-  chrome.runtime.sendMessage(
+  browser.runtime.sendMessage(
     {
       type: 'GREETINGS',
       payload: {
         message: 'Hello, my name is Pop. I am from Popup.',
       },
-    },
-    response => {
+    }).then(response => {
       console.log(response.message);
     }
   );
diff --git a/templates/popup/src/popup.nocrossbrowser.js b/templates/popup/src/popup.nocrossbrowser.js
new file mode 100644
index 0000000..10a6325
--- /dev/null
+++ b/templates/popup/src/popup.nocrossbrowser.js
@@ -0,0 +1,112 @@
+'use strict';
+
+import './popup.css';
+
+(function() {
+  // We will make use of Storage API to get and store `count` value
+  // More information on Storage API can we found at
+  // https://developer.chrome.com/extensions/storage
+
+  // To get storage access, we have to mention it in `permissions` property of manifest.json file
+  // More information on Permissions can we found at
+  // https://developer.chrome.com/extensions/declare_permissions
+  const counterStorage = {
+    get: cb => {
+      chrome.storage.sync.get(['count'], result => {
+        cb(result.count);
+      });
+    },
+    set: (value, cb) => {
+      chrome.storage.sync.set(
+        {
+          count: value,
+        },
+        () => {
+          cb();
+        }
+      );
+    },
+  };
+
+  function setupCounter(initialValue = 0) {
+    document.getElementById('counter').innerHTML = initialValue;
+
+    document.getElementById('incrementBtn').addEventListener('click', () => {
+      updateCounter({
+        type: 'INCREMENT',
+      });
+    });
+
+    document.getElementById('decrementBtn').addEventListener('click', () => {
+      updateCounter({
+        type: 'DECREMENT',
+      });
+    });
+  }
+
+  function updateCounter({ type }) {
+    counterStorage.get(count => {
+      let newCount;
+
+      if (type === 'INCREMENT') {
+        newCount = count + 1;
+      } else if (type === 'DECREMENT') {
+        newCount = count - 1;
+      } else {
+        newCount = count;
+      }
+
+      counterStorage.set(newCount, () => {
+        document.getElementById('counter').innerHTML = newCount;
+
+        // Communicate with content script of
+        // active tab by sending a message
+        chrome.tabs.query({ active: true, currentWindow: true }, tabs => {
+          const tab = tabs[0];
+
+          chrome.tabs.sendMessage(
+            tab.id,
+            {
+              type: 'COUNT',
+              payload: {
+                count: newCount,
+              },
+            },
+            response => {
+              console.log('Current count value passed to contentScript file');
+            }
+          );
+        });
+      });
+    });
+  }
+
+  function restoreCounter() {
+    // Restore count value
+    counterStorage.get(count => {
+      if (typeof count === 'undefined') {
+        // Set counter value as 0
+        counterStorage.set(0, () => {
+          setupCounter(0);
+        });
+      } else {
+        setupCounter(count);
+      }
+    });
+  }
+
+  document.addEventListener('DOMContentLoaded', restoreCounter);
+
+  // Communicate with background file by sending a message
+  chrome.runtime.sendMessage(
+    {
+      type: 'GREETINGS',
+      payload: {
+        message: 'Hello, my name is Pop. I am from Popup.',
+      },
+    },
+    response => {
+      console.log(response.message);
+    }
+  );
+})();

From 04155cd75aa540563e7d93269b7d93a35926c80b Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Tue, 29 Oct 2019 13:56:49 +0100
Subject: [PATCH 14/27] Update index.js

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 06b9b1e..064fbca 100755
--- a/index.js
+++ b/index.js
@@ -194,7 +194,7 @@ function createExtension(name, { overridePage, devtools, crossBrowser }) {
     }
   });
 
-  // if the webextenstion support is not enabled, we need to copy the files with .nocrosbbrowser.js ending
+  // if the webextenstion support is not enabled, we need to copy the template files with .nocrosbbrowser.js ending
   // but after that, these files are renamed and the .nocrosbbrowser extension is removed
   if(!crossBrowser) {
     files.forEach(file => {

From a7ec375fb0939d44aa1844546ac343d971c23c63 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Tue, 29 Oct 2019 14:02:46 +0100
Subject: [PATCH 15/27] Create .nocrossbrowser files for the devtools template,
 update original files to use WebExtensions

---
 templates/devtools/src/background.js          |  8 ++---
 .../devtools/src/background.nocrossbrowser.js | 19 ++++++++++
 templates/devtools/src/devtools.js            |  2 +-
 .../devtools/src/devtools.nocrossbrowser.js   | 10 ++++++
 templates/devtools/src/panel.js               | 10 +++---
 .../devtools/src/panel.nocrossbrowser.js      | 36 +++++++++++++++++++
 6 files changed, 74 insertions(+), 11 deletions(-)
 create mode 100644 templates/devtools/src/background.nocrossbrowser.js
 create mode 100644 templates/devtools/src/devtools.nocrossbrowser.js
 create mode 100644 templates/devtools/src/panel.nocrossbrowser.js

diff --git a/templates/devtools/src/background.js b/templates/devtools/src/background.js
index 7db5024..d3a942f 100644
--- a/templates/devtools/src/background.js
+++ b/templates/devtools/src/background.js
@@ -5,15 +5,15 @@
 // For more information on background script,
 // See https://developer.chrome.com/extensions/background_pages
 
-chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
   if (request.type === 'GREETINGS') {
     const message = `Hi Pan, my name is Bac. I am from Background. It's great to hear from you.`;
 
     // Log message coming from the `request` parameter
     console.log(request.payload.message);
     // Send a response message
-    sendResponse({
-      message,
-    });
+    // Send a response message using a Promise
+    // See: https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/onMessage
+    return Promise.resolve({ message });
   }
 });
diff --git a/templates/devtools/src/background.nocrossbrowser.js b/templates/devtools/src/background.nocrossbrowser.js
new file mode 100644
index 0000000..7db5024
--- /dev/null
+++ b/templates/devtools/src/background.nocrossbrowser.js
@@ -0,0 +1,19 @@
+'use strict';
+
+// With background scripts you can communicate with popup
+// and contentScript files.
+// For more information on background script,
+// See https://developer.chrome.com/extensions/background_pages
+
+chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+  if (request.type === 'GREETINGS') {
+    const message = `Hi Pan, my name is Bac. I am from Background. It's great to hear from you.`;
+
+    // Log message coming from the `request` parameter
+    console.log(request.payload.message);
+    // Send a response message
+    sendResponse({
+      message,
+    });
+  }
+});
diff --git a/templates/devtools/src/devtools.js b/templates/devtools/src/devtools.js
index 0dc66f3..146520e 100644
--- a/templates/devtools/src/devtools.js
+++ b/templates/devtools/src/devtools.js
@@ -5,6 +5,6 @@
 // See https://developer.chrome.com/extensions/devtools
 
 // Create a panel named `My Panel`
-chrome.devtools.panels.create('My Panel', '', 'panel.html', panel => {
+browser.devtools.panels.create('My Panel', '', 'panel.html').then( panel => {
   console.log('Panel was successfully created!');
 });
diff --git a/templates/devtools/src/devtools.nocrossbrowser.js b/templates/devtools/src/devtools.nocrossbrowser.js
new file mode 100644
index 0000000..0dc66f3
--- /dev/null
+++ b/templates/devtools/src/devtools.nocrossbrowser.js
@@ -0,0 +1,10 @@
+'use strict';
+
+// A DevTools extension adds functionality to the Chrome DevTools.
+// For more information on DevTools,
+// See https://developer.chrome.com/extensions/devtools
+
+// Create a panel named `My Panel`
+chrome.devtools.panels.create('My Panel', '', 'panel.html', panel => {
+  console.log('Panel was successfully created!');
+});
diff --git a/templates/devtools/src/panel.js b/templates/devtools/src/panel.js
index 50e5be2..4b4bed1 100644
--- a/templates/devtools/src/panel.js
+++ b/templates/devtools/src/panel.js
@@ -8,9 +8,8 @@
 
 import './panel.css';
 
-chrome.devtools.inspectedWindow.eval(
-  'window.React.version',
-  (result, isException) => {
+browser.devtools.inspectedWindow.eval(
+  'window.React.version').then((result, isException) => {
     let message = '';
     if (isException) {
       message = 'This page doesn’t appear to be using React.';
@@ -23,14 +22,13 @@ chrome.devtools.inspectedWindow.eval(
 );
 
 // Communicate with background file by sending a message
-chrome.runtime.sendMessage(
+browser.runtime.sendMessage(
   {
     type: 'GREETINGS',
     payload: {
       message: 'Hello, my name is Pan. I am from Panel.',
     },
-  },
-  response => {
+  }).then(response => {
     console.log(response.message);
   }
 );
diff --git a/templates/devtools/src/panel.nocrossbrowser.js b/templates/devtools/src/panel.nocrossbrowser.js
new file mode 100644
index 0000000..50e5be2
--- /dev/null
+++ b/templates/devtools/src/panel.nocrossbrowser.js
@@ -0,0 +1,36 @@
+'use strict';
+
+// For more information on Panels API,
+// See https://developer.chrome.com/extensions/devtools_panels
+
+// We will create a panel to detect
+// whether current page is using React or not.
+
+import './panel.css';
+
+chrome.devtools.inspectedWindow.eval(
+  'window.React.version',
+  (result, isException) => {
+    let message = '';
+    if (isException) {
+      message = 'This page doesn’t appear to be using React.';
+    } else {
+      message = `The page is using React v${result} ✅`;
+    }
+
+    document.getElementById('message').innerHTML = message;
+  }
+);
+
+// Communicate with background file by sending a message
+chrome.runtime.sendMessage(
+  {
+    type: 'GREETINGS',
+    payload: {
+      message: 'Hello, my name is Pan. I am from Panel.',
+    },
+  },
+  response => {
+    console.log(response.message);
+  }
+);

From d113178a865d9792aa70c2b1fc2a2e9029cd7fe3 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Tue, 29 Oct 2019 14:06:19 +0100
Subject: [PATCH 16/27] Create .nocrossbrowser files for override-page tamplate

---
 templates/override-page/src/app.js            |  5 +--
 .../override-page/src/app.nocrossbrowser.js   | 40 +++++++++++++++++++
 templates/override-page/src/background.js     |  9 ++---
 .../src/background.nocrossbrowser.js          | 18 +++++++++
 .../override-page/src/clock.nocrossbrowser.js | 16 ++++++++
 .../override-page/src/day.nocrossbrowser.js   | 17 ++++++++
 6 files changed, 97 insertions(+), 8 deletions(-)
 create mode 100644 templates/override-page/src/app.nocrossbrowser.js
 create mode 100644 templates/override-page/src/background.nocrossbrowser.js
 create mode 100644 templates/override-page/src/clock.nocrossbrowser.js
 create mode 100644 templates/override-page/src/day.nocrossbrowser.js

diff --git a/templates/override-page/src/app.js b/templates/override-page/src/app.js
index e0540f3..9dcd20d 100644
--- a/templates/override-page/src/app.js
+++ b/templates/override-page/src/app.js
@@ -26,14 +26,13 @@ import './app.css';
   setupDashboard();
 
   // Communicate with background file by sending a message
-  chrome.runtime.sendMessage(
+  browser.runtime.sendMessage(
     {
       type: 'GREETINGS',
       payload: {
         message: 'Hello, my name is Ove. I am from Override app.',
       },
-    },
-    response => {
+    }).then(response => {
       console.log(response.message);
     }
   );
diff --git a/templates/override-page/src/app.nocrossbrowser.js b/templates/override-page/src/app.nocrossbrowser.js
new file mode 100644
index 0000000..e0540f3
--- /dev/null
+++ b/templates/override-page/src/app.nocrossbrowser.js
@@ -0,0 +1,40 @@
+'use strict';
+
+import getCurrentTime from './clock';
+import getDay from './day';
+import './app.css';
+
+(function() {
+  function setTime() {
+    const time = getCurrentTime();
+
+    document.getElementById('clock').innerHTML = time;
+  }
+
+  function setDay() {
+    const day = getDay();
+
+    document.getElementById('day').innerHTML = day;
+  }
+
+  function setupDashboard() {
+    setDay();
+    setTime();
+    setInterval(setTime, 1000);
+  }
+
+  setupDashboard();
+
+  // Communicate with background file by sending a message
+  chrome.runtime.sendMessage(
+    {
+      type: 'GREETINGS',
+      payload: {
+        message: 'Hello, my name is Ove. I am from Override app.',
+      },
+    },
+    response => {
+      console.log(response.message);
+    }
+  );
+})();
diff --git a/templates/override-page/src/background.js b/templates/override-page/src/background.js
index 7425de7..11ff489 100644
--- a/templates/override-page/src/background.js
+++ b/templates/override-page/src/background.js
@@ -4,15 +4,14 @@
 // For more information on background script,
 // See https://developer.chrome.com/extensions/background_pages
 
-chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
   if (request.type === 'GREETINGS') {
     const message = `Hi Ove, my name is Bac. I am from Background. It's great to hear from you.`;
 
     // Log message coming from the `request` parameter
     console.log(request.payload.message);
-    // Send a response message
-    sendResponse({
-      message,
-    });
+    // Send a response message using a Promise
+    // See: https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/onMessage
+    return Promise.resolve({ message });
   }
 });
diff --git a/templates/override-page/src/background.nocrossbrowser.js b/templates/override-page/src/background.nocrossbrowser.js
new file mode 100644
index 0000000..7425de7
--- /dev/null
+++ b/templates/override-page/src/background.nocrossbrowser.js
@@ -0,0 +1,18 @@
+'use strict';
+
+// With background scripts you can communicate extension files.
+// For more information on background script,
+// See https://developer.chrome.com/extensions/background_pages
+
+chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+  if (request.type === 'GREETINGS') {
+    const message = `Hi Ove, my name is Bac. I am from Background. It's great to hear from you.`;
+
+    // Log message coming from the `request` parameter
+    console.log(request.payload.message);
+    // Send a response message
+    sendResponse({
+      message,
+    });
+  }
+});
diff --git a/templates/override-page/src/clock.nocrossbrowser.js b/templates/override-page/src/clock.nocrossbrowser.js
new file mode 100644
index 0000000..eaac080
--- /dev/null
+++ b/templates/override-page/src/clock.nocrossbrowser.js
@@ -0,0 +1,16 @@
+'use strict';
+
+function getCurrentTime() {
+  const date = new Date();
+  const hours = date.getHours();
+  const minutes = date.getMinutes();
+
+  let time = '';
+  time += hours;
+  time += ':';
+  time += minutes < 10 ? '0' + minutes : minutes;
+
+  return time;
+}
+
+export default getCurrentTime;
diff --git a/templates/override-page/src/day.nocrossbrowser.js b/templates/override-page/src/day.nocrossbrowser.js
new file mode 100644
index 0000000..20031cc
--- /dev/null
+++ b/templates/override-page/src/day.nocrossbrowser.js
@@ -0,0 +1,17 @@
+const DAYS = [
+  'Sunday',
+  'Monday',
+  'Tuesday',
+  'Wednesday',
+  'Thursday',
+  'Friday',
+  'Saturday',
+];
+
+function getDay() {
+  const day = new Date().getDay();
+
+  return DAYS[day];
+}
+
+export default getDay;

From 8298748f46124651e57a3119eb8875899975221a Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Sat, 2 Nov 2019 19:08:31 +0100
Subject: [PATCH 17/27] Update index.js: remove unneeded console.log statement

---
 index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/index.js b/index.js
index 064fbca..e7b0071 100755
--- a/index.js
+++ b/index.js
@@ -201,7 +201,6 @@ function createExtension(name, { overridePage, devtools, crossBrowser }) {
       const { base } = path.parse(file);
       let srcPath = path.resolve(root, 'src', base);
       let destPath = path.resolve(root, 'src', base.replace('.nocrossbrowser', ''));
-      console.log(srcPath, destPath);
       fs.moveSync(srcPath, destPath);
     });
   }

From 43b9fd3814691fa18c794c643ae8b7117c1628a7 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Sat, 2 Nov 2019 19:11:42 +0100
Subject: [PATCH 18/27] Using minfied version of webpack-polyfill

---
 config/webpack.common.js | 4 ++--
 index.js                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/webpack.common.js b/config/webpack.common.js
index 1612875..a611a77 100644
--- a/config/webpack.common.js
+++ b/config/webpack.common.js
@@ -64,7 +64,7 @@ module.exports = env => {
           from: '**/*.html',
           context: 'public',
           transform: (content) => {
-            const polyfill = '<script type="application/javascript" src="browser-polyfill.js"></script>';
+            const polyfill = '<script type="application/javascript" src="browser-polyfill.min.js"></script>';
             if(crossBrowser) {
               return content.toString().replace('<%= polyfill %>', polyfill);
             }
@@ -83,7 +83,7 @@ module.exports = env => {
     // Copy browser-polyfill.js for cross browser compability
     common.plugins.unshift(new CopyWebpackPlugin([
       {
-        from: 'node_modules/webextension-polyfill/dist/browser-polyfill.js'
+        from: 'node_modules/webextension-polyfill/dist/browser-polyfill.min.js'
       }
     ]));
   }
diff --git a/index.js b/index.js
index e7b0071..9196e63 100755
--- a/index.js
+++ b/index.js
@@ -12,7 +12,7 @@ const packageFile = require('./package.json');
 const { checkAppName, prettifyAppName } = require('./utils/name');
 const generateReadme = require('./scripts/readme');
 const tryGitInit = require('./scripts/git-init');
-const browserPolyfillFilename = 'browser-polyfill.js';
+const browserPolyfillFilename = 'browser-polyfill.min.js';
 
 let projectName;
 const OVERRIDE_PAGES = ['newtab', 'bookmarks', 'history'];

From ee72d1cfe2ab5094a208f3b822cae6944d1113c3 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Sat, 2 Nov 2019 19:14:29 +0100
Subject: [PATCH 19/27] Replace <%= polyfill %> with <%= browser-polyfill %> in
 every file

---
 config/webpack.common.js                  | 6 +++---
 templates/devtools/public/devtools.html   | 2 +-
 templates/devtools/public/panel.html      | 2 +-
 templates/override-page/public/index.html | 2 +-
 templates/popup/public/popup.html         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/webpack.common.js b/config/webpack.common.js
index a611a77..9b0c533 100644
--- a/config/webpack.common.js
+++ b/config/webpack.common.js
@@ -58,7 +58,7 @@ module.exports = env => {
           ignore: ['*.html']
         },
       ]),
-      // copy static .html files from `public` folder to `build` folder, and replace the `<%= polyfill %>` variable depending on config
+      // copy static .html files from `public` folder to `build` folder, and replace the `<%= browser-polyfill %>` variable depending on config
       new CopyWebpackPlugin([
         {
           from: '**/*.html',
@@ -66,9 +66,9 @@ module.exports = env => {
           transform: (content) => {
             const polyfill = '<script type="application/javascript" src="browser-polyfill.min.js"></script>';
             if(crossBrowser) {
-              return content.toString().replace('<%= polyfill %>', polyfill);
+              return content.toString().replace('<%= browser-polyfill %>', polyfill);
             }
-            return content.toString().replace('<%= polyfill %>', '');
+            return content.toString().replace('<%= browser-polyfill %>', '');
           }
         },
       ]),
diff --git a/templates/devtools/public/devtools.html b/templates/devtools/public/devtools.html
index 96dbde1..aaaaad8 100644
--- a/templates/devtools/public/devtools.html
+++ b/templates/devtools/public/devtools.html
@@ -5,7 +5,7 @@
   <title>Chrome DevTools</title>
 </head>
 <body>
-  <%= polyfill %>
+  <%= browser-polyfill %>
   <script src="devtools.js"></script>
 
   <!--
diff --git a/templates/devtools/public/panel.html b/templates/devtools/public/panel.html
index 56b80f0..44038be 100644
--- a/templates/devtools/public/panel.html
+++ b/templates/devtools/public/panel.html
@@ -17,7 +17,7 @@
     </main>
   </div>
 
-  <%= polyfill %>
+  <%= browser-polyfill %>
   <script src="panel.js"></script>
 
   <!--
diff --git a/templates/override-page/public/index.html b/templates/override-page/public/index.html
index 81e7301..21628f6 100644
--- a/templates/override-page/public/index.html
+++ b/templates/override-page/public/index.html
@@ -15,7 +15,7 @@
     <p class="title">Chrome Extension is Ready!</p>
     <p class="subtitle">Start by updating <code>index.html</code></p>
   </div>
-  <%= polyfill %>
+  <%= browser-polyfill %>
   <script src="app.js"></script>
 
   <!--
diff --git a/templates/popup/public/popup.html b/templates/popup/public/popup.html
index 0543515..e980601 100644
--- a/templates/popup/public/popup.html
+++ b/templates/popup/public/popup.html
@@ -20,7 +20,7 @@
     <p class="subtitle">Start by updating <code>popup.html</code></p>
   </div>
 
-  <%= polyfill %>
+  <%= browser-polyfill %>
   <script src="popup.js"></script>
 
   <!--

From a1d53f92e4e1408020b96a2f0e9bf5f6aef29d58 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Sat, 2 Nov 2019 19:18:22 +0100
Subject: [PATCH 20/27] Removed optional type attribute in script tag

---
 config/webpack.common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/webpack.common.js b/config/webpack.common.js
index 9b0c533..b4680f1 100644
--- a/config/webpack.common.js
+++ b/config/webpack.common.js
@@ -64,7 +64,7 @@ module.exports = env => {
           from: '**/*.html',
           context: 'public',
           transform: (content) => {
-            const polyfill = '<script type="application/javascript" src="browser-polyfill.min.js"></script>';
+            const polyfill = '<script src="browser-polyfill.min.js"></script>';
             if(crossBrowser) {
               return content.toString().replace('<%= browser-polyfill %>', polyfill);
             }

From 1c358a64ce14b5f20f13ec0dfaef35fc332a61a7 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Sat, 2 Nov 2019 19:23:23 +0100
Subject: [PATCH 21/27] Checking indexOf return value for -1

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 9196e63..dbb95ed 100755
--- a/index.js
+++ b/index.js
@@ -187,7 +187,7 @@ function createExtension(name, { overridePage, devtools, crossBrowser }) {
       if(!crossBrowser && filename.indexOf('.nocrossbrowser') > -1) {
         files.push(filename);
         return true;
-      } else if(crossBrowser && filename.indexOf('.nocrossbrowser') < 0) {
+      } else if(crossBrowser && filename.indexOf('.nocrossbrowser') === -1) {
         return true;
       }
       return false;

From 9e06e929acbf12143b1dd7dfa394a125ac231612 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Sat, 2 Nov 2019 19:28:53 +0100
Subject: [PATCH 22/27] Update index.js: usign RegExp.test() instead of
 String.match()

---
 index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index dbb95ed..23734c4 100755
--- a/index.js
+++ b/index.js
@@ -182,8 +182,8 @@ function createExtension(name, { overridePage, devtools, crossBrowser }) {
   const files = [];
   fs.copySync(path.resolve(__dirname, 'templates', templateName), root, {
     filter: filename => {
-      if(!filename.match(/\.js$/)) return true; // copy all files that aren't .js files
-      if(!!filename.match(/^webpack\.config\.js$/)) return true; // explcitly copy webpack.config.js all the time
+      if(!/\.js$/.test(filename)) return true; // copy all files that aren't .js files
+      if(/^webpack\.config\.js$/.test(filename)) return true; // explcitly copy webpack.config.js all the time
       if(!crossBrowser && filename.indexOf('.nocrossbrowser') > -1) {
         files.push(filename);
         return true;

From 3203437fc2baa9dbfc03d83bf77c6bbf07b2d695 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Mon, 4 Nov 2019 10:23:15 +0100
Subject: [PATCH 23/27] Update index.js: fixing webpack.config.js regex

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 23734c4..beeb0e8 100755
--- a/index.js
+++ b/index.js
@@ -183,7 +183,7 @@ function createExtension(name, { overridePage, devtools, crossBrowser }) {
   fs.copySync(path.resolve(__dirname, 'templates', templateName), root, {
     filter: filename => {
       if(!/\.js$/.test(filename)) return true; // copy all files that aren't .js files
-      if(/^webpack\.config\.js$/.test(filename)) return true; // explcitly copy webpack.config.js all the time
+      if(/webpack\.config\.js$/.test(filename)) return true; // explcitly copy webpack.config.js all the time
       if(!crossBrowser && filename.indexOf('.nocrossbrowser') > -1) {
         files.push(filename);
         return true;

From 09241a585aaca40ae6da3f92be5e1e6a384e1479 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Mon, 4 Nov 2019 10:27:34 +0100
Subject: [PATCH 24/27] Update index.js: using RegEx to determine if filename
 ends with '.nocrossbrowser.js'

---
 index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index beeb0e8..131318a 100755
--- a/index.js
+++ b/index.js
@@ -182,12 +182,13 @@ function createExtension(name, { overridePage, devtools, crossBrowser }) {
   const files = [];
   fs.copySync(path.resolve(__dirname, 'templates', templateName), root, {
     filter: filename => {
+      const endsWithNoCrossbrowser = /\.nocrossbrowser\.js$/.test(filename); // determine if filename ends with '.nocrossbrowser.js'
       if(!/\.js$/.test(filename)) return true; // copy all files that aren't .js files
       if(/webpack\.config\.js$/.test(filename)) return true; // explcitly copy webpack.config.js all the time
-      if(!crossBrowser && filename.indexOf('.nocrossbrowser') > -1) {
+      if(!crossBrowser && endsWithNoCrossbrowser) {
         files.push(filename);
         return true;
-      } else if(crossBrowser && filename.indexOf('.nocrossbrowser') === -1) {
+      } else if(crossBrowser && !endsWithNoCrossbrowser) {
         return true;
       }
       return false;

From eac1322fefdeac5392c0b152c49c40249ed37d7b Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Mon, 4 Nov 2019 10:44:18 +0100
Subject: [PATCH 25/27] Updated referenced resources to MDN articles

---
 templates/devtools/src/background.js      | 2 +-
 templates/devtools/src/devtools.js        | 2 +-
 templates/devtools/src/panel.js           | 2 +-
 templates/override-page/src/background.js | 2 +-
 templates/popup/src/background.js         | 2 +-
 templates/popup/src/contentScript.js      | 2 +-
 templates/popup/src/popup.js              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/devtools/src/background.js b/templates/devtools/src/background.js
index d3a942f..8728d5c 100644
--- a/templates/devtools/src/background.js
+++ b/templates/devtools/src/background.js
@@ -3,7 +3,7 @@
 // With background scripts you can communicate with popup
 // and contentScript files.
 // For more information on background script,
-// See https://developer.chrome.com/extensions/background_pages
+// See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Anatomy_of_a_WebExtension#Background_scripts
 
 browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
   if (request.type === 'GREETINGS') {
diff --git a/templates/devtools/src/devtools.js b/templates/devtools/src/devtools.js
index 146520e..eeca04b 100644
--- a/templates/devtools/src/devtools.js
+++ b/templates/devtools/src/devtools.js
@@ -2,7 +2,7 @@
 
 // A DevTools extension adds functionality to the Chrome DevTools.
 // For more information on DevTools,
-// See https://developer.chrome.com/extensions/devtools
+// See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/user_interface/devtools_panels
 
 // Create a panel named `My Panel`
 browser.devtools.panels.create('My Panel', '', 'panel.html').then( panel => {
diff --git a/templates/devtools/src/panel.js b/templates/devtools/src/panel.js
index 4b4bed1..cb691d9 100644
--- a/templates/devtools/src/panel.js
+++ b/templates/devtools/src/panel.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // For more information on Panels API,
-// See https://developer.chrome.com/extensions/devtools_panels
+// See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/user_interface/devtools_panels
 
 // We will create a panel to detect
 // whether current page is using React or not.
diff --git a/templates/override-page/src/background.js b/templates/override-page/src/background.js
index 11ff489..32c31f6 100644
--- a/templates/override-page/src/background.js
+++ b/templates/override-page/src/background.js
@@ -2,7 +2,7 @@
 
 // With background scripts you can communicate extension files.
 // For more information on background script,
-// See https://developer.chrome.com/extensions/background_pages
+// See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Anatomy_of_a_WebExtension#Background_scripts
 
 browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
   if (request.type === 'GREETINGS') {
diff --git a/templates/popup/src/background.js b/templates/popup/src/background.js
index 2034d16..c196f0e 100644
--- a/templates/popup/src/background.js
+++ b/templates/popup/src/background.js
@@ -3,7 +3,7 @@
 // With background scripts you can communicate with popup
 // and contentScript files.
 // For more information on background script,
-// See https://developer.chrome.com/extensions/background_pages
+// See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Anatomy_of_a_WebExtension#Background_scripts
 
 browser.runtime.onMessage.addListener((request, sender) => {
   if (request.type === 'GREETINGS') {
diff --git a/templates/popup/src/contentScript.js b/templates/popup/src/contentScript.js
index 54e4d95..6a3a664 100644
--- a/templates/popup/src/contentScript.js
+++ b/templates/popup/src/contentScript.js
@@ -9,7 +9,7 @@
 // under `content_scripts` property
 
 // For more information on Content Scripts,
-// See https://developer.chrome.com/extensions/content_scripts
+// See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Anatomy_of_a_WebExtension#Content_scripts
 
 // Log `title` of current active web page
 const pageTitle = document.head.getElementsByTagName('title')[0].innerHTML;
diff --git a/templates/popup/src/popup.js b/templates/popup/src/popup.js
index d19888c..ebf0b92 100644
--- a/templates/popup/src/popup.js
+++ b/templates/popup/src/popup.js
@@ -5,11 +5,11 @@ import './popup.css';
 (function() {
   // We will make use of Storage API to get and store `count` value
   // More information on Storage API can we found at
-  // https://developer.chrome.com/extensions/storage
+  // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/storage
 
   // To get storage access, we have to mention it in `permissions` property of manifest.json file
   // More information on Permissions can we found at
-  // https://developer.chrome.com/extensions/declare_permissions
+  // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/permissions
   const counterStorage = {
     get: cb => {
       browser.storage.sync.get(['count']).then(result => {

From 2dac67d11abbe99ba64e2fb0df8eecf37d1e3371 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Mon, 4 Nov 2019 11:09:06 +0100
Subject: [PATCH 26/27] Update panel.js: fixing
 browser.devtools.inspectedWindow.eval returned Promise handler

---
 templates/devtools/src/panel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/devtools/src/panel.js b/templates/devtools/src/panel.js
index cb691d9..10d4992 100644
--- a/templates/devtools/src/panel.js
+++ b/templates/devtools/src/panel.js
@@ -9,9 +9,9 @@
 import './panel.css';
 
 browser.devtools.inspectedWindow.eval(
-  'window.React.version').then((result, isException) => {
+  'window.React.version').then(([result, error]) => {
     let message = '';
-    if (isException) {
+    if (error) {
       message = 'This page doesn’t appear to be using React.';
     } else {
       message = `The page is using React v${result} ✅`;

From ce0e351773e8c1cec82885a0538c5738ea713b21 Mon Sep 17 00:00:00 2001
From: Andras <andras@cabsolutely.co>
Date: Mon, 4 Nov 2019 11:09:40 +0100
Subject: [PATCH 27/27] Update index.js

---
 index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/index.js b/index.js
index 131318a..22799fb 100755
--- a/index.js
+++ b/index.js
@@ -190,6 +190,10 @@ function createExtension(name, { overridePage, devtools, crossBrowser }) {
         return true;
       } else if(crossBrowser && !endsWithNoCrossbrowser) {
         return true;
+      } else if(!crossBrowser && !endsWithNoCrossbrowser) {
+        const parsedPath = path.parse(filename);
+        const pathWithCrossbrowser = path.resolve(parsedPath.dir, parsedPath.name, '.nocrossbrowser', parsedPath.ext);
+        return !fs.pathExists(pathWithCrossbrowser);
       }
       return false;
     }