@nrwl/next 15.8.6 → 15.8.8

package/src/executors/build/lib/create-next-config-file.js

@@ -1,49 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNextConfigFile = void 0;
-const devkit_1 = require("@nrwl/devkit");
-const ts = require("typescript");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const typescript_1 = require("nx/src/utils/typescript");
 function createNextConfigFile(options, context) {
     const nextConfigPath = options.nextConfig
         ? (0, path_1.join)(context.root, options.nextConfig)
         : (0, path_1.join)(context.root, options.root, 'next.config.js');
-    // Copy config file and our `with-nx.js` file to remove dependency on @nrwl/next for production build.
     if ((0, fs_1.existsSync)(nextConfigPath)) {
-        (0, fs_1.writeFileSync)((0, path_1.join)(options.outputPath, 'with-nx.js'), getWithNxContent());
-        (0, fs_1.writeFileSync)((0, path_1.join)(options.outputPath, 'next.config.js'), (0, fs_1.readFileSync)(nextConfigPath)
-            .toString()
-            .replace('@nrwl/next/plugins/with-nx', './with-nx.js'));
+        (0, fs_1.copyFileSync)(nextConfigPath, (0, path_1.join)(options.outputPath, 'next.config.js'));
     }
 }
 exports.createNextConfigFile = createNextConfigFile;
-function getWithNxContent() {
-    var _a;
-    const withNxFile = (0, path_1.join)(__dirname, '../../../../plugins/with-nx.js');
-    let withNxContent = (0, fs_1.readFileSync)(withNxFile).toString();
-    const withNxSource = ts.createSourceFile(withNxFile, withNxContent, ts.ScriptTarget.Latest, true);
-    const getWithNxContextDeclaration = (_a = (0, typescript_1.findNodes)(withNxSource, ts.SyntaxKind.FunctionDeclaration)) === null || _a === void 0 ? void 0 : _a.find((node) => { var _a; return ((_a = node.name) === null || _a === void 0 ? void 0 : _a.text) === 'getWithNxContext'; });
-    if (getWithNxContextDeclaration) {
-        withNxContent = (0, devkit_1.applyChangesToString)(withNxContent, [
-            {
-                type: devkit_1.ChangeType.Delete,
-                start: getWithNxContextDeclaration.getStart(withNxSource),
-                length: getWithNxContextDeclaration.getWidth(withNxSource),
-            },
-            {
-                type: devkit_1.ChangeType.Insert,
-                index: getWithNxContextDeclaration.getStart(withNxSource),
-                text: (0, devkit_1.stripIndents) `function getWithNxContext() {
-          return {
-            workspaceRoot: '${devkit_1.workspaceRoot}',
-            libsDir: '${(0, devkit_1.workspaceLayout)().libsDir}'
-          }
-        }`,
-            },
-        ]);
-    }
-    return withNxContent;
-}
 //# sourceMappingURL=create-next-config-file.js.map

package/src/executors/build/lib/create-next-config-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-next-config-file.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/build/lib/create-next-config-file.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,iCAAiC;AACjC,2BAA6D;AAC7D,+BAA4B;AAG5B,wDAAoD;AAEpD,SAAgB,oBAAoB,CAClC,OAAgC,EAChC,OAAwB;IAExB,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU;QACvC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;QACxC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAEvD,sGAAsG;IACtG,IAAI,IAAA,eAAU,EAAC,cAAc,CAAC,EAAE;QAC9B,IAAA,kBAAa,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC1E,IAAA,kBAAa,EACX,IAAA,WAAI,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,EAC1C,IAAA,iBAAY,EAAC,cAAc,CAAC;aACzB,QAAQ,EAAE;aACV,OAAO,CAAC,4BAA4B,EAAE,cAAc,CAAC,CACzD,CAAC;KACH;AACH,CAAC;AAlBD,oDAkBC;AAED,SAAS,gBAAgB;;IACvB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,gCAAgC,CAAC,CAAC;IACrE,IAAI,aAAa,GAAG,IAAA,iBAAY,EAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;IACxD,MAAM,YAAY,GAAG,EAAE,CAAC,gBAAgB,CACtC,UAAU,EACV,aAAa,EACb,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,MAAM,2BAA2B,GAAG,MAAA,IAAA,sBAAS,EAC3C,YAAY,EACZ,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAClC,0CAAE,IAAI,CACL,CAAC,IAA4B,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,IAAI,MAAK,kBAAkB,CAAA,EAAA,CACzE,CAAC;IAEF,IAAI,2BAA2B,EAAE;QAC/B,aAAa,GAAG,IAAA,6BAAoB,EAAC,aAAa,EAAE;YAClD;gBACE,IAAI,EAAE,mBAAU,CAAC,MAAM;gBACvB,KAAK,EAAE,2BAA2B,CAAC,QAAQ,CAAC,YAAY,CAAC;gBACzD,MAAM,EAAE,2BAA2B,CAAC,QAAQ,CAAC,YAAY,CAAC;aAC3D;YACD;gBACE,IAAI,EAAE,mBAAU,CAAC,MAAM;gBACvB,KAAK,EAAE,2BAA2B,CAAC,QAAQ,CAAC,YAAY,CAAC;gBACzD,IAAI,EAAE,IAAA,qBAAY,EAAA;;8BAEI,sBAAa;wBACnB,IAAA,wBAAe,GAAE,CAAC,OAAO;;UAEvC;aACH;SACF,CAAC,CAAC;KACJ;IAED,OAAO,aAAa,CAAC;AACvB,CAAC"}
+{"version":3,"file":"create-next-config-file.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/build/lib/create-next-config-file.ts"],"names":[],"mappings":";;;AAEA,2BAA8C;AAC9C,+BAA4B;AAI5B,SAAgB,oBAAoB,CAClC,OAAgC,EAChC,OAAwB;IAExB,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU;QACvC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;QACxC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAEvD,IAAI,IAAA,eAAU,EAAC,cAAc,CAAC,EAAE;QAC9B,IAAA,iBAAY,EAAC,cAAc,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC;KAC1E;AACH,CAAC;AAXD,oDAWC"}

