todo

HSLdevcom · Aug 11, 2022 · c5aad97 · c5aad97
1 parent 02eb848
commit c5aad97
Show file tree

Hide file tree

Showing 5 changed files with 2,465 additions and 2,343 deletions.
diff --git a/build/contextHelper.js b/build/contextHelper.js
@@ -73,32 +73,32 @@ function faviconPluginFromConfig(config) {
     // Your source logo
     logo,
     // The prefix for all image files (might be a folder or a name)
-    prefix: `assets/icons-${config.CONFIG}-[hash]/`,
+    prefix: `assets/icons-${config.CONFIG}-[contenthash]/`,
     // Emit all stats of the generated icons
-    emitStats: true,
-    // The name of the json containing all favicon information
-    statsFilename: `assets/iconstats-${config.CONFIG}.json`,
-    inject: false,
-    // favicon background color (see https://github.com/haydenbleasel/favicons#usage)
-    // This matches the application background color
-    background: '#eef1f3',
-    theme_color: config.colors ? config.colors.primary : '#eef1f3',
-    // favicon app title (see https://github.com/haydenbleasel/favicons#usage)
-    title: config.title,
-    appName: config.title,
-    appDescription: config.meta.description,
-    icons: {
-      android: true,
-      appleIcon: true,
-      appleStartup: true,
-      coast: false,
-      favicons: true,
-      firefox: true,
-      opengraph: false,
-      twitter: false,
-      yandex: false,
-      windows: false,
-    },
+    // emitStats: true,
+    // // The name of the json containing all favicon information
+    // statsFilename: `assets/iconstats-${config.CONFIG}.json`,
+    // inject: false,
+    // // favicon background color (see https://github.com/haydenbleasel/favicons#usage)
+    // // This matches the application background color
+    // background: '#eef1f3',
+    // theme_color: config.colors ? config.colors.primary : '#eef1f3',
+    // // favicon app title (see https://github.com/haydenbleasel/favicons#usage)
+    // title: config.title,
+    // appName: config.title,
+    // appDescription: config.meta.description,
+    // icons: {
+    //   android: true,
+    //   appleIcon: true,
+    //   appleStartup: true,
+    //   coast: false,
+    //   favicons: true,
+    //   firefox: true,
+    //   opengraph: false,
+    //   twitter: false,
+    //   yandex: false,
+    //   windows: false,
+    // },
   });
 }
 

diff --git a/digitransit-store/scripts/create-new-module b/digitransit-store/scripts/create-new-module
@@ -188,6 +188,7 @@ $ npm install @digitransit-store/digitransit-store
 \`\`\`
 `);
 
