@nx/webpack 22.7.0-beta.0 → 22.7.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "22.7.0-beta.0",
+  "version": "22.7.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -64,11 +64,11 @@
     "webpack-dev-server": "^5.2.1",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "22.7.0-beta.0",
-    "@nx/js": "22.7.0-beta.0"
+    "@nx/devkit": "22.7.0-beta.2",
+    "@nx/js": "22.7.0-beta.2"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.0"
+    "nx": "22.7.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

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

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.devServerExecutor = devServerExecutor;
-const webpack = require("webpack");
+const tslib_1 = require("tslib");
+const webpack_1 = tslib_1.__importDefault(require("webpack"));
 const devkit_1 = require("@nx/devkit");
 const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
 const operators_1 = require("rxjs/operators");
-const WebpackDevServer = require("webpack-dev-server");
+const webpack_dev_server_1 = tslib_1.__importDefault(require("webpack-dev-server"));
 const get_dev_server_config_1 = require("./lib/get-dev-server-config");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const run_webpack_1 = require("../../utils/run-webpack");
@@ -60,7 +61,7 @@ async function* devServerExecutor(serveOptions, context) {
             config.devServer ??= devServer;
         }
     }
-    return yield* (0, rxjs_for_await_1.eachValueFrom)((0, run_webpack_1.runWebpackDevServer)(config, webpack, WebpackDevServer).pipe((0, operators_1.tap)(({ stats }) => {
+    return yield* (0, rxjs_for_await_1.eachValueFrom)((0, run_webpack_1.runWebpackDevServer)(config, webpack_1.default, webpack_dev_server_1.default).pipe((0, operators_1.tap)(({ stats }) => {
         console.info(stats.toString(config.stats));
     }), (0, operators_1.map)(({ baseUrl, stats }) => {
         return {

package/src/executors/dev-server/lib/get-dev-server-config.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDevServerOptions = getDevServerOptions;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 const fs_1 = require("fs");
 const serve_path_1 = require("./serve-path");
 function getDevServerOptions(root, serveOptions, buildOptions) {

package/src/executors/ssr-dev-server/lib/wait-until-server-is-listening.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitUntilServerIsListening = waitUntilServerIsListening;
-const net = require("net");
+const tslib_1 = require("tslib");
+const net = tslib_1.__importStar(require("net"));
 function waitUntilServerIsListening(port) {
     const allowedErrorCodes = ['ECONNREFUSED', 'ECONNRESET'];
     const maxAttempts = 25;

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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ssrDevServerExecutor = ssrDevServerExecutor;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const pc = require("picocolors");
+const pc = tslib_1.__importStar(require("picocolors"));
 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");
 async function* ssrDevServerExecutor(options, context) {

package/src/executors/webpack/lib/run-webpack.d.ts

@@ -1,4 +1,4 @@
-import * as webpack from 'webpack';
+import webpack from 'webpack';
 import { Observable } from 'rxjs';
 export declare function runWebpack(config: webpack.Configuration): Observable<webpack.Stats>;
 //# sourceMappingURL=run-webpack.d.ts.map

package/src/executors/webpack/lib/run-webpack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-webpack.d.ts","sourceRoot":"","sources":["../../../../../../../packages/webpack/src/executors/webpack/lib/run-webpack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,wBAAgB,UAAU,CACxB,MAAM,EAAE,OAAO,CAAC,aAAa,GAC5B,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CA6B3B"}
+{"version":3,"file":"run-webpack.d.ts","sourceRoot":"","sources":["../../../../../../../packages/webpack/src/executors/webpack/lib/run-webpack.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,wBAAgB,UAAU,CACxB,MAAM,EAAE,OAAO,CAAC,aAAa,GAC5B,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CA6B3B"}

package/src/executors/webpack/lib/run-webpack.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runWebpack = runWebpack;
-const webpack = require("webpack");
+const tslib_1 = require("tslib");
+const webpack_1 = tslib_1.__importDefault(require("webpack"));
 const rxjs_1 = require("rxjs");
 // TODO(jack): move to dev-server executor
 function runWebpack(config) {
@@ -9,7 +10,7 @@ function runWebpack(config) {
         // Passing `watch` option here will result in a warning due to missing callback.
         // We manually call `.watch` or `.run` later so this option isn't needed here.
         const { watch, ...normalizedConfig } = config;
-        const webpackCompiler = webpack(normalizedConfig);
+        const webpackCompiler = (0, webpack_1.default)(normalizedConfig);
         const callback = (err, stats) => {
             if (err) {
                 subscriber.error(err);

package/src/generators/convert-config-to-webpack-plugin/lib/extract-webpack-options.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractWebpackOptions = extractWebpackOptions;
+const tslib_1 = require("tslib");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 function extractWebpackOptions(tree, webpackConfigPath) {
     const source = tree.read(webpackConfigPath).toString('utf-8');
     const sourceFile = (0, tsquery_1.ast)(source);

package/src/generators/convert-to-inferred/utils/ast.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toPropertyAssignment = toPropertyAssignment;
 exports.toExpression = toExpression;
-const ts = require("typescript");
+const tslib_1 = require("tslib");
+const ts = tslib_1.__importStar(require("typescript"));
 function toPropertyAssignment(key, value) {
     if (typeof value === 'string') {
         return ts.factory.createPropertyAssignment(ts.factory.createStringLiteral(key), ts.factory.createStringLiteral(value));

package/src/generators/convert-to-inferred/utils/build-post-target-transformer.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildPostTargetTransformerFactory = buildPostTargetTransformerFactory;
+const tslib_1 = require("tslib");
 const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 const ast_1 = require("./ast");
 function buildPostTargetTransformerFactory(migrationContext) {
     return function buildPostTargetTransformer(target, tree, projectDetails, inferredTarget) {

package/src/generators/convert-to-inferred/utils/serve-post-target-transformer.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.servePostTargetTransformerFactory = servePostTargetTransformerFactory;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const path_1 = require("path");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 const serve_path_1 = require("../../../executors/dev-server/lib/serve-path");
 const ast_1 = require("./ast");
 function servePostTargetTransformerFactory(migrationContext) {

package/src/plugins/generate-package-json-plugin.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GeneratePackageJsonPlugin = void 0;
-const fs = require("fs");
+const tslib_1 = require("tslib");
+const fs = tslib_1.__importStar(require("fs"));
 const webpack_1 = require("webpack");
 const js_1 = require("@nx/js");
 const devkit_1 = require("@nx/devkit");

package/src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NxTsconfigPathsWebpackPlugin = void 0;
-const path = require("path");
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
 const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
 const devkit_1 = require("@nx/devkit");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");

package/src/plugins/nx-webpack-plugin/lib/apply-base-config.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyBaseConfig = applyBaseConfig;
-const path = require("path");
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
 const license_webpack_plugin_1 = require("license-webpack-plugin");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
+const copy_webpack_plugin_1 = tslib_1.__importDefault(require("copy-webpack-plugin"));
 const webpack_1 = require("webpack");
 const js_1 = require("@nx/js");
 const stats_json_plugin_1 = require("../../stats-json-plugin");
@@ -295,7 +296,7 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
         }));
     }
     if (Array.isArray(options.assets) && options.assets.length > 0) {
-        plugins.push(new CopyWebpackPlugin({
+        plugins.push(new copy_webpack_plugin_1.default({
             patterns: options.assets.map((asset) => {
                 return {
                     context: asset.input,

package/src/plugins/nx-webpack-plugin/lib/apply-web-config.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyWebConfig = applyWebConfig;
-const path = require("path");
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
 const webpack_subresource_integrity_1 = require("webpack-subresource-integrity");
 const webpack_1 = require("webpack");
 const write_index_html_plugin_1 = require("../../write-index-html-plugin");

package/src/plugins/nx-webpack-plugin/lib/compiler-loaders.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLoaderFromCompiler = createLoaderFromCompiler;
-const path = require("path");
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
 const js_1 = require("@nx/js");
 function createLoaderFromCompiler(options) {
     switch (options.compiler) {

package/src/plugins/nx-webpack-plugin/lib/get-terser-ecma-version.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTerserEcmaVersion = getTerserEcmaVersion;
-const path = require("path");
-const fs = require("fs");
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const fs = tslib_1.__importStar(require("fs"));
 const browserslist = require("browserslist");
 const VALID_BROWSERSLIST_FILES = ['.browserslistrc', 'browserslist'];
 const ES5_BROWSERS = [

package/src/plugins/nx-webpack-plugin/lib/instantiate-script-plugins.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.instantiateScriptPlugins = instantiateScriptPlugins;
-const path = require("path");
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
 const hash_format_1 = require("../../../utils/hash-format");
 const scripts_webpack_plugin_1 = require("../../../utils/webpack/plugins/scripts-webpack-plugin");
 const normalize_entry_1 = require("../../../utils/webpack/normalize-entry");

package/src/plugins/nx-webpack-plugin/lib/stylesheet-loaders.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCommonLoadersForCssModules = getCommonLoadersForCssModules;
 exports.getCommonLoadersForGlobalCss = getCommonLoadersForGlobalCss;
 exports.getCommonLoadersForGlobalStyle = getCommonLoadersForGlobalStyle;
-const path = require("path");
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
 const autoprefixer = require("autoprefixer");
 const postcssImports = require("postcss-import");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");

package/src/plugins/webpack-nx-build-coordination-plugin.js

@@ -52,7 +52,7 @@ class WebpackNxBuildCoordinationPlugin {
         try {
             return await new Promise((res) => {
                 this.buildCmdProcess = (0, child_process_1.exec)(this.buildCmd, {
-                    windowsHide: false,
+                    windowsHide: true,
                 });
                 this.buildCmdProcess.stdout.pipe(process.stdout);
                 this.buildCmdProcess.stderr.pipe(process.stderr);

package/src/plugins/write-index-html-plugin.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WriteIndexHtmlPlugin = void 0;
-const webpack = require("webpack");
+const tslib_1 = require("tslib");
+const webpack = tslib_1.__importStar(require("webpack"));
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
 const interpolate_env_variables_to_index_1 = require("../utils/webpack/interpolate-env-variables-to-index");

package/src/utils/create-copy-plugin.d.ts

@@ -1,4 +1,4 @@
-import * as CopyWebpackPlugin from 'copy-webpack-plugin';
+import CopyWebpackPlugin from 'copy-webpack-plugin';
 import { AssetGlobPattern } from '../executors/webpack/schema';
 export declare function createCopyPlugin(assets: AssetGlobPattern[]): CopyWebpackPlugin;
 //# sourceMappingURL=create-copy-plugin.d.ts.map

package/src/utils/create-copy-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-copy-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/webpack/src/utils/create-copy-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,iBAAiB,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,qBAqB1D"}
+{"version":3,"file":"create-copy-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/webpack/src/utils/create-copy-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,qBAqB1D"}

package/src/utils/create-copy-plugin.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCopyPlugin = createCopyPlugin;
-const CopyWebpackPlugin = require("copy-webpack-plugin");
+const tslib_1 = require("tslib");
+const copy_webpack_plugin_1 = tslib_1.__importDefault(require("copy-webpack-plugin"));
 function createCopyPlugin(assets) {
-    return new CopyWebpackPlugin({
+    return new copy_webpack_plugin_1.default({
         patterns: assets.map((asset) => {
             return {
                 context: asset.input,

package/src/utils/fs.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findUp = findUp;
 exports.findAllNodeModules = findAllNodeModules;
 exports.deleteOutputDir = deleteOutputDir;
-const path = require("path");
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
 const fs_1 = require("fs");
 const fileutils_1 = require("nx/src/utils/fileutils");
 function findUp(names, from, stopOnNodeModules = false) {

package/src/utils/webpack/plugins/postcss-cli-resources.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostcssCliResources = PostcssCliResources;
+const tslib_1 = require("tslib");
 const loader_utils_1 = require("loader-utils");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 const url_1 = require("url");
 function wrapUrl(url) {
     let wrappedUrl;

package/src/utils/webpack/plugins/scripts-webpack-plugin.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScriptsWebpackPlugin = void 0;
+const tslib_1 = require("tslib");
 const loader_utils_1 = require("loader-utils");
-const path = require("path");
-const webpack = require("webpack");
+const path = tslib_1.__importStar(require("path"));
+const webpack = tslib_1.__importStar(require("webpack"));
 const Chunk = require('webpack/lib/Chunk');
 const EntryPoint = require('webpack/lib/Entrypoint');
 function addDependencies(compilation, scripts) {