openmrs 3.2.0 → 3.2.1-pre.933

package/default-webpack-config.js

@@ -4,7 +4,7 @@ const { CleanWebpackPlugin } = require("clean-webpack-plugin");
 const { DefinePlugin, container } = require("webpack");
 const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
 const { StatsWriterPlugin } = require("webpack-stats-plugin");
-const { mergeWith, isArray } = require("lodash");
+const { merge, mergeWith, isArray } = require("lodash");
 
 const production = "production";
 const { ModuleFederationPlugin } = container;
@@ -32,6 +32,10 @@ function makeIdent(name) {
 
 const overrides = {};
 const additionalConfig = {};
+const scriptRuleConfig = {};
+const cssRuleConfig = {};
+const scssRuleConfig = {};
+const assetRuleConfig = {};
 
 module.exports = (env, argv = {}) => {
   const root = process.cwd();
@@ -67,29 +71,41 @@ module.exports = (env, argv = {}) => {
     target: "web",
     module: {
       rules: [
-        {
-          test: /\.m?(js|ts|tsx)$/,
-          exclude: /(node_modules|bower_components)/,
-          use: {
-            loader: require.resolve("babel-loader"),
+        merge(
+          {
+            test: /\.m?(js|ts|tsx)$/,
+            exclude: /(node_modules|bower_components)/,
+            use: {
+              loader: require.resolve("babel-loader"),
+            },
           },
-        },
-        {
-          test: /\.css$/,
-          use: [require.resolve("style-loader"), cssLoader],
-        },
-        {
-          test: /\.s[ac]ss$/i,
-          use: [
-            require.resolve("style-loader"),
-            cssLoader,
-            { loader: require.resolve("sass-loader") },
-          ],
-        },
-        {
-          test: /\.(png|jpe?g|gif|svg)$/i,
-          type: "asset/resource",
-        },
+          scriptRuleConfig
+        ),
+        merge(
+          {
+            test: /\.css$/,
+            use: [require.resolve("style-loader"), cssLoader],
+          },
+          cssRuleConfig
+        ),
+        merge(
+          {
+            test: /\.s[ac]ss$/i,
+            use: [
+              require.resolve("style-loader"),
+              cssLoader,
+              { loader: require.resolve("sass-loader") },
+            ],
+          },
+          scssRuleConfig
+        ),
+        merge(
+          {
+            test: /\.(png|jpe?g|gif|svg)$/i,
+            type: "asset/resource",
+          },
+          assetRuleConfig
+        ),
       ],
     },
     mode,
@@ -164,3 +180,31 @@ module.exports.additionalConfig = additionalConfig;
  * Make sure to modify this object and not reassign it.
  */
 module.exports.overrides = overrides;
+
+/**
+ * This object will be merged into the webpack rule governing
+ * the loading of JS, JSX, TS, etc. files.
+ * Make sure to modify this object and not reassign it.
+ */
+module.exports.scriptRuleConfig = scriptRuleConfig;
+
+/**
+ * This object will be merged into the webpack rule governing
+ * the loading of CSS files.
+ * Make sure to modify this object and not reassign it.
+ */
+module.exports.cssRuleConfig = cssRuleConfig;
+
+/**
+ * This object will be merged into the webpack rule governing
+ * the loading of SCSS files.
+ * Make sure to modify this object and not reassign it.
+ */
+module.exports.scssRuleConfig = scssRuleConfig;
+
+/**
+ * This object will be merged into the webpack rule governing
+ * the loading of static asset files.
+ * Make sure to modify this object and not reassign it.
+ */
+module.exports.assetRuleConfig = assetRuleConfig;

package/dist/cli.js

@@ -51,7 +51,7 @@ yargs.command("debug", "Starts a new debugging session of the OpenMRS app shell.
     .default("host", "localhost")
     .describe("host", "The host name or IP for the server to use.")
     .string("backend")
-    .default("backend", "https://openmrs-spa.org/")
+    .default("backend", "https://dev3.openmrs.org/")
     .describe("backend", "The backend to proxy API requests to.")
     .string("add-cookie")
     .default("add-cookie", "")
@@ -94,7 +94,7 @@ yargs.command("develop", "Starts a new frontend module development session with
     .default("host", "localhost")
     .describe("host", "The host name or IP for the server to use.")
     .string("backend")
-    .default("backend", "https://openmrs-spa.org/")
+    .default("backend", "https://dev3.openmrs.org/")
     .describe("backend", "The backend to proxy API requests to.")
     .string("add-cookie")
     .default("add-cookie", "")
@@ -184,7 +184,7 @@ yargs.command(["start", "$0"], "Starts the app shell using the provided configur
     .default("host", "localhost")
     .describe("host", "The host name or IP for the server to use.")
     .string("backend")
-    .default("backend", "https://openmrs-spa.org/")
+    .default("backend", "https://dev3.openmrs.org/")
     .describe("backend", "The backend to proxy API requests to.")
     .string("add-cookie")
     .default("add-cookie", "")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmrs",
-  "version": "3.2.0",
+  "version": "3.2.1-pre.933",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "bin": {
@@ -35,23 +35,24 @@
     "@babel/preset-env": "^7.11.0",
     "@babel/preset-react": "^7.10.4",
     "@babel/preset-typescript": "^7.10.4",
-    "@openmrs/esm-app-shell": "3.2.0",
+    "@openmrs/esm-app-shell": "3.2.1-pre.933",
     "@types/react": "^16.9.46",
     "@types/systemjs": "^6.1.0",
-    "autoprefixer": "^9.6.1",
+    "autoprefixer": "^10.4.2",
     "axios": "^0.21.1",
     "babel-loader": "^8.2.2",
     "browserslist-config-openmrs": "^1.0.1",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^10.0.0",
     "css-loader": "^5.2.4",
-    "cssnano": "^4.1.10",
+    "cssnano": "^5.0.16",
     "ejs": "^2.6.2",
     "fork-ts-checker-webpack-plugin": "^6.5.0",
     "glob": "^7.1.3",
     "html-webpack-plugin": "^5.5.0",
     "inquirer": "^7.3.3",
     "mini-css-extract-plugin": "^2.4.5",
+    "postcss": "^8.4.6",
     "postcss-loader": "^6.2.1",
     "rimraf": "^3.0.2",
     "sass": "^1.44.0",
@@ -78,5 +79,5 @@
     "@types/rimraf": "^2.0.2",
     "@types/tar": "^4.0.3"
   },
-  "gitHead": "9c4a04089e29ff99321d6fef72294f402deb0f7b"
+  "gitHead": "1b80ed23aaf71ecd7744adaee5e0a885ed643683"
 }

package/src/cli.ts

@@ -45,7 +45,7 @@ yargs.command(
       .default("host", "localhost")
       .describe("host", "The host name or IP for the server to use.")
       .string("backend")
-      .default("backend", "https://openmrs-spa.org/")
+      .default("backend", "https://dev3.openmrs.org/")
       .describe("backend", "The backend to proxy API requests to.")
       .string("add-cookie")
       .default("add-cookie", "")
@@ -139,7 +139,7 @@ yargs.command(
       .default("host", "localhost")
       .describe("host", "The host name or IP for the server to use.")
       .string("backend")
-      .default("backend", "https://openmrs-spa.org/")
+      .default("backend", "https://dev3.openmrs.org/")
       .describe("backend", "The backend to proxy API requests to.")
       .string("add-cookie")
       .default("add-cookie", "")
@@ -337,7 +337,7 @@ yargs.command(
       .default("host", "localhost")
       .describe("host", "The host name or IP for the server to use.")
       .string("backend")
-      .default("backend", "https://openmrs-spa.org/")
+      .default("backend", "https://dev3.openmrs.org/")
       .describe("backend", "The backend to proxy API requests to.")
       .string("add-cookie")
       .default("add-cookie", "")