package/src/executors/export/export.impl.js

@@ -6,12 +6,13 @@ const devkit_1 = require("@nrwl/devkit");
 const export_1 = require("next/dist/export");
 const path_1 = require("path");
 const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
-const devkit_2 = require("@nrwl/devkit");
-const config_1 = require("../../utils/config");
-const constants_1 = require("../../utils/constants");
 const nextTrace = require("next/dist/trace");
+const os_1 = require("os");
+const child_process_1 = require("child_process");
+const chalk = require("chalk");
+// platform specific command name
+const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
 function exportExecutor(options, context) {
-    var _a, e_1, _b, _c;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let dependencies = [];
         if (!options.buildLibsFromSource) {
@@ -19,34 +20,19 @@ function exportExecutor(options, context) {
             context.configurationName);
             dependencies = result.dependencies;
         }
-        const libsDir = (0, path_1.join)(context.root, (0, devkit_2.workspaceLayout)().libsDir);
-        const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget);
-        const build = yield (0, devkit_1.runExecutor)(buildTarget, {}, context);
+        const libsDir = (0, path_1.join)(context.root, (0, devkit_1.workspaceLayout)().libsDir);
+        const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph);
         try {
-            for (var _d = true, build_1 = tslib_1.__asyncValues(build), build_1_1; build_1_1 = yield build_1.next(), _a = build_1_1.done, !_a;) {
-                _c = build_1_1.value;
-                _d = false;
-                try {
-                    const result = _c;
-                    if (!result.success) {
-                        return result;
-                    }
-                }
-                finally {
-                    _d = true;
-                }
-            }
+            const args = getBuildTargetCommand(options);
+            (0, child_process_1.execFileSync)(pmCmd, args, {
+                stdio: [0, 1, 2],
+            });
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = build_1.return)) yield _b.call(build_1);
-            }
-            finally { if (e_1) throw e_1.error; }
+        catch (_a) {
+            throw new Error(`Build target failed: ${chalk.bold(options.buildTarget)}`);
         }
         const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
         const root = (0, path_1.resolve)(context.root, buildOptions.root);
-        const config = yield (0, config_1.prepareConfig)(constants_1.PHASE_EXPORT, buildOptions, context, dependencies, libsDir);
         // Taken from:
         // https://github.com/vercel/next.js/blob/ead56eaab68409e96c19f7d9139747bac1197aa9/packages/next/cli/next-export.ts#L13
         const nextExportCliSpan = nextTrace.trace('next-export-cli');
@@ -55,9 +41,13 @@ function exportExecutor(options, context) {
             silent: options.silent,
             threads: options.threads,
             outdir: `${buildOptions.outputPath}/exported`,
-        }, nextExportCliSpan, config);
+        }, nextExportCliSpan);
         return { success: true };
     });
 }
 exports.default = exportExecutor;
+function getBuildTargetCommand(options) {
+    const cmd = ['nx', 'run', options.buildTarget];
+    return cmd;
+}
 //# sourceMappingURL=export.impl.js.map

