@nrwl/next 14.5.7 → 14.5.8
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/CHANGELOG.md +1 -1
- package/package.json +9 -9
- package/src/executors/build/build.impl.js +3 -4
- package/src/executors/build/build.impl.js.map +1 -1
- package/src/executors/build/lib/create-package-json.js +3 -5
- package/src/executors/build/lib/create-package-json.js.map +1 -1
- package/src/executors/export/export.impl.js +3 -4
- package/src/executors/export/export.impl.js.map +1 -1
- package/src/executors/server/server.impl.js +1 -1
- package/src/executors/server/server.impl.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
## [14.5.
|
|
6
|
+
## [14.5.8](https://github.com/nrwl/nx/compare/14.5.7...14.5.8) (2022-08-19)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/next
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/next",
|
|
3
|
-
"version": "14.5.
|
|
3
|
+
"version": "14.5.8",
|
|
4
4
|
"description": "When 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.\n\nThe Next.js plugin 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.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -34,13 +34,13 @@
|
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@babel/plugin-proposal-decorators": "^7.14.5",
|
|
37
|
-
"@nrwl/cypress": "14.5.
|
|
38
|
-
"@nrwl/devkit": "14.5.
|
|
39
|
-
"@nrwl/jest": "14.5.
|
|
40
|
-
"@nrwl/linter": "14.5.
|
|
41
|
-
"@nrwl/react": "14.5.
|
|
42
|
-
"@nrwl/web": "14.5.
|
|
43
|
-
"@nrwl/workspace": "14.5.
|
|
37
|
+
"@nrwl/cypress": "14.5.8",
|
|
38
|
+
"@nrwl/devkit": "14.5.8",
|
|
39
|
+
"@nrwl/jest": "14.5.8",
|
|
40
|
+
"@nrwl/linter": "14.5.8",
|
|
41
|
+
"@nrwl/react": "14.5.8",
|
|
42
|
+
"@nrwl/web": "14.5.8",
|
|
43
|
+
"@nrwl/workspace": "14.5.8",
|
|
44
44
|
"@svgr/webpack": "^6.1.2",
|
|
45
45
|
"chalk": "4.1.0",
|
|
46
46
|
"dotenv": "~10.0.0",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"url-loader": "^4.1.1",
|
|
53
53
|
"webpack-merge": "^5.8.0"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "8a6107914793a544aa2e20252bcd495dec889117"
|
|
56
56
|
}
|
|
@@ -6,9 +6,8 @@ const build_1 = require("next/dist/build");
|
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const fs_extra_1 = require("fs-extra");
|
|
8
8
|
const fileutils_1 = require("@nrwl/workspace/src/utilities/fileutils");
|
|
9
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
10
9
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
11
|
-
const
|
|
10
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
12
11
|
const config_1 = require("../../utils/config");
|
|
13
12
|
const create_package_json_1 = require("./lib/create-package-json");
|
|
14
13
|
const create_next_config_file_1 = require("./lib/create-next-config-file");
|
|
@@ -22,10 +21,10 @@ function buildExecutor(options, context) {
|
|
|
22
21
|
(_b = process.env).__NEXT_REACT_ROOT || (_b.__NEXT_REACT_ROOT = 'true');
|
|
23
22
|
let dependencies = [];
|
|
24
23
|
const root = (0, path_1.resolve)(context.root, options.root);
|
|
25
|
-
const libsDir = (0, path_1.join)(context.root, (0,
|
|
24
|
+
const libsDir = (0, path_1.join)(context.root, (0, devkit_1.workspaceLayout)().libsDir);
|
|
26
25
|
(0, check_project_1.checkPublicDirectory)(root);
|
|
27
26
|
if (!options.buildLibsFromSource && context.targetName) {
|
|
28
|
-
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(
|
|
27
|
+
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
|
|
29
28
|
dependencies = result.dependencies;
|
|
30
29
|
}
|
|
31
30
|
const config = yield (0, config_1.prepareConfig)(constants_1.PHASE_PRODUCTION_BUILD, options, context, dependencies, libsDir);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AAEvB,2CAAoC;AACpC,+BAAqC;AACrC,uCAA2C;AAC3C,uEAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AAEvB,2CAAoC;AACpC,+BAAqC;AACrC,uCAA2C;AAC3C,uEAA0E;AAC1E,6FAG4D;AAC5D,yCAA+C;AAE/C,+CAAmD;AACnD,mEAA8D;AAC9D,2EAAqE;AACrE,uDAA2D;AAE3D,qDAA+D;AAE/D,SAA8B,aAAa,CACzC,OAAgC,EAChC,OAAwB;;;QAExB,oCAAoC;QACpC,MAAC,OAAO,CAAC,GAAW,EAAC,QAAQ,QAAR,QAAQ,GAAK,YAAY,EAAC;QAC/C,MAAC,OAAO,CAAC,GAAW,EAAC,iBAAiB,QAAjB,iBAAiB,GAAK,MAAM,EAAC;QAElD,IAAI,YAAY,GAAoC,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAA,wBAAe,GAAE,CAAC,OAAO,CAAC,CAAC;QAE9D,IAAA,oCAAoB,EAAC,IAAI,CAAC,CAAC;QAE3B,IAAI,CAAC,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,UAAU,EAAE;YACtD,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;YACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;SACpC;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAa,EAChC,kCAAsB,EACtB,OAAO,EACP,OAAO,EACP,YAAY,EACZ,OAAO,CACR,CAAC;QAEF,MAAM,IAAA,eAAK,EAAC,IAAI,EAAE,MAAa,CAAC,CAAC;QAEjC,IAAI,CAAC,IAAA,2BAAe,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACxC,IAAA,gBAAK,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SAC3B;QAED,MAAM,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC1C,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;AA7CD,gCA6CC"}
|
|
@@ -3,12 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.createPackageJson = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const devkit_2 = require("@nrwl/devkit");
|
|
7
6
|
const create_package_json_1 = require("@nrwl/workspace/src/utilities/create-package-json");
|
|
8
7
|
function createPackageJson(options, context) {
|
|
9
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
-
const
|
|
11
|
-
const packageJson = (0, create_package_json_1.createPackageJson)(context.projectName, depGraph, {
|
|
9
|
+
const packageJson = (0, create_package_json_1.createPackageJson)(context.projectName, context.projectGraph, {
|
|
12
10
|
root: context.root,
|
|
13
11
|
projectRoot: context.workspace.projects[context.projectName].sourceRoot,
|
|
14
12
|
});
|
|
@@ -19,12 +17,12 @@ function createPackageJson(options, context) {
|
|
|
19
17
|
if (!packageJson.devDependencies) {
|
|
20
18
|
packageJson.devDependencies = {};
|
|
21
19
|
}
|
|
22
|
-
const nrwlWorkspaceNode =
|
|
20
|
+
const nrwlWorkspaceNode = context.projectGraph.externalNodes['npm:@nrwl/workspace'];
|
|
23
21
|
if (nrwlWorkspaceNode) {
|
|
24
22
|
packageJson.dependencies['@nrwl/workspace'] =
|
|
25
23
|
nrwlWorkspaceNode.data.version;
|
|
26
24
|
}
|
|
27
|
-
const typescriptNode =
|
|
25
|
+
const typescriptNode = context.projectGraph.externalNodes['npm:typescript'];
|
|
28
26
|
if (typescriptNode) {
|
|
29
27
|
packageJson.dependencies['typescript'] = typescriptNode.data.version;
|
|
30
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/build/lib/create-package-json.ts"],"names":[],"mappings":";;;;AACA,yCAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"create-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/build/lib/create-package-json.ts"],"names":[],"mappings":";;;;AACA,yCAA6C;AAC7C,2FAA6G;AAG7G,SAAsB,iBAAiB,CACrC,OAAgC,EAChC,OAAwB;;QAExB,MAAM,WAAW,GAAG,IAAA,uCAAmB,EACrC,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,YAAY,EACpB;YACE,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,UAAU;SACxE,CACF,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE;YACxB,WAAW,CAAC,OAAO,GAAG,EAAE,CAAC;SAC1B;QACD,WAAW,CAAC,OAAO,CAAC,KAAK,GAAG,YAAY,CAAC;QACzC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE;YAChC,WAAW,CAAC,eAAe,GAAG,EAAE,CAAC;SAClC;QACD,MAAM,iBAAiB,GACrB,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;QAE5D,IAAI,iBAAiB,EAAE;YACrB,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAAC;gBACzC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC;SAClC;QAED,MAAM,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAC5E,IAAI,cAAc,EAAE;YAClB,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC;SACtE;QAED,IAAA,sBAAa,EAAC,GAAG,OAAO,CAAC,UAAU,eAAe,EAAE,WAAW,CAAC,CAAC;IACnE,CAAC;CAAA;AAjCD,8CAiCC"}
|
|
@@ -5,9 +5,8 @@ require("dotenv/config");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const export_1 = require("next/dist/export");
|
|
7
7
|
const path_1 = require("path");
|
|
8
|
-
const devkit_2 = require("@nrwl/devkit");
|
|
9
8
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
10
|
-
const
|
|
9
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
11
10
|
const config_1 = require("../../utils/config");
|
|
12
11
|
const constants_1 = require("../../utils/constants");
|
|
13
12
|
const nextTrace = require("next/dist/trace");
|
|
@@ -16,11 +15,11 @@ function exportExecutor(options, context) {
|
|
|
16
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
16
|
let dependencies = [];
|
|
18
17
|
if (!options.buildLibsFromSource) {
|
|
19
|
-
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(
|
|
18
|
+
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph, context.root, context.projectName, 'build', // this should be generalized
|
|
20
19
|
context.configurationName);
|
|
21
20
|
dependencies = result.dependencies;
|
|
22
21
|
}
|
|
23
|
-
const libsDir = (0, path_1.join)(context.root, (0,
|
|
22
|
+
const libsDir = (0, path_1.join)(context.root, (0, devkit_2.workspaceLayout)().libsDir);
|
|
24
23
|
const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget);
|
|
25
24
|
const build = yield (0, devkit_1.runExecutor)(buildTarget, {}, context);
|
|
26
25
|
try {
|
|
@@ -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,
|
|
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,IAAA,UAAA,sBAAA,KAAK,CAAA,WAAA;gBAArB,MAAM,MAAM,kBAAA,CAAA;gBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;oBACnB,OAAO,MAAM,CAAC;iBACf;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"}
|
|
@@ -39,7 +39,7 @@ function getDependencies(options, context) {
|
|
|
39
39
|
return [];
|
|
40
40
|
}
|
|
41
41
|
else {
|
|
42
|
-
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(
|
|
42
|
+
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph, context.root, context.projectName, 'build', // should be generalized
|
|
43
43
|
context.configurationName);
|
|
44
44
|
return result.dependencies;
|
|
45
45
|
}
|
|
@@ -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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"}
|