@nx/webpack 16.4.0-beta.1 → 16.4.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "16.4.0-beta.1",
+  "version": "16.4.0-beta.13",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -30,16 +30,17 @@
   },
   "dependencies": {
     "@babel/core": "^7.15.0",
-    "@nrwl/webpack": "16.4.0-beta.1",
-    "@nx/devkit": "16.4.0-beta.1",
-    "@nx/js": "16.4.0-beta.1",
+    "@nrwl/webpack": "16.4.0-beta.13",
+    "@nx/devkit": "16.4.0-beta.13",
+    "@nx/js": "16.4.0-beta.13",
     "autoprefixer": "^10.4.9",
     "babel-loader": "^9.1.2",
+    "browserslist": "^4.21.4",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.1",
     "copy-webpack-plugin": "^10.2.4",
     "css-loader": "^6.4.0",
-    "css-minimizer-webpack-plugin": "^3.4.1",
+    "css-minimizer-webpack-plugin": "^5.0.0",
     "dotenv": "~10.0.0",
     "file-loader": "^6.2.0",
     "fork-ts-checker-webpack-plugin": "7.2.13",
@@ -58,7 +59,7 @@
     "sass-loader": "^12.2.0",
     "source-map-loader": "^3.0.0",
     "style-loader": "^3.3.0",
-    "stylus": "^0.55.0",
+    "stylus": "^0.59.0",
     "stylus-loader": "^7.1.0",
     "terser-webpack-plugin": "^5.3.3",
     "ts-loader": "^9.3.1",
@@ -75,5 +76,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "1c4fb934b607f0d93bb23bff2cf0f39b31a8fa43"
+  "gitHead": "d81afedfcc8d07db8cdb9b0e9286de0321ee184e"
 }

package/src/executors/ssr-dev-server/ssr-dev-server.impl.js