package/src/executors/export/export.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"export.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/export/export.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,yCAKsB;AACtB,6CAAyC;AACzC,+BAAqC;AACrC,6FAG4D;AAC5D,yCAA+C;AAE/C,+CAAmD;AAKnD,qDAAqD;AACrD,6CAA8C;AAE9C,SAA8B,cAAc,CAC1C,OAAiC,EACjC,OAAwB;;;QAExB,IAAI,YAAY,GAAoC,EAAE,CAAC;QACvD,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YAChC,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,EAAE,6BAA6B;YACtC,OAAO,CAAC,iBAAiB,CAC1B,CAAC;YACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;SACpC;QAED,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAA,wBAAe,GAAE,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,MAAM,IAAA,oBAAW,EAAC,WAAW,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;;YAE1D,KAA2B,eAAA,UAAA,sBAAA,KAAK,CAAA,WAAA;gBAAL,qBAAK;gBAAL,WAAK;;oBAArB,MAAM,MAAM,KAAA,CAAA;oBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;wBACnB,OAAO,MAAM,CAAC;qBACf;;;;;aACF;;;;;;;;;QAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,WAAW,EACX,OAAO,CACR,CAAC;QACF,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAa,EAChC,wBAAY,EACZ,YAAY,EACZ,OAAO,EACP,YAAY,EACZ,OAAO,CACR,CAAC;QAEF,cAAc;QACd,uHAAuH;QACvH,MAAM,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAE7D,MAAM,IAAA,gBAAS,EACb,IAAI,EACJ;YACE,aAAa,EAAE,WAAW;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,GAAG,YAAY,CAAC,UAAU,WAAW;SACvC,EACR,iBAAiB,EACjB,MAAM,CACP,CAAC;QAEF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;CAC1B;AAxDD,iCAwDC"}
+{"version":3,"file":"export.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/export/export.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,yCAKsB;AACtB,6CAAyC;AACzC,+BAAqC;AACrC,6FAG4D;AAO5D,6CAA8C;AAC9C,2BAA8B;AAC9B,iDAA6C;AAC7C,+BAA+B;AAE/B,iCAAiC;AACjC,MAAM,KAAK,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;AAEzD,SAA8B,cAAc,CAC1C,OAAiC,EACjC,OAAwB;;QAExB,IAAI,YAAY,GAAoC,EAAE,CAAC;QACvD,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YAChC,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,EAAE,6BAA6B;YACtC,OAAO,CAAC,iBAAiB,CAC1B,CAAC;YACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;SACpC;QAED,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAA,wBAAe,GAAE,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,IAAA,0BAAiB,EACnC,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,YAAY,CACrB,CAAC;QAEF,IAAI;YACF,MAAM,IAAI,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;YAC5C,IAAA,4BAAY,EAAC,KAAK,EAAE,IAAI,EAAE;gBACxB,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;SACJ;QAAC,WAAM;YACN,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;SAC5E;QAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,WAAW,EACX,OAAO,CACR,CAAC;QACF,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QAEtD,cAAc;QACd,uHAAuH;QACvH,MAAM,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAE7D,MAAM,IAAA,gBAAS,EACb,IAAI,EACJ;YACE,aAAa,EAAE,WAAW;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,GAAG,YAAY,CAAC,UAAU,WAAW;SACvC,EACR,iBAAiB,CAClB,CAAC;QAEF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;CAAA;AArDD,iCAqDC;AAED,SAAS,qBAAqB,CAAC,OAAiC;IAC9D,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC/C,OAAO,GAAG,CAAC;AACb,CAAC"}

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

@@ -6,11 +6,8 @@ const devkit_1 = require("@nrwl/devkit");
 const chalk = require("chalk");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
-const config_1 = require("../../utils/config");
 const custom_server_1 = require("./lib/custom-server");
 const default_server_1 = require("./lib/default-server");
-const constants_1 = require("../../utils/constants");
 const infoPrefix = `[ ${chalk.dim(chalk.cyan('info'))} ] `;
 function serveExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* serveExecutor_1() {
@@ -24,27 +21,16 @@ function serveExecutor(options, context) {
         process.env.PORT = options.port;
         const buildOptions = (0, devkit_1.readTargetOptions)((0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph), context);
         const root = (0, path_1.resolve)(context.root, buildOptions.root);
-        const config = yield tslib_1.__await((0, config_1.prepareConfig)(options.dev ? constants_1.PHASE_DEVELOPMENT_SERVER : constants_1.PHASE_PRODUCTION_SERVER, buildOptions, context, getDependencies(options, context), (0, path_1.join)(context.root, (0, devkit_1.workspaceLayout)().libsDir)));
         if (options.customServerTarget) {
-            yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runCustomServer(root, config, options, buildOptions, context))));
+            yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runCustomServer(root, options, buildOptions, context))));
         }
         else {
-            yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runNextDevServer(root, config, options, buildOptions, context))));
+            yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runNextDevServer(root, options, buildOptions, context))));
         }
     });
 }
 exports.default = serveExecutor;
