@nx/devkit 22.3.0-beta.2 → 22.3.0-beta.3

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 (9) hide show
  1. package/package.json +2 -2
  2. package/src/generators/format-files.d.ts.map +1 -1
  3. package/src/generators/format-files.js +1 -3
  4. package/src/generators/plugin-migrations/executor-to-plugin-migrator.d.ts.map +1 -1
  5. package/src/generators/plugin-migrations/executor-to-plugin-migrator.js +2 -1
  6. package/src/generators/project-name-and-root-utils.js +2 -2
  7. package/src/generators/target-defaults-utils.js +1 -1
  8. package/src/utils/package-json.d.ts.map +1 -1
  9. package/src/utils/package-json.js +4 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/devkit",
3
- "version": "22.3.0-beta.2",
3
+ "version": "22.3.0-beta.3",
4
4
  "private": false,
5
5
  "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
6
6
  "repository": {
@@ -38,7 +38,7 @@
38
38
  },
39
39
  "devDependencies": {
40
40
  "jest": "^30.0.2",
41
- "nx": "22.3.0-beta.2"
41
+ "nx": "22.3.0-beta.3"
42
42
  },
43
43
  "peerDependencies": {
44
44
  "nx": ">= 21 <= 23 || ^22.0.0-0"
package/src/generators/format-files.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"format-files.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/generators/format-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAAa,MAAM,uBAAuB,CAAC;AAQlE;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,IAAI,EACV,OAAO,GAAE;IACP,qBAAqB,CAAC,EAAE,OAAO,CAAC;CAC5B,GACL,OAAO,CAAC,IAAI,CAAC,CAgEf"}
1
+ {"version":3,"file":"format-files.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/generators/format-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAAa,MAAM,uBAAuB,CAAC;AAQlE;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,IAAI,EACV,OAAO,GAAE;IACP,qBAAqB,CAAC,EAAE,OAAO,CAAC;CAC5B,GACL,OAAO,CAAC,IAAI,CAAC,CA6Df"}
package/src/generators/format-files.js CHANGED
@@ -49,9 +49,7 @@ async function formatFiles(tree, options = {}) {
49
49
  if (support.ignored || !support.inferredParser) {
50
50
  return;
51
51
  }
52
- tree.write(file.path,
53
- // In prettier v3 the format result is a promise
54
- await prettier.format(file.content.toString('utf-8'), options));
52
+ tree.write(file.path, await prettier.format(file.content.toString('utf-8'), options));
55
53
  }
