Merge pull request #12 from actuallymentor/migrate/vite-and-viem

Migrate/vite and viem

.ncurc.js

@@ -3,13 +3,12 @@
 // docs: https://www.npmjs.com/package/npm-check-updates
 // /////////////////////////////*/
 module.exports = {
-    upgrade: true,
+    upgrade: false,
     target: 'minor',
-    // Which test to run between every upgrade
-    doctor: true,
     doctorTest: 'npm run test:ci:with_emulator',
     reject: [
         '@rainbow-me/rainbowkit',
         'wagmi', // Upgrade wagmi only as details in @rainbow-me/rainbowkit docs: https://github.com/rainbow-me/rainbowkit/releases
+        'cypress' // After cypress 11 a bunch of issues are introduced. It no longer can access non localhost:3000 urls (like emulators at localhost:8080) and doesn't allow for "cross-origin" redirects to localhost:5051
     ]
-}
+}

.nvmrc

@@ -1 +1 @@
-16
+20

.vscode/settings.json

@@ -1,22 +1,26 @@
-// 20230208221345
-// https://raw.githubusercontent.com/poap-xyz/skunk-linter/main/.vscode/settings.json?token=GHSAT0AAAAAABWN7UGTIJ5SZ3KC3JHC7CHSY7ED2MA
-
 {
-    "i18n-ally.localesPaths": [
-      "public/locales"
-    ],
-    "i18n-ally.keystyle": "nested",
-    "eslint.validate": [
-      "javascript",
-      "javascriptreact",
-      "typescript",
-      "typescriptreact"
-    ],
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    },
-    "editor.renderWhitespace": "all",
-    "editor.formatOnSave": true,
-    "eslint.format.enable": true,
-    "eslint.run": "onType"
-  }
+  "i18n-ally.localesPaths": [
+    "public/locales"
+  ],
+  "i18n-ally.keystyle": "nested",
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
+  "editor.renderWhitespace": "all",
+  "editor.formatOnSave": true,
+  "eslint.format.enable": true,
+  "eslint.run": "onType",
+  "explorer.fileNesting.enabled": true,
+  "explorer.fileNesting.patterns": {
+    "vite.config.js": "*.js,.babelrc,.nvmrc,index.html,.gitignore",
+    ".env": ".env*,.*.json",
+    "firebase.json": "fire*,.fire*",
+    "package.json": "package-lock.json, yarn.lock, pnpm-lock.yaml"
+  }
+}

cypress.config.js

@@ -3,7 +3,7 @@ module.exports = defineConfig( {
 
     defaultCommandTimeout: 60000,
     requestTimeout: 60000,
-    video: true,
+    video: process.env.CYPRESS_API_URL ? false : true,
     videoCompression: false,
     screenscreenshotOnRunFailureshots: true,
     chromeWebSecurity: false,
@@ -35,7 +35,7 @@ module.exports = defineConfig( {
             const dotenvConfig = {
                 path: `${ __dirname }/${ envFile }`
             }
-            console.log( `Runing cypress with ${ process.env.NODE_ENV } and ${ envFile }` )
+            console.log( `Runing cypress with ${ process.env.NODE_ENV }, director ${ process.env.CYPRESS_API_URL }, and ${ envFile }` )
 
             require( 'dotenv' ).config( dotenvConfig )
 

cypress/support/e2e.js

@@ -7,6 +7,8 @@ import "cypress-fail-fast"
 // Stub google analytics requests
 beforeEach( () => {
 
+    if( !cy.connect_metamask ) cy.log( `MISSING CUSTOM COMMANDS: `, cy.connect_metamask )
+
     cy.intercept( 'https://www.googletagmanager.com/**/*', { middleware: true }, req => {
 
         // Disable request caching

dev-dist/sw.js

@@ -0,0 +1,92 @@
+/**
+ * Copyright 2018 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.
+ */
+
+// If the loader is already loaded, just stop.
+if (!self.define) {
+  let registry = {};
+
+  // Used for `eval` and `importScripts` where we can't get script URL by other means.
+  // In both cases, it's safe to use a global var because those functions are synchronous.
+  let nextDefineUri;
+
+  const singleRequire = (uri, parentUri) => {
+    uri = new URL(uri + ".js", parentUri).href;
+    return registry[uri] || (
+
+        new Promise(resolve => {
+          if ("document" in self) {
+            const script = document.createElement("script");
+            script.src = uri;
+            script.onload = resolve;
+            document.head.appendChild(script);
+          } else {
+            nextDefineUri = uri;
+            importScripts(uri);
+            resolve();
+          }
+        })
+
+      .then(() => {
+        let promise = registry[uri];
+        if (!promise) {
+          throw new Error(`Module ${uri} didn’t register its module`);
+        }
+        return promise;
+      })
+    );
+  };
+
+  self.define = (depsNames, factory) => {
+    const uri = nextDefineUri || ("document" in self ? document.currentScript.src : "") || location.href;
+    if (registry[uri]) {
+      // Module is already loading or loaded.
+      return;
+    }
+    let exports = {};
+    const require = depUri => singleRequire(depUri, uri);
+    const specialDeps = {
+      module: { uri },
+      exports,
+      require
+    };
+    registry[uri] = Promise.all(depsNames.map(
+      depName => specialDeps[depName] || require(depName)
+    )).then(deps => {
+      factory(...deps);
+      return exports;
+    });
+  };
+}
+define(['./workbox-b5f7729d'], (function (workbox) { 'use strict';
+
+  self.skipWaiting();
+  workbox.clientsClaim();
+
+  /**
+   * The precacheAndRoute() method efficiently caches and responds to
+   * requests for URLs in the manifest.
+   * See https://goo.gl/S9QRab
+   */
+  workbox.precacheAndRoute([{
+    "url": "registerSW.js",
+    "revision": "3ca0b8505b4bec776b69afdba2768812"
+  }, {
+    "url": "index.html",
+    "revision": "0.3b0kn536cf"
+  }], {});
+  workbox.cleanupOutdatedCaches();
+  workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
+    allowlist: [/^\/$/]
+  }));
+
+}));