-function getDependencies(options, context) {
-    if (options.buildLibsFromSource) {
-        return [];
-    }
-    else {
-        const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph, context.root, context.projectName, 'build', // should be generalized
-        context.configurationName);
-        return result.dependencies;
-    }
-}
-function runNextDevServer(root, config, options, buildOptions, context) {
+function runNextDevServer(root, options, buildOptions, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* runNextDevServer_1() {
         const baseUrl = `http://${options.hostname || 'localhost'}:${options.port}`;
         const settings = {
@@ -52,7 +38,6 @@ function runNextDevServer(root, config, options, buildOptions, context) {
             dir: root,
             staticMarkup: options.staticMarkup,
             quiet: options.quiet,
-            conf: config,
             port: options.port,
             customServer: !!options.customServerTarget,
             hostname: options.hostname || 'localhost',
@@ -91,7 +76,7 @@ function runNextDevServer(root, config, options, buildOptions, context) {
         }
     });
 }
-function runCustomServer(root, config, options, buildOptions, context) {
+function runCustomServer(root, options, buildOptions, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* runCustomServer_1() {
         var _a, e_1, _b, _c;
         process.env.NX_NEXT_DIR = root;

package/src/executors/server/server.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":"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"}

package/src/generators/application/lib/add-cypress.js

@@ -2,14 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCypress = void 0;
 const tslib_1 = require("tslib");
-const cypress_1 = require("@nrwl/cypress");
+const devkit_1 = require("@nrwl/devkit");
 const linter_1 = require("@nrwl/linter");
+const versions_1 = require("../../../utils/versions");
 function addCypress(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (options.e2eTestRunner !== 'cypress') {
             return () => { };
         }
-        return (0, cypress_1.cypressProjectGenerator)(host, Object.assign(Object.assign({}, options), { linter: linter_1.Linter.EsLint, name: `${options.name}-e2e`, directory: options.directory, project: options.projectName }));
+        const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nrwl/cypress', versions_1.nxVersion);
+        return cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { linter: linter_1.Linter.EsLint, name: `${options.name}-e2e`, directory: options.directory, project: options.projectName }));
     });
 }
 exports.addCypress = addCypress;

package/src/generators/application/lib/add-cypress.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,2CAAwD;AAGxD,yCAAsC;AAEtC,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,OAAO,IAAA,iCAAuB,EAAC,IAAI,kCAC9B,OAAO,KACV,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,WAAW,IAC5B,CAAC;IACL,CAAC;CAAA;AAZD,gCAYC"}
+{"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,yCAAmD;AACnD,yCAAsC;AAEtC,sDAAoD;AAGpD,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAA,sBAAa,EAE/C,eAAe,EAAE,oBAAS,CAAC,CAAC;QAC9B,OAAO,uBAAuB,CAAC,IAAI,kCAC9B,OAAO,KACV,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,WAAW,IAC5B,CAAC;IACL,CAAC;CAAA;AAfD,gCAeC"}

package/src/generators/application/lib/add-jest.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJest = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const jest_1 = require("@nrwl/jest");
+const versions_1 = require("../../../utils/versions");
 function addJest(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (options.unitTestRunner !== 'jest') {
             return () => { };
         }
-        const jestTask = yield (0, jest_1.jestProjectGenerator)(host, Object.assign(Object.assign({}, options), { project: options.projectName, supportTsx: true, skipSerializers: true, setupFile: 'none', compiler: 'babel' }));
+        const { jestProjectGenerator } = (0, devkit_1.ensurePackage)('@nrwl/jest', versions_1.nxVersion);
+        const jestTask = yield jestProjectGenerator(host, Object.assign(Object.assign({}, options), { project: options.projectName, supportTsx: true, skipSerializers: true, setupFile: 'none', compiler: 'babel' }));
         const tsConfigSpecJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json'));
         (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
             var _a, _b, _c, _d;

package/src/generators/application/lib/add-jest.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-jest.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-jest.ts"],"names":[],"mappings":";;;;AAAA,yCAA6E;AAC7E,qCAAkD;AAGlD,SAAsB,OAAO,CAAC,IAAU,EAAE,OAAyB;;QACjE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAoB,EAAC,IAAI,kCAC3C,OAAO,KACV,OAAO,EAAE,OAAO,CAAC,WAAW,EAC5B,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,IAAI,EACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,IACjB,CAAC;QAEH,MAAM,gBAAgB,GAAG,IAAA,iBAAQ,EAC/B,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAChE,CAAC;QAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,EAC1D,CAAC,IAAI,EAAE,EAAE;;;YACP,MAAA,IAAI,CAAC,eAAe,oCAApB,IAAI,CAAC,eAAe,GAAK,EAAE,EAAC;YAC5B,YAAA,IAAI,CAAC,eAAe,EAAC,KAAK,uCAAL,KAAK,GAAK,EAAE,EAAC;YAClC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAC7B,GAAG,CAAC,MAAA,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,eAAe,0CAAE,KAAK,mCAAI,EAAE,CAAC,CACpD,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;QAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,oBAAoB,CAAC,EAC/D,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,eAAe,CAAC,GAAG,GAAG,OAAO,CAAC;YACnC,oGAAoG;YACpG,IAAI,OAAO,CAAC,uBAAuB,EAAE;gBACnC,MAAM,QAAQ,GAAG,IAAA,iBAAQ,EACvB,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAC3D,CAAC;gBACF,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,gBAAgB,CAAC,CAAC;aACvE;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;QAEF,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAnDD,0BAmDC"}
+{"version":3,"file":"add-jest.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-jest.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AAEtB,sDAAoD;AAGpD,SAAsB,OAAO,CAAC,IAAU,EAAE,OAAyB;;QACjE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAA,sBAAa,EAC5C,YAAY,EACZ,oBAAS,CACV,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,IAAI,kCAC3C,OAAO,KACV,OAAO,EAAE,OAAO,CAAC,WAAW,EAC5B,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,IAAI,EACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,IACjB,CAAC;QAEH,MAAM,gBAAgB,GAAG,IAAA,iBAAQ,EAC/B,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAChE,CAAC;QAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,EAC1D,CAAC,IAAI,EAAE,EAAE;;;YACP,MAAA,IAAI,CAAC,eAAe,oCAApB,IAAI,CAAC,eAAe,GAAK,EAAE,EAAC;YAC5B,YAAA,IAAI,CAAC,eAAe,EAAC,KAAK,uCAAL,KAAK,GAAK,EAAE,EAAC;YAClC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAC7B,GAAG,CAAC,MAAA,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,eAAe,0CAAE,KAAK,mCAAI,EAAE,CAAC,CACpD,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;QAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,oBAAoB,CAAC,EAC/D,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,eAAe,CAAC,GAAG,GAAG,OAAO,CAAC;YACnC,oGAAoG;YACpG,IAAI,OAAO,CAAC,uBAAuB,EAAE;gBACnC,MAAM,QAAQ,GAAG,IAAA,iBAAQ,EACvB,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAC3D,CAAC;gBACF,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,gBAAgB,CAAC,CAAC;aACvE;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;QAEF,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAvDD,0BAuDC"}

package/src/generators/init/init.js

@@ -4,8 +4,6 @@ exports.nextInitSchematic = exports.nextInitGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
-const jest_1 = require("@nrwl/jest");
-const cypress_1 = require("@nrwl/cypress");
 const versions_1 = require("@nrwl/react/src/utils/versions");
 const init_1 = require("@nrwl/react/src/generators/init/init");
 const js_1 = require("@nrwl/js");
@@ -27,11 +25,13 @@ function nextInitGenerator(host, schema) {
         const tasks = [];
         tasks.push(yield (0, js_1.initGenerator)(host, Object.assign(Object.assign({}, schema), { skipFormat: true })));
         if (!schema.unitTestRunner || schema.unitTestRunner === 'jest') {
-            const jestTask = yield (0, jest_1.jestInitGenerator)(host, schema);
+            const { jestInitGenerator } = (0, devkit_1.ensurePackage)('@nrwl/jest', versions_2.nxVersion);
+            const jestTask = yield jestInitGenerator(host, schema);
             tasks.push(jestTask);
         }
         if (!schema.e2eTestRunner || schema.e2eTestRunner === 'cypress') {
-            const cypressTask = yield (0, cypress_1.cypressInitGenerator)(host, {});
+            const { cypressInitGenerator } = (0, devkit_1.ensurePackage)('@nrwl/cypress', versions_2.nxVersion);
+            const cypressTask = yield cypressInitGenerator(host, {});
             tasks.push(cypressTask);
         }
         const reactTask = yield (0, init_1.default)(host, schema);

package/src/generators/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,2FAAqF;AACrF,qCAA+C;AAC/C,2CAAqD;AACrD,6DAA+E;AAC/E,+DAAsE;AACtE,iCAA4D;AAE5D,mDAK8B;AAE9B,yEAAoE;AAEpE,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,YAAY,EAAE,oBAAS;QACvB,IAAI,EAAE,sBAAW;QACjB,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;QAC5B,KAAK,EAAE,uBAAY;KACpB,EACD;QACE,oBAAoB,EAAE,kCAAuB;KAC9C,CACF,CAAC;AACJ,CAAC;AAED,SAAsB,iBAAiB,CAAC,IAAU,EAAE,MAAkB;;QACpE,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,kBAAe,EAAC,IAAI,kCACrB,MAAM,KACT,UAAU,EAAE,IAAI,IAChB,CACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QACD,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE;YAC/D,MAAM,WAAW,GAAG,MAAM,IAAA,8BAAoB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACzD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,MAAM,SAAS,GAAG,MAAM,IAAA,cAAkB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtB,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,IAAA,uCAAiB,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA5BD,8CA4BC;AAED,kBAAe,iBAAiB,CAAC;AACpB,QAAA,iBAAiB,GAAG,IAAA,2BAAkB,EAAC,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,2FAAqF;AACrF,6DAA+E;AAC/E,+DAAsE;AACtE,iCAA4D;AAE5D,mDAK8B;AAE9B,yEAAoE;AAEpE,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,YAAY,EAAE,oBAAS;QACvB,IAAI,EAAE,sBAAW;QACjB,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;QAC5B,KAAK,EAAE,uBAAY;KACpB,EACD;QACE,oBAAoB,EAAE,kCAAuB;KAC9C,CACF,CAAC;AACJ,CAAC;AAED,SAAsB,iBAAiB,CAAC,IAAU,EAAE,MAAkB;;QACpE,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,kBAAe,EAAC,IAAI,kCACrB,MAAM,KACT,UAAU,EAAE,IAAI,IAChB,CACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAA,sBAAa,EACzC,YAAY,EACZ,oBAAS,CACV,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QACD,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE;YAC/D,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAA,sBAAa,EAE5C,eAAe,EAAE,oBAAS,CAAC,CAAC;YAC9B,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACzD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,MAAM,SAAS,GAAG,MAAM,IAAA,cAAkB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtB,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,IAAA,uCAAiB,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAnCD,8CAmCC;AAED,kBAAe,iBAAiB,CAAC;AACpB,QAAA,iBAAiB,GAAG,IAAA,2BAAkB,EAAC,iBAAiB,CAAC,CAAC"}

package/src/migrations/update-15-8-8/add-style-packages.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nrwl/devkit';
+export declare function update(tree: Tree): Promise<import("@nrwl/devkit").GeneratorCallback>;
+export default update;

package/src/migrations/update-15-8-8/add-style-packages.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.update = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+function update(tree) {
+    var _a, _b;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projects = (0, devkit_1.getProjects)(tree);
+        const missingDeps = {};
+        for (const [, config] of projects) {
+            if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/next:build' &&
+                tree.exists((0, devkit_1.joinPathFragments)(config.root, 'next.config.js'))) {
+                const nextConfigContent = tree.read((0, devkit_1.joinPathFragments)(config.root, 'next.config.js'), 'utf-8');
+                if (nextConfigContent.includes('@nrwl/next/plugins/with-less')) {
+                    missingDeps['less'] = '3.12.2';
+                }
+                if (nextConfigContent.includes('@nrwl/next/plugins/with-stylus')) {
+                    missingDeps['stylus'] = '^0.55.0';
+                }
+            }
+        }
+        return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, missingDeps);
+    });
+}
+exports.update = update;
+exports.default = update;
+//# sourceMappingURL=add-style-packages.js.map

