@nrwl/next 15.8.5 → 15.8.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +10 -10
- package/plugins/with-nx.d.ts +2 -1
- package/plugins/with-nx.js +73 -3
- package/plugins/with-nx.js.map +1 -1
- package/src/executors/build/build.impl.js +2 -12
- package/src/executors/build/build.impl.js.map +1 -1
- package/src/executors/export/export.impl.js +18 -28
- package/src/executors/export/export.impl.js.map +1 -1
- package/src/executors/server/server.impl.js +4 -19
- package/src/executors/server/server.impl.js.map +1 -1
- package/src/utils/config.d.ts +1 -4
- package/src/utils/config.js +24 -45
- package/src/utils/config.js.map +1 -1
- package/src/utils/types.d.ts +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/next",
|
|
3
|
-
"version": "15.8.
|
|
3
|
+
"version": "15.8.7",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
|
|
6
6
|
"repository": {
|
|
@@ -35,14 +35,14 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@babel/plugin-proposal-decorators": "^7.14.5",
|
|
38
|
-
"@nrwl/cypress": "15.8.
|
|
39
|
-
"@nrwl/devkit": "15.8.
|
|
40
|
-
"@nrwl/jest": "15.8.
|
|
41
|
-
"@nrwl/js": "15.8.
|
|
42
|
-
"@nrwl/linter": "15.8.
|
|
43
|
-
"@nrwl/react": "15.8.
|
|
44
|
-
"@nrwl/webpack": "15.8.
|
|
45
|
-
"@nrwl/workspace": "15.8.
|
|
38
|
+
"@nrwl/cypress": "15.8.7",
|
|
39
|
+
"@nrwl/devkit": "15.8.7",
|
|
40
|
+
"@nrwl/jest": "15.8.7",
|
|
41
|
+
"@nrwl/js": "15.8.7",
|
|
42
|
+
"@nrwl/linter": "15.8.7",
|
|
43
|
+
"@nrwl/react": "15.8.7",
|
|
44
|
+
"@nrwl/webpack": "15.8.7",
|
|
45
|
+
"@nrwl/workspace": "15.8.7",
|
|
46
46
|
"@svgr/webpack": "^6.1.2",
|
|
47
47
|
"chalk": "^4.1.0",
|
|
48
48
|
"dotenv": "~10.0.0",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"access": "public"
|
|
59
59
|
},
|
|
60
60
|
"types": "./index.d.ts",
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "f300d356c11fb8eaffe44b1839c4dac4b7df1ff1"
|
|
62
62
|
}
|
package/plugins/with-nx.d.ts
CHANGED
|
@@ -8,4 +8,5 @@ export interface WithNxContext {
|
|
|
8
8
|
workspaceRoot: string;
|
|
9
9
|
libsDir: string;
|
|
10
10
|
}
|
|
11
|
-
export declare function withNx(
|
|
11
|
+
export declare function withNx(_nextConfig?: WithNxOptions, context?: WithNxContext): () => Promise<NextConfig>;
|
|
12
|
+
export declare function getNextConfig(nextConfig?: WithNxOptions, context?: WithNxContext): NextConfig;
|
package/plugins/with-nx.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.withNx = void 0;
|
|
3
|
+
exports.getNextConfig = exports.withNx = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
7
|
+
const path = require("path");
|
|
8
|
+
const config_1 = require("../src/utils/config");
|
|
5
9
|
function regexEqual(x, y) {
|
|
6
10
|
return (x instanceof RegExp &&
|
|
7
11
|
y instanceof RegExp &&
|
|
@@ -21,7 +25,72 @@ function getWithNxContext() {
|
|
|
21
25
|
libsDir: workspaceLayout().libsDir,
|
|
22
26
|
};
|
|
23
27
|
}
|
|
24
|
-
function
|
|
28
|
+
function getTargetConfig(graph, target) {
|
|
29
|
+
const projectNode = graph.nodes[target.project];
|
|
30
|
+
return projectNode.data.targets[target.target];
|
|
31
|
+
}
|
|
32
|
+
function getOptions(graph, target) {
|
|
33
|
+
const targetConfig = getTargetConfig(graph, target);
|
|
34
|
+
const options = targetConfig.options;
|
|
35
|
+
if (target.configuration) {
|
|
36
|
+
Object.assign(options, targetConfig.configurations[target.configuration]);
|
|
37
|
+
}
|
|
38
|
+
return options;
|
|
39
|
+
}
|
|
40
|
+
function getNxContext(graph, target) {
|
|
41
|
+
const targetConfig = getTargetConfig(graph, target);
|
|
42
|
+
if ('@nrwl/next:build' === targetConfig.executor) {
|
|
43
|
+
return {
|
|
44
|
+
node: graph.nodes[target.project],
|
|
45
|
+
options: getOptions(graph, target),
|
|
46
|
+
projectName: target.project,
|
|
47
|
+
targetName: target.target,
|
|
48
|
+
configurationName: target.configuration,
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
const targetOptions = getOptions(graph, target);
|
|
52
|
+
// If we are running serve or export pull the options from the dependent target first (ex. build)
|
|
53
|
+
if (targetOptions.devServerTarget) {
|
|
54
|
+
const devServerTarget = (0, devkit_1.parseTargetString)(targetOptions.devServerTarget, graph);
|
|
55
|
+
return getNxContext(graph, devServerTarget);
|
|
56
|
+
}
|
|
57
|
+
else if (['@nrwl/next:server', '@nrwl/next:export'].includes(targetConfig.executor)) {
|
|
58
|
+
const buildTarget = (0, devkit_1.parseTargetString)(targetOptions.buildTarget, graph);
|
|
59
|
+
return getNxContext(graph, buildTarget);
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
throw new Error('Could not determine the config for this Next application.');
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
function withNx(_nextConfig = {}, context = getWithNxContext()) {
|
|
66
|
+
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
let dependencies = [];
|
|
68
|
+
const graph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
69
|
+
const originalTarget = {
|
|
70
|
+
project: process.env.NX_TASK_TARGET_PROJECT,
|
|
71
|
+
target: process.env.NX_TASK_TARGET_TARGET,
|
|
72
|
+
configuration: process.env.NX_TASK_TARGET_CONFIGURATION,
|
|
73
|
+
};
|
|
74
|
+
const { node: projectNode, options, projectName: project, targetName, configurationName, } = getNxContext(graph, originalTarget);
|
|
75
|
+
const projectDirectory = projectNode.data.root;
|
|
76
|
+
if (!options.buildLibsFromSource && targetName) {
|
|
77
|
+
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(graph, devkit_1.workspaceRoot, project, targetName, configurationName);
|
|
78
|
+
dependencies = result.dependencies;
|
|
79
|
+
}
|
|
80
|
+
// Get next config
|
|
81
|
+
const nextConfig = getNextConfig(_nextConfig, context);
|
|
82
|
+
const outputDir = `${(0, devkit_1.offsetFromRoot)(projectDirectory)}${options.outputPath}`;
|
|
83
|
+
nextConfig.distDir =
|
|
84
|
+
nextConfig.distDir && nextConfig.distDir !== '.next'
|
|
85
|
+
? (0, devkit_1.joinPathFragments)(outputDir, nextConfig.distDir)
|
|
86
|
+
: (0, devkit_1.joinPathFragments)(outputDir, '.next');
|
|
87
|
+
const userWebpackConfig = nextConfig.webpack;
|
|
88
|
+
nextConfig.webpack = (a, b) => (0, config_1.createWebpackConfig)(devkit_1.workspaceRoot, options.root, options.fileReplacements, options.assets, dependencies, path.join(devkit_1.workspaceRoot, context.libsDir))(userWebpackConfig ? userWebpackConfig(a, b) : a, b);
|
|
89
|
+
return nextConfig;
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
exports.withNx = withNx;
|
|
93
|
+
function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
|
|
25
94
|
var _a;
|
|
26
95
|
// If `next-compose-plugins` is used, the context argument is invalid.
|
|
27
96
|
if (!context.libsDir || !context.workspaceRoot) {
|
|
@@ -147,7 +216,7 @@ function withNx(nextConfig = {}, context = getWithNxContext()) {
|
|
|
147
216
|
return userWebpack(config, options);
|
|
148
217
|
} });
|
|
149
218
|
}
|
|
150
|
-
exports.
|
|
219
|
+
exports.getNextConfig = getNextConfig;
|
|
151
220
|
function getNxEnvironmentVariables() {
|
|
152
221
|
return Object.keys(process.env)
|
|
153
222
|
.filter((env) => /^NX_/i.test(env))
|
|
@@ -174,4 +243,5 @@ function addNxEnvVariables(config) {
|
|
|
174
243
|
module.exports = withNx;
|
|
175
244
|
// Support for newer generated code: `const { withNx } = require(...);`
|
|
176
245
|
module.exports.withNx = withNx;
|
|
246
|
+
module.exports.getNextConfig = getNextConfig;
|
|
177
247
|
//# sourceMappingURL=with-nx.js.map
|
package/plugins/with-nx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-nx.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-nx.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"with-nx.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-nx.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,13 +9,10 @@ const path_1 = require("path");
|
|
|
9
9
|
const fs_extra_1 = require("fs-extra");
|
|
10
10
|
const semver_1 = require("semver");
|
|
11
11
|
const fileutils_1 = require("@nrwl/workspace/src/utilities/fileutils");
|
|
12
|
-
const
|
|
13
|
-
const version_utils_1 = require("@nrwl/workspace/src/utilities/version-utils");
|
|
14
|
-
const config_1 = require("../../utils/config");
|
|
12
|
+
const version_utils_1 = require("@nrwl/workspace/src/utils/version-utils");
|
|
15
13
|
const update_package_json_1 = require("./lib/update-package-json");
|
|
16
14
|
const create_next_config_file_1 = require("./lib/create-next-config-file");
|
|
17
15
|
const check_project_1 = require("./lib/check-project");
|
|
18
|
-
const constants_1 = require("../../utils/constants");
|
|
19
16
|
const lock_file_1 = require("nx/src/lock-file/lock-file");
|
|
20
17
|
function buildExecutor(options, context) {
|
|
21
18
|
var _a, _b, _c;
|
|
@@ -23,14 +20,8 @@ function buildExecutor(options, context) {
|
|
|
23
20
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
24
21
|
// Cast to any to overwrite NODE_ENV
|
|
25
22
|
(_d = process.env).NODE_ENV || (_d.NODE_ENV = 'production');
|
|
26
|
-
let dependencies = [];
|
|
27
23
|
const root = (0, path_1.resolve)(context.root, options.root);
|
|
28
|
-
const libsDir = (0, path_1.join)(context.root, (0, devkit_1.workspaceLayout)().libsDir);
|
|
29
24
|
(0, check_project_1.checkPublicDirectory)(root);
|
|
30
|
-
if (!options.buildLibsFromSource && context.targetName) {
|
|
31
|
-
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
|
|
32
|
-
dependencies = result.dependencies;
|
|
33
|
-
}
|
|
34
25
|
// Set `__NEXT_REACT_ROOT` based on installed ReactDOM version
|
|
35
26
|
const packageJsonPath = (0, path_1.join)(root, 'package.json');
|
|
36
27
|
const packageJson = (0, fs_extra_1.existsSync)(packageJsonPath)
|
|
@@ -43,8 +34,7 @@ function buildExecutor(options, context) {
|
|
|
43
34
|
if (hasReact18) {
|
|
44
35
|
(_e = process.env).__NEXT_REACT_ROOT || (_e.__NEXT_REACT_ROOT = 'true');
|
|
45
36
|
}
|
|
46
|
-
|
|
47
|
-
yield (0, build_1.default)(root, config);
|
|
37
|
+
yield (0, build_1.default)(root);
|
|
48
38
|
if (!(0, fileutils_1.directoryExists)(options.outputPath)) {
|
|
49
39
|
(0, fs_extra_1.mkdir)(options.outputPath);
|
|
50
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,yCAKsB;AACtB,iCAA6D;AAC7D,2CAAoC;AACpC,+BAAqC;AACrC,uCAAsE;AACtE,mCAA6B;AAC7B,uEAA0E;AAC1E,2EAAkF;AAElF,mEAA8D;AAC9D,2EAAqE;AACrE,uDAA2D;AAG3D,0DAA6D;AAE7D,SAA8B,aAAa,CACzC,OAAgC,EAChC,OAAwB;;;;QAExB,oCAAoC;QACpC,MAAC,OAAO,CAAC,GAAW,EAAC,QAAQ,QAAR,QAAQ,GAAK,YAAY,EAAC;QAE/C,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEjD,IAAA,oCAAoB,EAAC,IAAI,CAAC,CAAC;QAE3B,8DAA8D;QAC9D,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnD,MAAM,WAAW,GAAG,IAAA,qBAAU,EAAC,eAAe,CAAC;YAC7C,CAAC,CAAC,IAAA,qBAAY,EAAC,eAAe,CAAC;YAC/B,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,eAAe,GAAG,IAAA,qBAAY,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,cAAc,CAAC,CAAC,CAAC;QAC1E,MAAM,eAAe,GACnB,MAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,YAAY,0CAAG,WAAW,CAAC,mCACxC,MAAA,eAAe,CAAC,YAAY,0CAAG,WAAW,CAAC,CAAC;QAC9C,MAAM,UAAU,GACd,eAAe;YACf,IAAA,YAAG,EAAC,IAAA,uCAAuB,EAAC,WAAW,EAAE,eAAe,CAAC,EAAE,QAAQ,CAAC,CAAC;QACvE,IAAI,UAAU,EAAE;YACd,MAAC,OAAO,CAAC,GAAW,EAAC,iBAAiB,QAAjB,iBAAiB,GAAK,MAAM,EAAC;SACnD;QAED,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;QAElB,IAAI,CAAC,IAAA,2BAAe,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACxC,IAAA,gBAAK,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SAC3B;QAED,MAAM,gBAAgB,GAAG,IAAA,sBAAiB,EACxC,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,YAAY,EACpB;YACE,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,YAAY,EAAE,CAAC,OAAO,CAAC,mCAAmC,EAAE,yEAAyE;SACtI,CACF,CAAC;QACF,IAAA,uCAAiB,EAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAA,sBAAa,EAAC,GAAG,OAAO,CAAC,UAAU,eAAe,EAAE,gBAAgB,CAAC,CAAC;QAEtE,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC5B,MAAM,QAAQ,GAAG,IAAA,mBAAc,EAAC,gBAAgB,CAAC,CAAC;YAClD,IAAA,wBAAa,EAAC,GAAG,OAAO,CAAC,UAAU,IAAI,IAAA,2BAAe,GAAE,EAAE,EAAE,QAAQ,EAAE;gBACpE,QAAQ,EAAE,OAAO;aAClB,CAAC,CAAC;SACJ;QAED,IAAA,8CAAoB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEvC,IAAA,mBAAQ,EAAC,IAAA,WAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEnE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;CAC1B;AAxDD,gCAwDC"}
|
|
@@ -6,12 +6,13 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const export_1 = require("next/dist/export");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
9
|
-
const devkit_2 = require("@nrwl/devkit");
|
|
10
|
-
const config_1 = require("../../utils/config");
|
|
11
|
-
const constants_1 = require("../../utils/constants");
|
|
12
9
|
const nextTrace = require("next/dist/trace");
|
|
10
|
+
const os_1 = require("os");
|
|
11
|
+
const child_process_1 = require("child_process");
|
|
12
|
+
const chalk = require("chalk");
|
|
13
|
+
// platform specific command name
|
|
14
|
+
const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
|
|
13
15
|
function exportExecutor(options, context) {
|
|
14
|
-
var _a, e_1, _b, _c;
|
|
15
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
17
|
let dependencies = [];
|
|
17
18
|
if (!options.buildLibsFromSource) {
|
|
@@ -19,34 +20,19 @@ function exportExecutor(options, context) {
|
|
|
19
20
|
context.configurationName);
|
|
20
21
|
dependencies = result.dependencies;
|
|
21
22
|
}
|
|
22
|
-
const libsDir = (0, path_1.join)(context.root, (0,
|
|
23
|
-
const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget);
|
|
24
|
-
const build = yield (0, devkit_1.runExecutor)(buildTarget, {}, context);
|
|
23
|
+
const libsDir = (0, path_1.join)(context.root, (0, devkit_1.workspaceLayout)().libsDir);
|
|
24
|
+
const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph);
|
|
25
25
|
try {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
const result = _c;
|
|
31
|
-
if (!result.success) {
|
|
32
|
-
return result;
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
finally {
|
|
36
|
-
_d = true;
|
|
37
|
-
}
|
|
38
|
-
}
|
|
26
|
+
const args = getBuildTargetCommand(options);
|
|
27
|
+
(0, child_process_1.execFileSync)(pmCmd, args, {
|
|
28
|
+
stdio: [0, 1, 2],
|
|
29
|
+
});
|
|
39
30
|
}
|
|
40
|
-
catch (
|
|
41
|
-
|
|
42
|
-
try {
|
|
43
|
-
if (!_d && !_a && (_b = build_1.return)) yield _b.call(build_1);
|
|
44
|
-
}
|
|
45
|
-
finally { if (e_1) throw e_1.error; }
|
|
31
|
+
catch (_a) {
|
|
32
|
+
throw new Error(`Build target failed: ${chalk.bold(options.buildTarget)}`);
|
|
46
33
|
}
|
|
47
34
|
const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
|
|
48
35
|
const root = (0, path_1.resolve)(context.root, buildOptions.root);
|
|
49
|
-
const config = yield (0, config_1.prepareConfig)(constants_1.PHASE_EXPORT, buildOptions, context, dependencies, libsDir);
|
|
50
36
|
// Taken from:
|
|
51
37
|
// https://github.com/vercel/next.js/blob/ead56eaab68409e96c19f7d9139747bac1197aa9/packages/next/cli/next-export.ts#L13
|
|
52
38
|
const nextExportCliSpan = nextTrace.trace('next-export-cli');
|
|
@@ -55,9 +41,13 @@ function exportExecutor(options, context) {
|
|
|
55
41
|
silent: options.silent,
|
|
56
42
|
threads: options.threads,
|
|
57
43
|
outdir: `${buildOptions.outputPath}/exported`,
|
|
58
|
-
}, nextExportCliSpan
|
|
44
|
+
}, nextExportCliSpan);
|
|
59
45
|
return { success: true };
|
|
60
46
|
});
|
|
61
47
|
}
|
|
62
48
|
exports.default = exportExecutor;
|
|
49
|
+
function getBuildTargetCommand(options) {
|
|
50
|
+
const cmd = ['nx', 'run', options.buildTarget];
|
|
51
|
+
return cmd;
|
|
52
|
+
}
|
|
63
53
|
//# sourceMappingURL=export.impl.js.map
|
|
@@ -1 +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;
|
|
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;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"}
|
|
@@ -6,11 +6,8 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const chalk = require("chalk");
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
8
|
const path_1 = require("path");
|
|
9
|
-
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
10
|
-
const config_1 = require("../../utils/config");
|
|
11
9
|
const custom_server_1 = require("./lib/custom-server");
|
|
12
10
|
const default_server_1 = require("./lib/default-server");
|
|
13
|
-
const constants_1 = require("../../utils/constants");
|
|
14
11
|
const infoPrefix = `[ ${chalk.dim(chalk.cyan('info'))} ] `;
|
|
15
12
|
function serveExecutor(options, context) {
|
|
16
13
|
return tslib_1.__asyncGenerator(this, arguments, function* serveExecutor_1() {
|
|
@@ -24,27 +21,16 @@ function serveExecutor(options, context) {
|
|
|
24
21
|
process.env.PORT = options.port;
|
|
25
22
|
const buildOptions = (0, devkit_1.readTargetOptions)((0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph), context);
|
|
26
23
|
const root = (0, path_1.resolve)(context.root, buildOptions.root);
|
|
27
|
-
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)));
|
|
28
24
|
if (options.customServerTarget) {
|
|
29
|
-
yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runCustomServer(root,
|
|
25
|
+
yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runCustomServer(root, options, buildOptions, context))));
|
|
30
26
|
}
|
|
31
27
|
else {
|
|
32
|
-
yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runNextDevServer(root,
|
|
28
|
+
yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runNextDevServer(root, options, buildOptions, context))));
|
|
33
29
|
}
|
|
34
30
|
});
|
|
35
31
|
}
|
|
36
32
|
exports.default = serveExecutor;
|
|
37
|
-
function
|
|
38
|
-
if (options.buildLibsFromSource) {
|
|
39
|
-
return [];
|
|
40
|
-
}
|
|
41
|
-
else {
|
|
42
|
-
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph, context.root, context.projectName, 'build', // should be generalized
|
|
43
|
-
context.configurationName);
|
|
44
|
-
return result.dependencies;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
function runNextDevServer(root, config, options, buildOptions, context) {
|
|
33
|
+
function runNextDevServer(root, options, buildOptions, context) {
|
|
48
34
|
return tslib_1.__asyncGenerator(this, arguments, function* runNextDevServer_1() {
|
|
49
35
|
const baseUrl = `http://${options.hostname || 'localhost'}:${options.port}`;
|
|
50
36
|
const settings = {
|
|
@@ -52,7 +38,6 @@ function runNextDevServer(root, config, options, buildOptions, context) {
|
|
|
52
38
|
dir: root,
|
|
53
39
|
staticMarkup: options.staticMarkup,
|
|
54
40
|
quiet: options.quiet,
|
|
55
|
-
conf: config,
|
|
56
41
|
port: options.port,
|
|
57
42
|
customServer: !!options.customServerTarget,
|
|
58
43
|
hostname: options.hostname || 'localhost',
|
|
@@ -91,7 +76,7 @@ function runNextDevServer(root, config, options, buildOptions, context) {
|
|
|
91
76
|
}
|
|
92
77
|
});
|
|
93
78
|
}
|
|
94
|
-
function runCustomServer(root,
|
|
79
|
+
function runCustomServer(root, options, buildOptions, context) {
|
|
95
80
|
return tslib_1.__asyncGenerator(this, arguments, function* runCustomServer_1() {
|
|
96
81
|
var _a, e_1, _b, _c;
|
|
97
82
|
process.env.NX_NEXT_DIR = root;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":"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"}
|
package/src/utils/config.d.ts
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
import { ExecutorContext } from '@nrwl/devkit';
|
|
2
|
-
import type { PHASE_DEVELOPMENT_SERVER, PHASE_EXPORT, PHASE_PRODUCTION_BUILD, PHASE_PRODUCTION_SERVER } from 'next/dist/shared/lib/constants';
|
|
3
1
|
import { Configuration } from 'webpack';
|
|
4
|
-
import { FileReplacement
|
|
2
|
+
import { FileReplacement } from './types';
|
|
5
3
|
import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
|
|
6
4
|
export declare function createWebpackConfig(workspaceRoot: string, projectRoot: string, fileReplacements?: FileReplacement[], assets?: any, dependencies?: DependentBuildableProjectNode[], libsDir?: string): (a: any, b: any) => Configuration;
|
|
7
|
-
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
CHANGED
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
3
|
+
exports.createWebpackConfig = void 0;
|
|
6
4
|
const path_1 = require("path");
|
|
7
5
|
const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
|
|
8
6
|
const webpack_1 = require("@nrwl/webpack");
|
|
9
7
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
10
|
-
const loadConfig = require('next/dist/server/config').default;
|
|
11
8
|
function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [], assets = null, dependencies = [], libsDir = '') {
|
|
12
|
-
return function webpackConfig(config, { isServer,
|
|
9
|
+
return function webpackConfig(config, { isServer, }) {
|
|
13
10
|
const mainFields = ['es2015', 'module', 'main'];
|
|
14
11
|
const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
|
|
15
12
|
let tsConfigPath = (0, path_1.join)(projectRoot, 'tsconfig.json');
|
|
@@ -32,12 +29,22 @@ function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [],
|
|
|
32
29
|
alias[replacement.replace] = replacement.with;
|
|
33
30
|
return alias;
|
|
34
31
|
}, config.resolve.alias);
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
32
|
+
// Apply any rules that work on ts files to the libsDir as well
|
|
33
|
+
const rulesToAdd = [];
|
|
34
|
+
for (const r of config.module.rules) {
|
|
35
|
+
if (typeof r === 'string') {
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
if (isTsRule(r)) {
|
|
39
|
+
rulesToAdd.push(Object.assign(Object.assign({}, r), { include: [libsDir] }));
|
|
40
|
+
}
|
|
41
|
+
else if (r.oneOf && r.oneOf.find(isTsRule)) {
|
|
42
|
+
rulesToAdd.push(Object.assign(Object.assign({}, r), { oneOf: r.oneOf
|
|
43
|
+
.filter(isTsRule)
|
|
44
|
+
.map((subRule) => (Object.assign(Object.assign({}, subRule), { include: [libsDir] }))) }));
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
config.module.rules.push(...rulesToAdd);
|
|
41
48
|
// Copy (shared) assets to `public` folder during client-side compilation
|
|
42
49
|
if (!isServer && Array.isArray(assets) && assets.length > 0) {
|
|
43
50
|
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) })))));
|
|
@@ -46,41 +53,13 @@ function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [],
|
|
|
46
53
|
};
|
|
47
54
|
}
|
|
48
55
|
exports.createWebpackConfig = createWebpackConfig;
|
|
49
|
-
function
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
const userWebpack = config.webpack;
|
|
53
|
-
const userNextConfig = getConfigEnhancer(options.nextConfig, context.root);
|
|
54
|
-
// Yes, these do have different capitalisation...
|
|
55
|
-
const outputDir = `${(0, devkit_1.offsetFromRoot)(options.root)}${options.outputPath}`;
|
|
56
|
-
config.distDir =
|
|
57
|
-
config.distDir && config.distDir !== '.next'
|
|
58
|
-
? (0, devkit_1.joinPathFragments)(outputDir, config.distDir)
|
|
59
|
-
: (0, devkit_1.joinPathFragments)(outputDir, '.next');
|
|
60
|
-
config.webpack = (a, b) => createWebpackConfig(context.root, options.root, options.fileReplacements, options.assets, dependencies, libsDir)(userWebpack ? userWebpack(a, b) : a, b);
|
|
61
|
-
if (typeof userNextConfig !== 'function') {
|
|
62
|
-
throw new Error(`Module specified by 'nextConfig' option does not export a function. It should be of form 'module.exports = (phase, config, options) => config;'`);
|
|
63
|
-
}
|
|
64
|
-
return userNextConfig(phase, config, { options });
|
|
65
|
-
});
|
|
66
|
-
}
|
|
67
|
-
exports.prepareConfig = prepareConfig;
|
|
68
|
-
function getConfigEnhancer(pluginPath, workspaceRoot) {
|
|
69
|
-
if (!pluginPath) {
|
|
70
|
-
return (_, x) => x;
|
|
71
|
-
}
|
|
72
|
-
let fullPath;
|
|
73
|
-
try {
|
|
74
|
-
fullPath = require.resolve(pluginPath);
|
|
75
|
-
}
|
|
76
|
-
catch (_a) {
|
|
77
|
-
fullPath = (0, path_1.join)(workspaceRoot, pluginPath);
|
|
78
|
-
}
|
|
79
|
-
try {
|
|
80
|
-
return require(fullPath);
|
|
56
|
+
function isTsRule(r) {
|
|
57
|
+
if (typeof r === 'string') {
|
|
58
|
+
return false;
|
|
81
59
|
}
|
|
82
|
-
|
|
83
|
-
|
|
60
|
+
if (!(r.test instanceof RegExp)) {
|
|
61
|
+
return false;
|
|
84
62
|
}
|
|
63
|
+
return r.test.test('a.ts');
|
|
85
64
|
}
|
|
86
65
|
//# sourceMappingURL=config.js.map
|
package/src/utils/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/config.ts"],"names":[],"mappings":"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"}
|