Bring up to date

build/base.config.js

@@ -17,18 +17,17 @@ const path = require('path');
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+const AsyncCssPlugin = require("async-css-plugin");
 const {GenerateSW} = require('workbox-webpack-plugin');
 const VueLoaderPlugin = require('vue-loader/lib/plugin')
 
 module.exports = {
   devtool: 'source-map',
+  target: ['web', 'es5'],
   entry: {
     polyfill: '@babel/polyfill',
     index: './static/index.js',
-    view: './static/view.js',
-    faq: './static/faq.js',
-    view_account: './static/view-account.js',
-    admin: './static/admin/index.js',
+    shared_wheel: './static/index.js',
   },
   output: {
     filename: '[name]-[contenthash].js',
@@ -86,7 +85,7 @@ module.exports = {
         }]
       },
       {
-        test: /\.(png|jpg|gif|ico)$/,
+        test: /\.(png|jpg|jpeg|gif|ico)$/,
         use: [
           {
             loader: 'file-loader',
@@ -124,36 +123,24 @@ module.exports = {
       filename: './index.html',
       chunks: ['index', 'vendor']
     }),
+    new AsyncCssPlugin(),
     new HtmlWebpackPlugin({
-      template: './static/view.html',
-      filename: './view.html',
-      chunks: ['view', 'vendor']
-    }),
-    new HtmlWebpackPlugin({
-      template: './static/faq.html',
-      filename: './faq.html',
-      chunks: ['faq', 'vendor']
-    }),
-    new HtmlWebpackPlugin({
-      template: './static/view-account.html',
-      filename: './view-account.html',
-      chunks: ['view_account', 'vendor']
-    }),
-    new HtmlWebpackPlugin({
-      template: './static/admin/index.html',
-      filename: './admin.html',
-      chunks: ['admin', 'vendor']
+      template: './static/shared_wheel.html',
+      filename: './shared-wheel.html',
+      chunks: ['index', 'vendor']
     }),
     new CopyWebpackPlugin({patterns: [
+      { from: './static/third_party', to: 'third_party' },
       { from: './static/manifest.json', to: '.' },
-      { from: './static/images/favicon.ico', to: '.' },
-      { from: './static/404.html', to: '.' },
+      { from: './static/images/favicon.ico', to: '.' }
     ]}),
     new GenerateSW({
       exclude: [
-        /\.map$/, /\.png$/, /\.mp3$/, /\.xml$/, /\.ico$/,
+        /\.map$/, /\.png$/, /\.jpg$/, /\.mp3$/, /\.xml$/, /\.ico$/,
         /faq/, /privacy/, /translate/, /404/, /vendors~/, /^locale/,
-        /admin/, /view/, /index/, /polyfill/, /precache/, /vendor/
+        /admin/, /index/, /classroom/, /tutorials/, /polyfill/, /precache/,
+        /vendor/, /view/, /e628cc/, /shared/, /carousel/, /notFound/, /export/,
+        /firebase/, /howler/, /translations/, /vibrant/, /workbox/
       ],
       skipWaiting: true,
       clientsClaim: true,

build/test.config.js

@@ -18,7 +18,7 @@ const {merge} = require('webpack-merge');
 const baseConfig = require('./base.config.js');
 
 module.exports = merge(baseConfig, {
-  mode: 'production',
+  mode: 'development',
   devtool: 'source-map',
   plugins: [
     new dotenv({

build_and_serve_local.bat

@@ -0,0 +1,2 @@
+call .\build_dev.bat
+firebase serve --project=test

build_and_serve_local.sh

@@ -1,12 +1,16 @@
 # Copyright 2020 Google LLC
+# 
 # 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
+# 
 #     https://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.
+
 ./build_dev.sh
 firebase serve --project=test

build_dev.bat

@@ -0,0 +1,2 @@
+rmdir /s /q dist
+call npx webpack --config build/dev.config.js

build_dev.sh

@@ -1,12 +1,16 @@
 # Copyright 2020 Google LLC
+# 
 # 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
+# 
 #     https://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.
+
 rm -r dist/*
-npx webpack --config build/dev.config.js --display=minimal
+npx webpack --config build/dev.config.js

build_prod.bat

@@ -0,0 +1,5 @@
+rmdir /s /q dist
+call npx webpack --config build/prod.config.js
+ECHO
+ECHO 'npm audit:'
+call npm audit --parseable

build_prod.sh

@@ -1,18 +1,16 @@
 # Copyright 2020 Google LLC
+# 
 # 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
+# 
 #     https://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.
+
 rm -r dist/*
-npx webpack --config build/prod.config.js --display=minimal
-ls -lh dist/index*.js
-ls -lh dist/vendor-*.js
-ls -lh dist/css/vendor*.css
-echo
-echo 'npm audit:'
-npm audit --parseable | awk -F $'\t' '{print $2,$3}'
+npx webpack --config build/prod.config.js

build_test.bat

@@ -0,0 +1,2 @@
+rmdir /s /q dist
+call npx webpack --config build/test.config.js

build_test.sh

@@ -1,15 +1,16 @@
 # Copyright 2020 Google LLC
+# 
 # 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
+# 
 #     https://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.
+
 rm -r dist/*
-npx webpack --config build/test.config.js --display=minimal
-ls -lh dist/index*.js
-ls -lh dist/vendor-*.js
-ls -lh dist/css/vendor*.css
+npx webpack --config build/test.config.js

cloc.sh

@@ -1,11 +1,15 @@
 # Copyright 2020 Google LLC
+# 
 # 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
+# 
 #     https://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.
-npx cloc --vcs=git --not-match-f=package
+
+npx cloc --vcs=git --exclude-ext=json,xml --exclude-dir=old_bundles

debug-tests.sh

@@ -1,11 +1,15 @@
 # Copyright 2020 Google LLC
+# 
 # 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
+# 
 #     https://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.
+
 npx mocha debug --require @babel/register

deploy_prod.bat

@@ -0,0 +1 @@
+firebase deploy --project=prod

deploy_prod.sh

@@ -1,11 +1,15 @@
 # Copyright 2020 Google LLC
+# 
 # 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
+# 
 #     https://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.
+
 firebase deploy --project=prod

deploy_test.bat

@@ -0,0 +1 @@
+firebase deploy --project=test

deploy_test.sh

@@ -1,11 +1,15 @@
 # Copyright 2020 Google LLC
+# 
 # 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
+# 
 #     https://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.
+
 firebase deploy --project=test

deploy_test_firestore.bat

@@ -0,0 +1 @@
+firebase deploy --only=firestore --project=test

backup_firestore.sh → deploy_test_firestore.sh

@@ -1,25 +1,15 @@
 # Copyright 2020 Google LLC
+# 
 # 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
+# 
 #     https://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.
 
-PROJECT_ID=[enter your GCP Project id here]
-
-gcloud firestore export gs://$PROJECT_ID \
-    --project=PROJECT_ID
-
-# Export specific collection.
-# gcloud firestore export gs://$PROJECT_ID \
-#    --project=$PROJECT_ID \
-#    --collection-ids=shared-wheels
-
-# Import into test environment (skip last line to import all collections).
-# gcloud firestore import gs://$PROJECT_ID-backup/2020-03-22T17:47:21_54737 \
-#    --project=$PROJECT_ID-test \
-#    --collection-ids=shared-wheels
+firebase deploy --only=firestore --project=test

deploy_test_hosting.bat

@@ -0,0 +1 @@
+firebase deploy --only=hosting --project=test

deploy_test_hosting.sh

@@ -0,0 +1,15 @@
+# Copyright 2020 Google LLC
+# 
+# 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
+# 
+#     https://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.
+
+firebase deploy --only=hosting --project=test

firebase.json

@@ -7,46 +7,16 @@
   },
   "hosting": {
     "public": "dist",
+    "redirects": [
+    ],
     "rewrites": [
       {
-        "source": "/[A-Za-z0-9][A-Za-z0-9][A-Za-z0-9]-[A-Za-z0-9][A-Za-z0-9][A-Za-z0-9]",
-        "destination": "/index.html"
-      },
-      {
-        "source": "/[a-z][a-z]/[A-Za-z0-9][A-Za-z0-9][A-Za-z0-9]-[A-Za-z0-9][A-Za-z0-9][A-Za-z0-9]",
-        "destination": "/index.html"
-      },
-      {
-        "source": "/[a-z][a-z][a-z]/[A-Za-z0-9][A-Za-z0-9][A-Za-z0-9]-[A-Za-z0-9][A-Za-z0-9][A-Za-z0-9]",
-        "destination": "/index.html"
-      },
-      {
-        "source": "/[a-z][a-z]-[A-Z][A-Z]/[A-Za-z0-9][A-Za-z0-9][A-Za-z0-9]-[A-Za-z0-9][A-Za-z0-9][A-Za-z0-9]",
-        "destination": "/index.html"
+        "source": "**/[A-Za-z0-9][A-Za-z0-9][A-Za-z0-9]-[A-Za-z0-9][A-Za-z0-9][A-Za-z0-9]",
+        "destination": "/shared-wheel.html"
       },
       {
-        "source": "/[a-z][a-z]",
+        "source": "**",
         "destination": "/index.html"
-      },
-      {
-        "source": "/[a-z][a-z][a-z]",
-        "destination": "/index.html"
-      },
-      {
-        "source": "/[a-z][a-z]-[A-Z][A-Z]",
-        "destination": "/index.html"
-      },
-      {
-        "source": "/view/**",
-        "destination": "/view.html"
-      },
-      {
-        "source": "/faq",
-        "destination": "/faq.html"
-      },
-      {
-        "source": "/faq/*",
-        "destination": "/faq.html"
       }
     ],
     "ignore": [