package/src/migrations/update-15-8-8/add-style-packages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-style-packages.js","sourceRoot":"","sources":["../../../../../../packages/next/src/migrations/update-15-8-8/add-style-packages.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,SAAsB,MAAM,CAAC,IAAU;;;QACrC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,EAAE,CAAC;QAEvB,KAAK,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,QAAQ,EAAE;YACjC,IACE,CAAA,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,kBAAkB;gBACtD,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,EAC7D;gBACA,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC,EAChD,OAAO,CACR,CAAC;gBAEF,IAAI,iBAAiB,CAAC,QAAQ,CAAC,8BAA8B,CAAC,EAAE;oBAC9D,WAAW,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC;iBAChC;gBAED,IAAI,iBAAiB,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EAAE;oBAChE,WAAW,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC;iBACnC;aACF;SACF;QAED,OAAO,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,WAAW,CAAC,CAAC;;CAC5D;AAzBD,wBAyBC;AAED,kBAAe,MAAM,CAAC"}

package/src/utils/buildable-libs.d.ts

@@ -1,3 +0,0 @@
-import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
-import { ExecutorContext } from '@nrwl/devkit';
-export declare function assertDependentProjectsHaveBeenBuilt(dependencies: DependentBuildableProjectNode[], context: ExecutorContext): void;