+// todo: remove this?
 writeFileSync(join(folderPath, 'webpack.config.babel.js'), `const path = require('path');
 
 const mode = process.env.ENV;

diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "digitransit-store/packages/*"
   ],
   "scripts": {
-    "setup": "yarn && yarn build-workspaces && yarn node14-patch",
+    "setup": "yarn && yarn build-workspaces",
     "static": "mkdir -p _static/js; mkdir -p _static/css; cp -r static/* _static",
     "win-static": "xcopy static\\* _static /e /s /y /i& if not exist _static\\js mkdir _static\\js& if not exist _static\\css mkdir _static\\css",
     "prebuild": "yarn run static && yarn run relay",
@@ -62,8 +62,7 @@
     "digitransit-store-docs": "node -r esm ./digitransit-store/scripts/generate-readmes",
     "digitransit-store-new-module": "node -r esm ./digitransit-store/scripts/create-new-module",
     "digitransit-store-tests": "lerna run build:test --scope '@digitransit-store/*' && lerna run test --scope '@digitransit-store/*'",
-    "build-store": "lerna run clean --scope '@digitransit-store/*' && NODE_ENV=production SCOPE='@digitransit-store/*' rollup -c ./config/rollup.config.js",
-    "node14-patch": "rm -f ./node_modules/react-leaflet/node_modules/@babel/runtime/helpers/esm/package.json"
+    "build-store": "lerna run clean --scope '@digitransit-store/*' && NODE_ENV=production SCOPE='@digitransit-store/*' rollup -c ./config/rollup.config.js"
   },
   "main": "server.js",
   "repository": {
@@ -75,7 +74,7 @@
   },
   "engineStrict": true,
   "engines": {
-    "node": ">=10.19.0",
+    "node": ">=16.14.0",
     "npm": ">=3.0"
   },
   "browserslist": [
@@ -211,6 +210,7 @@
     "suncalc": "1.8.0",
     "swipe-js-iso": "2.1.5",
     "universal-cookie": "4.0.4",
+    "url": "^0.11.0",
     "uuid": "8.3.0",
     "zurb-foundation-5": "5.4.7"
   },
@@ -232,7 +232,7 @@
     "@rollup/plugin-node-resolve": "11.0.1",
     "@testing-library/react-hooks": "^8.0.0",
     "async": "^3.2.2",
-    "autoprefixer": "9.8.6",
+    "autoprefixer": "^9.8.8",
     "axe-core": "^4.2.1",
     "babel-eslint": "10.1.0",
     "babel-loader": "^8.2.5",
@@ -242,9 +242,10 @@
     "base64-arraybuffer": "0.1.5",
     "chai": "4.2.0",
     "codecov": "3.7.2",
-    "compression-webpack-plugin": "^6.1.1",
-    "copy-webpack-plugin": "6.1.0",
-    "css-loader": "^5.0.0",
+    "compression-webpack-plugin": "^10.0.0",
+    "copy-webpack-plugin": "^11.0.0",
+    "css-loader": "^6.7.1",
+    "css-minimizer-webpack-plugin": "^4.0.0",
     "documentation": "13.2.5",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.4",
@@ -259,7 +260,8 @@
     "eslint-plugin-jsx-a11y": "6.3.1",
     "eslint-plugin-prettier": "3.1.4",
     "eslint-plugin-react": "7.20.6",
-    "favicons-webpack-plugin": "0.0.9",
+    "favicons": "^6.2.2",
+    "favicons-webpack-plugin": "^5.0.2",
     "fetch-mock": "9.10.7",
     "file-loader": "^6.0.0",
     "git-precommit-checks": "3.0.0",
@@ -272,18 +274,17 @@
     "jsdom": "13.2.0",
     "lerna": "3.20.2",
     "lint-staged": "10.3.0",
-    "mini-css-extract-plugin": "0.11.1",
+    "mini-css-extract-plugin": "^2.6.1",
     "mocha": "8.1.3",
     "mock-local-storage": "1.1.15",
     "mockdate": "3.0.2",
-    "node-sass": "4.14.1",
+    "node-sass": "^7.0.0",
     "nodemon": "1.18.10",
     "nyc": "15.0.1",
-    "optimize-css-assets-webpack-plugin": "^5.0.4",
     "playwright": "1.16.2",
     "postcss": "8.2.1",
     "postcss-flexbugs-fixes": "4.2.1",
-    "postcss-loader": "4.0.1",
+    "postcss-loader": "^7.0.0",
     "prettier": "2.1.1",
     "relay-compiler": "10.0.1",
     "rollup": "2.35.1",
@@ -292,19 +293,19 @@
     "rollup-plugin-peer-deps-external": "2.2.4",
     "rollup-plugin-postcss": "4.0.0",
     "rollup-plugin-terser": "7.0.2",
-    "sass-loader": "10.0.2",
+    "sass-loader": "^13.0.0",
     "selenium-webdriver": "4.0.0-alpha.1",
     "sinon": "9.0.3",
     "stats-webpack-plugin": "0.7.0",
-    "style-loader": "^2.0.0",
+    "style-loader": "^3.0.0",
     "stylelint": "13.7.0",
     "stylelint-scss": "3.18.0",
-    "terser-webpack-plugin": "^4.1.0",
+    "terser-webpack-plugin": "^5.3.3",
     "url-loader": "^4.0.0",
-    "webpack": "^4.46.0",
-    "webpack-assets-manifest": "^4.0.6",
+    "webpack": "^5.74.0",
+    "webpack-assets-manifest": "^5.1.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "3.10.3"
+    "webpack-dev-server": "^4.9.3"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -188,6 +188,7 @@ $ npm install @digitransit-store/digitransit-store @@
     \`\`\`
     `);
+    // todo: remove this?
     writeFileSync(join(folderPath, 'webpack.config.babel.js'), `const path = require('path');
     const mode = process.env.ENV;
@@ Expand Down @@