@mouryaamit/nx-polystack 1.2.7 → 1.3.1

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 (77) hide show
  1. package/README.md +33 -1
  2. package/dist/src/cli/commands/app-from.js +2 -2
  3. package/dist/src/cli/commands/app-from.js.map +1 -1
  4. package/dist/src/cli/commands/build.js +2 -2
  5. package/dist/src/cli/commands/build.js.map +1 -1
  6. package/dist/src/cli/commands/index.js +2 -0
  7. package/dist/src/cli/commands/index.js.map +1 -1
  8. package/dist/src/cli/commands/inspect.d.ts +3 -0
  9. package/dist/src/cli/commands/inspect.js +105 -0
  10. package/dist/src/cli/commands/inspect.js.map +1 -0
  11. package/dist/src/cli/commands/new.d.ts +3 -0
  12. package/dist/src/cli/commands/new.js +19 -1
  13. package/dist/src/cli/commands/new.js.map +1 -1
  14. package/dist/src/cli/commands/preset.js +3 -0
  15. package/dist/src/cli/commands/preset.js.map +1 -1
  16. package/dist/src/cli/commands/upgrade.d.ts +51 -0
  17. package/dist/src/cli/commands/upgrade.js +447 -0
  18. package/dist/src/cli/commands/upgrade.js.map +1 -0
  19. package/dist/src/cli/help.js +22 -0
  20. package/dist/src/cli/help.js.map +1 -1
  21. package/dist/src/cli/launcher.js +3 -1
  22. package/dist/src/cli/launcher.js.map +1 -1
  23. package/dist/src/cli/run-tree.js +4 -4
  24. package/dist/src/cli/run-tree.js.map +1 -1
  25. package/dist/src/executors/build/executor.js +4 -0
  26. package/dist/src/executors/build/executor.js.map +1 -1
  27. package/dist/src/executors/build/schema.d.ts +2 -0
  28. package/dist/src/executors/build/schema.json +28 -7
  29. package/dist/src/executors/clean/executor.js +0 -1
  30. package/dist/src/executors/clean/executor.js.map +1 -1
  31. package/dist/src/executors/flutter-build/executor.js +19 -2
  32. package/dist/src/executors/flutter-build/executor.js.map +1 -1
  33. package/dist/src/executors/flutter-build/schema.d.ts +2 -0
  34. package/dist/src/executors/flutter-build/schema.json +13 -1
  35. package/dist/src/generators/app/files/ionic/package.json__template__ +4 -4
  36. package/dist/src/generators/app/generator.js +4 -2
  37. package/dist/src/generators/app/generator.js.map +1 -1
  38. package/dist/src/generators/infra/generator.js +2 -2
  39. package/dist/src/generators/infra/generator.js.map +1 -1
  40. package/dist/src/generators/lib/types/ionic.d.ts +2 -2
  41. package/dist/src/generators/lib/types/ionic.js +4 -3
  42. package/dist/src/generators/lib/types/ionic.js.map +1 -1
  43. package/dist/src/generators/migrate/adapters/angular-cli.d.ts +1 -1
  44. package/dist/src/generators/migrate/adapters/angular-cli.js +16 -10
  45. package/dist/src/generators/migrate/adapters/angular-cli.js.map +1 -1
  46. package/dist/src/generators/migrate/adapters/angular-workspace.js +3 -1
  47. package/dist/src/generators/migrate/adapters/angular-workspace.js.map +1 -1
  48. package/dist/src/generators/migrate/adapters/npm-workspaces.js +2 -1
  49. package/dist/src/generators/migrate/adapters/npm-workspaces.js.map +1 -1
  50. package/dist/src/generators/migrate/angular-config-files.js +8 -0
  51. package/dist/src/generators/migrate/angular-config-files.js.map +1 -1
  52. package/dist/src/generators/migrate/angular-project-json.d.ts +5 -0
  53. package/dist/src/generators/migrate/angular-project-json.js +18 -6
  54. package/dist/src/generators/migrate/angular-project-json.js.map +1 -1
  55. package/dist/src/generators/migrate/dependencies.d.ts +10 -1
  56. package/dist/src/generators/migrate/dependencies.js +26 -5
  57. package/dist/src/generators/migrate/dependencies.js.map +1 -1
  58. package/dist/src/generators/preset/generator.js +9 -0
  59. package/dist/src/generators/preset/generator.js.map +1 -1
  60. package/dist/src/generators/preset/schema.d.ts +2 -0
  61. package/dist/src/generators/preset/schema.json +5 -0
  62. package/dist/src/lib/helpers/build-gen.d.ts +26 -0
  63. package/dist/src/lib/helpers/build-gen.js +68 -0
  64. package/dist/src/lib/helpers/build-gen.js.map +1 -0
  65. package/dist/src/lib/helpers/inject-meta.d.ts +3 -0
  66. package/dist/src/lib/helpers/inject-meta.js +1 -0
  67. package/dist/src/lib/helpers/inject-meta.js.map +1 -1
  68. package/dist/src/lib/upgrade/pins.d.ts +34 -0
  69. package/dist/src/lib/upgrade/pins.js +89 -0
  70. package/dist/src/lib/upgrade/pins.js.map +1 -0
  71. package/dist/src/lib/utils/angular-deps.d.ts +31 -6
  72. package/dist/src/lib/utils/angular-deps.js +86 -37
  73. package/dist/src/lib/utils/angular-deps.js.map +1 -1
  74. package/dist/src/lib/utils/nx-tree.d.ts +5 -0
  75. package/dist/src/lib/utils/nx-tree.js +39 -0
  76. package/dist/src/lib/utils/nx-tree.js.map +1 -0
  77. package/package.json +3 -3