package/src/utils/buildable-libs.js

@@ -1,19 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertDependentProjectsHaveBeenBuilt = void 0;
-const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
-const chalk = require("chalk");
-const devkit_1 = require("@nrwl/devkit");
-function assertDependentProjectsHaveBeenBuilt(dependencies, context) {
-    const missing = (0, buildable_libs_utils_1.findMissingBuildDependencies)(context.root, context.projectName, context.targetName, dependencies);
-    if (missing.length > 0) {
-        throw new Error(chalk.red((0, devkit_1.stripIndents) `
-      Some of the project ${context.projectName}'s dependencies have not been built yet.
-      
-      Please build these libraries first:
-      ${missing.map((x) => ` - ${x.node.name}`).join('\n')}
-    `));
-    }
-}
-exports.assertDependentProjectsHaveBeenBuilt = assertDependentProjectsHaveBeenBuilt;
 //# sourceMappingURL=buildable-libs.js.map

package/src/utils/buildable-libs.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildable-libs.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/buildable-libs.ts"],"names":[],"mappings":";;;AAAA,6FAG4D;AAC5D,+BAA+B;AAC/B,yCAA6D;AAE7D,SAAgB,oCAAoC,CAClD,YAA6C,EAC7C,OAAwB;IAExB,MAAM,OAAO,GAAG,IAAA,mDAA4B,EAC1C,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,YAAY,CACb,CAAC;IACF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CACb,KAAK,CAAC,GAAG,CAAC,IAAA,qBAAY,EAAA;4BAEpB,OAAO,CAAC,WACV;;;QAGE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;KACrD,CAAC,CACD,CAAC;KACH;AACH,CAAC;AAtBD,oFAsBC"}
+{"version":3,"file":"buildable-libs.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/buildable-libs.ts"],"names":[],"mappings":""}

package/src/utils/config.d.ts

@@ -1,7 +1,4 @@
-import { ExecutorContext } from '@nrwl/devkit';
-import type { PHASE_DEVELOPMENT_SERVER, PHASE_EXPORT, PHASE_PRODUCTION_BUILD, PHASE_PRODUCTION_SERVER } from 'next/dist/shared/lib/constants';
 import { Configuration } from 'webpack';
-import { FileReplacement, NextBuildBuilderOptions } from './types';
+import { FileReplacement } from './types';
 import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
 export declare function createWebpackConfig(workspaceRoot: string, projectRoot: string, fileReplacements?: FileReplacement[], assets?: any, dependencies?: DependentBuildableProjectNode[], libsDir?: string): (a: any, b: any) => Configuration;
-export declare function prepareConfig(phase: typeof PHASE_PRODUCTION_BUILD | typeof PHASE_EXPORT | typeof PHASE_DEVELOPMENT_SERVER | typeof PHASE_PRODUCTION_SERVER, options: NextBuildBuilderOptions, context: ExecutorContext, dependencies: DependentBuildableProjectNode[], libsDir: string): Promise<any>;

