Merge pull request #231 from creative-commoners/pulls/4/node18

MNT Use node 18

.eslintrc.js

@@ -0,0 +1 @@
+module.exports = require('@silverstripe/eslint-config/.eslintrc');

.nvmrc

@@ -1 +1 @@
-10
+18

mix-manifest.json

@@ -1,6 +1,29 @@
 {
     "/dist/js/main.js": "/dist/js/main.js",
-    "/dist/css/main.css": "/dist/css/main.css",
     "/dist/css/editor.css": "/dist/css/editor.css",
+    "/dist/css/main.css": "/dist/css/main.css",
+    "/dist/images/application.png": "/dist/images/application.png",
+    "/dist/images/external-link.png": "/dist/images/external-link.png",
+    "/dist/images/facebook.png": "/dist/images/facebook.png",
+    "/dist/images/favicon.ico": "/dist/images/favicon.ico",
+    "/dist/images/logo.png": "/dist/images/logo.png",
+    "/dist/images/logoOrig.png": "/dist/images/logoOrig.png",
+    "/dist/images/newzealand-government-footer.png": "/dist/images/newzealand-government-footer.png",
+    "/dist/images/page_excel.png": "/dist/images/page_excel.png",
+    "/dist/images/page_white_acrobat.png": "/dist/images/page_white_acrobat.png",
+    "/dist/images/page_white_zip.png": "/dist/images/page_white_zip.png",
+    "/dist/images/page_word.png": "/dist/images/page_word.png",
+    "/dist/images/twitter.png": "/dist/images/twitter.png",
+    "/dist/fonts/FontAwesome.otf": "/dist/fonts/FontAwesome.otf",
+    "/dist/fonts/fontawesome-webfont.eot": "/dist/fonts/fontawesome-webfont.eot",
+    "/dist/fonts/fontawesome-webfont.svg": "/dist/fonts/fontawesome-webfont.svg",
+    "/dist/fonts/fontawesome-webfont.ttf": "/dist/fonts/fontawesome-webfont.ttf",
+    "/dist/fonts/fontawesome-webfont.woff": "/dist/fonts/fontawesome-webfont.woff",
+    "/dist/fonts/fontawesome-webfont.woff2": "/dist/fonts/fontawesome-webfont.woff2",
+    "/dist/fonts/glyphicons-halflings-regular.eot": "/dist/fonts/glyphicons-halflings-regular.eot",
+    "/dist/fonts/glyphicons-halflings-regular.svg": "/dist/fonts/glyphicons-halflings-regular.svg",
+    "/dist/fonts/glyphicons-halflings-regular.ttf": "/dist/fonts/glyphicons-halflings-regular.ttf",
+    "/dist/fonts/glyphicons-halflings-regular.woff": "/dist/fonts/glyphicons-halflings-regular.woff",
+    "/dist/fonts/glyphicons-halflings-regular.woff2": "/dist/fonts/glyphicons-halflings-regular.woff2",
     "/dist/js/jquery.min.js": "/dist/js/jquery.min.js"
 }

package.json

@@ -1,11 +1,14 @@
 {
   "name": "cwp-starter-theme",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "private": true,
+  "engines": {
+    "node": "^18.x"
+  },
   "scripts": {
-    "watch": "webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js --watch",
-    "dev": "yarn lint && webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "build": "yarn lint && NODE_ENV=production webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "watch": "mix watch",
+    "dev": "mix",
+    "build": "mix --production",
     "lint": "yarn lint-js; yarn lint-sass",
     "lint-js": "node_modules/.bin/eslint src/js",
     "lint-sass": "node_modules/.bin/sass-lint -v"
@@ -18,6 +21,7 @@
   "dependencies": {
     "ajv": "^6.12.3",
     "bootstrap": "^4.3.1",
+    "core-js": "^3.32.1",
     "font-awesome": "^4.7.0",
     "imagemin": "^6.0.0",
     "jquery": "^3.5.1",
@@ -26,16 +30,9 @@
     "popper.js": "^1.14.5"
   },
   "devDependencies": {
-    "@babel/core": "^7.4.0",
-    "@babel/polyfill": "^7.4.0",
-    "@babel/preset-env": "^7.4.0",
-    "babel-eslint": "^7.1.1",
-    "eslint": "^3.13.1",
-    "eslint-config-airbnb": "^14.0.0",
-    "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-jsx-a11y": "^3.0.2",
-    "eslint-plugin-react": "^6.9.0",
-    "laravel-mix": "^4.0.0",
+    "@babel/runtime": "^7.20.0",
+    "@silverstripe/eslint-config": "^1.1.0",
+    "laravel-mix": "^6.0.49",
     "sass": "^1.17.3",
     "sass-lint": "^1.10.2",
     "sass-loader": "^7.3.1",

src/js/components/content.js

@@ -3,7 +3,7 @@ import $ from 'jquery';
 /* eslint-enable */
 
 export default function () {
-    // Maori language class to add lang type
+  // Maori language class to add lang type
   $('.maori').attr('lang', 'mi');
 
   $('.nonvisual-indicator').addClass('sr-only').removeClass('nonvisual-indicator');

src/js/main.js

@@ -10,6 +10,7 @@ import popover from 'bootstrap/js/src/popover';
 import modal from 'bootstrap/js/src/modal';
 import tab from 'bootstrap/js/src/tab';
 import highlight from 'jquery-highlight/jquery.highlight';
+import "core-js/stable";
 
 // Define local components
 import navigation from './components/navigation';