@@ -1 +1 @@
1
- {"version":3,"file":"angular-project-json.js","sourceRoot":"","sources":["../../../../src/generators/migrate/angular-project-json.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"angular-project-json.js","sourceRoot":"","sources":["../../../../src/generators/migrate/angular-project-json.ts"],"names":[],"mappings":"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"}
@@ -10,8 +10,17 @@ export interface AngularMismatch {
10
10
  }
11
11
  /** Workspace and source @angular/core majors when they differ; undefined otherwise. */
12
12
  export declare function angularMismatch(tree: Tree, pkg: PackageJson | undefined): AngularMismatch | undefined;
13
- /** The --force-angular refusal message. */
13
+ /** The --force-angular refusal message, with the way out for each direction. */
14
14
  export declare function angularMismatchMessage(m: AngularMismatch): string;
15
+ /** First Angular major with the application builder (`@angular-devkit/build-angular:application`). */
16
+ export declare const APPLICATION_BUILDER_MAJOR = 17;
17
+ /** Angular majors whose workspace builds with TypeScript 4.x (5-only tsconfig options fail). */
18
+ export declare const TS4_MAX_ANGULAR_MAJOR = 15;
19
+ /**
20
+ * The Angular major the migrated code will build with: the workspace's, or (when the workspace has
21
+ * no Angular yet) the source's, which the migration adds; the generators' default otherwise.
22
+ */
23
+ export declare function buildAngularMajor(tree: Tree, pkg: PackageJson | undefined): number;
15
24
  /** Packages declared in dependencies, devDependencies or optionalDependencies. */
16
25
  export declare function packageNames(tree: Tree): Set<string>;
17
26
  export interface MergeInput {
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.mergeDependencies = exports.packageNames = exports.angularMismatchMessage = exports.angularMismatch = void 0;
3
+ exports.mergeDependencies = exports.packageNames = exports.buildAngularMajor = exports.TS4_MAX_ANGULAR_MAJOR = exports.APPLICATION_BUILDER_MAJOR = exports.angularMismatchMessage = exports.angularMismatch = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const path = tslib_1.__importStar(require("path"));
6
6
  const devkit_1 = require("@nx/devkit");
@@ -25,14 +25,35 @@ function angularMismatch(tree, pkg) {
25
25
  : { workspace, source, workspaceMajor, sourceMajor };
26
26
  }
27
27
  exports.angularMismatch = angularMismatch;
28
- /** The --force-angular refusal message. */
28
+ /** The --force-angular refusal message, with the way out for each direction. */
29
29
  function angularMismatchMessage(m) {
30
+ const fix = m.sourceMajor > m.workspaceMajor
31
+ ? `Bring the workspace to Angular ${m.sourceMajor} first (one major at a time), or ` +
32
+ `migrate into a workspace that is on Angular ${m.sourceMajor}.`
33
+ : `Update the source to Angular ${m.workspaceMajor} first, one major at a time ` +
34
+ `(\`ng update @angular/core@${m.sourceMajor + 1} @angular/cli@${m.sourceMajor + 1}\`, ` +
35
+ `and so on), so its code gets each version's migrations.`;
30
36
  return (`the workspace uses Angular ${m.workspaceMajor} (@angular/core ${m.workspace}) but the ` +
31
- `source uses Angular ${m.sourceMajor} (@angular/core ${m.source}). Bring them to the same ` +
32
- 'major first, or pass --force-angular to migrate anyway (the build may fail until the ' +
33
- 'versions match).');
37
+ `source uses Angular ${m.sourceMajor} (@angular/core ${m.source}). ${fix} Or pass ` +
38
+ '--force-angular to migrate anyway (the build may fail until the versions match).');
34
39
  }
35
40
  exports.angularMismatchMessage = angularMismatchMessage;
41
+ /** First Angular major with the application builder (`@angular-devkit/build-angular:application`). */
42
+ exports.APPLICATION_BUILDER_MAJOR = 17;
43
+ /** Angular majors whose workspace builds with TypeScript 4.x (5-only tsconfig options fail). */
44
+ exports.TS4_MAX_ANGULAR_MAJOR = 15;
45
+ /**
46
+ * The Angular major the migrated code will build with: the workspace's, or (when the workspace has
47
+ * no Angular yet) the source's, which the migration adds; the generators' default otherwise.
48
+ */
49
+ function buildAngularMajor(tree, pkg) {
50
+ const workspace = tree.exists('package.json')
51
+ ? (0, dependencies_1.declaredVersion)(tree, '@angular/core')
52
+ : undefined;
53
+ const version = workspace ?? (0, source_1.sourceDependency)(pkg, '@angular/core');
54
+ return (version ? (0, dependencies_1.majorOf)(version) : undefined) ?? angular_deps_1.ANGULAR_MAJOR;
55
+ }
56
+ exports.buildAngularMajor = buildAngularMajor;
36
57
  /** Packages versioned with Angular itself. */
37
58
  const ANGULAR_PACKAGE = /^(@angular\/|@angular-devkit\/|@angular-eslint\/|@schematics\/angular$)/;
38
59
  const ANGULAR_BUILD_LINT = [
@@ -1 +1 @@
1
- {"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../src/generators/migrate/dependencies.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../src/generators/migrate/dependencies.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,7 @@ const context_1 = require("../../cli/context");
8
8
  const versions_1 = require("../../cli/versions");
9
9
  const config_1 = require("../../lib/env-encryption/config");
10
10
  const workspace_1 = require("../../lib/env-encryption/workspace");
11
+ const angular_deps_1 = require("../../lib/utils/angular-deps");
11
12
  const lint_staged_1 = require("../../lib/utils/lint-staged");
12
13
  const quality_1 = require("../../lib/utils/quality");
13
14
  const llm_block_1 = require("../../lib/utils/llm-block");
@@ -66,6 +67,14 @@ async function presetGenerator(tree, options) {
66
67
  return json;
67
68
  });
68
69
  tree.write(quality_1.LINT_STAGED_ESLINT_SCRIPT, quality_1.LINT_STAGED_ESLINT_JS);
70
+ // `pstack new --angular=N`: the workspace starts on that Angular, so apps, libraries and
71
+ // migrated projects are generated for it (pstack new installs after the preset).
72
+ if (options.angular !== undefined) {
73
+ if (!angular_deps_1.GENERATOR_ANGULAR_MAJORS.includes(options.angular)) {
74
+ throw new Error(`preset: --angular must be one of ${angular_deps_1.GENERATOR_ANGULAR_MAJORS.join(', ')} (got ${options.angular}).`);
75
+ }
76
+ (0, angular_deps_1.ensureAngularDependencies)(tree, { major: options.angular });
77
+ }
69
78
  // Repo docs, CI (replaces the old --ci templates), quality checks, upgrade workflow. Its install
70
79
  // task is not returned: `pstack new` (or Nx's create flow) installs after the preset.
71
80
  if (infraParts.length > 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/preset/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/preset/generator.ts"],"names":[],"mappings":"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"}
@@ -15,6 +15,8 @@ export interface PresetGeneratorSchema {
15
15
  lintCommand?: string;
16
16
  skipFormat?: boolean;
17
17
  skipInstall?: boolean;
18
+ /** Angular major to add now (15 or 16); without it Angular 15 is added by the first Angular app. */
19
+ angular?: number;
18
20
  /** nx-polystack version to pin in the generated package.json (default: this plugin's version). */
19
21
  pluginVersion?: string;
20
22
  }
@@ -77,6 +77,11 @@
77
77
  "default": false,
78
78
  "description": "Skip npm install after generation."
79
79
  },
80
+ "angular": {
81
+ "type": "number",
82
+ "enum": [15, 16],
83
+ "description": "Angular major to add to the workspace now. Without it, the first Angular or Ionic app adds Angular 15."
84
+ },
80
85
  "pluginVersion": {
81
86
  "type": "string",
82
87
  "description": "nx-polystack version to pin in the generated package.json (default: the running plugin's version)."
@@ -0,0 +1,26 @@
1
+ /**
2
+ * Which tool made a build, written into the build meta payload (`<meta name="x-build">`):
3
+ * `gen` = "nx-polystack@<version>", plus the Angular (`ng`) and Nx (`nx`) versions installed in the
4
+ * workspace. Lets `pstack inspect` tell a pstack build, and its versions, from the output alone.
5
+ */
6
+ export interface GenInfo {
7
+ gen: string;
8
+ ng?: string;
9
+ nx?: string;
10
+ }
11
+ export declare const GEN_PREFIX = "nx-polystack@";
12
+ /** Release option `buildMeta`. */
13
+ export interface BuildMetaOptions {
14
+ /** Write gen/ng/nx into the build meta (default true). */
15
+ gen?: boolean;
16
+ }
17
+ export declare function pluginOwnVersion(): string;
18
+ /** gen/ng/nx for the meta payload, or undefined when `buildMeta.gen` is false. */
19
+ export declare function generatorInfo(repoRoot: string, options: BuildMetaOptions | undefined, version?: string): GenInfo | undefined;
20
+ export interface FoundMeta {
21
+ /** The meta tag name (x-build, or a renamed one). */
22
+ name: string;
23
+ payload: Record<string, unknown>;
24
+ }
25
+ /** Every `<meta name=… content=…>` whose content is a pstack build payload. */
26
+ export declare function findBuildMeta(html: string): FoundMeta[];
@@ -0,0 +1,68 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.findBuildMeta = exports.generatorInfo = exports.pluginOwnVersion = exports.GEN_PREFIX = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const fs = tslib_1.__importStar(require("fs"));
6
+ const path = tslib_1.__importStar(require("path"));
7
+ const context_1 = require("../../cli/context");
8
+ exports.GEN_PREFIX = 'nx-polystack@';
9
+ function installedVersion(repoRoot, pkg) {
10
+ const file = path.join(repoRoot, 'node_modules', pkg, 'package.json');
11
+ if (!fs.existsSync(file))
12
+ return undefined;
13
+ try {
14
+ return (0, context_1.readPackageVersion)(file);
15
+ }
16
+ catch {
17
+ return undefined;
18
+ }
19
+ }
20
+ function pluginOwnVersion() {
21
+ return (0, context_1.readPackageVersion)(path.join((0, context_1.selfPackageRoot)(__dirname), 'package.json'));
22
+ }
23
+ exports.pluginOwnVersion = pluginOwnVersion;
24
+ /** gen/ng/nx for the meta payload, or undefined when `buildMeta.gen` is false. */
25
+ function generatorInfo(repoRoot, options, version = pluginOwnVersion()) {
26
+ if (options !== undefined && (typeof options !== 'object' || Array.isArray(options))) {
27
+ throw new Error('buildMeta must be an object, e.g. { "gen": false }');
28
+ }
29
+ if (options?.gen !== undefined && typeof options.gen !== 'boolean') {
30
+ throw new Error('buildMeta.gen must be true or false');
31
+ }
32
+ if (options?.gen === false)
33
+ return undefined;
34
+ const info = { gen: `${exports.GEN_PREFIX}${version}` };
35
+ const ng = installedVersion(repoRoot, '@angular/core');
36
+ const nx = installedVersion(repoRoot, 'nx');
37
+ if (ng)
38
+ info.ng = ng;
39
+ if (nx)
40
+ info.nx = nx;
41
+ return info;
42
+ }
43
+ exports.generatorInfo = generatorInfo;
44
+ /** Fields every pstack build meta has; a base64 JSON meta with them is one, whatever its name. */
45
+ const REQUIRED = ['env', 'timestamp_utc', 'commit'];
46
+ /** Every `<meta name=… content=…>` whose content is a pstack build payload. */
47
+ function findBuildMeta(html) {
48
+ const out = [];
49
+ const tagRe = /<meta\b[^>]*>/gi;
50
+ for (const [tag] of html.matchAll(tagRe)) {
51
+ const name = /\bname\s*=\s*(["'])([^"']*)\1/i.exec(tag)?.[2];
52
+ const content = /\bcontent\s*=\s*(["'])([^"']*)\1/i.exec(tag)?.[2];
53
+ if (!name || !content || !/^[A-Za-z0-9+/=_-]+$/.test(content))
54
+ continue;
55
+ try {
56
+ const json = JSON.parse(Buffer.from(content, 'base64').toString('utf8'));
57
+ if (json && typeof json === 'object' && REQUIRED.every((k) => k in json)) {
58
+ out.push({ name, payload: json });
59
+ }
60
+ }
61
+ catch {
62
+ // not a build meta
63
+ }
64
+ }
65
+ return out;
66
+ }
67
+ exports.findBuildMeta = findBuildMeta;
68
+ //# sourceMappingURL=build-gen.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"build-gen.js","sourceRoot":"","sources":["../../../../src/lib/helpers/build-gen.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import type { GenInfo } from './build-gen';
1
2
  export interface InjectMetaOptions {
2
3
  indexHtmlPath: string;
3
4
  env: string;
@@ -10,5 +11,7 @@ export interface InjectMetaOptions {
10
11
  now?: Date;
11
12
  /** Extra payload fields (aes-gcm key share `k`). */
12
13
  extra?: Record<string, string>;
14
+ /** Tool and versions that made the build (gen, ng, nx); omitted when undefined. */
15
+ gen?: GenInfo;
13
16
  }
14
17
  export declare function injectBuildMeta(opts: InjectMetaOptions): void;
@@ -29,6 +29,7 @@ function injectBuildMeta(opts) {
29
29
  branch,
30
30
  commit,
31
31
  build: buildNumber,
32
+ ...(opts.gen ?? {}),
32
33
  };
33
34
  const base64 = Buffer.from(JSON.stringify(payload), 'utf8').toString('base64');
34
35
  const tag = `<meta name="${metaName}" content="${base64}">`;
@@ -1 +1 @@
1
- {"version":3,"file":"inject-meta.js","sourceRoot":"","sources":["../../../../src/lib/helpers/inject-meta.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AAgBzB,SAAgB,eAAe,CAAC,IAAuB;IACrD,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC;IAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACjC,MAAM,IAAI,KAAK,CAAC,0CAA0C,aAAa,EAAE,CAAC,CAAC;KAC5E;IAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;QACpD,QAAQ,EAAE,cAAc;QACxB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;QACd,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IAEH,4DAA4D;IAC5D,MAAM,OAAO,GAAG;QACd,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QACrB,GAAG;QACH,aAAa,EAAE,GAAG,CAAC,WAAW,EAAE;QAChC,aAAa,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC;QACvC,MAAM;QACN,MAAM;QACN,KAAK,EAAE,WAAW;KACnB,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/E,MAAM,GAAG,GAAG,eAAe,QAAQ,cAAc,MAAM,IAAI,CAAC;IAC5D,MAAM,QAAQ,GAAG,IAAI,MAAM,CACzB,eAAe,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,SAAS,CACxE,CAAC;IAEF,IAAI,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAClD,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACvB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;KACpC;SAAM,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACpC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,eAAe,GAAG,EAAE,CAAC,CAAC;KAC7D;SAAM;QACL,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC;KAC1B;IAED,EAAE,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAChD,CAAC;AA9CD,0CA8CC"}
1
+ {"version":3,"file":"inject-meta.js","sourceRoot":"","sources":["../../../../src/lib/helpers/inject-meta.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AAoBzB,SAAgB,eAAe,CAAC,IAAuB;IACrD,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC;IAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACjC,MAAM,IAAI,KAAK,CAAC,0CAA0C,aAAa,EAAE,CAAC,CAAC;KAC5E;IAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;QACpD,QAAQ,EAAE,cAAc;QACxB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;QACd,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IAEH,4DAA4D;IAC5D,MAAM,OAAO,GAAG;QACd,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QACrB,GAAG;QACH,aAAa,EAAE,GAAG,CAAC,WAAW,EAAE;QAChC,aAAa,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC;QACvC,MAAM;QACN,MAAM;QACN,KAAK,EAAE,WAAW;QAClB,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;KACpB,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/E,MAAM,GAAG,GAAG,eAAe,QAAQ,cAAc,MAAM,IAAI,CAAC;IAC5D,MAAM,QAAQ,GAAG,IAAI,MAAM,CACzB,eAAe,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,SAAS,CACxE,CAAC;IAEF,IAAI,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAClD,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACvB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;KACpC;SAAM,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACpC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,eAAe,GAAG,EAAE,CAAC,CAAC;KAC7D;SAAM;QACL,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC;KAC1B;IAED,EAAE,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAChD,CAAC;AA/CD,0CA+CC"}
@@ -0,0 +1,34 @@
1
+ /**
2
+ * The versions `pstack upgrade angular` moves a workspace to, one Angular major per step. Proven
3
+ * by the NX-72 walk (Angular 15 → 21 with web, Ionic/Capacitor and standalone migration).
4
+ *
5
+ * Version strings with a dot are pinned with `~`; a bare major (e.g. "21") with `^<major>.0.0`.
6
+ */
7
+ export interface AngularPins {
8
+ /** @angular/core and the Angular build packages. */
9
+ angular: string;
10
+ /** Nx the step migrates to (16 stays on Nx 17.0: `nx migrate @angular/core@16`). */
11
+ nx: string;
12
+ typescript: string;
13
+ /** @ionic/angular; "9" is reached through `@ionic/migrate`. */
14
+ ionic: string;
15
+ /** Capacitor major for each Ionic app's own package.json. */
16
+ capacitor: number;
17
+ /** Node major the workspace declares (engines.node and .nvmrc). */
18
+ node: number;
19
+ angularEslint: string;
20
+ }
21
+ export declare const ANGULAR_PINS: Readonly<Record<number, AngularPins>>;
22
+ export declare const MIN_ANGULAR = 15;
23
+ export declare const MAX_ANGULAR = 21;
24
+ /**
25
+ * The step that runs Angular's inject() migration (`@angular/core:inject`): angular-eslint 20 turns
26
+ * on `@angular-eslint/prefer-inject` as an error, so constructor parameter injection stops linting.
27
+ */
28
+ export declare const INJECT_MIGRATION_ANGULAR = 20;
29
+ /** The first Angular major whose Nx step needs the second `nx migrate @angular/core` pass. */
30
+ export declare const NX_SKIPS_ANGULAR_FROM = 21;
31
+ /** npm range for a pin: "5.4.5" → "~5.4.5", "21" → "^21.0.0". */
32
+ export declare function pinRange(pin: string): string;
33
+ /** Major of a version or range ("~17.3.0", "^16.2.12", "17.3.9", "20"); undefined if none. */
34
+ export declare function majorOfSpec(spec: string | undefined): number | undefined;
@@ -0,0 +1,89 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.majorOfSpec = exports.pinRange = exports.NX_SKIPS_ANGULAR_FROM = exports.INJECT_MIGRATION_ANGULAR = exports.MAX_ANGULAR = exports.MIN_ANGULAR = exports.ANGULAR_PINS = void 0;
4
+ exports.ANGULAR_PINS = {
5
+ 15: {
6
+ angular: '15.2.10',
7
+ nx: '17.0.6',
8
+ typescript: '4.9.5',
9
+ ionic: '7.8.6',
10
+ capacitor: 5,
11
+ node: 20,
12
+ angularEslint: '15.2.1',
13
+ },
14
+ 16: {
15
+ angular: '16.2.12',
16
+ nx: '17.0.6',
17
+ typescript: '5.1.6',
18
+ ionic: '7.8.6',
19
+ capacitor: 6,
20
+ node: 20,
21
+ angularEslint: '16.3.1',
22
+ },
23
+ 17: {
24
+ angular: '17.3.12',
25
+ nx: '18.3.5',
26
+ typescript: '5.4.5',
27
+ ionic: '7.8.6',
28
+ capacitor: 6,
29
+ node: 20,
30
+ angularEslint: '17.3.0',
31
+ },
32
+ 18: {
33
+ angular: '18.2.14',
34
+ nx: '19.8.14',
35
+ typescript: '5.5.4',
36
+ ionic: '8.7.11',
37
+ capacitor: 7,
38
+ node: 20,
39
+ angularEslint: '18.4.3',
40
+ },
41
+ 19: {
42
+ angular: '19.2.25',
43
+ nx: '20.8.4',
44
+ typescript: '5.8.3',
45
+ ionic: '8.7.11',
46
+ capacitor: 7,
47
+ node: 20,
48
+ angularEslint: '19.8.1',
49
+ },
50
+ 20: {
51
+ angular: '20.3.32',
52
+ nx: '21.6.11',
53
+ typescript: '5.9.3',
54
+ ionic: '8.7.11',
55
+ capacitor: 7,
56
+ node: 20,
57
+ angularEslint: '20.7.0',
58
+ },
59
+ 21: {
60
+ angular: '21.2.24',
61
+ nx: '22.7.12',
62
+ typescript: '5.9.3',
63
+ ionic: '9',
64
+ capacitor: 8,
65
+ node: 22,
66
+ angularEslint: '21',
67
+ },
68
+ };
69
+ exports.MIN_ANGULAR = 15;
70
+ exports.MAX_ANGULAR = 21;
71
+ /**
72
+ * The step that runs Angular's inject() migration (`@angular/core:inject`): angular-eslint 20 turns
73
+ * on `@angular-eslint/prefer-inject` as an error, so constructor parameter injection stops linting.
74
+ */
75
+ exports.INJECT_MIGRATION_ANGULAR = 20;
76
+ /** The first Angular major whose Nx step needs the second `nx migrate @angular/core` pass. */
77
+ exports.NX_SKIPS_ANGULAR_FROM = 21;
78
+ /** npm range for a pin: "5.4.5" → "~5.4.5", "21" → "^21.0.0". */
79
+ function pinRange(pin) {
80
+ return pin.includes('.') ? `~${pin}` : `^${pin}.0.0`;
81
+ }
82
+ exports.pinRange = pinRange;
83
+ /** Major of a version or range ("~17.3.0", "^16.2.12", "17.3.9", "20"); undefined if none. */
84
+ function majorOfSpec(spec) {
85
+ const m = spec === undefined ? null : /(\d+)/.exec(spec);
86
+ return m ? Number(m[1]) : undefined;
87
+ }
88
+ exports.majorOfSpec = majorOfSpec;
89
+ //# sourceMappingURL=pins.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pins.js","sourceRoot":"","sources":["../../../../src/lib/upgrade/pins.ts"],"names":[],"mappings":";;;AAqBa,QAAA,YAAY,GAA0C;IACjE,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,SAAS;QACb,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,SAAS;QACb,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,SAAS;QACb,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,IAAI;KACpB;CACF,CAAC;AAEW,QAAA,WAAW,GAAG,EAAE,CAAC;AACjB,QAAA,WAAW,GAAG,EAAE,CAAC;AAE9B;;;GAGG;AACU,QAAA,wBAAwB,GAAG,EAAE,CAAC;AAE3C,8FAA8F;AACjF,QAAA,qBAAqB,GAAG,EAAE,CAAC;AAExC,iEAAiE;AACjE,SAAgB,QAAQ,CAAC,GAAW;IAClC,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC;AACvD,CAAC;AAFD,4BAEC;AAED,8FAA8F;AAC9F,SAAgB,WAAW,CAAC,IAAwB;IAClD,MAAM,CAAC,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtC,CAAC;AAHD,kCAGC"}
@@ -1,16 +1,41 @@
1
1
  import { GeneratorCallback, Tree } from '@nx/devkit';
2
- /** Angular line the generated app templates target (NgModule bootstrap, browser builder, browserTarget). */
2
+ /** Angular line a workspace without Angular gets by default (NgModule bootstrap, browser builder). */
3
3
  export declare const ANGULAR_VERSION = "~15.2.0";
4
+ export declare const ANGULAR_MAJOR = 15;
5
+ /**
6
+ * Angular majors the generators write for: `pstack new --angular=<major>`, and `pstack app` / `:lib`
7
+ * fill in packages for a workspace on one of them. One major is added per public release.
8
+ */
9
+ export declare const GENERATOR_ANGULAR_MAJORS: readonly number[];
10
+ /** Versions the generators add for one Angular major (only where a package is missing). */
11
+ export interface AngularGeneratorVersions {
12
+ angular: string;
13
+ zoneJs: string;
14
+ typescript: string;
15
+ typesNode: string;
16
+ angularEslint: string;
17
+ ionicAngular: string;
18
+ capacitor: string;
19
+ }
20
+ export declare function angularGeneratorVersions(major: number): AngularGeneratorVersions;
21
+ /**
22
+ * The generator versions for the workspace's Angular (the declared @angular/core), or for Angular
23
+ * 15 when there is none or the major is not one the generators support.
24
+ */
25
+ export declare function workspaceGeneratorVersions(tree: Tree): AngularGeneratorVersions;
4
26
  export interface EnsureAngularOptions {
5
27
  /** Also add the runtime packages the generated app imports (used by `pstack app`). */
6
28
  includeRuntime?: boolean;
29
+ /** Angular major for a workspace without @angular/core (default 15; `pstack new --angular`). */
30
+ major?: number;
7
31
  }
8
32
  /**
9
- * Makes sure an Angular 15 app can build and lint. Packages are only added, never upgraded:
10
- * - no @angular/core → the whole Angular 15 set (runtime, build, lint, TypeScript ~4.9.5,
11
- * @types/node ~18.16.9);
12
- * - Angular 15 installed → missing build/lint packages at the installed Angular version
13
- * (plus the imported runtime packages when `includeRuntime`);
33
+ * Makes sure a generated Angular app or library can build and lint. Packages are only added,
34
+ * never upgraded:
35
+ * - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
36
+ * and @types/node;
37
+ * - a generator major installed (15, 16) → missing build/lint packages at the installed Angular
38
+ * version (plus the imported runtime packages when `includeRuntime`);
14
39
  * - another Angular major → nothing; warns which build/lint packages are missing.
15
40
  */
16
41
  export declare function ensureAngularDependencies(tree: Tree, opts?: EnsureAngularOptions): GeneratorCallback | undefined;