orc-scripts 1.9.0-dev.1 → 2.0.0-dev.3

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "orc-scripts",
-  "version": "1.9.0-dev.1",
+  "version": "2.0.0-dev.3",
   "description": "Scripts toolbox for Orckestra",
   "type": "commonjs",
   "bin": {
     "orc-scripts": "src/index.js"
   },
   "engines": {
-    "node": ">= 10",
-    "npm": ">= 6.13.4"
+    "node": ">= 18",
+    "npm": ">= 9.0.0"
   },
   "scripts": {
     "coverage": "node src test --coverage",
@@ -61,7 +61,7 @@
     "@welldone-software/why-did-you-render": "^4.2.5",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.0.1",
-    "babel-loader": "^8.0.4",
+    "babel-loader": "^8.3.0",
     "babel-plugin-react-intl-auto": "^3.1.0",
     "babel-plugin-root-import": "^6.5.0",
     "babel-plugin-styled-components": "^1.10.6",
@@ -70,7 +70,7 @@
     "core-js": "^3.0.0",
     "coveralls": "^3.0.2",
     "cross-spawn": "^7.0.0",
-    "css-loader": "^3.4.2",
+    "css-loader": "^6.8.1",
     "date-fns": "^2",
     "dotenv": "^8.0.0",
     "enzyme": "^3.11.0",
@@ -83,13 +83,13 @@
     "eslint-plugin-react": "^7.11.1",
     "eslint-plugin-react-hooks": "^2.5.1",
     "extract-react-intl-messages": "^4.1.1",
-    "file-loader": "^6.0.0",
+    "file-loader": "^6.2.0",
     "full-icu": "^1.3.1",
     "husky": "^4.0.0",
     "icu4c-data": "^0.64.2",
     "identity-obj-proxy": "^3.0.0",
     "imagemin": "^5.0.0",
-    "img-loader": "^3.0.1",
+    "img-loader": "^4.0.0",
     "immutable": "^3.0.0",
     "immutable4": "npm:immutable@^4.0.0-rc.12",
     "is-ci": "^2.0.0",
@@ -127,24 +127,24 @@
     "rimraf": "^3.0.0",
     "seamless-immutable": "^7.1.3",
     "sinon": "^9.0.0",
-    "style-loader": "^1.1.3",
+    "style-loader": "^3.3.3",
     "styled-components": "5.1.1",
     "styled-transition-group": "^2.0.0",
-    "svg-inline-loader": "^0.8.0",
+    "svg-inline-loader": "^0.8.2",
     "ts-jest": "^26.4.0",
-    "typeface-open-sans": "^0.0.75",
+    "typeface-open-sans": "^1.1.13",
     "typeface-roboto-condensed": "^0.0.75",
     "unexpected": "^11.1.0",
     "unexpected-dom": "^4.14.3",
     "unexpected-immutable": "^0.5.0",
     "unexpected-reaction": "^2.14.0",
     "unexpected-sinon": "^10.11.1",
-    "url-loader": "^4.0.0",
+    "url-loader": "^4.1.1",
     "url-pattern": "^1.0.3",
     "url-polyfill": "^1.1.0",
-    "webpack": "^4.25.1",
-    "webpack-bundle-analyzer": "^3.6.0",
-    "webpack-dev-server": "^3.1.10",
+    "webpack": "^5.89.0",
+    "webpack-bundle-analyzer": "^4.10.0",
+    "webpack-dev-server": "^4.15.1",
     "whatwg-fetch": "^3.0.0"
   },
   "sideEffects": false,

package/src/config/webpack.config.js

@@ -28,17 +28,16 @@ const config = {
 	module: {
 		rules: [
 			{
-				resource: {
-					test: /\.js$/, // Only JavaScript files
-					or: [
-						// One of these conditions must be true
-						{ not: [/node_modules/] }, // No dependencies unless explicitly allowed by whitelist
-					].concat(
+				test: /\.js$/, // Only JavaScript files
+				exclude: {
+					and: [/node_modules/], // Exclude libraries in node_modules ...
+					not: [
+						// Except for a few of them that needs to be transpiled because they use modern syntax
 						// Allowed by whitelist
 						babelWhitelist.map(
 							lib => new RegExp("node_modules(?:/|\\\\)" + lib.replace("/", "(?:/|\\\\)") + "(?:/|\\\\)"),
 						),
-					),
+					]
 				},
 				use: [
 					{
@@ -61,12 +60,7 @@ const config = {
 			},
 			{
 				test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/,
-				use: {
-					loader: "url-loader",
-					options: {
-						limit: 50000,
-					},
-				},
+				type: 'asset/inline',
 			},
 		],
 	},
@@ -95,8 +89,10 @@ if (parseEnv("NODE_ENV") === "production") {
 	config.mode = "production";
 } else {
 	config.devtool = "inline-source-map";
-	config.optimization = { usedExports: true };
-	config.plugins.push(new webpack.NamedModulesPlugin(), new webpack.HotModuleReplacementPlugin());
+	config.optimization = {
+		usedExports: true,
+		moduleIds: 'named',
+	};
 	config.mode = "development";
 }
 

package/src/scripts/start.js

@@ -1,4 +1,4 @@
-const webpackDevServer = require("webpack-dev-server");
+const DevServer = require("webpack-dev-server");
 const webpack = require("webpack");
 
 const HOST = process.env.HOSTNAME || "localhost";
@@ -9,37 +9,27 @@ const PORT = argPort || process.env.PORT || 5000;
 
 const config = require("../config/webpack.config.js");
 const options = {
-	contentBase: "./dist",
-	publicPath: process.env.WEBPACK_PUBLIC_PATH || "/",
 	historyApiFallback: true,
-	hotOnly: true,
+	hot: "only",
 	port: PORT,
 	host: HOST,
+	static: './dist',
+	devMiddleware: {
+		publicPath: process.env.WEBPACK_PUBLIC_PATH || "/",
+	},
 };
 
 if (HOST !== "localhost") {
 	options.public = HOST;
 }
 if (HOST !== "localhost" || args.indexOf("--https") !== -1 || process.env.HTTPS) {
-	options.https = true;
+	options.server = 'https';
 }
 
-const location = "http" + (options.https ? "s" : "") + "://" + HOST + ":" + PORT;
-
-// /mockData/ contains json files to simulate API endpoints
-options.before = (app, server) => {
-	app.get("/mockData/*", (req, res, next) => {
-		const parsedUrl = new URL(req.url, location);
-		parsedUrl.pathname = parsedUrl.pathname + ".json";
-		req.url = parsedUrl.href.replace(location, "");
-		next();
-	});
-};
-
-webpackDevServer.addDevServerEntrypoints(config, options);
 const compiler = webpack(config);
-const server = new webpackDevServer(compiler, options);
 
-server.listen(PORT, "localhost", () => {
-	console.log("dev server listening at " + location);
-});
+const server = new DevServer(options, compiler);
+
+(async () => {
+	await server.start();
+})();