@nx/workspace 16.1.3 → 16.2.0-beta.0
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 +29 -29
- package/src/generators/convert-to-nx-project/schema.json +3 -3
- package/src/generators/move/lib/normalize-schema.js +2 -4
- package/src/generators/move/lib/normalize-schema.js.map +1 -1
- package/src/generators/move/lib/update-imports.js +2 -1
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/move/schema.json +1 -1
- package/src/generators/new/files-integrated-repo/package.json__tmpl__ +1 -1
- package/src/generators/new/files-root-app/package.json__tmpl__ +1 -1
- package/src/generators/new/generate-preset.js +0 -1
- package/src/generators/new/generate-preset.js.map +1 -1
- package/src/generators/new/generate-workspace-files.js +3 -4
- package/src/generators/new/generate-workspace-files.js.map +1 -1
- package/src/generators/new/new.d.ts +0 -1
- package/src/generators/new/new.js +1 -1
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/new/schema.json +2 -6
- package/src/generators/npm-package/npm-package.js +5 -5
- package/src/generators/npm-package/npm-package.js.map +1 -1
- package/src/generators/preset/schema.d.ts +0 -1
- package/src/generators/preset/schema.json +2 -6
- package/src/generators/remove/schema.json +2 -2
- package/src/generators/run-commands/schema.json +1 -1
- package/src/utilities/get-import-path.d.ts +2 -0
- package/src/utilities/get-import-path.js +24 -0
- package/src/utilities/get-import-path.js.map +1 -0
- package/src/generators/preset/files/angular/app.module.d.ts +0 -0
- package/src/generators/preset/files/angular/app.module.js +0 -1
- package/src/generators/preset/files/angular/app.module.js.map +0 -1
- package/src/generators/preset/files/angular/app.module.ts +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/workspace",
|
|
3
|
-
"version": "16.
|
|
3
|
+
"version": "16.2.0-beta.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
|
|
6
6
|
"repository": {
|
|
@@ -33,36 +33,36 @@
|
|
|
33
33
|
"requirements": {},
|
|
34
34
|
"migrations": "./migrations.json",
|
|
35
35
|
"packageGroup": {
|
|
36
|
-
"@nrwl/js": "16.
|
|
37
|
-
"@nrwl/jest": "16.
|
|
38
|
-
"@nrwl/linter": "16.
|
|
39
|
-
"@nrwl/angular": "16.
|
|
40
|
-
"@nrwl/cypress": "16.
|
|
41
|
-
"@nrwl/detox": "16.
|
|
42
|
-
"@nrwl/devkit": "16.
|
|
43
|
-
"@nrwl/esbuild": "16.
|
|
44
|
-
"@nrwl/eslint-plugin-nx": "16.
|
|
45
|
-
"@nrwl/expo": "16.
|
|
46
|
-
"@nrwl/express": "16.
|
|
47
|
-
"@nrwl/nest": "16.
|
|
48
|
-
"@nrwl/next": "16.
|
|
49
|
-
"@nrwl/node": "16.
|
|
36
|
+
"@nrwl/js": "16.2.0-beta.0",
|
|
37
|
+
"@nrwl/jest": "16.2.0-beta.0",
|
|
38
|
+
"@nrwl/linter": "16.2.0-beta.0",
|
|
39
|
+
"@nrwl/angular": "16.2.0-beta.0",
|
|
40
|
+
"@nrwl/cypress": "16.2.0-beta.0",
|
|
41
|
+
"@nrwl/detox": "16.2.0-beta.0",
|
|
42
|
+
"@nrwl/devkit": "16.2.0-beta.0",
|
|
43
|
+
"@nrwl/esbuild": "16.2.0-beta.0",
|
|
44
|
+
"@nrwl/eslint-plugin-nx": "16.2.0-beta.0",
|
|
45
|
+
"@nrwl/expo": "16.2.0-beta.0",
|
|
46
|
+
"@nrwl/express": "16.2.0-beta.0",
|
|
47
|
+
"@nrwl/nest": "16.2.0-beta.0",
|
|
48
|
+
"@nrwl/next": "16.2.0-beta.0",
|
|
49
|
+
"@nrwl/node": "16.2.0-beta.0",
|
|
50
50
|
"nx-cloud": "latest",
|
|
51
|
-
"@nrwl/nx-plugin": "16.
|
|
52
|
-
"@nrwl/react-native": "16.
|
|
53
|
-
"@nrwl/react": "16.
|
|
54
|
-
"@nrwl/rollup": "16.
|
|
55
|
-
"@nrwl/storybook": "16.
|
|
56
|
-
"@nrwl/tao": "16.
|
|
57
|
-
"@nrwl/vite": "16.
|
|
58
|
-
"@nrwl/web": "16.
|
|
59
|
-
"@nrwl/webpack": "16.
|
|
60
|
-
"nx": "16.
|
|
51
|
+
"@nrwl/nx-plugin": "16.2.0-beta.0",
|
|
52
|
+
"@nrwl/react-native": "16.2.0-beta.0",
|
|
53
|
+
"@nrwl/react": "16.2.0-beta.0",
|
|
54
|
+
"@nrwl/rollup": "16.2.0-beta.0",
|
|
55
|
+
"@nrwl/storybook": "16.2.0-beta.0",
|
|
56
|
+
"@nrwl/tao": "16.2.0-beta.0",
|
|
57
|
+
"@nrwl/vite": "16.2.0-beta.0",
|
|
58
|
+
"@nrwl/web": "16.2.0-beta.0",
|
|
59
|
+
"@nrwl/webpack": "16.2.0-beta.0",
|
|
60
|
+
"nx": "16.2.0-beta.0"
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
63
|
"dependencies": {
|
|
64
|
-
"@nrwl/workspace": "16.
|
|
65
|
-
"@nx/devkit": "16.
|
|
64
|
+
"@nrwl/workspace": "16.2.0-beta.0",
|
|
65
|
+
"@nx/devkit": "16.2.0-beta.0",
|
|
66
66
|
"@parcel/watcher": "2.0.4",
|
|
67
67
|
"chalk": "^4.1.0",
|
|
68
68
|
"chokidar": "^3.5.1",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"ignore": "^5.0.4",
|
|
75
75
|
"minimatch": "3.0.5",
|
|
76
76
|
"npm-run-path": "^4.0.1",
|
|
77
|
-
"nx": "16.
|
|
77
|
+
"nx": "16.2.0-beta.0",
|
|
78
78
|
"open": "^8.4.0",
|
|
79
79
|
"rxjs": "^7.8.0",
|
|
80
80
|
"tmp": "~0.2.1",
|
|
@@ -86,5 +86,5 @@
|
|
|
86
86
|
"access": "public"
|
|
87
87
|
},
|
|
88
88
|
"types": "./index.d.ts",
|
|
89
|
-
"gitHead": "
|
|
89
|
+
"gitHead": "f7ba85e8ec9c074eaee81731a20aee7ea6dbc8aa"
|
|
90
90
|
}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "http://json-schema.org/schema",
|
|
3
3
|
"$id": "SchematicsConvertToNxProject",
|
|
4
|
-
"title": "@
|
|
4
|
+
"title": "@nx/workspace:fix-configuration",
|
|
5
5
|
"description": "Migrates v1 config to v2 standalone configuration.",
|
|
6
6
|
"type": "object",
|
|
7
7
|
"cli": "nx",
|
|
8
8
|
"examples": [
|
|
9
9
|
{
|
|
10
|
-
"command": "nx g @
|
|
10
|
+
"command": "nx g @nx/workspace:convert-to-nx-project --project my-feature-lib",
|
|
11
11
|
"description": "Convert the `my-feature-lib` project to use `project.json` file instead of `workspace.json`"
|
|
12
12
|
},
|
|
13
13
|
{
|
|
14
|
-
"command": "nx g @
|
|
14
|
+
"command": "nx g @nx/workspace:convert-to-nx-project --all",
|
|
15
15
|
"description": "Convert all projects in `workspace.json` to separate `project.json` files"
|
|
16
16
|
}
|
|
17
17
|
],
|
|
@@ -1,17 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeSchema = void 0;
|
|
4
|
-
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const path_1 = require("nx/src/utils/path");
|
|
6
4
|
const utils_1 = require("./utils");
|
|
5
|
+
const get_import_path_1 = require("../../../utilities/get-import-path");
|
|
7
6
|
function normalizeSchema(tree, schema, projectConfiguration) {
|
|
8
7
|
var _a, _b;
|
|
9
8
|
const destination = schema.destination.startsWith('/')
|
|
10
9
|
? (0, utils_1.normalizeSlashes)(schema.destination.slice(1))
|
|
11
10
|
: schema.destination;
|
|
12
11
|
const newProjectName = (_a = schema.newProjectName) !== null && _a !== void 0 ? _a : (0, utils_1.getNewProjectName)(destination);
|
|
13
|
-
|
|
14
|
-
return Object.assign(Object.assign({}, schema), { destination, importPath: (_b = schema.importPath) !== null && _b !== void 0 ? _b : (0, utils_1.normalizeSlashes)((0, path_1.getImportPath)(npmScope, destination)), newProjectName, relativeToRootDestination: (0, utils_1.getDestination)(tree, schema, projectConfiguration) });
|
|
12
|
+
return Object.assign(Object.assign({}, schema), { destination, importPath: (_b = schema.importPath) !== null && _b !== void 0 ? _b : (0, utils_1.normalizeSlashes)((0, get_import_path_1.getImportPath)(tree, destination)), newProjectName, relativeToRootDestination: (0, utils_1.getDestination)(tree, schema, projectConfiguration) });
|
|
15
13
|
}
|
|
16
14
|
exports.normalizeSchema = normalizeSchema;
|
|
17
15
|
//# sourceMappingURL=normalize-schema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/normalize-schema.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/normalize-schema.ts"],"names":[],"mappings":";;;AAEA,mCAA8E;AAC9E,wEAAmE;AAEnE,SAAgB,eAAe,CAC7B,IAAU,EACV,MAAc,EACd,oBAA0C;;IAE1C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC;QACpD,CAAC,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;IACvB,MAAM,cAAc,GAClB,MAAA,MAAM,CAAC,cAAc,mCAAI,IAAA,yBAAiB,EAAC,WAAW,CAAC,CAAC;IAE1D,uCACK,MAAM,KACT,WAAW,EACX,UAAU,EACR,MAAA,MAAM,CAAC,UAAU,mCAAI,IAAA,wBAAgB,EAAC,IAAA,+BAAa,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC,EACzE,cAAc,EACd,yBAAyB,EAAE,IAAA,sBAAc,EACvC,IAAI,EACJ,MAAM,EACN,oBAAoB,CACrB,IACD;AACJ,CAAC;AAvBD,0CAuBC"}
|
|
@@ -6,6 +6,7 @@ const ts_config_1 = require("../../../utilities/ts-config");
|
|
|
6
6
|
const utils_1 = require("./utils");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const typescript_1 = require("../../../utilities/typescript");
|
|
9
|
+
const get_import_path_1 = require("../../../utilities/get-import-path");
|
|
9
10
|
let tsModule;
|
|
10
11
|
/**
|
|
11
12
|
* Updates all the imports in the workspace and modifies the tsconfig appropriately.
|
|
@@ -30,7 +31,7 @@ function updateImports(tree, schema, project) {
|
|
|
30
31
|
}
|
|
31
32
|
const projectRef = {
|
|
32
33
|
from: fromPath ||
|
|
33
|
-
(0, utils_1.normalizeSlashes)((0,
|
|
34
|
+
(0, utils_1.normalizeSlashes)((0, get_import_path_1.getImportPath)(tree, project.root.slice(libsDir.length).replace(/^\/|\\/, ''))),
|
|
34
35
|
to: schema.importPath,
|
|
35
36
|
};
|
|
36
37
|
if (schema.updateImportPath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
"type": "object",
|
|
8
8
|
"examples": [
|
|
9
9
|
{
|
|
10
|
-
"command": "nx g @
|
|
10
|
+
"command": "nx g @nx/workspace:move --project my-feature-lib --destination shared/my-feature-lib",
|
|
11
11
|
"description": "Move `libs/my-feature-lib` to `libs/shared/my-feature-lib`"
|
|
12
12
|
}
|
|
13
13
|
],
|
|
@@ -56,7 +56,6 @@ function generatePreset(host, opts) {
|
|
|
56
56
|
`--name=${opts.appName}`,
|
|
57
57
|
opts.style ? `--style=${opts.style}` : null,
|
|
58
58
|
opts.linter ? `--linter=${opts.linter}` : null,
|
|
59
|
-
opts.npmScope ? `--npmScope=${opts.npmScope}` : `--npmScope=${opts.name}`,
|
|
60
59
|
opts.preset ? `--preset=${opts.preset}` : null,
|
|
61
60
|
opts.bundler ? `--bundler=${opts.bundler}` : null,
|
|
62
61
|
opts.framework ? `--framework=${opts.framework}` : null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AACpB,8CAA0C;AAC1C,mDAI8B;AAC9B,8EAAwE;AAExE,+BAA4B;AAC5B,4CAA4C;AAC5C,iDAAoD;AAEpD,SAAgB,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IACzE,IACE,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,KAAK;QAC/B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG,EAC7B;QACA,OAAO;KACR;IACD,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC7D,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,YAAY,EACZ,GAAG,EACH,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CACxC,CAAC;AACJ,CAAC;AAhBD,sDAgBC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,IAAsB;IAC/D,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE;QAC3C,OAAO,EAAE,CAAC,aAAa,CAAC;QACxB,OAAO,EAAE;YACP,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IACH,MAAM,YAAY,GAAiB;QACjC,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACrC,CAAC;IACF,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;IACvC,MAAM,UAAU,GAAG,GAAG,GAAG,CAAC,IAAI,KAAK,CAAC;IACpC,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAEjC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,IAAA,qBAAK,EAAC,UAAU,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE;YACjE,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,EAAE,CAAC;aACX;iBAAM;gBACL,MAAM,OAAO,GAAG,uCAAuC,CAAC;gBACxD,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,SAAS,aAAa,CAAC,OAAyB;QAC9C,oBAAoB;QACpB,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,SAAS,cAAc,CAAC,IAAsB;QAC5C,OAAO;YACL,GAAG;YACH,sBAAsB;YACtB,UAAU,IAAI,CAAC,OAAO,EAAE;YACxB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI;YAC3C,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;YAC9C,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,6 @@ function setPresetProperty(tree, options) {
|
|
|
38
38
|
delete json.implicitDependencies;
|
|
39
39
|
delete json.targetDefaults;
|
|
40
40
|
delete json.workspaceLayout;
|
|
41
|
-
delete json.npmScope;
|
|
42
41
|
}
|
|
43
42
|
return json;
|
|
44
43
|
});
|
|
@@ -61,10 +60,9 @@ function createAppsAndLibsFolders(tree, options) {
|
|
|
61
60
|
tree.write((0, path_1.join)(options.directory, 'libs/.gitkeep'), '');
|
|
62
61
|
}
|
|
63
62
|
}
|
|
64
|
-
function createNxJson(tree, { directory,
|
|
63
|
+
function createNxJson(tree, { directory, defaultBase, preset }) {
|
|
65
64
|
const nxJson = {
|
|
66
65
|
$schema: './node_modules/nx/schemas/nx-schema.json',
|
|
67
|
-
npmScope: npmScope,
|
|
68
66
|
affected: {
|
|
69
67
|
defaultBase,
|
|
70
68
|
},
|
|
@@ -152,7 +150,8 @@ function addPropertyWithStableKeys(obj, key, value) {
|
|
|
152
150
|
}
|
|
153
151
|
function normalizeOptions(options) {
|
|
154
152
|
let defaultBase = options.defaultBase || (0, default_base_1.deduceDefaultBase)();
|
|
155
|
-
|
|
153
|
+
const name = (0, devkit_1.names)(options.name).fileName;
|
|
154
|
+
return Object.assign(Object.assign({ name }, options), { defaultBase });
|
|
156
155
|
}
|
|
157
156
|
function setUpWorkspacesInPackageJson(tree, options) {
|
|
158
157
|
if (options.preset === presets_1.Preset.NPM || options.preset === presets_1.Preset.Core) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-workspace-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":";;;;AAAA,uCAUoB;AACpB,mDAAiD;AACjD,+BAA8C;AAC9C,8CAA0C;AAC1C,+DAAiE;AAGjE,SAAsB,sBAAsB,CAC1C,IAAU,EACV,OAAyB;;QAEzB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SACzD;QACD,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5B,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5B,MAAM,CAAC,YAAY,CAAC,GAAG,IAAA,iCAAwB,EAC7C,OAAO,CAAC,cAAgC,CACzC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACb,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,IAAI,CAAC,YAAY,IAAI,CAAC,EAAE;YAC3D,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC5B;aAAM,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,IAAI,CAAC,YAAY,IAAI,CAAC,EAAE;YAClE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QACD,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxC,4BAA4B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA1BD,wDA0BC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IAC9D,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5D,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG,EAAE;YACnE,yBAAyB,CAAC,IAAI,EAAE,SAAS,EAAE,qBAAqB,CAAC,CAAC;YAClE,OAAO,IAAI,CAAC,oBAAoB,CAAC;YACjC,OAAO,IAAI,CAAC,cAAc,CAAC;YAC3B,OAAO,IAAI,CAAC,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-workspace-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ function normalizeOptions(options) {
|
|
|
71
71
|
const normalized = Object.assign({}, options);
|
|
72
72
|
normalized.name = (0, devkit_1.names)(options.name).fileName;
|
|
73
73
|
if (!options.directory) {
|
|
74
|
-
normalized.directory =
|
|
74
|
+
normalized.directory = normalized.name;
|
|
75
75
|
}
|
|
76
76
|
const parsed = parsePresetName(options.preset);
|
|
77
77
|
normalized.preset = parsed.package;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AAEpB,+BAA4B;AAC5B,8CAA0C;AAE1C,yEAAoE;AACpE,uDAA0E;
|
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,10 +25,6 @@
|
|
|
25
25
|
"type": "boolean",
|
|
26
26
|
"default": true
|
|
27
27
|
},
|
|
28
|
-
"npmScope": {
|
|
29
|
-
"type": "string",
|
|
30
|
-
"description": "Npm scope for importing libs."
|
|
31
|
-
},
|
|
32
28
|
"standaloneApi": {
|
|
33
29
|
"description": "Use Standalone Components if generating an Angular application.",
|
|
34
30
|
"type": "boolean",
|
|
@@ -73,9 +69,9 @@
|
|
|
73
69
|
"enum": ["express", "koa", "fastify", "nest", "none"]
|
|
74
70
|
},
|
|
75
71
|
"nextAppDir": {
|
|
76
|
-
"description": "Enable
|
|
72
|
+
"description": "Enable the App Router for this project.",
|
|
77
73
|
"type": "boolean",
|
|
78
|
-
"default":
|
|
74
|
+
"default": true
|
|
79
75
|
},
|
|
80
76
|
"e2eTestRunner": {
|
|
81
77
|
"description": "The tool to use for running e2e tests.",
|
|
@@ -4,15 +4,15 @@ exports.npmPackageSchematic = exports.npmPackageGenerator = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const
|
|
7
|
+
const get_import_path_1 = require("../../utilities/get-import-path");
|
|
8
8
|
function normalizeOptions(options) {
|
|
9
9
|
options.name = (0, devkit_1.names)(options.name).fileName;
|
|
10
10
|
return options;
|
|
11
11
|
}
|
|
12
|
-
function addFiles(projectRoot, tree,
|
|
12
|
+
function addFiles(projectRoot, tree, options) {
|
|
13
13
|
const packageJsonPath = (0, path_1.join)(projectRoot, 'package.json');
|
|
14
14
|
(0, devkit_1.writeJson)(tree, packageJsonPath, {
|
|
15
|
-
name: (0,
|
|
15
|
+
name: (0, get_import_path_1.getImportPath)(tree, options.name),
|
|
16
16
|
version: '0.0.0',
|
|
17
17
|
scripts: {
|
|
18
18
|
test: 'node index.js',
|
|
@@ -23,7 +23,7 @@ function addFiles(projectRoot, tree, npmScope, options) {
|
|
|
23
23
|
function npmPackageGenerator(tree, options) {
|
|
24
24
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
25
|
options = normalizeOptions(options);
|
|
26
|
-
const { libsDir
|
|
26
|
+
const { libsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
27
27
|
const projectRoot = (0, path_1.join)(libsDir, options.name);
|
|
28
28
|
(0, devkit_1.addProjectConfiguration)(tree, options.name, {
|
|
29
29
|
root: projectRoot,
|
|
@@ -32,7 +32,7 @@ function npmPackageGenerator(tree, options) {
|
|
|
32
32
|
const projectJsonExists = tree.exists((0, path_1.join)(projectRoot, 'project.json'));
|
|
33
33
|
const isEmpty = fileCount === 0 || (fileCount === 1 && projectJsonExists);
|
|
34
34
|
if (isEmpty) {
|
|
35
|
-
addFiles(projectRoot, tree,
|
|
35
|
+
addFiles(projectRoot, tree, options);
|
|
36
36
|
}
|
|
37
37
|
yield (0, devkit_1.formatFiles)(tree);
|
|
38
38
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-package.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/npm-package/npm-package.ts"],"names":[],"mappings":";;;;AAAA,uCASoB;AACpB,+BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"npm-package.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/npm-package/npm-package.ts"],"names":[],"mappings":";;;;AAAA,uCASoB;AACpB,+BAA4B;AAC5B,qEAAgE;AAMhE,SAAS,gBAAgB,CAAC,OAAuB;IAC/C,OAAO,CAAC,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,QAAQ,CAAC,WAAmB,EAAE,IAAU,EAAE,OAAuB;IACxE,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC1D,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE;QAC/B,IAAI,EAAE,IAAA,+BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC;QACvC,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE;YACP,IAAI,EAAE,eAAe;SACtB;KACF,CAAC,CAAC;IAEH,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,SAAsB,mBAAmB,CAAC,IAAU,EAAE,OAAuB;;QAC3E,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAEpC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEhD,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1C,IAAI,EAAE,WAAW;SAClB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;QACpD,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,SAAS,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,iBAAiB,CAAC,CAAC;QAE1E,IAAI,OAAO,EAAE;YACX,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACtC;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAnBD,kDAmBC;AAEY,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC"}
|
|
@@ -14,10 +14,6 @@
|
|
|
14
14
|
"description": "The name of the application.",
|
|
15
15
|
"type": "string"
|
|
16
16
|
},
|
|
17
|
-
"npmScope": {
|
|
18
|
-
"description": "Npm scope for importing libs.",
|
|
19
|
-
"type": "string"
|
|
20
|
-
},
|
|
21
17
|
"linter": {
|
|
22
18
|
"description": "The tool to use for running lint checks.",
|
|
23
19
|
"type": "string",
|
|
@@ -85,9 +81,9 @@
|
|
|
85
81
|
"default": false
|
|
86
82
|
},
|
|
87
83
|
"nextAppDir": {
|
|
88
|
-
"description": "Enable
|
|
84
|
+
"description": "Enable the App Router for this project.",
|
|
89
85
|
"type": "boolean",
|
|
90
|
-
"default":
|
|
86
|
+
"default": true
|
|
91
87
|
},
|
|
92
88
|
"e2eTestRunner": {
|
|
93
89
|
"description": "The tool to use for running e2e tests.",
|
|
@@ -7,11 +7,11 @@
|
|
|
7
7
|
"type": "object",
|
|
8
8
|
"examples": [
|
|
9
9
|
{
|
|
10
|
-
"command": "nx g @
|
|
10
|
+
"command": "nx g @nx/workspace:remove my-feature-lib",
|
|
11
11
|
"description": "Remove `my-feature-lib` from the workspace"
|
|
12
12
|
},
|
|
13
13
|
{
|
|
14
|
-
"command": "nx g @
|
|
14
|
+
"command": "nx g @nx/workspace:remove my-feature-lib --forceRemove",
|
|
15
15
|
"description": "Force removal of `my-feature-lib` from the workspace"
|
|
16
16
|
}
|
|
17
17
|
],
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
"cli": "nx",
|
|
8
8
|
"examples": [
|
|
9
9
|
{
|
|
10
|
-
"command": "nx g @
|
|
10
|
+
"command": "nx g @nx/workspace:run-commands printhello --project my-feature-lib --command 'echo hello'",
|
|
11
11
|
"description": "Add the `printhello` target to `my-feature-lib`"
|
|
12
12
|
}
|
|
13
13
|
],
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getImportPath = void 0;
|
|
4
|
+
const nx_json_1 = require("nx/src/generators/utils/nx-json");
|
|
5
|
+
const json_1 = require("nx/src/generators/utils/json");
|
|
6
|
+
function getImportPath(tree, projectDirectory) {
|
|
7
|
+
const npmScope = getNpmScope(tree);
|
|
8
|
+
return npmScope
|
|
9
|
+
? `${npmScope === '@' ? '' : '@'}${npmScope}/${projectDirectory}`
|
|
10
|
+
: projectDirectory;
|
|
11
|
+
}
|
|
12
|
+
exports.getImportPath = getImportPath;
|
|
13
|
+
function getNpmScope(tree) {
|
|
14
|
+
const nxJson = (0, nx_json_1.readNxJson)(tree);
|
|
15
|
+
// TODO(v17): Remove reading this from nx.json
|
|
16
|
+
if (nxJson.npmScope) {
|
|
17
|
+
return nxJson.npmScope;
|
|
18
|
+
}
|
|
19
|
+
const { name } = (0, json_1.readJson)(tree, 'package.json');
|
|
20
|
+
if (name === null || name === void 0 ? void 0 : name.startsWith('@')) {
|
|
21
|
+
return name.split('/')[0].substring(1);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=get-import-path.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-import-path.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/get-import-path.ts"],"names":[],"mappings":";;;AACA,6DAA6D;AAC7D,uDAAwD;AAExD,SAAgB,aAAa,CAAC,IAAU,EAAE,gBAAwB;IAChE,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IACnC,OAAO,QAAQ;QACb,CAAC,CAAC,GAAG,QAAQ,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,IAAI,gBAAgB,EAAE;QACjE,CAAC,CAAC,gBAAgB,CAAC;AACvB,CAAC;AALD,sCAKC;AAED,SAAS,WAAW,CAAC,IAAU;IAC7B,MAAM,MAAM,GAAG,IAAA,oBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,8CAA8C;IAC9C,IAAI,MAAM,CAAC,QAAQ,EAAE;QACnB,OAAO,MAAM,CAAC,QAAQ,CAAC;KACxB;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,eAAQ,EAAoB,IAAI,EAAE,cAAc,CAAC,CAAC;IAEnE,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAC,GAAG,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KACxC;AACH,CAAC"}
|
|
File without changes
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
//# sourceMappingURL=app.module.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/generators/preset/files/angular/app.module.ts"],"names":[],"mappings":""}
|
|
File without changes
|