@@ -7,9 +7,9 @@ const chalk = require("chalk");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const wait_until_server_is_listening_1 = require("./lib/wait-until-server-is-listening");
 function ssrDevServerExecutor(options, context) {
-    var _a;
+    var _a, _b;
     return tslib_1.__asyncGenerator(this, arguments, function* ssrDevServerExecutor_1() {
-        var _b, e_1, _c, _d;
+        var _c, e_1, _d, _e;
         const browserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, context.projectGraph);
         const serverTarget = (0, devkit_1.parseTargetString)(options.serverTarget, context.projectGraph);
         const browserOptions = (0, devkit_1.readTargetOptions)(browserTarget, context);
@@ -21,34 +21,29 @@ function ssrDevServerExecutor(options, context) {
         const combined = (0, async_iterable_1.combineAsyncIterables)(runBrowser, runServer);
         process.env['port'] = `${options.port}`;
         try {
-            for (var _e = true, combined_1 = tslib_1.__asyncValues(combined), combined_1_1; combined_1_1 = yield tslib_1.__await(combined_1.next()), _b = combined_1_1.done, !_b;) {
-                _d = combined_1_1.value;
-                _e = false;
-                try {
-                    const output = _d;
-                    if (!output.success)
-                        throw new Error('Could not build application');
-                    if (output.options.target === 'node') {
-                        nodeStarted = true;
-                    }
-                    else if (((_a = output.options) === null || _a === void 0 ? void 0 : _a.target) === 'web') {
-                        browserBuilt = true;
-                    }
-                    if (nodeStarted && browserBuilt) {
-                        yield tslib_1.__await((0, wait_until_server_is_listening_1.waitUntilServerIsListening)(options.port));
-                        console.log(`[ ${chalk.green('ready')} ] on http://localhost:${options.port}`);
-                        yield yield tslib_1.__await(Object.assign(Object.assign({}, output), { baseUrl: `http://localhost:${options.port}` }));
-                    }
+            for (var _f = true, combined_1 = tslib_1.__asyncValues(combined), combined_1_1; combined_1_1 = yield tslib_1.__await(combined_1.next()), _c = combined_1_1.done, !_c; _f = true) {
+                _e = combined_1_1.value;
+                _f = false;
+                const output = _e;
+                if (!output.success)
+                    throw new Error('Could not build application');
+                if (((_a = output.options) === null || _a === void 0 ? void 0 : _a.target) === 'node') {
+                    nodeStarted = true;
                 }
-                finally {
-                    _e = true;
+                else if (((_b = output.options) === null || _b === void 0 ? void 0 : _b.target) === 'web') {
+                    browserBuilt = true;
+                }
+                if (nodeStarted && browserBuilt) {
+                    yield tslib_1.__await((0, wait_until_server_is_listening_1.waitUntilServerIsListening)(options.port));
+                    console.log(`[ ${chalk.green('ready')} ] on http://localhost:${options.port}`);
+                    yield yield tslib_1.__await(Object.assign(Object.assign({}, output), { baseUrl: `http://localhost:${options.port}` }));
                 }
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (!_e && !_b && (_c = combined_1.return)) yield tslib_1.__await(_c.call(combined_1));
+                if (!_f && !_c && (_d = combined_1.return)) yield tslib_1.__await(_d.call(combined_1));
             }
             finally { if (e_1) throw e_1.error; }
         }

package/src/executors/webpack/schema.d.ts

@@ -70,28 +70,16 @@ export interface WebpackExecutorOptions {
   webpackConfig?: string;
   babelConfig?: string;
   babelUpwardRootMode?: boolean;
-  // TODO(jack): Also deprecate these in schema.json once we have migration from executor options to webpack.config.js file.
-  /** @deprecated Moved to withWeb options from `@nx/webpack` */
   baseHref?: string;
-  /** @deprecated Moved to withWeb options from `@nx/webpack` */
   crossOrigin?: 'none' | 'anonymous' | 'use-credentials';
-  /** @deprecated Moved to withWeb options from `@nx/webpack` */
   deployUrl?: string;
-  /** @deprecated Moved to withWeb options from `@nx/webpack` */
   extractCss?: boolean;
-  /** @deprecated Moved to withWeb options from `@nx/webpack` */
   generateIndexHtml?: boolean;
-  /** @deprecated Moved to withWeb options from `@nx/webpack` */
   index?: string;
-  /** @deprecated Moved to withWeb options from `@nx/webpack` */
   postcssConfig?: string;
-  /** @deprecated Moved to withWeb options from `@nx/webpack` */
   scripts?: Array<ExtraEntryPointClass | string>;
-  /** @deprecated Moved to withWeb options from `@nx/webpack` */
   stylePreprocessorOptions?: any;
-  /** @deprecated Moved to withWeb options from `@nx/webpack` */
   styles?: Array<ExtraEntryPointClass | string>;
-  /** @deprecated Moved to withWeb options from `@nx/webpack` */
   subresourceIntegrity?: boolean;
 }
 

package/src/generators/init/init.js

@@ -5,13 +5,9 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
 const versions_1 = require("../../utils/versions");
-const add_babel_inputs_1 = require("@nx/js/src/utils/add-babel-inputs");
 function webpackInitGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const tasks = [];
-        if (schema.compiler === 'babel') {
-            (0, add_babel_inputs_1.addBabelInputs)(tree);
-        }
         const devDependencies = {
             '@nx/webpack': versions_1.nxVersion,
         };

package/src/generators/webpack-project/schema.json

@@ -21,7 +21,7 @@
       "type": "string",
       "enum": ["babel", "swc", "tsc"],
       "description": "The compiler to use to build source.",
-      "default": "babel"
+      "default": "swc"
     },
     "main": {
       "type": "string",

package/src/generators/webpack-project/webpack-project.js

@@ -37,7 +37,7 @@ function addBuildTarget(tree, options) {
     const buildOptions = {
         target: options.target,
         outputPath: (0, devkit_1.joinPathFragments)('dist', project.root),
-        compiler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'babel',
+        compiler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'swc',
         main: (_b = options.main) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(project.root, 'src/main.ts'),
         tsConfig: (_c = options.tsConfig) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.app.json'),
         webpackConfig: (0, devkit_1.joinPathFragments)(project.root, 'webpack.config.js'),
@@ -48,8 +48,11 @@ function addBuildTarget(tree, options) {
     if (options.babelConfig) {
         buildOptions.babelConfig = options.babelConfig;
     }
-    else {
-        buildOptions.babelUpwardRootMode = true;
+    else if (options.compiler === 'babel') {
+        // If no babel config file is provided then write a default one, otherwise build will fail.
+        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(project.root, '.babelrc'), {
+            presets: ['@nx/js/babel'],
+        });
     }
     if (options.target === 'web') {
         tree.write((0, devkit_1.joinPathFragments)(project.root, 'webpack.config.js'), `

package/src/utils/web-babel-loader.js

@@ -12,15 +12,16 @@ var __rest = (this && this.__rest) || function (s, e) {
 module.exports = require('babel-loader').custom(() => {
     return {
         customOptions(_a) {
-            var { isModern, emitDecoratorMetadata } = _a, loader = __rest(_a, ["isModern", "emitDecoratorMetadata"]);
+            var { isTest, isModern, emitDecoratorMetadata } = _a, loader = __rest(_a, ["isTest", "isModern", "emitDecoratorMetadata"]);
             return {
-                custom: { isModern, emitDecoratorMetadata },
+                custom: { isTest, isModern, emitDecoratorMetadata },
                 loader,
             };
         },
-        config(cfg, { customOptions: { isModern, emitDecoratorMetadata } }) {
+        config(cfg, { customOptions: { isTest, isModern, emitDecoratorMetadata } }) {
             // Add hint to our babel preset so it can handle modern vs legacy bundles.
             cfg.options.caller.isModern = isModern;
+            cfg.options.caller.isTest = isTest;
             cfg.options.caller.emitDecoratorMetadata = emitDecoratorMetadata;
             return cfg.options;
         },

package/src/utils/with-nx.d.ts

@@ -16,6 +16,7 @@ export declare function createLoaderFromCompiler(options: NormalizedWebpackExecu
         cwd: string;
         emitDecoratorMetadata: boolean;
         isModern: boolean;
+        isTest: boolean;
         envName: string;
         cacheDirectory: boolean;
         cacheCompression: boolean;

package/src/utils/with-nx.js

@@ -2,17 +2,37 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLoaderFromCompiler = exports.withNx = void 0;
 const path = require("path");
+const path_1 = require("path");
 const webpack_1 = require("webpack");
 const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
 const js_1 = require("@nx/js");
 const license_webpack_plugin_1 = require("license-webpack-plugin");
-const TerserPlugin = require("terser-webpack-plugin");
-const nodeExternals = require("webpack-node-externals");
-const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
 const stats_json_plugin_1 = require("../plugins/stats-json-plugin");
 const create_copy_plugin_1 = require("./create-copy-plugin");
 const generate_package_json_plugin_1 = require("../plugins/generate-package-json-plugin");
 const hash_format_1 = require("./hash-format");
+const fs_1 = require("fs");
+const TerserPlugin = require("terser-webpack-plugin");
+const nodeExternals = require("webpack-node-externals");
+const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
+const browserslist = require("browserslist");
+const VALID_BROWSERSLIST_FILES = ['.browserslistrc', 'browserslist'];
+function getTerserEcmaVersion(projectRoot) {
+    let pathToBrowserslistFile = '';
+    for (const browserslistFile of VALID_BROWSERSLIST_FILES) {
+        const fullPathToFile = (0, path_1.join)(projectRoot, browserslistFile);
+        if ((0, fs_1.existsSync)(fullPathToFile)) {
+            pathToBrowserslistFile = fullPathToFile;
+            break;
+        }
+    }
+    if (!pathToBrowserslistFile) {
+        return 2020;
+    }
+    const env = browserslist.loadConfig({ path: pathToBrowserslistFile });
+    const browsers = browserslist(env);
+    return browsers.includes('ie 11') ? 5 : 2020;
+}
 const IGNORED_WEBPACK_WARNINGS = [
     /The comment file/i,
     /could not find any license/i,
@@ -143,7 +163,7 @@ function withNx(pluginOptions) {
                             parallel: true,
                             terserOptions: {
                                 keep_classnames: true,
-                                ecma: 2020,
+                                ecma: getTerserEcmaVersion((0, path_1.join)(options.root, options.projectRoot)),
                                 safari10: true,
                                 format: {
                                     ascii_only: true,
@@ -215,7 +235,7 @@ function withNx(pluginOptions) {
 }
 exports.withNx = withNx;
 function createLoaderFromCompiler(options) {
-    var _a, _b;
+    var _a, _b, _c;
     switch (options.compiler) {
         case 'swc':
             return {
@@ -267,7 +287,8 @@ function createLoaderFromCompiler(options) {
                     cwd: path.join(options.root, options.sourceRoot),
                     emitDecoratorMetadata: tsConfig.options.emitDecoratorMetadata,
                     isModern: true,
-                    envName: process.env.NODE_ENV,
+                    isTest: process.env.NX_CYPRESS_COMPONENT_TEST === 'true',
+                    envName: (_a = process.env.BABEL_ENV) !== null && _a !== void 0 ? _a : process.env.NODE_ENV,
                     cacheDirectory: true,
                     cacheCompression: false,
                 },
@@ -278,7 +299,7 @@ function createLoaderFromCompiler(options) {
             }
             else {
                 babelConfig.options['configFile'] =
-                    (_b = (_a = babelConfig.options) === null || _a === void 0 ? void 0 : _a['babelConfig']) !== null && _b !== void 0 ? _b : path.join(options.root, options.projectRoot, '.babelrc');
+                    (_c = (_b = babelConfig.options) === null || _b === void 0 ? void 0 : _b['babelConfig']) !== null && _c !== void 0 ? _c : path.join(options.root, options.projectRoot, '.babelrc');
             }
             return babelConfig;
         default: