nx 14.1.6-beta.1 → 14.1.7-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.
Files changed (29) hide show
  1. package/migrations.json +6 -0
  2. package/package.json +4 -4
  3. package/schemas/nx-schema.json +127 -0
  4. package/schemas/project-schema.json +68 -0
  5. package/schemas/workspace-schema.json +134 -0
  6. package/src/command-line/format.js +15 -2
  7. package/src/command-line/format.js.map +1 -1
  8. package/src/command-line/migrate.js +14 -5
  9. package/src/command-line/migrate.js.map +1 -1
  10. package/src/command-line/run-one.js +5 -0
  11. package/src/command-line/run-one.js.map +1 -1
  12. package/src/generators/utils/project-configuration.d.ts +2 -1
  13. package/src/generators/utils/project-configuration.js +11 -4
  14. package/src/generators/utils/project-configuration.js.map +1 -1
  15. package/src/hasher/git-hasher.d.ts +1 -0
  16. package/src/hasher/git-hasher.js +23 -24
  17. package/src/hasher/git-hasher.js.map +1 -1
  18. package/src/migrations/update-14-0-6/remove-roots.js +4 -1
  19. package/src/migrations/update-14-0-6/remove-roots.js.map +1 -1
  20. package/src/migrations/update-14-2-0/add-json-schema.d.ts +2 -0
  21. package/src/migrations/update-14-2-0/add-json-schema.js +38 -0
  22. package/src/migrations/update-14-2-0/add-json-schema.js.map +1 -0
  23. package/src/project-graph/build-nodes/workspace-projects.js +2 -2
  24. package/src/project-graph/build-nodes/workspace-projects.js.map +1 -1
  25. package/src/tasks-runner/utils.js +4 -2
  26. package/src/tasks-runner/utils.js.map +1 -1
  27. package/src/utils/package-manager.js +5 -5
  28. package/src/utils/package-manager.js.map +1 -1
  29. package/src/utils/versions.js +1 -1
package/migrations.json CHANGED
@@ -5,6 +5,12 @@
5
5
  "version": "14.0.6",
6
6
  "description": "Remove root property from project.json files",
7
7
  "factory": "./src/migrations/update-14-0-6/remove-roots"
8
+ },
9
+ "14-2-0-add-json-schema": {
10
+ "cli": "nx",
11
+ "version": "14.2.0-beta.0",
12
+ "description": "Add JSON Schema to Nx configuration files",
13
+ "factory": "./src/migrations/update-14-2-0/add-json-schema"
8
14
  }
9
15
  }
10
16
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nx",
3
- "version": "14.1.6-beta.1",
3
+ "version": "14.1.7-beta.2",
4
4
  "description": "Smart, Fast and Extensible Build System",
5
5
  "repository": {
6
6
  "type": "git",
@@ -42,7 +42,7 @@
42
42
  "chokidar": "^3.5.1",
43
43
  "cli-cursor": "3.1.0",
44
44
  "cli-spinners": "2.6.1",
45
- "fs-extra": "^9.1.0",
45
+ "fs-extra": "^10.1.0",
46
46
  "dotenv": "~10.0.0",
47
47
  "figures": "3.2.0",
48
48
  "glob": "7.1.4",
@@ -62,8 +62,8 @@
62
62
  "minimatch": "3.0.4",
63
63
  "enquirer": "~2.3.6",
64
64
  "tslib": "^2.3.0",
65
- "@nrwl/cli": "14.1.6-beta.1",
66
- "@nrwl/tao": "14.1.6-beta.1"
65
+ "@nrwl/cli": "14.1.7-beta.2",
66
+ "@nrwl/tao": "14.1.7-beta.2"
67
67
  },