package/src/utils/config.js

@@ -1,15 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareConfig = exports.createWebpackConfig = void 0;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
+exports.createWebpackConfig = void 0;
 const path_1 = require("path");
 const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
-const webpack_1 = require("@nrwl/webpack");
+const create_copy_plugin_1 = require("./create-copy-plugin");
 const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
-const loadConfig = require('next/dist/server/config').default;
 function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [], assets = null, dependencies = [], libsDir = '') {
-    return function webpackConfig(config, { isServer, defaultLoaders, }) {
+    return function webpackConfig(config, { isServer, }) {
         const mainFields = ['es2015', 'module', 'main'];
         const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
         let tsConfigPath = (0, path_1.join)(projectRoot, 'tsconfig.json');
@@ -32,55 +29,37 @@ function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [],
             alias[replacement.replace] = replacement.with;
             return alias;
         }, config.resolve.alias);
-        config.module.rules.push({
-            test: /\.([jt])sx?$/,
-            include: [libsDir],
-            exclude: /node_modules/,
-            use: [defaultLoaders.babel],
-        });
+        // Apply any rules that work on ts files to the libsDir as well
+        const rulesToAdd = [];
+        for (const r of config.module.rules) {
+            if (typeof r === 'string') {
+                continue;
+            }
+            if (isTsRule(r)) {
+                rulesToAdd.push(Object.assign(Object.assign({}, r), { include: [libsDir] }));
+            }
+            else if (r.oneOf && r.oneOf.find(isTsRule)) {
+                rulesToAdd.push(Object.assign(Object.assign({}, r), { oneOf: r.oneOf
+                        .filter(isTsRule)
+                        .map((subRule) => (Object.assign(Object.assign({}, subRule), { include: [libsDir] }))) }));
+            }
+        }
+        config.module.rules.push(...rulesToAdd);
         // Copy (shared) assets to `public` folder during client-side compilation
         if (!isServer && Array.isArray(assets) && assets.length > 0) {
-            config.plugins.push((0, webpack_1.createCopyPlugin)((0, webpack_1.normalizeAssets)(assets, workspaceRoot, projectRoot).map((asset) => (Object.assign(Object.assign({}, asset), { output: (0, path_1.join)('../public', asset.output) })))));
+            config.plugins.push((0, create_copy_plugin_1.createCopyPlugin)(assets, workspaceRoot, projectRoot));
         }
         return config;
     };
 }
 exports.createWebpackConfig = createWebpackConfig;
