fix!: support for node v16+ by migrating node-saas to saas and updati…

…ng webpack from v4 -> v5 (#94) * fix: support for node v16+ by migrating node-saas to saas and updating webpack from v4 -> v5 fixes #85 * fix!: removes support for node v10 and node v12. Node v16+ is now required (mostly for current versions of babel)
activescott · Sep 10, 2023 · 033714a · 033714a
1 parent fa8333a
commit 033714a
Show file tree

Hide file tree

Showing 14 changed files with 7,042 additions and 19,702 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x]
+        node-version: [16.x, 18.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -33,10 +33,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Use Node.js v12.x
+      - name: Select Node.js Version
         uses: actions/setup-node@v1
         with:
-          node-version: v12.x
+          node-version: v18.x
 
       - name: build
         run: |

diff --git a/.sass-cache/e82a74d7953e4c55c7bc1ce2216b138b8841d307/all.scssc b/.sass-cache/e82a74d7953e4c55c7bc1ce2216b138b8841d307/all.scssc
diff --git a/.sass-cache/fa6a1f1fa284475981ddba46344c8158b2c5201f/main.scssc b/.sass-cache/fa6a1f1fa284475981ddba46344c8158b2c5201f/main.scssc
diff --git a/babel.config.js b/babel.config.js
@@ -1,29 +1,23 @@
-module.exports = proc => {
+module.exports = (proc) => {
   const isTest = proc.env("test")
-  const plugins = [
-    [
-      "@babel/plugin-proposal-decorators",
-      {
-        "legacy": true
-      }
-    ],
-    "@babel/plugin-proposal-class-properties",
-    "@babel/plugin-proposal-object-rest-spread",
-    "@babel/plugin-transform-flow-strip-types",
-    "@babel/plugin-transform-runtime"
-  ]
-  if ( isTest ){
-    plugins.push( "transform-es2015-modules-commonjs" )
+  const plugins = ["@babel/plugin-transform-runtime"]
+  if (isTest) {
+    plugins.push("transform-es2015-modules-commonjs")
   }
   return {
-    "presets": [
-      [ "@babel/preset-env", { targets: { node: "current" } } ]
+    presets: [
+      [
+        "@babel/preset-env",
+        {
+          targets: {
+            esmodules: true,
+          },
+        },
+      ],
     ],
     plugins,
-    "ignore": [
-      "node_modules/**/*"
-    ],
-    "sourceMaps": true,
-    "sourceType": "unambiguous"
+    ignore: ["node_modules/**/*"],
+    sourceMaps: true,
+    sourceType: "unambiguous",
   }
-}
+}
diff --git a/bower.json b/bower.json
diff --git a/examples-new/events/index.html b/examples-new/events/index.html
@@ -3,13 +3,12 @@
   <head>
     <title>Example</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+
     <!-- By loading a UMD module this way, it will expose the library on window.CookieConsent -->
     <script src="https://unpkg.com/@activescott/cookieconsent@>=5"></script>
 
     <!-- For local dev (assumes npm install from package.json installs local package):  -->
-    <!--
-    <script src="node_modules/@activescott/cookieconsent/dist/umd/index.js"></script>
-    -->
+    <!-- <script src="node_modules/@activescott/cookieconsent/dist/umd/index.js"></script> -->
 
     <script>
       /** This is just a quick & dirty way to allow deleting this page's cookies and refreshing the page to easily trigger cookie consent again */

diff --git a/examples-new/simplest/package.json b/examples-new/simplest/package.json
@@ -5,5 +5,8 @@
   },
   "devDependencies": {
     "serve": "^12.0.1"
+  },
+  "dependencies": {
+    "@activescott/cookieconsent": "file:../.."
   }
-}
+}
diff --git a/examples-new/simplest/simplest.html b/examples-new/simplest/simplest.html
@@ -1,40 +1,43 @@
 <!DOCTYPE html>
 <html>
-<head>
+  <head>
     <title>Example</title>
-    <meta name='viewport' content='width=device-width, initial-scale=1'>
-    <!-- By loading a UMD module this way, it will expose the libray on window.CookieConsent -->
-    <script src="https://unpkg.com/@activescott/cookieconsent@>=5">
-    </script>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+    <!-- By loading a UMD module this way, it will expose the library on window.CookieConsent -->
+    <script src="https://unpkg.com/@activescott/cookieconsent@>=5"></script>
+
+    <!-- For local dev (assumes npm install from package.json installs local package):  -->
+    <!-- <script src="node_modules/@activescott/cookieconsent/dist/umd/index.js"></script> -->
+
     <script>
-        function main() {
-            const options = {
-                // all of this is optional:
-                palette: {
-                    popup: {
-                        background: "#4586c6",
-                        text: "#ffffffc0",
-                    },
-                    button: {
-                        background: "transparent",
-                        text: "#ffffffc0",
-                        border: "#ffffffc0",
-                    },
-                },
-                content: {
-                    link: "Learn More",
-                    href: "/policy/privacy",
-                },
-            }
-            new window.CookieConsent(options)
+      function main() {
+        const options = {
+          // all of this is optional:
+          palette: {
+            popup: {
+              background: "#4586c6",
+              text: "#ffffffc0",
+            },
+            button: {
+              background: "transparent",
+              text: "#ffffffc0",
+              border: "#ffffffc0",
+            },
+          },
+          content: {
+            link: "Learn More",
+            href: "/policy/privacy",
+          },
         }
-        document.addEventListener("DOMContentLoaded", main)
+        new window.CookieConsent(options)
+      }
+      document.addEventListener("DOMContentLoaded", main)
     </script>
-</head>
-
-<body>
-    You should see the cookie consent prompt in a new browser session (try a private window). Or look in the browser
-    console for errors.
-</body>
+  </head>
 
-</html>
+  <body>
+    You should see the cookie consent prompt in a new browser session (try a
+    private window). Or look in the browser console for errors.
+  </body>
+</html>