@nrwl/workspace 15.2.1 → 15.3.0-beta.1
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +1 -1
- package/index.d.ts +2 -1
- package/package.json +30 -30
- package/presets/npm.json +0 -3
- package/src/generators/ci-workflow/ci-workflow.d.ts +1 -1
- package/src/generators/ci-workflow/ci-workflow.js +13 -0
- package/src/generators/ci-workflow/ci-workflow.js.map +1 -1
- package/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__ +37 -0
- package/src/generators/ci-workflow/schema.json +3 -2
- package/src/generators/move/lib/update-imports.js +3 -3
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/new/files-readme/README.md.template +21 -0
- package/src/generators/new/files-root-app/__dot__vscode/extensions.json__tmpl__ +2 -4
- package/src/generators/new/files-root-app/package.json__tmpl__ +3 -3
- package/src/generators/new/generate-preset.js +4 -3
- package/src/generators/new/generate-preset.js.map +1 -1
- package/src/generators/new/generate-workspace-files.d.ts +1 -1
- package/src/generators/new/generate-workspace-files.js +46 -35
- package/src/generators/new/generate-workspace-files.js.map +1 -1
- package/src/generators/preset/preset.js +15 -3
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/utils/presets.d.ts +4 -3
- package/src/generators/utils/presets.js +4 -3
- package/src/generators/utils/presets.js.map +1 -1
- package/src/utilities/ast-utils.js +10 -10
- package/src/utilities/generate-globs.js +6 -1
- package/src/utilities/generate-globs.js.map +1 -1
- package/src/utilities/typescript/find-nodes.d.ts +5 -2
- package/src/utilities/typescript/find-nodes.js +7 -25
- package/src/utilities/typescript/find-nodes.js.map +1 -1
- package/src/utilities/typescript.js +1 -1
- package/src/utilities/typescript.js.map +1 -1
- package/src/utils/ast-utils.js +12 -12
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/rules/rename-package-imports.js +2 -1
- package/src/utils/rules/rename-package-imports.js.map +1 -1
- package/src/generators/workspace/schema.json +0 -71
- package/src/utilities/create-package-json.d.ts +0 -10
- package/src/utilities/create-package-json.js +0 -90
- package/src/utilities/create-package-json.js.map +0 -1
- package/src/utils/graph-utils.d.ts +0 -5
- package/src/utils/graph-utils.js +0 -116
- package/src/utils/graph-utils.js.map +0 -1
- package/src/utils/runtime-lint-utils.d.ts +0 -80
- package/src/utils/runtime-lint-utils.js +0 -309
- package/src/utils/runtime-lint-utils.js.map +0 -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
|
-
|
|
6
|
+
# [15.3.0-beta.1](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.1) (2022-11-24)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/workspace
|
package/index.d.ts
CHANGED
|
@@ -6,7 +6,8 @@ export { ExistingPrettierConfig, resolveUserExistingPrettierConfig, } from './sr
|
|
|
6
6
|
export { output } from './src/utilities/output';
|
|
7
7
|
export { readWorkspaceConfig, readPackageJson, } from 'nx/src/project-graph/file-utils';
|
|
8
8
|
export { ProjectGraphCache } from 'nx/src/project-graph/nx-deps-cache';
|
|
9
|
-
export { readJsonInTree, updateJsonInTree, updateWorkspaceInTree, insert, replaceNodeValue, addDepsToPackageJson, addMethod, addIncludeToTsConfig, addGlobal, getProjectConfig, addParameterToConstructor, createOrUpdate, findNodes,
|
|
9
|
+
export { readJsonInTree, updateJsonInTree, updateWorkspaceInTree, insert, replaceNodeValue, addDepsToPackageJson, addMethod, addIncludeToTsConfig, addGlobal, getProjectConfig, addParameterToConstructor, createOrUpdate, findNodes, // TODO(v16): remove this
|
|
10
|
+
updatePackageJsonDependencies, readWorkspace, renameSyncInTree, renameDirSyncInTree, updateNxJsonInTree, readNxJsonInTree, InsertChange, ReplaceChange, RemoveChange, } from './src/utils/ast-utils';
|
|
10
11
|
export { getNpmScope, getWorkspacePath, replaceAppNameWithPath, editTarget, parseTarget, serializeTarget, } from './src/utils/cli-config-utils';
|
|
11
12
|
export { getWorkspace, updateWorkspace, updateBuilderConfig, } from './src/utils/workspace';
|
|
12
13
|
export { addUpdateTask } from './src/utils/update-task';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.3.0-beta.1",
|
|
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,31 +33,31 @@
|
|
|
33
33
|
"requirements": {},
|
|
34
34
|
"migrations": "./migrations.json",
|
|
35
35
|
"packageGroup": {
|
|
36
|
-
"@nrwl/angular": "15.
|
|
37
|
-
"@nrwl/cli": "15.
|
|
38
|
-
"@nrwl/cypress": "15.
|
|
39
|
-
"@nrwl/detox": "15.
|
|
40
|
-
"@nrwl/devkit": "15.
|
|
41
|
-
"@nrwl/esbuild": "15.
|
|
42
|
-
"@nrwl/eslint-plugin-nx": "15.
|
|
43
|
-
"@nrwl/expo": "15.
|
|
44
|
-
"@nrwl/express": "15.
|
|
45
|
-
"@nrwl/jest": "15.
|
|
46
|
-
"@nrwl/js": "15.
|
|
47
|
-
"@nrwl/linter": "15.
|
|
48
|
-
"@nrwl/nest": "15.
|
|
49
|
-
"@nrwl/next": "15.
|
|
50
|
-
"@nrwl/node": "15.
|
|
36
|
+
"@nrwl/angular": "15.3.0-beta.1",
|
|
37
|
+
"@nrwl/cli": "15.3.0-beta.1",
|
|
38
|
+
"@nrwl/cypress": "15.3.0-beta.1",
|
|
39
|
+
"@nrwl/detox": "15.3.0-beta.1",
|
|
40
|
+
"@nrwl/devkit": "15.3.0-beta.1",
|
|
41
|
+
"@nrwl/esbuild": "15.3.0-beta.1",
|
|
42
|
+
"@nrwl/eslint-plugin-nx": "15.3.0-beta.1",
|
|
43
|
+
"@nrwl/expo": "15.3.0-beta.1",
|
|
44
|
+
"@nrwl/express": "15.3.0-beta.1",
|
|
45
|
+
"@nrwl/jest": "15.3.0-beta.1",
|
|
46
|
+
"@nrwl/js": "15.3.0-beta.1",
|
|
47
|
+
"@nrwl/linter": "15.3.0-beta.1",
|
|
48
|
+
"@nrwl/nest": "15.3.0-beta.1",
|
|
49
|
+
"@nrwl/next": "15.3.0-beta.1",
|
|
50
|
+
"@nrwl/node": "15.3.0-beta.1",
|
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
|
52
|
-
"@nrwl/nx-plugin": "15.
|
|
53
|
-
"@nrwl/react": "15.
|
|
54
|
-
"@nrwl/react-native": "15.
|
|
55
|
-
"@nrwl/rollup": "15.
|
|
56
|
-
"@nrwl/storybook": "15.
|
|
57
|
-
"@nrwl/tao": "15.
|
|
58
|
-
"@nrwl/web": "15.
|
|
59
|
-
"@nrwl/webpack": "15.
|
|
60
|
-
"nx": "15.
|
|
52
|
+
"@nrwl/nx-plugin": "15.3.0-beta.1",
|
|
53
|
+
"@nrwl/react": "15.3.0-beta.1",
|
|
54
|
+
"@nrwl/react-native": "15.3.0-beta.1",
|
|
55
|
+
"@nrwl/rollup": "15.3.0-beta.1",
|
|
56
|
+
"@nrwl/storybook": "15.3.0-beta.1",
|
|
57
|
+
"@nrwl/tao": "15.3.0-beta.1",
|
|
58
|
+
"@nrwl/web": "15.3.0-beta.1",
|
|
59
|
+
"@nrwl/webpack": "15.3.0-beta.1",
|
|
60
|
+
"nx": "15.3.0-beta.1"
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
63
|
"peerDependencies": {
|
|
@@ -69,9 +69,9 @@
|
|
|
69
69
|
}
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
|
-
"@nrwl/devkit": "15.
|
|
73
|
-
"@nrwl/jest": "15.
|
|
74
|
-
"@nrwl/linter": "15.
|
|
72
|
+
"@nrwl/devkit": "15.3.0-beta.1",
|
|
73
|
+
"@nrwl/jest": "15.3.0-beta.1",
|
|
74
|
+
"@nrwl/linter": "15.3.0-beta.1",
|
|
75
75
|
"@parcel/watcher": "2.0.4",
|
|
76
76
|
"chalk": "4.1.0",
|
|
77
77
|
"chokidar": "^3.5.1",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"ignore": "^5.0.4",
|
|
87
87
|
"minimatch": "3.0.5",
|
|
88
88
|
"npm-run-path": "^4.0.1",
|
|
89
|
-
"nx": "15.
|
|
89
|
+
"nx": "15.3.0-beta.1",
|
|
90
90
|
"open": "^8.4.0",
|
|
91
91
|
"rxjs": "^6.5.4",
|
|
92
92
|
"semver": "7.3.4",
|
|
@@ -99,5 +99,5 @@
|
|
|
99
99
|
"access": "public"
|
|
100
100
|
},
|
|
101
101
|
"types": "./index.d.ts",
|
|
102
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "2d43fddb87f6044faf72cb3d3bc7ca82d36b3237"
|
|
103
103
|
}
|
package/presets/npm.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
2
|
export interface Schema {
|
|
3
3
|
name?: string;
|
|
4
|
-
ci: 'github' | 'azure' | 'circleci';
|
|
4
|
+
ci: 'github' | 'azure' | 'circleci' | 'bitbucket-pipelines';
|
|
5
5
|
}
|
|
6
6
|
export declare function ciWorkflowGenerator(host: Tree, schema: Schema): Promise<void>;
|
|
@@ -13,6 +13,9 @@ function ciWorkflowGenerator(host, schema) {
|
|
|
13
13
|
if (!nxCloudUsed) {
|
|
14
14
|
throw new Error('This workspace is not connected to Nx Cloud.');
|
|
15
15
|
}
|
|
16
|
+
if (ci === 'bitbucket-pipelines' && defaultBranchNeedsOriginPrefix(nxJson)) {
|
|
17
|
+
(0, devkit_1.writeJson)(host, 'nx.json', appendOriginPrefix(nxJson));
|
|
18
|
+
}
|
|
16
19
|
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, 'files', ci), '', options);
|
|
17
20
|
yield (0, devkit_1.formatFiles)(host);
|
|
18
21
|
});
|
|
@@ -30,4 +33,14 @@ function normalizeOptions(options) {
|
|
|
30
33
|
tmpl: '',
|
|
31
34
|
};
|
|
32
35
|
}
|
|
36
|
+
function defaultBranchNeedsOriginPrefix(nxJson) {
|
|
37
|
+
var _a, _b;
|
|
38
|
+
return !((_b = (_a = nxJson.affected) === null || _a === void 0 ? void 0 : _a.defaultBase) === null || _b === void 0 ? void 0 : _b.startsWith('origin/'));
|
|
39
|
+
}
|
|
40
|
+
function appendOriginPrefix(nxJson) {
|
|
41
|
+
var _a, _b;
|
|
42
|
+
return Object.assign(Object.assign({}, nxJson), { affected: Object.assign(Object.assign({}, ((_a = nxJson.affected) !== null && _a !== void 0 ? _a : {})), { defaultBase: ((_b = nxJson.affected) === null || _b === void 0 ? void 0 : _b.defaultBase)
|
|
43
|
+
? `origin/${nxJson.affected.defaultBase}`
|
|
44
|
+
: 'origin/main' }) });
|
|
45
|
+
}
|
|
33
46
|
//# sourceMappingURL=ci-workflow.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ci-workflow.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/ci-workflow/ci-workflow.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"ci-workflow.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/ci-workflow/ci-workflow.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,+DAAiE;AAOjE,SAAsB,mBAAmB,CAAC,IAAU,EAAE,MAAc;;QAClE,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QACrB,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEzC,MAAM,MAAM,GAAwB,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,gBAAgB,CACpC,CAAC;QACF,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;SACjE;QAED,IAAI,EAAE,KAAK,qBAAqB,IAAI,8BAA8B,CAAC,MAAM,CAAC,EAAE;YAC1E,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;SACxD;QAED,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAC5E,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAlBD,kDAkBC;AAWD,SAAS,gBAAgB,CAAC,OAAe;IACvC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAA,cAAK,EAC9D,OAAO,CAAC,IAAI,IAAI,IAAI,CACrB,CAAC;IACF,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,SAAS,EAAE,qBAAqB,EAAE,GACpE,IAAA,iCAAwB,GAAE,CAAC;IAC7B,OAAO;QACL,YAAY;QACZ,gBAAgB;QAChB,qBAAqB;QACrB,oBAAoB;QACpB,UAAU,EAAE,IAAA,gCAAiB,GAAE;QAC/B,IAAI,EAAE,EAAE;KACT,CAAC;AACJ,CAAC;AAED,SAAS,8BAA8B,CAAC,MAA2B;;IACjE,OAAO,CAAC,CAAA,MAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW,0CAAE,UAAU,CAAC,SAAS,CAAC,CAAA,CAAC;AAC9D,CAAC;AAED,SAAS,kBAAkB,CAAC,MAA2B;;IACrD,uCACK,MAAM,KACT,QAAQ,kCACH,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,EAAE,CAAC,KAC1B,WAAW,EAAE,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW;gBACvC,CAAC,CAAC,UAAU,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE;gBACzC,CAAC,CAAC,aAAa,OAEnB;AACJ,CAAC"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
image: node:16.18
|
|
2
|
+
|
|
3
|
+
clone:
|
|
4
|
+
depth: full
|
|
5
|
+
|
|
6
|
+
definitions:
|
|
7
|
+
steps:
|
|
8
|
+
- step: &agent
|
|
9
|
+
name: Agent
|
|
10
|
+
script:
|
|
11
|
+
- export NX_BRANCH=$BITBUCKET_PR_ID
|
|
12
|
+
<% if(packageManagerPrefix == 'pnpm exec'){ %>
|
|
13
|
+
- npm install --prefix=$HOME/.local -g pnpm@6.32.4
|
|
14
|
+
<% } %>
|
|
15
|
+
- <%= packageManagerInstall %>
|
|
16
|
+
- <%= packageManagerPrefix %> nx-cloud start-agent
|
|
17
|
+
|
|
18
|
+
pipelines:
|
|
19
|
+
pull-requests:
|
|
20
|
+
'**':
|
|
21
|
+
- parallel:
|
|
22
|
+
- step:
|
|
23
|
+
name: <%= workflowName %>
|
|
24
|
+
script:
|
|
25
|
+
- export NX_BRANCH=$BITBUCKET_PR_ID
|
|
26
|
+
<% if(packageManagerPrefix == 'pnpm exec'){ %>
|
|
27
|
+
- npm install --prefix=$HOME/.local -g pnpm@6.32.4
|
|
28
|
+
<% } %>
|
|
29
|
+
- <%= packageManagerInstall %>
|
|
30
|
+
- <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
|
|
31
|
+
- <%= packageManagerPrefix %> nx-cloud record -- yarn nx workspace-lint
|
|
32
|
+
- <%= packageManagerPrefix %> nx-cloud record -- yarn nx format:check
|
|
33
|
+
- <%= packageManagerPrefix %> nx affected --target=lint & <%= packageManagerPrefix %> nx affected --target=test & <%= packageManagerPrefix %> nx affected --target=build
|
|
34
|
+
- <%= packageManagerPrefix %> nx-cloud stop-all-agents
|
|
35
|
+
- step: *agent
|
|
36
|
+
- step: *agent
|
|
37
|
+
- step: *agent
|
|
@@ -9,14 +9,15 @@
|
|
|
9
9
|
"ci": {
|
|
10
10
|
"type": "string",
|
|
11
11
|
"description": "CI provider.",
|
|
12
|
-
"enum": ["github", "circleci", "azure"],
|
|
12
|
+
"enum": ["github", "circleci", "azure", "bitbucket-pipelines"],
|
|
13
13
|
"x-prompt": {
|
|
14
14
|
"message": "What is your target CI provider?",
|
|
15
15
|
"type": "list",
|
|
16
16
|
"items": [
|
|
17
17
|
{ "value": "github", "label": "Github Actions" },
|
|
18
18
|
{ "value": "circleci", "label": "Circle CI" },
|
|
19
|
-
{ "value": "azure", "label": "Azure DevOps" }
|
|
19
|
+
{ "value": "azure", "label": "Azure DevOps" },
|
|
20
|
+
{ "value": "bitbucket-pipelines", "label": "BitBucket Pipelines" }
|
|
20
21
|
]
|
|
21
22
|
}
|
|
22
23
|
},
|
|
@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const path_1 = require("nx/src/utils/path");
|
|
6
6
|
const ts = require("typescript");
|
|
7
7
|
const typescript_1 = require("../../../utilities/typescript");
|
|
8
|
-
const
|
|
8
|
+
const typescript_2 = require("nx/src/utils/typescript");
|
|
9
9
|
const utils_1 = require("./utils");
|
|
10
10
|
/**
|
|
11
11
|
* Updates all the imports in the workspace and modifies the tsconfig appropriately.
|
|
@@ -90,7 +90,7 @@ function updateImportPaths(tree, path, from, to) {
|
|
|
90
90
|
* Update the module specifiers on static imports
|
|
91
91
|
*/
|
|
92
92
|
function updateImportDeclarations(sourceFile, from, to) {
|
|
93
|
-
const importDecls = (0,
|
|
93
|
+
const importDecls = (0, typescript_2.findNodes)(sourceFile, ts.SyntaxKind.ImportDeclaration);
|
|
94
94
|
const changes = [];
|
|
95
95
|
for (const { moduleSpecifier } of importDecls) {
|
|
96
96
|
if (ts.isStringLiteral(moduleSpecifier)) {
|
|
@@ -103,7 +103,7 @@ function updateImportDeclarations(sourceFile, from, to) {
|
|
|
103
103
|
* Update the module specifiers on dynamic imports and require statements
|
|
104
104
|
*/
|
|
105
105
|
function updateDynamicImports(sourceFile, from, to) {
|
|
106
|
-
const expressions = (0,
|
|
106
|
+
const expressions = (0, typescript_2.findNodes)(sourceFile, ts.SyntaxKind.CallExpression);
|
|
107
107
|
const changes = [];
|
|
108
108
|
for (const { expression, arguments: args } of expressions) {
|
|
109
109
|
const moduleSpecifier = args[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":";;;AAAA,yCAUsB;AACtB,4CAAkD;AAClD,iCAAiC;AACjC,8DAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
# <%= formattedNames.className %>
|
|
2
|
+
|
|
3
|
+
<a href="https://nx.dev" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png" width="45"></a>
|
|
4
|
+
|
|
5
|
+
✨ **This workspace has been generated by [Nx, a Smart, fast and extensible build system.](https://nx.dev)** ✨<% if (!!appName) { %>
|
|
6
|
+
|
|
7
|
+
## Development server
|
|
8
|
+
|
|
9
|
+
Run `nx serve <%= appName %>` for a dev server. Navigate to http://localhost:4200/. The app will automatically reload if you change any of the source files.<% } %>
|
|
10
|
+
|
|
11
|
+
## Understand this workspace
|
|
12
|
+
|
|
13
|
+
Run `nx graph` to see a diagram of the dependencies of the projects.
|
|
14
|
+
|
|
15
|
+
## Remote caching
|
|
16
|
+
|
|
17
|
+
Run `npx nx connect-to-nx-cloud` to enable [remote caching](https://nx.app) and make CI faster.
|
|
18
|
+
|
|
19
|
+
## Further help
|
|
20
|
+
|
|
21
|
+
Visit the [Nx Documentation](https://nx.dev) to learn more.
|
|
@@ -8,10 +8,10 @@
|
|
|
8
8
|
"dependencies": {
|
|
9
9
|
},
|
|
10
10
|
"devDependencies": {
|
|
11
|
-
"nx": "<%= nxVersion %>",
|
|
12
11
|
"@nrwl/cli": "<%= nxVersion %>",
|
|
13
12
|
"@nrwl/workspace": "<%= nxVersion %>",
|
|
14
|
-
"
|
|
15
|
-
"prettier": "<%= prettierVersion %>"
|
|
13
|
+
"nx": "<%= nxVersion %>",
|
|
14
|
+
"prettier": "<%= prettierVersion %>",
|
|
15
|
+
"typescript": "<%= typescriptVersion %>"
|
|
16
16
|
}
|
|
17
17
|
}
|
|
@@ -86,7 +86,8 @@ function getPresetDependencies(preset, version) {
|
|
|
86
86
|
switch (preset) {
|
|
87
87
|
case presets_1.Preset.TS:
|
|
88
88
|
return { dependencies: {}, dev: { '@nrwl/js': versions_1.nxVersion } };
|
|
89
|
-
case presets_1.Preset.
|
|
89
|
+
case presets_1.Preset.AngularMonorepo:
|
|
90
|
+
case presets_1.Preset.AngularStandalone:
|
|
90
91
|
return { dependencies: { '@nrwl/angular': versions_1.nxVersion }, dev: {} };
|
|
91
92
|
case presets_1.Preset.Express:
|
|
92
93
|
return { dependencies: {}, dev: { '@nrwl/express': versions_1.nxVersion } };
|
|
@@ -94,9 +95,9 @@ function getPresetDependencies(preset, version) {
|
|
|
94
95
|
return { dependencies: {}, dev: { '@nrwl/nest': versions_1.nxVersion } };
|
|
95
96
|
case presets_1.Preset.NextJs:
|
|
96
97
|
return { dependencies: { '@nrwl/next': versions_1.nxVersion }, dev: {} };
|
|
97
|
-
case presets_1.Preset.
|
|
98
|
+
case presets_1.Preset.ReactMonorepo:
|
|
98
99
|
return { dependencies: {}, dev: { '@nrwl/react': versions_1.nxVersion } };
|
|
99
|
-
case presets_1.Preset.
|
|
100
|
+
case presets_1.Preset.ReactStandalone:
|
|
100
101
|
return { dependencies: {}, dev: { '@nrwl/react': versions_1.nxVersion } };
|
|
101
102
|
case presets_1.Preset.ReactNative:
|
|
102
103
|
return { dependencies: {}, dev: { '@nrwl/react-native': versions_1.nxVersion } };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,4 +3,4 @@ import { NormalizedSchema } from './new';
|
|
|
3
3
|
export declare const DEFAULT_NRWL_PRETTIER_CONFIG: {
|
|
4
4
|
singleQuote: boolean;
|
|
5
5
|
};
|
|
6
|
-
export declare function generateWorkspaceFiles(
|
|
6
|
+
export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSchema): Promise<void>;
|
|
@@ -11,36 +11,37 @@ const default_base_1 = require("../../utilities/default-base");
|
|
|
11
11
|
exports.DEFAULT_NRWL_PRETTIER_CONFIG = {
|
|
12
12
|
singleQuote: true,
|
|
13
13
|
};
|
|
14
|
-
function generateWorkspaceFiles(
|
|
14
|
+
function generateWorkspaceFiles(tree, options) {
|
|
15
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
if (!options.name) {
|
|
17
17
|
throw new Error(`Invalid options, "name" is required.`);
|
|
18
18
|
}
|
|
19
19
|
options = normalizeOptions(options);
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
20
|
+
createReadme(tree, options);
|
|
21
|
+
createFiles(tree, options);
|
|
22
|
+
createNxJson(tree, options);
|
|
23
|
+
createPrettierrc(tree, options);
|
|
24
|
+
if (options.preset === presets_1.Preset.AngularMonorepo) {
|
|
25
|
+
decorateAngularClI(tree, options);
|
|
25
26
|
}
|
|
26
27
|
const [packageMajor] = (0, devkit_1.getPackageManagerVersion)(options.packageManager).split('.');
|
|
27
28
|
if (options.packageManager === 'pnpm' && +packageMajor >= 7) {
|
|
28
|
-
createNpmrc(
|
|
29
|
+
createNpmrc(tree, options);
|
|
29
30
|
}
|
|
30
31
|
else if (options.packageManager === 'yarn' && +packageMajor >= 2) {
|
|
31
|
-
createYarnrcYml(
|
|
32
|
+
createYarnrcYml(tree, options);
|
|
32
33
|
}
|
|
33
|
-
setPresetProperty(
|
|
34
|
-
addNpmScripts(
|
|
35
|
-
createAppsAndLibsFolders(
|
|
36
|
-
setUpWorkspacesInPackageJson(
|
|
37
|
-
yield (0, devkit_1.formatFiles)(
|
|
34
|
+
setPresetProperty(tree, options);
|
|
35
|
+
addNpmScripts(tree, options);
|
|
36
|
+
createAppsAndLibsFolders(tree, options);
|
|
37
|
+
setUpWorkspacesInPackageJson(tree, options);
|
|
38
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
38
39
|
});
|
|
39
40
|
}
|
|
40
41
|
exports.generateWorkspaceFiles = generateWorkspaceFiles;
|
|
41
|
-
function decorateAngularClI(
|
|
42
|
+
function decorateAngularClI(tree, options) {
|
|
42
43
|
const decorateCli = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '..', 'utils', 'decorate-angular-cli.js__tmpl__')).toString();
|
|
43
|
-
|
|
44
|
+
tree.write((0, path_1.join)(options.directory, 'decorate-angular-cli.js'), decorateCli);
|
|
44
45
|
}
|
|
45
46
|
function setPresetProperty(tree, options) {
|
|
46
47
|
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'nx.json'), (json) => {
|
|
@@ -55,21 +56,22 @@ function setPresetProperty(tree, options) {
|
|
|
55
56
|
return json;
|
|
56
57
|
});
|
|
57
58
|
}
|
|
58
|
-
function createAppsAndLibsFolders(
|
|
59
|
+
function createAppsAndLibsFolders(tree, options) {
|
|
59
60
|
if (options.preset === presets_1.Preset.Core ||
|
|
60
61
|
options.preset === presets_1.Preset.TS ||
|
|
61
62
|
options.preset === presets_1.Preset.NPM) {
|
|
62
|
-
|
|
63
|
+
tree.write((0, path_1.join)(options.directory, 'packages/.gitkeep'), '');
|
|
63
64
|
}
|
|
64
|
-
else if (options.preset === presets_1.Preset.
|
|
65
|
+
else if (options.preset === presets_1.Preset.AngularStandalone ||
|
|
66
|
+
options.preset === presets_1.Preset.ReactStandalone) {
|
|
65
67
|
// don't generate any folders
|
|
66
68
|
}
|
|
67
69
|
else {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
+
tree.write((0, path_1.join)(options.directory, 'apps/.gitkeep'), '');
|
|
71
|
+
tree.write((0, path_1.join)(options.directory, 'libs/.gitkeep'), '');
|
|
70
72
|
}
|
|
71
73
|
}
|
|
72
|
-
function createNxJson(
|
|
74
|
+
function createNxJson(tree, { directory, npmScope, packageManager, defaultBase, preset }) {
|
|
73
75
|
const nxJson = {
|
|
74
76
|
$schema: './node_modules/nx/schemas/nx-schema.json',
|
|
75
77
|
npmScope: npmScope,
|
|
@@ -103,34 +105,43 @@ function createNxJson(host, { directory, npmScope, packageManager, defaultBase,
|
|
|
103
105
|
};
|
|
104
106
|
nxJson.targetDefaults.build.inputs = ['production', '^production'];
|
|
105
107
|
}
|
|
106
|
-
(0, devkit_1.writeJson)(
|
|
108
|
+
(0, devkit_1.writeJson)(tree, (0, path_1.join)(directory, 'nx.json'), nxJson);
|
|
107
109
|
}
|
|
108
|
-
function createFiles(
|
|
110
|
+
function createFiles(tree, options) {
|
|
109
111
|
const formattedNames = (0, devkit_1.names)(options.name);
|
|
110
|
-
const filesDirName = options.preset === presets_1.Preset.
|
|
112
|
+
const filesDirName = options.preset === presets_1.Preset.AngularStandalone ||
|
|
113
|
+
options.preset === presets_1.Preset.ReactStandalone
|
|
111
114
|
? './files-root-app'
|
|
112
115
|
: options.preset === presets_1.Preset.NPM || options.preset === presets_1.Preset.Core
|
|
113
116
|
? './files-package-based-repo'
|
|
114
117
|
: './files-integrated-repo';
|
|
115
|
-
(0, devkit_1.generateFiles)(
|
|
118
|
+
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, filesDirName), options.directory, Object.assign(Object.assign({ formattedNames, dot: '.', tmpl: '', cliCommand: options.preset === presets_1.Preset.AngularMonorepo ? 'ng' : 'nx', nxCli: false, typescriptVersion: versions_1.typescriptVersion,
|
|
116
119
|
prettierVersion: versions_1.prettierVersion,
|
|
117
120
|
// angular cli is used only when workspace schematics is added to angular cli
|
|
118
121
|
angularCliVersion: versions_1.angularCliVersion }, options), { nxVersion: versions_1.nxVersion, packageManager: options.packageManager }));
|
|
119
122
|
}
|
|
120
|
-
function
|
|
121
|
-
|
|
123
|
+
function createReadme(tree, { name, appName, directory }) {
|
|
124
|
+
const formattedNames = (0, devkit_1.names)(name);
|
|
125
|
+
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files-readme'), directory, {
|
|
126
|
+
formattedNames,
|
|
127
|
+
appName,
|
|
128
|
+
name,
|
|
129
|
+
});
|
|
130
|
+
}
|
|
131
|
+
function createPrettierrc(tree, options) {
|
|
132
|
+
(0, devkit_1.writeJson)(tree, (0, path_1.join)(options.directory, '.prettierrc'), exports.DEFAULT_NRWL_PRETTIER_CONFIG);
|
|
122
133
|
}
|
|
123
134
|
// ensure that pnpm install add all the missing peer deps
|
|
124
|
-
function createNpmrc(
|
|
125
|
-
|
|
135
|
+
function createNpmrc(tree, options) {
|
|
136
|
+
tree.write((0, path_1.join)(options.directory, '.npmrc'), 'strict-peer-dependencies=false\nauto-install-peers=true\n');
|
|
126
137
|
}
|
|
127
138
|
// ensure that yarn (berry) install uses classic node linker
|
|
128
|
-
function createYarnrcYml(
|
|
129
|
-
|
|
139
|
+
function createYarnrcYml(tree, options) {
|
|
140
|
+
tree.write((0, path_1.join)(options.directory, '.yarnrc.yml'), 'nodeLinker: node-modules\n');
|
|
130
141
|
}
|
|
131
|
-
function addNpmScripts(
|
|
132
|
-
if (options.preset === presets_1.Preset.
|
|
133
|
-
(0, devkit_1.updateJson)(
|
|
142
|
+
function addNpmScripts(tree, options) {
|
|
143
|
+
if (options.preset === presets_1.Preset.AngularMonorepo) {
|
|
144
|
+
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
|
|
134
145
|
Object.assign(json.scripts, {
|
|
135
146
|
ng: 'nx',
|
|
136
147
|
postinstall: 'node ./decorate-angular-cli.js',
|
|
@@ -141,7 +152,7 @@ function addNpmScripts(host, options) {
|
|
|
141
152
|
if (options.preset !== presets_1.Preset.TS &&
|
|
142
153
|
options.preset !== presets_1.Preset.Core &&
|
|
143
154
|
options.preset !== presets_1.Preset.NPM) {
|
|
144
|
-
(0, devkit_1.updateJson)(
|
|
155
|
+
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
|
|
145
156
|
Object.assign(json.scripts, {
|
|
146
157
|
start: 'nx serve',
|
|
147
158
|
build: 'nx build',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-workspace-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,mDAK8B;AAC9B,2BAAkC;AAClC,+BAA8C;AAC9C,8CAA0C;AAC1C,+DAAiE;AAGpD,QAAA,4BAA4B,GAAG;IAC1C,WAAW,EAAE,IAAI;CAClB,CAAC;AAEF,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,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5B,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,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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"}
|
|
@@ -22,7 +22,7 @@ function createPreset(tree, options) {
|
|
|
22
22
|
if (options.preset === presets_1.Preset.Empty || options.preset === presets_1.Preset.Apps) {
|
|
23
23
|
return;
|
|
24
24
|
}
|
|
25
|
-
else if (options.preset === presets_1.Preset.
|
|
25
|
+
else if (options.preset === presets_1.Preset.AngularMonorepo) {
|
|
26
26
|
const { applicationGenerator: angularApplicationGenerator, } = require('@nrwl' + '/angular/generators');
|
|
27
27
|
yield angularApplicationGenerator(tree, {
|
|
28
28
|
name: options.name,
|
|
@@ -31,7 +31,18 @@ function createPreset(tree, options) {
|
|
|
31
31
|
standaloneConfig: options.standaloneConfig,
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
|
-
else if (options.preset === presets_1.Preset.
|
|
34
|
+
else if (options.preset === presets_1.Preset.AngularStandalone) {
|
|
35
|
+
const { applicationGenerator: angularApplicationGenerator, } = require('@nrwl' + '/angular/generators');
|
|
36
|
+
yield angularApplicationGenerator(tree, {
|
|
37
|
+
name: options.name,
|
|
38
|
+
style: options.style,
|
|
39
|
+
linter: 'none',
|
|
40
|
+
unitTestRunner: 'none',
|
|
41
|
+
standaloneConfig: options.standaloneConfig,
|
|
42
|
+
rootProject: true,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
else if (options.preset === presets_1.Preset.ReactMonorepo) {
|
|
35
46
|
const { applicationGenerator: reactApplicationGenerator, } = require('@nrwl' + '/react');
|
|
36
47
|
yield reactApplicationGenerator(tree, {
|
|
37
48
|
name: options.name,
|
|
@@ -40,7 +51,7 @@ function createPreset(tree, options) {
|
|
|
40
51
|
standaloneConfig: options.standaloneConfig,
|
|
41
52
|
});
|
|
42
53
|
}
|
|
43
|
-
else if (options.preset === presets_1.Preset.
|
|
54
|
+
else if (options.preset === presets_1.Preset.ReactStandalone) {
|
|
44
55
|
const { applicationGenerator: reactApplicationGenerator, } = require('@nrwl' + '/react');
|
|
45
56
|
yield reactApplicationGenerator(tree, {
|
|
46
57
|
name: options.name,
|
|
@@ -49,6 +60,7 @@ function createPreset(tree, options) {
|
|
|
49
60
|
unitTestRunner: 'none',
|
|
50
61
|
standaloneConfig: options.standaloneConfig,
|
|
51
62
|
rootProject: true,
|
|
63
|
+
bundler: 'vite',
|
|
52
64
|
});
|
|
53
65
|
}
|
|
54
66
|
else if (options.preset === presets_1.Preset.NextJs) {
|