68
68
  "nx-migrations": {
69
69
  "migrations": "./migrations.json",
package/schemas/nx-schema.json ADDED
@@ -0,0 +1,127 @@
1
+ {
2
+ "$schema": "http://json-schema.org/draft-07/schema",
3
+ "$id": "https://nx.dev/core-concepts/configuration#nxjson",
4
+ "title": "JSON schema for Nx configuration",
5
+ "type": "object",
6
+ "properties": {
7
+ "implicitDependencies": {
8
+ "type": "object",
9
+ "description": "Map of files to projects that implicitly depend on them."
10
+ },
11
+ "affected": {
12
+ "type": "object",
13
+ "description": "Default options for `nx affected`.",
14
+ "properties": {
15
+ "defaultBase": {
16
+ "type": "string",
17
+ "description": "Default based branch used by affected commands."
18
+ }
19
+ },
20
+ "additionalProperties": false
21
+ },
22
+ "npmScope": {
23
+ "type": "string",
24
+ "description": "NPM Scope that the workspace uses."
25
+ },
26
+ "tasksRunnerOptions": {
27
+ "type": "object",
28
+ "additionalProperties": {
29
+ "$ref": "#/definitions/tasksRunnerOptions"
30
+ }
31
+ },
32
+ "targetDependencies": {
33
+ "type": "object",
34
+ "description": "Dependencies between different target names across all projects.",
35
+ "additionalProperties": {
36
+ "$ref": "#/definitions/targetDependencyConfig"
37
+ }
38
+ },
39
+ "workspaceLayout": {
40
+ "type": "object",
41
+ "description": "Where new apps + libs should be placed.",
42
+ "properties": {
43
+ "libsDir": {
44
+ "type": "string",
45
+ "description": "Default folder name for libs."
46
+ },
47
+ "appsDir": {
48
+ "type": "string",
49
+ "description": "Default folder name for apps."
50
+ }
51
+ },
52
+ "additionalProperties": false
53
+ },
54
+ "cli": {
55
+ "$ref": "#/definitions/cliOptions"
56
+ },
57
+ "generators": {
58
+ "$ref": "#/definitions/generatorOptions"
59
+ },
60
+ "plugins": {
61
+ "type": "array",
62
+ "description": "Plugins for extending the project graph.",
63
+ "items": {
64
+ "type": "string"
65
+ }
66
+ },
67
+ "defaultProject": {
68
+ "type": "string",
69
+ "description": "Default project. When project isn't provided, the default project will be used."
70
+ }
71
+ },
72
+ "definitions": {
73
+ "cliOptions": {
74
+ "type": "object",
75
+ "description": "Default generator collection.",
76
+ "properties": {
77
+ "packageManager": {
78
+ "type": "string",
79
+ "description": "The default package manager to use.",
80
+ "enum": ["yarn", "pnpm", "npm"]
81
+ },
82
+ "defaultCollection": {
83
+ "type": "string",
84
+ "description": "The default schematics collection to use."
85
+ }
86
+ }
87
+ },
88
+ "generatorOptions": {
89
+ "type": "object",
90
+ "description": "List of default values used by generators."
91
+ },
92
+ "tasksRunnerOptions": {
93
+ "type": "object",
94
+ "description": "Available Task Runners.",
95
+ "properties": {
96
+ "runner": {
97
+ "type": "string",
98
+ "description": "Path to resolve the runner."
99
+ },
100
+ "options": {
101
+ "type": "object",
102
+ "description": "Default options for the runner."
103
+ }
104
+ },
105
+ "additionalProperties": false
106
+ },
107
+ "targetDependencyConfig": {
108
+ "type": "array",
109
+ "description": "Target dependency.",
110
+ "items": {
111
+ "type": "object",
112
+ "properties": {
113
+ "projects": {
114
+ "type": "string",
115
+ "description": "The projects that the targets belong to.",
116
+ "enum": ["self", "dependencies"]
117
+ },
118
+ "target": {
119
+ "type": "string",
120
+ "description": "The name of the target."
121
+ }
122
+ },
123
+ "additionalProperties": false
124
+ }
125
+ }
126
+ }
127
+ }
package/schemas/project-schema.json ADDED
@@ -0,0 +1,68 @@
1
+ {
2
+ "$schema": "http://json-schema.org/draft-07/schema",
3
+ "$id": "https://nx.dev/project-schema",
4
+ "title": "JSON schema for Nx projects",
5
+ "type": "object",
6
+ "properties": {
7
+ "targets": {
8
+ "type": "object",
9
+ "description": "Configures all the targets which define what tasks you can run against the project",
10
+ "additionalProperties": {
11
+ "type": "object",
12
+ "properties": {
13
+ "executor": {
14
+ "description": "The function that Nx will invoke when you run this target",
15
+ "type": "string"
16
+ },
17
+ "options": {
18
+ "type": "object"
19
+ },
20
+ "outputs": {
21
+ "type": "array",
22
+ "items": {
23
+ "type": "string"
24
+ }
25
+ },
26
+ "configurations": {
27
+ "type": "object",
28
+ "description": "provides extra sets of values that will be merged into the options map",
29
+ "additionalProperties": {
30
+ "type": "object"
31
+ }
32
+ },
33
+ "dependsOn": {
34
+ "type": "array",
35
+ "description": "Target dependency.",
36
+ "items": {
37
+ "type": "object",
38
+ "properties": {
39
+ "projects": {
40
+ "type": "string",
41
+ "description": "The projects that the targets belong to.",
42
+ "enum": ["self", "dependencies"]
43
+ },
44
+ "target": {
45
+ "type": "string",
46
+ "description": "The name of the target."
47
+ }
48
+ },
49
+ "additionalProperties": false
50
+ }
51
+ }
52
+ }
53
+ }
54
+ },
55
+ "tags": {
56
+ "type": "array",
57
+ "items": {
58
+ "type": "string"
59
+ }
60
+ },
61
+ "implicitDependencies": {
62
+ "type": "array",
63
+ "items": {
64
+ "type": "string"
65
+ }
66
+ }
67
+ }
68
+ }
package/schemas/workspace-schema.json ADDED
@@ -0,0 +1,134 @@
1
+ {
2
+ "$schema": "http://json-schema.org/draft-07/schema",
3
+ "$id": "https://nx.dev",
4
+ "title": "JSON schema for Nx workspaces",
5
+ "type": "object",
6
+ "properties": {
7
+ "version": {
8
+ "type": "number",
9
+ "enum": [1, 2]
10
+ }
11
+ },
12
+ "allOf": [
13
+ {
14
+ "if": {
15
+ "properties": { "version": { "const": 2 } },
16
+ "required": ["version"]
17
+ },
18
+ "then": {
19
+ "properties": {
20
+ "projects": {
21
+ "type": "object",
22
+ "additionalProperties": {
23
+ "oneOf": [
24
+ {
25
+ "type": "string"
26
+ },
27
+ {
28
+ "type": "object",
29
+ "properties": {
30
+ "targets": {
31
+ "type": "object",
32
+ "description": "Configures all the targets which define what tasks you can run against the project",
33
+ "additionalProperties": {
34
+ "type": "object",
35
+ "properties": {
36
+ "executor": {
37
+ "description": "The function that Nx will invoke when you run this target",
38
+ "type": "string"
39
+ },
40
+ "options": {
41
+ "type": "object"
42
+ },
43
+ "outputs": {
44
+ "type": "array",
45
+ "items": {
46
+ "type": "string"
47
+ }
48
+ },
49
+ "configurations": {
50
+ "type": "object",
51
+ "description": "provides extra sets of values that will be merged into the options map",
52
+ "additionalProperties": {
53
+ "type": "object"
54
+ }
55
+ },
56
+ "dependsOn": {
57
+ "type": "array",
58
+ "description": "Target dependency.",
59
+ "items": {
60
+ "type": "object",
61
+ "properties": {
62
+ "projects": {
63
+ "type": "string",
64
+ "description": "The projects that the targets belong to.",
65
+ "enum": ["self", "dependencies"]
66
+ },
67
+ "target": {
68
+ "type": "string",
69
+ "description": "The name of the target."
70
+ }
71
+ },
72
+ "additionalProperties": false
73
+ }
74
+ }
75
+ }
76
+ }
77
+ },
78
+ "tags": {
79
+ "type": "array",
80
+ "items": {
81
+ "type": "string"
82
+ }
83
+ },
84
+ "implicitDependencies": {
85
+ "type": "array",
86
+ "items": {
87
+ "type": "string"
88
+ }
89
+ }
90
+ }
91
+ }
92
+ ]
93
+ }
94
+ }
95
+ }
96
+ },
97
+ "else": {
98
+ "properties": {
99
+ "projects": {
100
+ "type": "object",
101
+ "additionalProperties": {
102
+ "type": "object",
103
+ "properties": {
104
+ "architect": {
105
+ "type": "object",
106
+ "description": "Configures all the targets which define what tasks you can run against the project",
107
+ "additionalProperties": {
108
+ "type": "object",
109
+ "properties": {
110
+ "builder": {
111
+ "description": "The function that Nx will invoke when you run this architect",
112
+ "type": "string"
113
+ },
114
+ "options": {
115
+ "type": "object"
116
+ },
117
+ "configurations": {
118
+ "type": "object",
119
+ "description": "provides extra sets of values that will be merged into the options map",
120
+ "additionalProperties": {
121
+ "type": "object"
122
+ }
123
+ }
124
+ }
125
+ }
126
+ }
127
+ }
128
+ }
129
+ }
130
+ }
131
+ }
132
+ }
133
+ ]
134
+ }
package/src/command-line/format.js CHANGED
@@ -59,7 +59,11 @@ function getPatterns(args) {
59
59
  const supportedExtensions = prettier
60
60
  .getSupportInfo()
61
61
  .languages.flatMap((language) => language.extensions)
62
- .filter((extension) => !!extension);
62
+ .filter((extension) => !!extension)
63
+ // Prettier supports ".swcrc" as a file instead of an extension
64
+ // So we add ".swcrc" as a supported extension manually
65
+ // which allows it to be considered for calculating "patterns"
66
+ .concat('.swcrc');
63
67
  const patterns = p.files.filter((f) => (0, fileutils_1.fileExists)(f) && supportedExtensions.includes(path.extname(f)));
64
68
  return args.libsAndApps
65
69
  ? yield getPatternsFromApps(patterns, graph.allWorkspaceFiles)
@@ -110,9 +114,18 @@ function chunkify(target, size) {
110
114
  }
111
115
  function write(patterns) {
112
116
  if (patterns.length > 0) {
113
- (0, child_process_1.execSync)(`node "${PRETTIER_PATH}" --write ${patterns.join(' ')}`, {
117
+ const [swcrcPatterns, regularPatterns] = patterns.reduce((result, pattern) => {
118
+ result[pattern.includes('.swcrc') ? 0 : 1].push(pattern);
119
+ return result;
120
+ }, [[], []]);
121
+ (0, child_process_1.execSync)(`node "${PRETTIER_PATH}" --write --list-different ${regularPatterns.join(' ')}`, {
114
122
  stdio: [0, 1, 2],
115
123
  });
124
+ if (swcrcPatterns.length > 0) {
125
+ (0, child_process_1.execSync)(`node "${PRETTIER_PATH}" --write --list-different ${swcrcPatterns.join(' ')} --parser json`, {
126
+ stdio: [0, 1, 2],
127
+ });
128
+ }
116
129
  }
117
130
  }
118
131
  function check(patterns) {
package/src/command-line/format.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/format.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/format.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,oEAKqC;AACrC,kDAAgD;AAChD,4DAA6E;AAE7E,qDAG8B;AAC9B,gDAAkD;AAClD,qCAAqC;AACrC,sDAAwD;AACxD,oDAG6B;AAC7B,kDAAiE;AAEjE,kEAAyE;AACzE,6FAAkF;AAMlF,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAE/D,SAAsB,MAAM,CAC1B,OAA0B,EAC1B,IAAqB;;QAErB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,oDAA+B,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACrE,MAAM,QAAQ,GAAG,CAAC,MAAM,WAAW,CAAC,gCAAK,IAAI,GAAK,MAAM,CAAS,CAAC,CAAC,CAAC,GAAG,CACrE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAChB,CAAC;QAEF,uEAAuE;QACvE,MAAM,SAAS,GAAe,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAErD,QAAQ,OAAO,EAAE;YACf,KAAK,OAAO;gBACV,MAAM,iBAAiB,GAAG,IAAA,gCAAmB,EAAC,wBAAa,CAAC,CAAC;gBAC7D,IAAI,iBAAiB,EAAE;oBACrB,uCAAuC,CAAC,iBAAiB,CAAC,CAAC;oBAC3D,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;oBACrC,4BAA4B,CAAC,iBAAiB,CAAC,CAAC;iBACjD;gBACD,YAAY,EAAE,CAAC;gBACf,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBACzD,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC3C,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAC3B,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,EACrC,IAAI,CACL,CAAC;gBACF,IAAI,CAAC,IAAI,EAAE;oBACT,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACjB;gBACD,MAAM;SACT;IACH,CAAC;CAAA;AAlCD,wBAkCC;AAED,SAAe,WAAW,CACxB,IAAoD;;QAEpD,MAAM,KAAK,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QAC9C,MAAM,eAAe,GAAG,CAAC,GAAG,CAAC,CAAC;QAE9B,IAAI,IAAI,CAAC,GAAG,EAAE;YACZ,OAAO,eAAe,CAAC;SACxB;QAED,IAAI;YACF,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7C,OAAO,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAC/C;YAED,MAAM,CAAC,GAAG,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC;YAE3B,MAAM,mBAAmB,GAAG,QAAQ;iBACjC,cAAc,EAAE;iBAChB,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;iBACpD,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;gBACnC,+DAA+D;gBAC/D,uDAAuD;gBACvD,8DAA8D;iBAC7D,MAAM,CAAC,QAAQ,CAAC,CAAC;YAEpB,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAC7B,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,sBAAU,EAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CACtE,CAAC;YAEF,OAAO,IAAI,CAAC,WAAW;gBACrB,CAAC,CAAC,MAAM,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC;gBAC9D,CAAC,CAAC,QAAQ,CAAC;SACd;QAAC,WAAM;YACN,OAAO,eAAe,CAAC;SACxB;IACH,CAAC;CAAA;AAED,SAAe,mBAAmB,CAChC,aAAuB,EACvB,iBAA6B;;QAE7B,MAAM,KAAK,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QAC9C,MAAM,aAAa,GAAG,IAAA,uCAAc,EAClC,KAAK,EACL,IAAA,iCAAoB,EAAC,aAAa,EAAE,iBAAiB,CAAC,CACvD,CAAC;QACF,OAAO,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IACnE,CAAC;CAAA;AAED,SAAS,kBAAkB,CACzB,SAAqB,EACrB,MAAc,EACd,iBAAgC;IAEhC,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,OAAO;KACR;IACD,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE;QAC1C,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,EAAE;YACpD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClB;IACH,CAAC,CAAC;IACF,IAAI,iBAAiB,EAAE;QACrB,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;KACvC;IACD,CAAC,SAAS,EAAE,IAAA,oCAAuB,GAAE,CAAC;SACnC,MAAM,CAAC,OAAO,CAAC;SACf,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAE/B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACvB;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,QAAkB;IACjD,OAAO,IAAA,oCAAe,EAAC,QAAQ,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,QAAQ,CAAC,MAAgB,EAAE,IAAY;IAC9C,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,OAAmB,EAAE,KAAa,EAAE,KAAa,EAAE,EAAE;QACzE,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,SAAS,KAAK,CAAC,QAAkB;IAC/B,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,CAAC,aAAa,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,MAAM,CACtD,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YAClB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CAAC,EAAE,EAAE,EAAE,CAAyD,CACjE,CAAC;QAEF,IAAA,wBAAQ,EACN,SAAS,aAAa,8BAA8B,eAAe,CAAC,IAAI,CACtE,GAAG,CACJ,EAAE,EACH;YACE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CACF,CAAC;QAEF,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,IAAA,wBAAQ,EACN,SAAS,aAAa,8BAA8B,aAAa,CAAC,IAAI,CACpE,GAAG,CACJ,gBAAgB,EACjB;gBACE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CACF,CAAC;SACH;KACF;AACH,CAAC;AAED,SAAS,KAAK,CAAC,QAAkB;IAC/B,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC;KACb;IACD,IAAI;QACF,IAAA,wBAAQ,EAAC,SAAS,aAAa,sBAAsB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YACzE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACb;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAS,uCAAuC,CAAC,iBAAyB;IACxE,IAAI;QACF,MAAM,aAAa,GAAG,IAAA,wBAAY,EAAC,iBAAiB,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,IAAA,2CAA8B,EAAC,aAAa,CAAC,CAAC;QAClE,IAAI,WAAW,EAAE;YACf,IAAA,yBAAa,EAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;SAC/C;KACF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,sCAAsC,iBAAiB,EAAE,CAAC,CAAC;QACzE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,iBAAyB;IAClD,IAAI;QACF,MAAM,aAAa,GAAG,IAAA,wBAAY,EAAC,iBAAiB,CAAC,CAAC;QACtD,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACvD,MAAM,cAAc,GAAG,IAAA,8BAAgB,EAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChE,aAAa,CAAC,QAAQ,GAAG,cAAc,CAAC;YACxC,IAAA,yBAAa,EAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;SACjD;KACF;IAAC,OAAO,CAAC,EAAE;QACV,aAAa;KACd;AACH,CAAC;AAED,SAAS,YAAY;IACnB,IAAI;QACF,MAAM,YAAY,GAAG,IAAA,gCAAmB,GAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,IAAA,wBAAY,EAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,IAAA,8BAAgB,EAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACrE,QAAQ,CAAC,eAAe,CAAC,KAAK,GAAG,WAAW,CAAC;QAC7C,IAAA,yBAAa,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;KACvC;IAAC,OAAO,CAAC,EAAE;QACV,aAAa;KACd;AACH,CAAC;AAED,SAAS,4BAA4B,CAAC,iBAAyB;;IAC7D,IAAI;QACF,MAAM,aAAa,GAAG,IAAA,wBAAY,EAEhC,iBAAiB,CAAC,CAAC;QACrB,MAAM,MAAM,GAAG,IAAA,wBAAY,EAEzB,SAAS,CAAC,CAAC;QACb,IACE,aAAa,CAAC,GAAG;YACjB,aAAa,CAAC,UAAU;YACxB,MAAM,CAAC,QAAQ;YACf,MAAM,CAAC,cAAc,EACrB;YACA,MAAA,MAAM,CAAC,GAAG,oCAAV,MAAM,CAAC,GAAG,GAAK,aAAa,CAAC,GAAG,EAAC;YACjC,MAAA,MAAM,CAAC,UAAU,oCAAjB,MAAM,CAAC,UAAU,GACf,MAAA,aAAa,CAAC,UAAU,mCAAK,aAAqB,CAAC,UAAU,EAAC;YAChE,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,aAAa,CAAC,cAAc,EAAC;YACvD,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO,aAAa,CAAC,YAAY,CAAC,CAAC;YACnC,OAAO,aAAa,CAAC,gBAAgB,CAAC,CAAC;YACvC,gDAAgD,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YACxE,IAAA,yBAAa,EAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;YAChD,IAAA,yBAAa,EAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAClC;KACF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CACX,6CAA6C,iBAAiB,EAAE,CACjE,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC;AAED,SAAgB,gDAAgD,CAC9D,aAAyC,EACzC,MAKC;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,OAAO;KACR;IACD,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE;QAC5D,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,mCAC1B,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,GAC/B,MAAM,CACV,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC,QAAQ,CAAC;AACzB,CAAC;AAnBD,4GAmBC"}
package/src/command-line/migrate.js CHANGED
@@ -543,16 +543,25 @@ function isMigratingToNewMajor(from, to) {
543
543
  return (0, semver_1.major)(from) < (0, semver_1.major)(to);
544
544
  });
545
545
  }
546
+ function readNxVersion(packageJson) {
547
+ var _a, _b, _c, _d, _e, _f, _g;
548
+ return ((_f = (_d = (_b = (_a = packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies) === null || _a === void 0 ? void 0 : _a['nx']) !== null && _b !== void 0 ? _b : (_c = packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) === null || _c === void 0 ? void 0 : _c['nx']) !== null && _d !== void 0 ? _d : (_e = packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies) === null || _e === void 0 ? void 0 : _e['@nrwl/workspace']) !== null && _f !== void 0 ? _f : (_g = packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) === null || _g === void 0 ? void 0 : _g['@nrwl/workspace']);
549
+ }
546
550
  function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
547
- var _a, _b, _c;
548
551
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
549
552
  const pmc = (0, package_manager_1.getPackageManagerCommand)();
550
553
  try {
551
554
  let originalPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
552
- if (['nx', '@nrwl/workspace'].includes(opts.targetPackage) &&
553
- (yield isMigratingToNewMajor((_b = (_a = originalPackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a['nx']) !== null && _b !== void 0 ? _b : (_c = originalPackageJson.devDependencies) === null || _c === void 0 ? void 0 : _c['@nrwl/workspace'], opts.targetVersion))) {
554
- yield (0, connect_to_nx_cloud_1.connectToNxCloudCommand)('We noticed you are migrating to a new major version, but are not taking advantage of Nx Cloud. Nx Cloud can make your CI up to 10 times faster. Learn more about it here: nx.app. Would you like to add it?');
555
- originalPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
555
+ try {
556
+ if (['nx', '@nrwl/workspace'].includes(opts.targetPackage) &&
557
+ (yield isMigratingToNewMajor(readNxVersion(originalPackageJson), opts.targetVersion))) {
558
+ yield (0, connect_to_nx_cloud_1.connectToNxCloudCommand)('We noticed you are migrating to a new major version, but are not taking advantage of Nx Cloud. Nx Cloud can make your CI up to 10 times faster. Learn more about it here: nx.app. Would you like to add it?');
559
+ originalPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
560
+ }
561
+ }
562
+ catch (_a) {
563
+ // The above code is to remind folks when updating to a new major and not currently using Nx cloud.
564
+ // If for some reason it fails, it shouldn't affect the overall migration process
556
565
  }
557
566
  logger_1.logger.info(`Fetching meta data about packages.`);
558
567
  logger_1.logger.info(`It may take a few minutes.`);
package/src/command-line/migrate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/migrate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/migrate.ts"],"names":[],"mappings":"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"}
package/src/command-line/run-one.js CHANGED
@@ -59,6 +59,11 @@ function parseRunOneOptions(cwd, parsedArgs, workspaceConfiguration) {
59
59
  if (parsedArgs['project:target:configuration'].indexOf(':') > -1) {
60
60
  // run case
61
61
  [project, target, configuration] = (0, split_target_1.splitTarget)(parsedArgs['project:target:configuration']);
62
+ // this is to account for "nx npmsript:dev"
63
+ if (project && !target && defaultProjectName) {
64
+ target = project;
65
+ project = defaultProjectName;
66
+ }
62
67
  }
63
68
  else {
64
69
  target = parsedArgs['project:target:configuration'];
package/src/command-line/run-one.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"run-one.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-one.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run-one.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-one.ts"],"names":[],"mappings":"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"}
package/src/generators/utils/project-configuration.d.ts CHANGED
@@ -1,6 +1,6 @@
1
- import type { Tree } from '../tree';
2
1
  import type { NxJsonConfiguration } from '../../config/nx-json';
3
2
  import { ProjectConfiguration, WorkspaceJsonConfiguration } from '../../config/workspace-json-project-json';
3
+ import type { Tree } from '../tree';
4
4
  export declare type WorkspaceConfiguration = Omit<WorkspaceJsonConfiguration, 'projects'> & Partial<NxJsonConfiguration>;
5
5
  /**
6
6
  * Adds project configuration to the Nx workspace.
@@ -69,6 +69,7 @@ export declare function readNxJson(tree: Tree): NxJsonConfiguration | null;
69
69
  * @param project - the project name
70
70
  */
71
71
  export declare function isStandaloneProject(tree: Tree, project: string): boolean;
72
+ export declare function getRelativeProjectJsonSchemaPath(tree: Tree, project: ProjectConfiguration): string;
72
73
  /**
73
74
  * Read the workspace configuration, including projects.
74
75
  */
package/src/generators/utils/project-configuration.js CHANGED
@@ -1,11 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getWorkspacePath = exports.shouldDefaultToUsingStandaloneConfigs = exports.readWorkspace = exports.isStandaloneProject = exports.readNxJson = exports.readProjectConfiguration = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.getProjects = exports.removeProjectConfiguration = exports.updateProjectConfiguration = exports.addProjectConfiguration = void 0;
3
+ exports.getWorkspacePath = exports.shouldDefaultToUsingStandaloneConfigs = exports.readWorkspace = exports.getRelativeProjectJsonSchemaPath = exports.isStandaloneProject = exports.readNxJson = exports.readProjectConfiguration = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.getProjects = exports.removeProjectConfiguration = exports.updateProjectConfiguration = exports.addProjectConfiguration = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const workspaces_1 = require("../../config/workspaces");
6
5
  const path_1 = require("path");
7
- const json_1 = require("./json");
6
+ const workspaces_1 = require("../../config/workspaces");
8
7
  const path_2 = require("../../utils/path");
8
+ const json_1 = require("./json");
9
9
  /**
10
10
  * Adds project configuration to the Nx workspace.
11
11
  *
@@ -202,6 +202,10 @@ function setProjectConfiguration(tree, projectName, projectConfiguration, mode,
202
202
  }
203
203
  addProjectToWorkspaceJson(tree, projectName, projectConfiguration, mode, standalone);
204
204
  }
205
+ function getRelativeProjectJsonSchemaPath(tree, project) {
206
+ return (0, path_1.relative)((0, path_1.join)(tree.root, project.root), (0, path_1.join)(tree.root, 'node_modules/nx/schemas/project-schema.json'));
207
+ }
208
+ exports.getRelativeProjectJsonSchemaPath = getRelativeProjectJsonSchemaPath;
205
209
  function addProjectToWorkspaceJson(tree, projectName, project, mode, standalone = false) {
206
210
  var _a;
207
211
  const workspaceConfigPath = getWorkspacePath(tree);
@@ -215,6 +219,9 @@ function addProjectToWorkspaceJson(tree, projectName, project, mode, standalone
215
219
  const configFile = (mode === 'create' && standalone) || !workspaceConfigPath
216
220
  ? (0, path_2.joinPathFragments)(project.root, 'project.json')
217
221
  : getProjectFileLocation(tree, projectName);
222
+ const jsonSchema = configFile && mode === 'create'
223
+ ? { $schema: getRelativeProjectJsonSchemaPath(tree, project) }
224
+ : {};
218
225
  if (configFile) {
219
226
  if (mode === 'delete') {
220
227
  tree.delete(configFile);
@@ -226,7 +233,7 @@ function addProjectToWorkspaceJson(tree, projectName, project, mode, standalone
226
233
  workspaceJson.projects[projectName] = project.root;
227
234
  }
228
235
  // update the project.json file
229
- (0, json_1.writeJson)(tree, configFile, Object.assign(Object.assign({}, project), { root: undefined }));
236
+ (0, json_1.writeJson)(tree, configFile, Object.assign(Object.assign(Object.assign({}, jsonSchema), project), { root: undefined }));
230
237
  }
231
238
  }
232
239
  else if (mode === 'delete') {
package/src/generators/utils/project-configuration.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"project-configuration.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/utils/project-configuration.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"project-configuration.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/utils/project-configuration.ts"],"names":[],"mappings":"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"}
package/src/hasher/git-hasher.d.ts CHANGED
@@ -2,6 +2,7 @@ export declare function getGitHashForFiles(potentialFilesToHash: string[], path:
2
2
  hashes: Map<string, string>;
3
3
  deleted: string[];
4
4
  }>;
5
+ export declare function getGitHashForBatch(filesToHash: string[], path: any): Promise<Map<string, string>>;
5
6
  export declare function getFileHashes(path: string): Promise<{
6
7
  allFiles: Map<string, string>;
7
8
  }>;
package/src/hasher/git-hasher.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getFileHashes = exports.getGitHashForFiles = void 0;
3
+ exports.getFileHashes = exports.getGitHashForBatch = exports.getGitHashForFiles = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const child_process_1 = require("child_process");
6
6
  const fileutils_1 = require("../utils/fileutils");
@@ -32,10 +32,10 @@ exports.getGitHashForFiles = getGitHashForFiles;
32
32
  function getGitHashForBatch(filesToHash, path) {
33
33
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
34
34
  const res = new Map();
35
- const hashStdout = yield spawnProcess('git', ['hash-object', ...filesToHash], path);
35
+ const { stdout: hashStdout, stderr: hashStderr } = yield spawnProcess('git', ['hash-object', ...filesToHash], path);
36
36
  const hashes = hashStdout.split('\n').filter((s) => !!s);
37
37
  if (hashes.length !== filesToHash.length) {
38
- throw new Error(`Passed ${filesToHash.length} file paths to Git to hash, but received ${hashes.length} hashes.`);
38
+ throw new Error(`Passed ${filesToHash.length} file paths to Git to hash, but received ${hashes.length} hashes.\n${hashStderr}`);
39
39
  }
40
40
  for (let i = 0; i < hashes.length; i++) {
41
41
  const hash = hashes[i];
@@ -45,10 +45,11 @@ function getGitHashForBatch(filesToHash, path) {
45
45
  return res;
46
46
  });
47
47
  }
48
+ exports.getGitHashForBatch = getGitHashForBatch;
48
49
  function getActualFilesToHash(potentialFilesToHash, path) {
49
50
  const filesToHash = [];
50
51
  const deleted = [];
51
- for (let file of potentialFilesToHash) {
52
+ for (const file of potentialFilesToHash) {
52
53
  if ((0, fileutils_1.fileExists)((0, path_1.joinPathFragments)(path, file))) {
53
54
  filesToHash.push(file);
54
55
  }
@@ -59,7 +60,6 @@ function getActualFilesToHash(potentialFilesToHash, path) {
59
60
  return { filesToHash, deleted };
60
61
  }
61
62
  function spawnProcess(command, args, cwd) {
62
- var e_1, _a;
63
63
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
64
64
  const cp = (0, child_process_1.spawn)(command, args, {
65
65
  windowsHide: true,
@@ -67,29 +67,28 @@ function spawnProcess(command, args, cwd) {
67
67
  cwd,
68
68
  });
69
69
  let stdout = '';
70
- try {
71
- for (var _b = tslib_1.__asyncValues(cp.stdout), _c; _c = yield _b.next(), !_c.done;) {
72
- const data = _c.value;
73
- stdout += data;
74
- }
75
- }
76
- catch (e_1_1) { e_1 = { error: e_1_1 }; }
77
- finally {
78
- try {
79
- if (_c && !_c.done && (_a = _b.return)) yield _a.call(_b);
80
- }
81
- finally { if (e_1) throw e_1.error; }
82
- }
83
- return stdout;
70
+ let stderr = '';
71
+ cp.stdout.on('data', (data) => {
72
+ stdout += data;
73
+ });
74
+ cp.stderr.on('data', (data) => {
75
+ stderr += data;
76
+ });
77
+ return new Promise((resolve) => {
78
+ cp.on('close', (code) => {
79
+ resolve({ code, stdout, stderr });
80
+ });
81
+ });
84
82
  });
85
83
  }
86
84
  function getStagedFiles(path) {
87
85
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
88
- const staged = yield spawnProcess('git', ['ls-files', '-s', '-z', '--exclude-standard', '.'], path);
86
+ const { stdout: staged } = yield spawnProcess('git', ['ls-files', '-s', '-z', '--exclude-standard', '.'], path);
89
87
  const res = new Map();
90
- for (let line of staged.split('\0')) {
91
- if (!line)
88
+ for (const line of staged.split('\0')) {
89
+ if (!line) {
92
90
  continue;
91
+ }
93
92
  const [_, hash, __, ...fileParts] = line.split(/\s/);
94
93
  const fileName = fileParts.join(' ');
95
94
  res.set(fileName, hash);
@@ -99,14 +98,14 @@ function getStagedFiles(path) {
99
98
  }
100
99
  function getUnstagedFiles(path) {
101
100
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
102
- const unstaged = yield spawnProcess('git', ['ls-files', '-m', '-z', '--exclude-standard', '.'], path);
101
+ const { stdout: unstaged } = yield spawnProcess('git', ['ls-files', '-m', '-z', '--exclude-standard', '.'], path);
103
102
  const lines = unstaged.split('\0').filter((f) => !!f);
104
103
  return getGitHashForFiles(lines, path);
105
104
  });
106
105
  }
107
106
  function getUntrackedFiles(path) {
108
107
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
109
- const untracked = yield spawnProcess('git', ['ls-files', '--other', '-z', '--exclude-standard', '.'], path);
108
+ const { stdout: untracked } = yield spawnProcess('git', ['ls-files', '--other', '-z', '--exclude-standard', '.'], path);
110
109
  const lines = untracked.split('\0').filter((f) => !!f);
111
110
  return getGitHashForFiles(lines, path);
112
111
  });
package/src/hasher/git-hasher.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"git-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/git-hasher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"git-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/git-hasher.ts"],"names":[],"mappings":"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"}
package/src/migrations/update-14-0-6/remove-roots.js CHANGED
@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
4
  const project_configuration_1 = require("../../generators/utils/project-configuration");
5
5
  const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
6
+ const path_1 = require("path");
6
7
  function default_1(tree) {
7
8
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
8
9
  // This looks like it does nothing, but this will actually effectively migrate over all the configs that need to be moved over, but won't touch configs that don't need to be moved
9
10
  for (const [projName, projConfig] of (0, project_configuration_1.getProjects)(tree)) {
10
- (0, project_configuration_1.updateProjectConfiguration)(tree, projName, projConfig);
11
+ if (tree.exists((0, path_1.join)(projConfig.root, 'project.json'))) {
12
+ (0, project_configuration_1.updateProjectConfiguration)(tree, projName, projConfig);
13
+ }
11
14
  }
12
15
  yield (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
13
16
  });
package/src/migrations/update-14-0-6/remove-roots.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"remove-roots.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-14-0-6/remove-roots.ts"],"names":[],"mappings":";;;AACA,wFAGsD;AACtD,qJAA4I;AAE5I,mBAA+B,IAAU;;QACvC,mLAAmL;QACnL,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,IAAA,mCAAW,EAAC,IAAI,CAAC,EAAE;YACtD,IAAA,kDAA0B,EAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;SACxD;QAED,MAAM,IAAA,2FAAyC,EAAC,IAAI,CAAC,CAAC;IACxD,CAAC;CAAA;AAPD,4BAOC"}
1
+ {"version":3,"file":"remove-roots.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-14-0-6/remove-roots.ts"],"names":[],"mappings":";;;AACA,wFAGsD;AACtD,qJAA4I;AAC5I,+BAA4B;AAE5B,mBAA+B,IAAU;;QACvC,mLAAmL;QACnL,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,IAAA,mCAAW,EAAC,IAAI,CAAC,EAAE;YACtD,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,UAAU,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE;gBACtD,IAAA,kDAA0B,EAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;aACxD;SACF;QAED,MAAM,IAAA,2FAAyC,EAAC,IAAI,CAAC,CAAC;IACxD,CAAC;CAAA;AATD,4BASC"}
package/src/migrations/update-14-2-0/add-json-schema.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ import type { Tree } from '../../generators/tree';
2
+ export default function (tree: Tree): Promise<void>;
package/src/migrations/update-14-2-0/add-json-schema.js ADDED
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const tslib_1 = require("tslib");
4
+ const json_1 = require("../../generators/utils/json");
5
+ const project_configuration_1 = require("../../generators/utils/project-configuration");
6
+ function default_1(tree) {
7
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
8
+ // update nx.json $schema
9
+ const isNxJsonExist = tree.exists('nx.json');
10
+ if (isNxJsonExist) {
11
+ (0, json_1.updateJson)(tree, 'nx.json', (json) => {
12
+ if (!json['$schema']) {
13
+ json['$schema'] = './node_modules/nx/schemas/nx-schema.json';
14
+ }
15
+ return json;
16
+ });
17
+ }
18
+ // update workspace.json $schema
19
+ const isWorkspaceJsonExist = tree.exists('workspace.json');
20
+ if (isWorkspaceJsonExist) {
21
+ (0, json_1.updateJson)(tree, 'workspace.json', (json) => {
22
+ if (!json['$schema']) {
23
+ json['$schema'] = './node_modules/nx/schemas/workspace-schema.json';
24
+ }
25
+ return json;
26
+ });
27
+ }
28
+ // update projects $schema
29
+ for (const [projName, projConfig] of (0, project_configuration_1.getProjects)(tree)) {
30
+ if (projConfig['$schema'])
31
+ continue;
32
+ const relativeProjectJsonSchemaPath = (0, project_configuration_1.getRelativeProjectJsonSchemaPath)(tree, projConfig);
33
+ (0, project_configuration_1.updateProjectConfiguration)(tree, projName, Object.assign({ $schema: relativeProjectJsonSchemaPath }, projConfig));
34
+ }
35
+ });
36
+ }
37
+ exports.default = default_1;
38
+ //# sourceMappingURL=add-json-schema.js.map
package/src/migrations/update-14-2-0/add-json-schema.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"add-json-schema.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-14-2-0/add-json-schema.ts"],"names":[],"mappings":";;;AAEA,sDAAyD;AACzD,wFAIsD;AAEtD,mBAA+B,IAAU;;QACvC,yBAAyB;QACzB,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,aAAa,EAAE;YACjB,IAAA,iBAAU,EAAC,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;gBACnC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;oBACpB,IAAI,CAAC,SAAS,CAAC,GAAG,0CAA0C,CAAC;iBAC9D;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;QAED,gCAAgC;QAChC,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC3D,IAAI,oBAAoB,EAAE;YACxB,IAAA,iBAAU,EAAC,IAAI,EAAE,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC1C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;oBACpB,IAAI,CAAC,SAAS,CAAC,GAAG,iDAAiD,CAAC;iBACrE;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;QAED,0BAA0B;QAC1B,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,IAAA,mCAAW,EAAC,IAAI,CAAC,EAAE;YACtD,IAAI,UAAU,CAAC,SAAS,CAAC;gBAAE,SAAS;YAEpC,MAAM,6BAA6B,GAAG,IAAA,wDAAgC,EACpE,IAAI,EACJ,UAAU,CACX,CAAC;YACF,IAAA,kDAA0B,EAAC,IAAI,EAAE,QAAQ,EAAE,gBACzC,OAAO,EAAE,6BAA6B,IACnC,UAAU,CACU,CAAC,CAAC;SAC5B;IACH,CAAC;CAAA;AApCD,4BAoCC"}
package/src/project-graph/build-nodes/workspace-projects.js CHANGED
@@ -15,10 +15,10 @@ function buildWorkspaceProjectNodes(ctx, builder) {
15
15
  if ((0, fs_1.existsSync)((0, path_1.join)(projectRoot, 'package.json'))) {
16
16
  p.targets = (0, project_graph_utils_1.mergeNpmScriptsWithTargets)(projectRoot, p.targets);
17
17
  const { nx } = (0, fileutils_1.readJsonFile)((0, path_1.join)(projectRoot, 'package.json'));
18
- if (nx.tags) {
18
+ if (nx === null || nx === void 0 ? void 0 : nx.tags) {
19
19
  p.tags = [...(p.tags || []), ...nx.tags];
20
20
  }
21
- if (nx.implicitDependencies) {
21
+ if (nx === null || nx === void 0 ? void 0 : nx.implicitDependencies) {
22
22
  p.implicitDependencies = [
23
23
  ...(p.implicitDependencies || []),
24
24
  ...nx.implicitDependencies,
package/src/project-graph/build-nodes/workspace-projects.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":"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"}
package/src/tasks-runner/utils.js CHANGED
@@ -8,6 +8,7 @@ const fs_1 = require("fs");
8
8
  const path_1 = require("path");
9
9
  const nx_plugin_1 = require("../utils/nx-plugin");
10
10
  const package_manager_1 = require("../utils/package-manager");
11
+ const app_root_1 = require("../utils/app-root");
11
12
  function getCommandAsString(task) {
12
13
  const execCommand = (0, package_manager_1.getPackageManagerCommand)().exec;
13
14
  const args = getPrintableCommandArgsForTask(task);
@@ -134,8 +135,9 @@ function interpolateOutputs(template, data) {
134
135
  function getExecutorNameForTask(task, workspace) {
135
136
  const workspaceConfiguration = workspace.readWorkspaceConfiguration();
136
137
  const project = workspaceConfiguration.projects[task.target.project];
137
- if ((0, fs_1.existsSync)((0, path_1.join)(project.root, 'package.json'))) {
138
- project.targets = (0, project_graph_utils_1.mergeNpmScriptsWithTargets)(project.root, project.targets);
138
+ const projectRoot = (0, path_1.join)(app_root_1.workspaceRoot, project.root);
139
+ if ((0, fs_1.existsSync)((0, path_1.join)(projectRoot, 'package.json'))) {
140
+ project.targets = (0, project_graph_utils_1.mergeNpmScriptsWithTargets)(projectRoot, project.targets);
139
141
  }
140
142
  project.targets = (0, nx_plugin_1.mergePluginTargetsWithNxTargets)(project.root, project.targets, (0, nx_plugin_1.loadNxPlugins)(workspaceConfiguration.plugins));
141
143
  if (!project.targets[task.target.target]) {
package/src/tasks-runner/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":"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"}
package/src/utils/package-manager.js CHANGED
@@ -48,10 +48,8 @@ function getPackageManagerCommand(packageManager = detectPackageManager()) {
48
48
  }),
49
49
  pnpm: () => {
50
50
  const pnpmVersion = getPackageManagerVersion('pnpm');
51
- let useExec = false;
52
- if ((0, semver_1.gte)(pnpmVersion, '6.13.0')) {
53
- useExec = true;
54
- }
51
+ const useExec = (0, semver_1.gte)(pnpmVersion, '6.13.0');
52
+ const includeDoubleDashBeforeArgs = (0, semver_1.lt)(pnpmVersion, '7.0.0');
55
53
  return {
56
54
  install: 'pnpm install --no-frozen-lockfile',
57
55
  ciInstall: 'pnpm install --frozen-lockfile',
@@ -60,7 +58,9 @@ function getPackageManagerCommand(packageManager = detectPackageManager()) {
60
58
  addGlobal: 'pnpm add -g',
61
59
  rm: 'pnpm rm',
62
60
  exec: useExec ? 'pnpm exec' : 'pnpx',
63
- run: (script, args) => `pnpm run ${script} -- ${args}`,
61
+ run: (script, args) => includeDoubleDashBeforeArgs
62
+ ? `pnpm run ${script} -- ${args}`
63
+ : `pnpm run ${script} ${args}`,
64
64
  list: 'pnpm ls --depth 100',
65
65
  };
66
66
  },
package/src/utils/package-manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":"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"}
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.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
4
- exports.nxVersion = '14.1.6-beta.1';
4
+ exports.nxVersion = '14.1.7-beta.2';
5
5
  exports.angularCliVersion = '~13.2.0';
6
6
  exports.typescriptVersion = '~4.5.2';
7
7
  exports.prettierVersion = '^2.5.1';