Merge with upstream

scm-ui/scripts/babelMonoRepoTransformer.js

@@ -1,11 +1,11 @@
 /**
  * Read and use .babelrc from packages
  */
-const { join, resolve } = require("path");
+const path = require("path");
 const { createTransformer } = require("babel-jest");
 
-const packagePath = resolve(__dirname, "../");
-const packageGlob = join(packagePath, "*");
+const packagePath = path.resolve(__dirname, "../");
+const packageGlob = path.join(packagePath, "*");
 
 module.exports = createTransformer({
   babelrcRoots: packageGlob

scm-ui/scripts/babelPluginTransformer.js

@@ -0,0 +1,16 @@
+/**
+ * Read and use .babelrc from packages
+ */
+const path = require("path");
+const { createTransformer } = require("babel-jest");
+
+const packagePath = path.resolve(__dirname, "..");
+const packageGlob = path.join(packagePath, "*");
+const currentDirectory = path.join(process.cwd());
+
+module.exports = createTransformer({
+  babelrcRoots: [
+    packageGlob,
+    currentDirectory
+  ]
+});

scm-ui/scripts/jest-plugin.config.js

@@ -0,0 +1,30 @@
+const path = require("path");
+const fs = require("fs");
+const transformer = path.resolve(__dirname, "babelPluginTransformer.js");
+const rootDir = path.resolve(process.cwd());
+const packageJsonPath = path.join(rootDir, "package.json");
+const packageJson = JSON.parse(
+  fs.readFileSync(packageJsonPath, { encoding: "UTF-8" })
+);
+
+const reportDirectory = path.join(rootDir, "target", "jest-reports");
+
+module.exports = {
+  rootDir,
+  transform: { "^.+\\.js$": transformer },
+  transformIgnorePatterns: [".*/node_modules/.*"],
+  collectCoverage: true,
+  coverageDirectory: path.join(reportDirectory, "coverage"),
+  coveragePathIgnorePatterns: ["src/main/js/tests/.*"],
+  reporters: [
+    "default",
+    [
+      "jest-junit",
+      {
+        suiteName: packageJson.name + " tests",
+        outputDirectory: reportDirectory,
+        outputName: "TEST-plugin.xml"
+      }
+    ]
+  ]
+};

scm-ui/scripts/jest.config.js

@@ -12,7 +12,11 @@ module.exports = {
     "default",
     [
       "jest-junit",
-      { outputDirectory: reportDirectory, outputName: "TEST-all.xml" }
+      {
+        suiteName: "SCM-UI Package tests",
+        outputDirectory: reportDirectory,
+        outputName: "TEST-scm-ui.xml"
+      }
     ]
   ]
 };

scm-ui/scripts/webpack.config.js

@@ -29,22 +29,26 @@ module.exports = {
       {
         test: /\.(js|jsx)$/,
         exclude: /node_modules/,
-        use: [{
-          loader: "cache-loader"
-        },{
-          loader: "thread-loader"
-        }, {
-          loader: "babel-loader",
-          options: {
-            cacheDirectory: true,
-            presets: [
-              "@babel/preset-env",
-              "@babel/preset-react",
-              "@babel/preset-flow"
-            ],
-            plugins: ["@babel/plugin-proposal-class-properties"]
+        use: [
+          {
+            loader: "cache-loader"
+          },
+          {
+            loader: "thread-loader"
+          },
+          {
+            loader: "babel-loader",
+            options: {
+              cacheDirectory: true,
+              presets: [
+                "@babel/preset-env",
+                "@babel/preset-react",
+                "@babel/preset-flow"
+              ],
+              plugins: ["@babel/plugin-proposal-class-properties"]
+            }
           }
-        }]
+        ]
       },
       {
         test: /\.(css|scss|sass)$/i,
@@ -77,7 +81,13 @@ module.exports = {
       app.use(createContextPathMiddleware("/scm"));
     },
     after: function(app) {
-      const templatePath = path.join(__dirname, "..", "ui-webapp", "public", "index.mustache");
+      const templatePath = path.join(
+        __dirname,
+        "..",
+        "ui-webapp",
+        "public",
+        "index.mustache"
+      );
       const renderParams = {
         contextPath: "/scm"
       };
@@ -88,12 +98,16 @@ module.exports = {
   optimization: {
     runtimeChunk: "single",
     splitChunks: {
+      chunks: "all",
       cacheGroups: {
-        vendor: {
+        vendors: {
           test: /[\\/]node_modules[\\/]/,
-          name: "vendors",
-          enforce: true,
-          chunks: "all"
+          priority: -10
+        },
+        default: {
+          minChunks: 2,
+          priority: -20,
+          reuseExistingChunk: true
         }
       }
     }