-function prepareConfig(phase, options, context, dependencies, libsDir) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const config = (yield loadConfig(phase, options.root, null));
-        const userWebpack = config.webpack;
-        const userNextConfig = getConfigEnhancer(options.nextConfig, context.root);
-        // Yes, these do have different capitalisation...
-        const outputDir = `${(0, devkit_1.offsetFromRoot)(options.root)}${options.outputPath}`;
-        config.distDir =
-            config.distDir && config.distDir !== '.next'
-                ? (0, devkit_1.joinPathFragments)(outputDir, config.distDir)
-                : (0, devkit_1.joinPathFragments)(outputDir, '.next');
-        config.webpack = (a, b) => createWebpackConfig(context.root, options.root, options.fileReplacements, options.assets, dependencies, libsDir)(userWebpack ? userWebpack(a, b) : a, b);
-        if (typeof userNextConfig !== 'function') {
-            throw new Error(`Module specified by 'nextConfig' option does not export a function. It should be of form 'module.exports = (phase, config, options) => config;'`);
-        }
-        return userNextConfig(phase, config, { options });
-    });
-}
-exports.prepareConfig = prepareConfig;
-function getConfigEnhancer(pluginPath, workspaceRoot) {
-    if (!pluginPath) {
-        return (_, x) => x;
-    }
-    let fullPath;
-    try {
-        fullPath = require.resolve(pluginPath);
-    }
-    catch (_a) {
-        fullPath = (0, path_1.join)(workspaceRoot, pluginPath);
-    }
-    try {
-        return require(fullPath);
+function isTsRule(r) {
+    if (typeof r === 'string') {
+        return false;
     }
-    catch (_b) {
-        throw new Error(`Could not find file specified by 'nextConfig' option: ${fullPath}`);
+    if (!(r.test instanceof RegExp)) {
+        return false;
     }
+    return r.test.test('a.ts');
 }
 //# sourceMappingURL=config.js.map

package/src/utils/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/config.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,2 @@
+import * as CopyWebpackPlugin from 'copy-webpack-plugin';
+export declare function createCopyPlugin(assets: any[], root: string, sourceRoot: string): CopyWebpackPlugin;

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCopyPlugin = void 0;
+const CopyWebpackPlugin = require("copy-webpack-plugin");
+const path_1 = require("nx/src/utils/path");
+const path_2 = require("path");
+const fs_1 = require("fs");
+function normalizeAssets(assets, root, sourceRoot) {
+    return assets.map((asset) => {
+        if (typeof asset === 'string') {
+            const assetPath = (0, path_1.normalizePath)(asset);
+            const resolvedAssetPath = (0, path_2.resolve)(root, assetPath);
+            const resolvedSourceRoot = (0, path_2.resolve)(root, sourceRoot);
+            if (!resolvedAssetPath.startsWith(resolvedSourceRoot)) {
+                throw new Error(`The ${resolvedAssetPath} asset path must start with the project source root: ${sourceRoot}`);
+            }
+            const isDirectory = (0, fs_1.statSync)(resolvedAssetPath).isDirectory();
+            const input = isDirectory
+                ? resolvedAssetPath
+                : (0, path_2.dirname)(resolvedAssetPath);
+            const output = (0, path_2.relative)(resolvedSourceRoot, (0, path_2.resolve)(root, input));
+            const glob = isDirectory ? '**/*' : (0, path_2.basename)(resolvedAssetPath);
+            return {
+                input,
+                output,
+                glob,
+            };
+        }
+        else {
+            if (asset.output.startsWith('..')) {
+                throw new Error('An asset cannot be written to a location outside of the output path.');
+            }
+            const assetPath = (0, path_1.normalizePath)(asset.input);
+            const resolvedAssetPath = (0, path_2.resolve)(root, assetPath);
+            return Object.assign(Object.assign({}, asset), { input: resolvedAssetPath, 
+                // Now we remove starting slash to make Webpack place it from the output root.
+                output: asset.output.replace(/^\//, '') });
+        }
+    });
+}
+function createCopyPlugin(assets, root, sourceRoot) {
+    return new CopyWebpackPlugin({
+        patterns: normalizeAssets(assets, root, sourceRoot).map((asset) => {
+            var _a;
+            return {
+                context: asset.input,
+                to: (0, path_2.join)('../public', asset.output),
+                from: asset.glob,
+                globOptions: {
+                    ignore: [
+                        '.gitkeep',
+                        '**/.DS_Store',
+                        '**/Thumbs.db',
+                        ...((_a = asset.ignore) !== null && _a !== void 0 ? _a : []),
+                    ],
+                    dot: true,
+                },
+            };
+        }),
+    });
+}
+exports.createCopyPlugin = createCopyPlugin;
+//# sourceMappingURL=create-copy-plugin.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"create-copy-plugin.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/create-copy-plugin.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,4CAAkD;AAClD,+BAAkE;AAClE,2BAA8B;AAS9B,SAAS,eAAe,CACtB,MAAa,EACb,IAAY,EACZ,UAAkB;IAElB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,SAAS,GAAG,IAAA,oBAAa,EAAC,KAAK,CAAC,CAAC;YACvC,MAAM,iBAAiB,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACnD,MAAM,kBAAkB,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAErD,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;gBACrD,MAAM,IAAI,KAAK,CACb,OAAO,iBAAiB,wDAAwD,UAAU,EAAE,CAC7F,CAAC;aACH;YAED,MAAM,WAAW,GAAG,IAAA,aAAQ,EAAC,iBAAiB,CAAC,CAAC,WAAW,EAAE,CAAC;YAC9D,MAAM,KAAK,GAAG,WAAW;gBACvB,CAAC,CAAC,iBAAiB;gBACnB,CAAC,CAAC,IAAA,cAAO,EAAC,iBAAiB,CAAC,CAAC;YAC/B,MAAM,MAAM,GAAG,IAAA,eAAQ,EAAC,kBAAkB,EAAE,IAAA,cAAO,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;YAClE,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,iBAAiB,CAAC,CAAC;YAChE,OAAO;gBACL,KAAK;gBACL,MAAM;gBACN,IAAI;aACL,CAAC;SACH;aAAM;YACL,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBACjC,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;aACH;YAED,MAAM,SAAS,GAAG,IAAA,oBAAa,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7C,MAAM,iBAAiB,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACnD,uCACK,KAAK,KACR,KAAK,EAAE,iBAAiB;gBACxB,8EAA8E;gBAC9E,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IACvC;SACH;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,gBAAgB,CAC9B,MAAa,EACb,IAAY,EACZ,UAAkB;IAElB,OAAO,IAAI,iBAAiB,CAAC;QAC3B,QAAQ,EAAE,eAAe,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;;YAChE,OAAO;gBACL,OAAO,EAAE,KAAK,CAAC,KAAK;gBACpB,EAAE,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC;gBACnC,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,WAAW,EAAE;oBACX,MAAM,EAAE;wBACN,UAAU;wBACV,cAAc;wBACd,cAAc;wBACd,GAAG,CAAC,MAAA,KAAK,CAAC,MAAM,mCAAI,EAAE,CAAC;qBACxB;oBACD,GAAG,EAAE,IAAI;iBACV;aACF,CAAC;QACJ,CAAC,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAvBD,4CAuBC"}

package/src/utils/styles.d.ts

@@ -25,11 +25,13 @@ export declare const NEXT_SPECIFIC_STYLE_DEPENDENCIES: {
     less: {
         dependencies: {};
         devDependencies: {
+            less: string;
             'less-loader': string;
         };
     };
     styl: {
         dependencies: {
+            stylus: string;
             'stylus-loader': string;
         };
         devDependencies: {};