56
54
  catch (e) {
57
55
  console.warn(`Could not format ${file.path}. Error: "${e.message}"`);
package/src/generators/plugin-migrations/executor-to-plugin-migrator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"executor-to-plugin-migrator.d.ts","sourceRoot":"","sources":["../../../../../../packages/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,oBAAoB,EACrB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAKL,KAAK,aAAa,EAGlB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,IAAI,EACV,MAAM,uBAAuB,CAAC;AAY/B,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE/D,MAAM,MAAM,2BAA2B,GAAG,mBAAmB,GAAG;IAC9D,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,qBAAqB,GAAG,CAC3B,mBAAmB,EAAE,mBAAmB,EACxC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,2BAA2B,EAAE,2BAA2B,KACrD,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACxD,KAAK,gBAAgB,GAAG,CACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,oBAAoB,EAAE,oBAAoB,KACvC,KAAK,GAAG,MAAM,CAAC;AACpB,KAAK,iBAAiB,GAAG,CACvB,oBAAoB,EAAE,oBAAoB,KACvC,KAAK,GAAG,MAAM,CAAC;AAsSpB,qBAAa,uBAAwB,SAAQ,KAAK;;CAIjD;AAED,wBAAsB,+BAA+B,CAAC,CAAC,EACrD,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,EAC/B,oBAAoB,EAAE,CAAC,EACvB,UAAU,EAAE,KAAK,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wBAAwB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7D,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC,EACF,wBAAwB,CAAC,EAAE,MAAM,EACjC,MAAM,CAAC,EAAE,OAAO,YAAY,GAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAc9C;AAED,wBAAsB,iCAAiC,CAAC,CAAC,EACvD,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAC7B,oBAAoB,EAAE,CAAC,EACvB,UAAU,EAAE,KAAK,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wBAAwB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7D,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC,EACF,wBAAwB,CAAC,EAAE,MAAM,GAChC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAa9C"}
1
+ {"version":3,"file":"executor-to-plugin-migrator.d.ts","sourceRoot":"","sources":["../../../../../../packages/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,oBAAoB,EACrB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAKL,KAAK,aAAa,EAGlB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,IAAI,EACV,MAAM,uBAAuB,CAAC;AAY/B,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE/D,MAAM,MAAM,2BAA2B,GAAG,mBAAmB,GAAG;IAC9D,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,qBAAqB,GAAG,CAC3B,mBAAmB,EAAE,mBAAmB,EACxC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,2BAA2B,EAAE,2BAA2B,KACrD,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACxD,KAAK,gBAAgB,GAAG,CACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,oBAAoB,EAAE,oBAAoB,KACvC,KAAK,GAAG,MAAM,CAAC;AACpB,KAAK,iBAAiB,GAAG,CACvB,oBAAoB,EAAE,oBAAoB,KACvC,KAAK,GAAG,MAAM,CAAC;AAqSpB,qBAAa,uBAAwB,SAAQ,KAAK;;CAIjD;AAED,wBAAsB,+BAA+B,CAAC,CAAC,EACrD,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,EAC/B,oBAAoB,EAAE,CAAC,EACvB,UAAU,EAAE,KAAK,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wBAAwB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7D,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC,EACF,wBAAwB,CAAC,EAAE,MAAM,EACjC,MAAM,CAAC,EAAE,OAAO,YAAY,GAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAc9C;AAED,wBAAsB,iCAAiC,CAAC,CAAC,EACvD,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAC7B,oBAAoB,EAAE,CAAC,EACvB,UAAU,EAAE,KAAK,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wBAAwB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7D,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC,EACF,wBAAwB,CAAC,EAAE,MAAM,GAChC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAa9C"}
package/src/generators/plugin-migrations/executor-to-plugin-migrator.js CHANGED
@@ -92,7 +92,8 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
92
92
  delete projectConfig.targets[targetName];
93
93
  }
94
94
  if (!projectConfig['// targets']) {
95
- projectConfig['// targets'] = `to see all targets run: nx show project ${projectName} --web`;
95
+ projectConfig['// targets'] =
96
+ `to see all targets run: nx show project ${projectName} --web`;
96
97
  }
97
98
  (0, devkit_exports_1.updateProjectConfiguration)(this.tree, projectName, projectConfig);
98
99
  }, _ExecutorToPluginMigrator_mergeInputs = function _ExecutorToPluginMigrator_mergeInputs(target, inferredTarget) {
package/src/generators/project-name-and-root-utils.js CHANGED
@@ -71,8 +71,8 @@ function resolveImportPath(tree, projectName, projectRoot) {
71
71
  const npmScope = getNpmScope(tree);
72
72
  importPath =
73
73
  projectRoot === '.'
74
- ? (0, devkit_exports_1.readJson)(tree, 'package.json').name ??
75
- getImportPath(npmScope, projectName)
74
+ ? ((0, devkit_exports_1.readJson)(tree, 'package.json').name ??
75
+ getImportPath(npmScope, projectName))
76
76
  : getImportPath(npmScope, projectName);
77
77
  }
78
78
  return importPath;
package/src/generators/target-defaults-utils.js CHANGED
@@ -45,7 +45,7 @@ async function addE2eCiTargetDefaults(tree, e2ePlugin, buildTarget, pathToE2ECon
45
45
  }
46
46
  const ciTargetName = typeof foundPluginForApplication === 'string'
47
47
  ? 'e2e-ci'
48
- : foundPluginForApplication.options?.ciTargetName ?? 'e2e-ci';
48
+ : (foundPluginForApplication.options?.ciTargetName ?? 'e2e-ci');
49
49
  const ciTargetNameGlob = `${ciTargetName}--**/**`;
50
50
  nxJson.targetDefaults ??= {};
51
51
  const e2eCiTargetDefaults = nxJson.targetDefaults[ciTargetNameGlob];
package/src/utils/package-json.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/package-json.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,iBAAiB,EAItB,KAAK,IAAI,EAGV,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EACV,WAAW,EACX,4BAA4B,EAC7B,MAAM,2BAA2B,CAAC;AAmBnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwEG;AACH,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,4BAA4B,EAAE,GAChD,MAAM,GAAG,IAAI,CAAC;AACjB,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,EACzB,gBAAgB,CAAC,EAAE,4BAA4B,EAAE,GAChD,MAAM,GAAG,IAAI,CAAC;AACjB,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,eAAe,CAAC,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,4BAA4B,EAAE,GAChD,MAAM,GAAG,IAAI,CAAC;AACjB,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,WAAW,CAAC,EAAE,WAAW,EACzB,gBAAgB,CAAC,EAAE,4BAA4B,EAAE,GAChD,MAAM,GAAG,IAAI,CAAC;AAqPjB;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,eAAe,GAAE,MAAuB,EACxC,oBAAoB,CAAC,EAAE,OAAO,GAC7B,iBAAiB,CAqGnB;AA8JD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EAAE,EACtB,eAAe,EAAE,MAAM,EAAE,EACzB,eAAe,GAAE,MAAuB,GACvC,iBAAiB,CA6BnB;AAwHD;;;;;GAKG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACpD,IAAI,CAAC;AAER;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,EAC/C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,GACd,CAAC,CAAC;AA4FL;;GAEG;AACH,eAAO,MAAM,UAAU,QAAyC,CAAC"}
1
+ {"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/package-json.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,iBAAiB,EAItB,KAAK,IAAI,EAGV,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EACV,WAAW,EACX,4BAA4B,EAC7B,MAAM,2BAA2B,CAAC;AAmBnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwEG;AACH,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,4BAA4B,EAAE,GAChD,MAAM,GAAG,IAAI,CAAC;AACjB,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,EACzB,gBAAgB,CAAC,EAAE,4BAA4B,EAAE,GAChD,MAAM,GAAG,IAAI,CAAC;AACjB,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,eAAe,CAAC,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,4BAA4B,EAAE,GAChD,MAAM,GAAG,IAAI,CAAC;AACjB,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,WAAW,CAAC,EAAE,WAAW,EACzB,gBAAgB,CAAC,EAAE,4BAA4B,EAAE,GAChD,MAAM,GAAG,IAAI,CAAC;AAqPjB;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,eAAe,GAAE,MAAuB,EACxC,oBAAoB,CAAC,EAAE,OAAO,GAC7B,iBAAiB,CAqGnB;AA8JD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EAAE,EACtB,eAAe,EAAE,MAAM,EAAE,EACzB,eAAe,GAAE,MAAuB,GACvC,iBAAiB,CA6BnB;AAwHD;;;;;GAKG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACpD,IAAI,CAAC;AAER;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,EAC/C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,GACd,CAAC,CAAC;AA8FL;;GAEG;AACH,eAAO,MAAM,UAAU,QAAyC,CAAC"}
package/src/utils/package-json.js CHANGED
@@ -132,12 +132,12 @@ function isIncomingVersionGreater(tree, incomingVersion, existingVersion, packag
132
132
  // if version is in the format of "latest", "next" or similar - keep it, otherwise try to parse it
133
133
  const incomingVersionCompareBy = incomingVersion in NON_SEMVER_TAGS
134
134
  ? incomingVersion
135
- : cleanSemver(tree, incomingVersion, packageName)?.toString() ??
136
- UNIDENTIFIED_VERSION;
135
+ : (cleanSemver(tree, incomingVersion, packageName)?.toString() ??
136
+ UNIDENTIFIED_VERSION);
137
137
  const existingVersionCompareBy = resolvedExistingVersion in NON_SEMVER_TAGS
138
138
  ? resolvedExistingVersion
139
- : cleanSemver(tree, resolvedExistingVersion, packageName)?.toString() ??
140
- UNIDENTIFIED_VERSION;
139
+ : (cleanSemver(tree, resolvedExistingVersion, packageName)?.toString() ??
140
+ UNIDENTIFIED_VERSION);
141
141
  if (incomingVersionCompareBy in NON_SEMVER_TAGS &&
142
142
  existingVersionCompareBy in NON_SEMVER_TAGS) {
143
143
  return (NON_SEMVER_TAGS[incomingVersionCompareBy] >