@nrwl/next 13.9.3 → 13.10.0-beta.2
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 +8 -8
- package/plugins/with-nx.js +2 -2
- package/plugins/with-nx.js.map +1 -1
- package/src/executors/build/build.impl.js +4 -4
- package/src/executors/build/build.impl.js.map +1 -1
- package/src/executors/build/lib/create-package-json.js +2 -2
- package/src/executors/build/lib/create-package-json.js.map +1 -1
- package/src/executors/export/export.impl.js +4 -4
- package/src/executors/export/export.impl.js.map +1 -1
- package/src/executors/server/server.impl.js +4 -4
- package/src/executors/server/server.impl.js.map +1 -1
- package/src/utils/generate-globs.js +3 -3
- package/src/utils/generate-globs.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/next",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.10.0-beta.2",
|
|
4
4
|
"description": "Next.js Plugin for Nx",
|
|
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/react": "13.
|
|
38
|
-
"@nrwl/cypress": "13.
|
|
39
|
-
"@nrwl/devkit": "13.
|
|
40
|
-
"@nrwl/jest": "13.
|
|
41
|
-
"@nrwl/linter": "13.
|
|
42
|
-
"@nrwl/web": "13.
|
|
43
|
-
"@nrwl/workspace": "13.
|
|
37
|
+
"@nrwl/react": "13.10.0-beta.2",
|
|
38
|
+
"@nrwl/cypress": "13.10.0-beta.2",
|
|
39
|
+
"@nrwl/devkit": "13.10.0-beta.2",
|
|
40
|
+
"@nrwl/jest": "13.10.0-beta.2",
|
|
41
|
+
"@nrwl/linter": "13.10.0-beta.2",
|
|
42
|
+
"@nrwl/web": "13.10.0-beta.2",
|
|
43
|
+
"@nrwl/workspace": "13.10.0-beta.2",
|
|
44
44
|
"@svgr/webpack": "^6.1.2",
|
|
45
45
|
"chalk": "4.1.0",
|
|
46
46
|
"eslint-config-next": "^12.1.0",
|
package/plugins/with-nx.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const { join } = require('path');
|
|
4
|
-
const { appRootPath } = require('
|
|
5
|
-
const { workspaceLayout } = require('@nrwl/
|
|
4
|
+
const { appRootPath } = require('@nrwl/devkit');
|
|
5
|
+
const { workspaceLayout } = require('@nrwl/devkit');
|
|
6
6
|
function regexEqual(x, y) {
|
|
7
7
|
return (x instanceof RegExp &&
|
|
8
8
|
y instanceof RegExp &&
|
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":";;AAKA,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACjC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"with-nx.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-nx.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,11 +9,11 @@ const config_1 = require("../../utils/config");
|
|
|
9
9
|
const create_package_json_1 = require("./lib/create-package-json");
|
|
10
10
|
const create_next_config_file_1 = require("./lib/create-next-config-file");
|
|
11
11
|
const fileutils_1 = require("@nrwl/workspace/src/utilities/fileutils");
|
|
12
|
-
const
|
|
12
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
13
13
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
14
14
|
const check_project_1 = require("./lib/check-project");
|
|
15
15
|
const require_shim_1 = require("../../utils/require-shim");
|
|
16
|
-
const
|
|
16
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
17
17
|
const { PHASE_PRODUCTION_BUILD } = (0, require_shim_1.importConstants)();
|
|
18
18
|
function buildExecutor(options, context) {
|
|
19
19
|
var _a;
|
|
@@ -22,10 +22,10 @@ function buildExecutor(options, context) {
|
|
|
22
22
|
(_a = process.env).NODE_ENV || (_a.NODE_ENV = 'production');
|
|
23
23
|
let dependencies = [];
|
|
24
24
|
const root = (0, path_1.resolve)(context.root, options.root);
|
|
25
|
-
const libsDir = (0, path_1.join)(context.root, (0,
|
|
25
|
+
const libsDir = (0, path_1.join)(context.root, (0, devkit_2.workspaceLayout)().libsDir);
|
|
26
26
|
(0, check_project_1.checkPublicDirectory)(root);
|
|
27
27
|
if (!options.buildLibsFromSource && context.targetName) {
|
|
28
|
-
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0,
|
|
28
|
+
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_1.readCachedProjectGraph)(), context.root, context.projectName, context.targetName, context.configurationName);
|
|
29
29
|
dependencies = result.dependencies;
|
|
30
30
|
}
|
|
31
31
|
const config = yield (0, config_1.prepareConfig)(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;AAGvB,2CAAoC;AAEpC,+BAAqC;AACrC,uCAA2C;AAE3C,+CAAmD;AAEnD,mEAA8D;AAC9D,2EAAqE;AACrE,uEAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AAGvB,2CAAoC;AAEpC,+BAAqC;AACrC,uCAA2C;AAE3C,+CAAmD;AAEnD,mEAA8D;AAC9D,2EAAqE;AACrE,uEAA0E;AAC1E,yCAAsD;AACtD,6FAG4D;AAC5D,uDAA2D;AAC3D,2DAA2D;AAC3D,yCAA+C;AAE/C,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,8BAAe,GAAE,CAAC;AAErD,SAA8B,aAAa,CACzC,OAAgC,EAChC,OAAwB;;;QAExB,oCAAoC;QACpC,MAAC,OAAO,CAAC,GAAW,EAAC,QAAQ,QAAR,QAAQ,GAAK,YAAY,EAAC;QAE/C,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,IAAA,+BAAsB,GAAE,EACxB,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,sBAAsB,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;AA5CD,gCA4CC"}
|
|
@@ -3,11 +3,11 @@ 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
|
|
6
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
7
7
|
const create_package_json_1 = require("@nrwl/workspace/src/utilities/create-package-json");
|
|
8
8
|
function createPackageJson(options, context) {
|
|
9
9
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
10
|
-
const depGraph = (0,
|
|
10
|
+
const depGraph = (0, devkit_2.readCachedProjectGraph)();
|
|
11
11
|
const packageJson = (0, create_package_json_1.createPackageJson)(context.projectName, depGraph, {
|
|
12
12
|
root: context.root,
|
|
13
13
|
projectRoot: context.workspace.projects[context.projectName].sourceRoot,
|
|
@@ -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,yCAAsD;AACtD,2FAA6G;AAG7G,SAAsB,iBAAiB,CACrC,OAAgC,EAChC,OAAwB;;QAExB,MAAM,QAAQ,GAAG,IAAA,+BAAsB,GAAE,CAAC;QAC1C,MAAM,WAAW,GAAG,IAAA,uCAAmB,EAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,EAAE;YACrE,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,UAAU;SACxE,CAAC,CAAC;QACH,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,GAAG,QAAQ,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAEhE,IAAI,iBAAiB,EAAE;YACrB,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAAC;gBACzC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC;SAClC;QAED,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACxD,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;AA7BD,8CA6BC"}
|
|
@@ -6,10 +6,10 @@ 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 config_1 = require("../../utils/config");
|
|
9
|
-
const
|
|
9
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
10
10
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
11
11
|
const require_shim_1 = require("../../utils/require-shim");
|
|
12
|
-
const
|
|
12
|
+
const devkit_3 = require("@nrwl/devkit");
|
|
13
13
|
const nextTrace = require("next/dist/trace");
|
|
14
14
|
const { PHASE_EXPORT } = (0, require_shim_1.importConstants)();
|
|
15
15
|
function exportExecutor(options, context) {
|
|
@@ -17,11 +17,11 @@ function exportExecutor(options, context) {
|
|
|
17
17
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
18
18
|
let dependencies = [];
|
|
19
19
|
if (!options.buildLibsFromSource) {
|
|
20
|
-
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0,
|
|
20
|
+
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_2.readCachedProjectGraph)(), context.root, context.projectName, 'build', // this should be generalized
|
|
21
21
|
context.configurationName);
|
|
22
22
|
dependencies = result.dependencies;
|
|
23
23
|
}
|
|
24
|
-
const libsDir = (0, path_1.join)(context.root, (0,
|
|
24
|
+
const libsDir = (0, path_1.join)(context.root, (0, devkit_3.workspaceLayout)().libsDir);
|
|
25
25
|
const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget);
|
|
26
26
|
const build = yield (0, devkit_1.runExecutor)(buildTarget, {}, context);
|
|
27
27
|
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;AAErC,+CAAmD;AAKnD,
|
|
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;AAErC,+CAAmD;AAKnD,yCAAsD;AACtD,6FAG4D;AAC5D,2DAA2D;AAC3D,yCAA+C;AAC/C,6CAA8C;AAE9C,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,8BAAe,GAAE,CAAC;AAE3C,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,IAAA,+BAAsB,GAAE,EACxB,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,2BAAA,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,YAAY,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"}
|
|
@@ -9,11 +9,11 @@ const path_1 = require("path");
|
|
|
9
9
|
const config_1 = require("../../utils/config");
|
|
10
10
|
const custom_server_1 = require("./lib/custom-server");
|
|
11
11
|
const default_server_1 = require("./lib/default-server");
|
|
12
|
-
const
|
|
12
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
13
13
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
14
14
|
const buildable_libs_1 = require("../../utils/buildable-libs");
|
|
15
15
|
const require_shim_1 = require("../../utils/require-shim");
|
|
16
|
-
const
|
|
16
|
+
const devkit_3 = require("@nrwl/devkit");
|
|
17
17
|
const { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_SERVER } = (0, require_shim_1.importConstants)();
|
|
18
18
|
const infoPrefix = `[ ${chalk.dim(chalk.cyan('info'))} ] `;
|
|
19
19
|
const readyPrefix = `[ ${chalk.green('ready')} ]`;
|
|
@@ -30,9 +30,9 @@ function serveExecutor(options, context) {
|
|
|
30
30
|
const baseUrl = `http://${options.hostname || 'localhost'}:${options.port}`;
|
|
31
31
|
const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
|
|
32
32
|
const root = (0, path_1.resolve)(context.root, buildOptions.root);
|
|
33
|
-
const libsDir = (0, path_1.join)(context.root, (0,
|
|
33
|
+
const libsDir = (0, path_1.join)(context.root, (0, devkit_3.workspaceLayout)().libsDir);
|
|
34
34
|
if (!options.buildLibsFromSource) {
|
|
35
|
-
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0,
|
|
35
|
+
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_2.readCachedProjectGraph)(), context.root, context.projectName, 'build', // should be generalized
|
|
36
36
|
context.configurationName);
|
|
37
37
|
dependencies = result.dependencies;
|
|
38
38
|
(0, buildable_libs_1.assertDependentProjectsHaveBeenBuilt)(dependencies, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,yCAKsB;AAEtB,+BAA+B;AAC/B,2BAAgC;AAChC,+BAAqC;AAErC,+CAAmD;AAQnD,uDAAmD;AACnD,yDAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createGlobPatternsOfDependentProjects = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
6
|
-
const project_graph_utils_1 = require("
|
|
5
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
6
|
+
const project_graph_utils_1 = require("nx/src/utils/project-graph-utils");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
/**
|
|
9
9
|
* Use createGlobPatterns instead
|
|
@@ -13,7 +13,7 @@ function createGlobPatternsOfDependentProjects(projectName, fileGlobPattern = '/
|
|
|
13
13
|
devkit_1.logger.warn(`createGlobPatternsOfDependentProjects is deprecated. Use "createGlobPatternsForDependencies(__dirname)" from "@nrwl/next/tailwind" instead`);
|
|
14
14
|
try {
|
|
15
15
|
const projectDirs = (0, project_graph_utils_1.getSourceDirOfDependentProjects)(projectName);
|
|
16
|
-
return projectDirs.map((sourceDir) => (0, path_1.resolve)(
|
|
16
|
+
return projectDirs.map((sourceDir) => (0, path_1.resolve)(devkit_2.appRootPath, (0, devkit_1.joinPathFragments)(sourceDir, fileGlobPattern)));
|
|
17
17
|
}
|
|
18
18
|
catch (e) {
|
|
19
19
|
throw new Error(`createGlobPatternsOfDependentProjects: Error when generating globs: ${e === null || e === void 0 ? void 0 : e.message}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-globs.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/generate-globs.ts"],"names":[],"mappings":";;;AAAA,yCAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"generate-globs.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/generate-globs.ts"],"names":[],"mappings":";;;AAAA,yCAAyD;AACzD,yCAA2C;AAC3C,0EAAmF;AACnF,+BAA+B;AAE/B;;;GAGG;AACH,SAAgB,qCAAqC,CACnD,WAAmB,EACnB,kBAA0B,6BAA6B;IAEvD,eAAM,CAAC,IAAI,CACT,4IAA4I,CAC7I,CAAC;IAEF,IAAI;QACF,MAAM,WAAW,GAAG,IAAA,qDAA+B,EAAC,WAAW,CAAC,CAAC;QAEjE,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACnC,IAAA,cAAO,EAAC,oBAAW,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CACpE,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,uEAAuE,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,EAAE,CACpF,CAAC;KACH;AACH,CAAC;AAnBD,sFAmBC"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.stylusLoader = exports.lessLoader = exports.sassVersion = exports.eslintConfigNextVersion = exports.nextVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.
|
|
4
|
+
exports.nxVersion = '13.10.0-beta.2';
|
|
5
5
|
exports.nextVersion = '12.1.0';
|
|
6
6
|
exports.eslintConfigNextVersion = '12.1.1-canary.3';
|
|
7
7
|
exports.sassVersion = '1.43.2';
|