@mouryaamit/nx-polystack 1.11.3 → 1.11.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -1
- package/dist/migrations.json +5 -0
- package/dist/src/cli/commands/adopt-compare.d.ts +8 -0
- package/dist/src/cli/commands/adopt-compare.js +9 -4
- package/dist/src/cli/commands/adopt-compare.js.map +1 -1
- package/dist/src/cli/commands/standalone-providers.d.ts +34 -0
- package/dist/src/cli/commands/standalone-providers.js +423 -0
- package/dist/src/cli/commands/standalone-providers.js.map +1 -0
- package/dist/src/cli/commands/upgrade-standalone.d.ts +14 -1
- package/dist/src/cli/commands/upgrade-standalone.js +107 -10
- package/dist/src/cli/commands/upgrade-standalone.js.map +1 -1
- package/dist/src/cli/commands/upgrade.d.ts +1 -1
- package/dist/src/cli/commands/upgrade.js +34 -2
- package/dist/src/cli/commands/upgrade.js.map +1 -1
- package/dist/src/cli/help.js +6 -4
- package/dist/src/cli/help.js.map +1 -1
- package/dist/src/executors/build/executor.d.ts +17 -0
- package/dist/src/executors/build/executor.js +67 -12
- package/dist/src/executors/build/executor.js.map +1 -1
- package/dist/src/executors/build/schema.json +7 -3
- package/dist/src/executors/flutter-build/executor.js +32 -1
- package/dist/src/executors/flutter-build/executor.js.map +1 -1
- package/dist/src/executors/flutter-build/schema.d.ts +8 -0
- package/dist/src/executors/flutter-build/schema.json +53 -0
- package/dist/src/generators/adopt/flutter.d.ts +32 -0
- package/dist/src/generators/adopt/flutter.js +305 -0
- package/dist/src/generators/adopt/flutter.js.map +1 -0
- package/dist/src/generators/adopt/generator.d.ts +17 -0
- package/dist/src/generators/adopt/generator.js +187 -17
- package/dist/src/generators/adopt/generator.js.map +1 -1
- package/dist/src/generators/adopt/old-script-refs.d.ts +12 -0
- package/dist/src/generators/adopt/old-script-refs.js +239 -0
- package/dist/src/generators/adopt/old-script-refs.js.map +1 -0
- package/dist/src/generators/adopt/pipeline.d.ts +3 -1
- package/dist/src/generators/adopt/pipeline.js +13 -2
- package/dist/src/generators/adopt/pipeline.js.map +1 -1
- package/dist/src/generators/adopt/schema.json +2 -2
- package/dist/src/generators/app/files/angular/tsconfig.app.json__template__ +1 -1
- package/dist/src/generators/app/files/angular/tsconfig.json__template__ +1 -1
- package/dist/src/generators/app/generator.js +9 -0
- package/dist/src/generators/app/generator.js.map +1 -1
- package/dist/src/generators/env/generator.js +23 -7
- package/dist/src/generators/env/generator.js.map +1 -1
- package/dist/src/generators/lib/angular-lib.js +15 -0
- package/dist/src/generators/lib/angular-lib.js.map +1 -1
- package/dist/src/generators/lib/files/angular/config/tsconfig.json__template__ +1 -1
- package/dist/src/generators/lib/files/pii/README.md__template__ +1 -1
- package/dist/src/generators/lib/files/pii/src/index.ts__template__ +2 -2
- package/dist/src/generators/lib/files/session/src/index.ts__template__ +2 -2
- package/dist/src/generators/lib/files/state/ngrx/README.md__template__ +2 -2
- package/dist/src/generators/lib/files/state/ngrx/src/index.ts__template__ +2 -2
- package/dist/src/generators/lib/types/state.js +13 -8
- package/dist/src/generators/lib/types/state.js.map +1 -1
- package/dist/src/generators/migrate/nx/build-scripts.d.ts +6 -0
- package/dist/src/generators/migrate/nx/build-scripts.js +33 -1
- package/dist/src/generators/migrate/nx/build-scripts.js.map +1 -1
- package/dist/src/generators/migrate/nx/env-encryption.d.ts +7 -0
- package/dist/src/generators/migrate/nx/env-encryption.js +34 -10
- package/dist/src/generators/migrate/nx/env-encryption.js.map +1 -1
- package/dist/src/generators/preset/generator.js +4 -1
- package/dist/src/generators/preset/generator.js.map +1 -1
- package/dist/src/generators/preset/schema.d.ts +1 -1
- package/dist/src/generators/preset/schema.json +1 -1
- package/dist/src/lib/helpers/inject-nonce.d.ts +10 -2
- package/dist/src/lib/helpers/inject-nonce.js +19 -4
- package/dist/src/lib/helpers/inject-nonce.js.map +1 -1
- package/dist/src/lib/release/flat-output.d.ts +33 -0
- package/dist/src/lib/release/flat-output.js +88 -0
- package/dist/src/lib/release/flat-output.js.map +1 -0
- package/dist/src/lib/release/htaccess-adopt.d.ts +8 -0
- package/dist/src/lib/release/htaccess-adopt.js +39 -14
- package/dist/src/lib/release/htaccess-adopt.js.map +1 -1
- package/dist/src/lib/upgrade/angular15.d.ts +23 -0
- package/dist/src/lib/upgrade/angular15.js +139 -0
- package/dist/src/lib/upgrade/angular15.js.map +1 -0
- package/dist/src/lib/upgrade/pins.d.ts +1 -1
- package/dist/src/lib/upgrade/pins.js +12 -1
- package/dist/src/lib/upgrade/pins.js.map +1 -1
- package/dist/src/lib/utils/angular-deps.d.ts +17 -0
- package/dist/src/lib/utils/angular-deps.js +29 -4
- package/dist/src/lib/utils/angular-deps.js.map +1 -1
- package/dist/src/lib/utils/angular-project.d.ts +1 -1
- package/dist/src/lib/utils/angular-project.js +7 -3
- package/dist/src/lib/utils/angular-project.js.map +1 -1
- package/dist/src/migrations/application-builder-flat-output/application-builder-flat-output.d.ts +9 -0
- package/dist/src/migrations/application-builder-flat-output/application-builder-flat-output.js +68 -0
- package/dist/src/migrations/application-builder-flat-output/application-builder-flat-output.js.map +1 -0
- package/package.json +1 -1
|
@@ -7,6 +7,18 @@ export declare const ANGULAR_MAJOR = 15;
|
|
|
7
7
|
* fill in packages for a workspace on one of them. One major is added per public release.
|
|
8
8
|
*/
|
|
9
9
|
export declare const GENERATOR_ANGULAR_MAJORS: readonly number[];
|
|
10
|
+
/**
|
|
11
|
+
* From this major the browser builder takes `polyfills: ['zone.js']`; Angular 14 apps load zone.js
|
|
12
|
+
* from a `src/polyfills.ts` file and target ES2020.
|
|
13
|
+
*/
|
|
14
|
+
export declare const POLYFILLS_ARRAY_MAJOR = 15;
|
|
15
|
+
/**
|
|
16
|
+
* From this major apps and libraries can be standalone, and providers come from
|
|
17
|
+
* `makeEnvironmentProviders()` (Angular 14 has standalone components only as a developer preview).
|
|
18
|
+
*/
|
|
19
|
+
export declare const STANDALONE_MIN_MAJOR = 15;
|
|
20
|
+
/** Refuses standalone code on a workspace below Angular 15. */
|
|
21
|
+
export declare function assertStandaloneSupported(major: number, what: string): void;
|
|
10
22
|
/**
|
|
11
23
|
* From this major, generated apps provide HttpClient with `provideHttpClient(withInterceptorsFromDi())`
|
|
12
24
|
* (Angular 18 deprecates HttpClientModule; its own migration writes the same providers).
|
|
@@ -62,6 +74,11 @@ export interface AngularGeneratorVersions {
|
|
|
62
74
|
angularEslint: string;
|
|
63
75
|
ionicAngular: string;
|
|
64
76
|
capacitor: string;
|
|
77
|
+
/**
|
|
78
|
+
* @angular/cli and @angular-devkit/build-angular when their line differs from the framework's:
|
|
79
|
+
* Angular 14's last framework release is 14.3.0, its CLI's 14.2.13.
|
|
80
|
+
*/
|
|
81
|
+
angularCli?: string;
|
|
65
82
|
}
|
|
66
83
|
export declare function angularGeneratorVersions(major: number): AngularGeneratorVersions;
|
|
67
84
|
/**
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ngPackagrDependencies = exports.ensureAngularDependencies = exports.workspaceGeneratorMajor = exports.workspaceGeneratorVersions = exports.angularGeneratorVersions = exports.ionicAngularImport = exports.ionicStandaloneImport = exports.BUNDLER_RESOLUTION_MAJOR = exports.CONTROL_FLOW_MAJOR = exports.IONIC_LAZY_MAJOR = exports.ZONE_PROVIDER_MAJOR = exports.PREFER_INJECT_MAJOR = exports.STANDALONE_FALSE_MAJOR = exports.PROVIDE_HTTP_CLIENT_MAJOR = exports.GENERATOR_ANGULAR_MAJORS = exports.ANGULAR_MAJOR = exports.ANGULAR_VERSION = void 0;
|
|
3
|
+
exports.ngPackagrDependencies = exports.ensureAngularDependencies = exports.workspaceGeneratorMajor = exports.workspaceGeneratorVersions = exports.angularGeneratorVersions = exports.ionicAngularImport = exports.ionicStandaloneImport = exports.BUNDLER_RESOLUTION_MAJOR = exports.CONTROL_FLOW_MAJOR = exports.IONIC_LAZY_MAJOR = exports.ZONE_PROVIDER_MAJOR = exports.PREFER_INJECT_MAJOR = exports.STANDALONE_FALSE_MAJOR = exports.PROVIDE_HTTP_CLIENT_MAJOR = exports.assertStandaloneSupported = exports.STANDALONE_MIN_MAJOR = exports.POLYFILLS_ARRAY_MAJOR = exports.GENERATOR_ANGULAR_MAJORS = exports.ANGULAR_MAJOR = exports.ANGULAR_VERSION = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const pins_1 = require("../upgrade/pins");
|
|
6
6
|
const dependencies_1 = require("./dependencies");
|
|
@@ -11,7 +11,25 @@ exports.ANGULAR_MAJOR = 15;
|
|
|
11
11
|
* Angular majors the generators write for: `pstack new --angular=<major>`, and `pstack app` / `:lib`
|
|
12
12
|
* fill in packages for a workspace on one of them. One major is added per public release.
|
|
13
13
|
*/
|
|
14
|
-
exports.GENERATOR_ANGULAR_MAJORS = [15, 16, 17, 18, 19, 20, 21];
|
|
14
|
+
exports.GENERATOR_ANGULAR_MAJORS = [14, 15, 16, 17, 18, 19, 20, 21];
|
|
15
|
+
/**
|
|
16
|
+
* From this major the browser builder takes `polyfills: ['zone.js']`; Angular 14 apps load zone.js
|
|
17
|
+
* from a `src/polyfills.ts` file and target ES2020.
|
|
18
|
+
*/
|
|
19
|
+
exports.POLYFILLS_ARRAY_MAJOR = 15;
|
|
20
|
+
/**
|
|
21
|
+
* From this major apps and libraries can be standalone, and providers come from
|
|
22
|
+
* `makeEnvironmentProviders()` (Angular 14 has standalone components only as a developer preview).
|
|
23
|
+
*/
|
|
24
|
+
exports.STANDALONE_MIN_MAJOR = 15;
|
|
25
|
+
/** Refuses standalone code on a workspace below Angular 15. */
|
|
26
|
+
function assertStandaloneSupported(major, what) {
|
|
27
|
+
if (major < exports.STANDALONE_MIN_MAJOR) {
|
|
28
|
+
throw new Error(`${what}: standalone components need Angular ${exports.STANDALONE_MIN_MAJOR} or later (the workspace ` +
|
|
29
|
+
`is on Angular ${major}). Leave out --standalone, or move the workspace with "pstack upgrade angular" first.`);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
exports.assertStandaloneSupported = assertStandaloneSupported;
|
|
15
33
|
/**
|
|
16
34
|
* From this major, generated apps provide HttpClient with `provideHttpClient(withInterceptorsFromDi())`
|
|
17
35
|
* (Angular 18 deprecates HttpClientModule; its own migration writes the same providers).
|
|
@@ -64,7 +82,9 @@ function ionicAngularImport(major) {
|
|
|
64
82
|
return major >= exports.IONIC_LAZY_MAJOR ? '@ionic/angular/lazy' : '@ionic/angular';
|
|
65
83
|
}
|
|
66
84
|
exports.ionicAngularImport = ionicAngularImport;
|
|
85
|
+
const ANGULAR_CLI = { 14: '~14.2.13' };
|
|
67
86
|
const ZONE_JS = {
|
|
87
|
+
14: '~0.11.4',
|
|
68
88
|
15: '~0.12.0',
|
|
69
89
|
16: '~0.13.0',
|
|
70
90
|
17: '~0.14.0',
|
|
@@ -75,6 +95,7 @@ const ZONE_JS = {
|
|
|
75
95
|
};
|
|
76
96
|
/** @types/node the major's TypeScript can parse (a latest one uses newer syntax: TS1139). */
|
|
77
97
|
const TYPES_NODE = {
|
|
98
|
+
14: '~18.16.9',
|
|
78
99
|
15: '~18.16.9',
|
|
79
100
|
16: '~20.10.0',
|
|
80
101
|
17: '~20.10.0',
|
|
@@ -103,6 +124,7 @@ function angularGeneratorVersions(major) {
|
|
|
103
124
|
}
|
|
104
125
|
return {
|
|
105
126
|
angular: `~${pins.angular}`,
|
|
127
|
+
...(ANGULAR_CLI[major] ? { angularCli: ANGULAR_CLI[major] } : {}),
|
|
106
128
|
zoneJs: ZONE_JS[major],
|
|
107
129
|
typescript: `~${pins.typescript}`,
|
|
108
130
|
typesNode: TYPES_NODE[major],
|
|
@@ -150,8 +172,8 @@ function runtimeSupport(v) {
|
|
|
150
172
|
}
|
|
151
173
|
function buildAndLintPackages(angular, nx, v) {
|
|
152
174
|
return {
|
|
153
|
-
'@angular-devkit/build-angular': angular,
|
|
154
|
-
'@angular/cli': angular,
|
|
175
|
+
'@angular-devkit/build-angular': v.angularCli ?? angular,
|
|
176
|
+
'@angular/cli': v.angularCli ?? angular,
|
|
155
177
|
'@angular/compiler-cli': angular,
|
|
156
178
|
'@nx/angular': nx,
|
|
157
179
|
'@nx/eslint': nx,
|
|
@@ -222,6 +244,9 @@ function ngPackagrDependencies(angularCore) {
|
|
|
222
244
|
// ng-packagr releases don't follow Angular patch numbers, so pin the major only.
|
|
223
245
|
'ng-packagr': `^${major ?? exports.ANGULAR_MAJOR}.0.0`,
|
|
224
246
|
postcss: '^8.4.5',
|
|
247
|
+
// @nx/angular's stylesheet processor requires it on load; ng-packagr 14 and
|
|
248
|
+
// @angular-devkit/build-angular 14 brought it in, 15 does not (14 → 15 then fails).
|
|
249
|
+
'postcss-import': '~14.1.0',
|
|
225
250
|
'postcss-preset-env': '~7.5.0',
|
|
226
251
|
'postcss-url': '~10.1.3',
|
|
227
252
|
autoprefixer: '^10.4.0',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-deps.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-deps.ts"],"names":[],"mappings":";;;AAAA,uCAA6D;AAE7D,0CAAyD;AAEzD,iDAA6F;AAE7F,sGAAsG;AACzF,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,aAAa,GAAG,EAAE,CAAC;AAEhC;;;GAGG;AACU,QAAA,wBAAwB,GAAsB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"angular-deps.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-deps.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ export interface AngularTargetOptions {
|
|
|
30
30
|
}
|
|
31
31
|
/** Angular 17 renamed the dev-server and extract-i18n `browserTarget` option to `buildTarget`. */
|
|
32
32
|
export declare const BUILD_TARGET_OPTION_MAJOR = 17;
|
|
33
|
-
export declare function angularBuildTarget(name: string, root?: string, layout?: EnvLayout): Record<string, unknown>;
|
|
33
|
+
export declare function angularBuildTarget(name: string, root?: string, layout?: EnvLayout, angularMajor?: number): Record<string, unknown>;
|
|
34
34
|
export declare function angularServeTarget(name: string, port?: number, angularMajor?: number): Record<string, unknown>;
|
|
35
35
|
export declare function angularReleaseTarget(name: string, root?: string): Record<string, unknown>;
|
|
36
36
|
export declare const CLEAN_EXECUTOR = "@mouryaamit/nx-polystack:clean";
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ionicProjectTargets = exports.CAPACITOR_EXECUTOR = exports.angularProjectTargets = exports.cleanTarget = exports.CLEAN_EXECUTOR = exports.angularReleaseTarget = exports.angularServeTarget = exports.angularBuildTarget = exports.BUILD_TARGET_OPTION_MAJOR = exports.PER_ENV_ROOT_FILE = exports.ENV_LAYOUTS = exports.withReleaseHardening = exports.RELEASE_HARDENING = exports.RELEASE_CONFIGURATIONS = exports.POLYSTACK_BUILD_EXECUTOR = void 0;
|
|
4
4
|
const options_1 = require("../hardening/options");
|
|
5
|
+
const angular_deps_1 = require("./angular-deps");
|
|
5
6
|
const quality_1 = require("./quality");
|
|
6
7
|
exports.POLYSTACK_BUILD_EXECUTOR = '@mouryaamit/nx-polystack:build';
|
|
7
8
|
/** release configuration → pipeline env + Angular build configuration */
|
|
@@ -52,7 +53,7 @@ function optimized(name, envFile, layout) {
|
|
|
52
53
|
optimization: { scripts: true, styles: { minify: true, inlineCritical: false }, fonts: true },
|
|
53
54
|
};
|
|
54
55
|
}
|
|
55
|
-
function angularBuildTarget(name, root = `apps/${name}`, layout = 'default') {
|
|
56
|
+
function angularBuildTarget(name, root = `apps/${name}`, layout = 'default', angularMajor) {
|
|
56
57
|
return {
|
|
57
58
|
executor: '@angular-devkit/build-angular:browser',
|
|
58
59
|
outputs: ['{options.outputPath}'],
|
|
@@ -60,7 +61,10 @@ function angularBuildTarget(name, root = `apps/${name}`, layout = 'default') {
|
|
|
60
61
|
outputPath: `dist/${root}`,
|
|
61
62
|
index: `${root}/src/index.html`,
|
|
62
63
|
main: `${root}/src/main.ts`,
|
|
63
|
-
polyfills
|
|
64
|
+
// Angular 14's browser builder takes a file (src/polyfills.ts imports zone.js).
|
|
65
|
+
polyfills: (angularMajor ?? angular_deps_1.POLYFILLS_ARRAY_MAJOR) >= angular_deps_1.POLYFILLS_ARRAY_MAJOR
|
|
66
|
+
? ['zone.js']
|
|
67
|
+
: `${root}/src/polyfills.ts`,
|
|
64
68
|
tsConfig: `${root}/tsconfig.app.json`,
|
|
65
69
|
inlineStyleLanguage: 'scss',
|
|
66
70
|
// .htaccess is per env (environments/<app>/htaccess.<env>): the release build adds it.
|
|
@@ -133,7 +137,7 @@ exports.cleanTarget = cleanTarget;
|
|
|
133
137
|
/** Targets of a generated Angular app; `root` defaults to apps/<name>. */
|
|
134
138
|
function angularProjectTargets(name, root = `apps/${name}`, opts = {}) {
|
|
135
139
|
return {
|
|
136
|
-
build: angularBuildTarget(name, root, opts.envLayout ?? 'default'),
|
|
140
|
+
build: angularBuildTarget(name, root, opts.envLayout ?? 'default', opts.angularMajor),
|
|
137
141
|
serve: angularServeTarget(name, opts.port, opts.angularMajor),
|
|
138
142
|
release: angularReleaseTarget(name, root),
|
|
139
143
|
clean: cleanTarget(root),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-project.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-project.ts"],"names":[],"mappings":";;;AAAA,kDAA4D;AAE5D,uCAA4C;AAE/B,QAAA,wBAAwB,GAAG,gCAAgC,CAAC;AAEzE,yEAAyE;AAC5D,QAAA,sBAAsB,GAAgE;IACjG,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE;IACtD,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE;IAC9C,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,YAAY,EAAE;CACxD,CAAC;AAEF,oGAAoG;AACvF,QAAA,iBAAiB,GAAG;IAC/B,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,MAAM;IAClB,aAAa,EAAE,IAAI;IACnB,WAAW,EAAE,8BAAoB;CACzB,CAAC;AAEX,0FAA0F;AAC1F,SAAgB,oBAAoB,CAA4B,MAAS;IACvE,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;IACrC,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IACnD,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,yBAAiB,EAAE,WAAW,EAAE,CAAC,GAAG,yBAAiB,CAAC,WAAW,CAAC,EAAE,CAAC;AAC9F,CAAC;AAJD,oDAIC;AAED,MAAM,OAAO,GAAG;IACd,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE;IAC/D,EAAE,IAAI,EAAE,mBAAmB,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE;CAC3E,CAAC;AAGW,QAAA,WAAW,GAAyB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AACxE,gGAAgG;AACnF,QAAA,iBAAiB,GAAG,6BAA6B,CAAC;AAY/D,kGAAkG;AACrF,QAAA,yBAAyB,GAAG,EAAE,CAAC;AAE5C,SAAS,cAAc,CAAC,YAAqB;IAC3C,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC,IAAI,iCAAyB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC;AAC7F,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,OAAe,EAAE,MAAiB;IACtE,OAAO;QACL,OAAO,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,yBAAiB,CAAC,CAAC,CAAC,gBAAgB,IAAI,iBAAiB;QACzF,IAAI,EAAE,gBAAgB,IAAI,IAAI,OAAO,EAAE;KACxC,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,IAAY,EAAE,OAAe,EAAE,MAAiB;IACjE,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACvC,gBAAgB,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACzD,aAAa,EAAE,KAAK;QACpB,+FAA+F;QAC/F,YAAY,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;KAC9F,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAChC,IAAY,EACZ,IAAI,GAAG,QAAQ,IAAI,EAAE,EACrB,SAAoB,SAAS;
|
|
1
|
+
{"version":3,"file":"angular-project.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-project.ts"],"names":[],"mappings":";;;AAAA,kDAA4D;AAE5D,iDAAuD;AACvD,uCAA4C;AAE/B,QAAA,wBAAwB,GAAG,gCAAgC,CAAC;AAEzE,yEAAyE;AAC5D,QAAA,sBAAsB,GAAgE;IACjG,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE;IACtD,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE;IAC9C,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,YAAY,EAAE;CACxD,CAAC;AAEF,oGAAoG;AACvF,QAAA,iBAAiB,GAAG;IAC/B,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,MAAM;IAClB,aAAa,EAAE,IAAI;IACnB,WAAW,EAAE,8BAAoB;CACzB,CAAC;AAEX,0FAA0F;AAC1F,SAAgB,oBAAoB,CAA4B,MAAS;IACvE,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;IACrC,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IACnD,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,yBAAiB,EAAE,WAAW,EAAE,CAAC,GAAG,yBAAiB,CAAC,WAAW,CAAC,EAAE,CAAC;AAC9F,CAAC;AAJD,oDAIC;AAED,MAAM,OAAO,GAAG;IACd,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE;IAC/D,EAAE,IAAI,EAAE,mBAAmB,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE;CAC3E,CAAC;AAGW,QAAA,WAAW,GAAyB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AACxE,gGAAgG;AACnF,QAAA,iBAAiB,GAAG,6BAA6B,CAAC;AAY/D,kGAAkG;AACrF,QAAA,yBAAyB,GAAG,EAAE,CAAC;AAE5C,SAAS,cAAc,CAAC,YAAqB;IAC3C,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC,IAAI,iCAAyB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC;AAC7F,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,OAAe,EAAE,MAAiB;IACtE,OAAO;QACL,OAAO,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,yBAAiB,CAAC,CAAC,CAAC,gBAAgB,IAAI,iBAAiB;QACzF,IAAI,EAAE,gBAAgB,IAAI,IAAI,OAAO,EAAE;KACxC,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,IAAY,EAAE,OAAe,EAAE,MAAiB;IACjE,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACvC,gBAAgB,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACzD,aAAa,EAAE,KAAK;QACpB,+FAA+F;QAC/F,YAAY,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;KAC9F,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAChC,IAAY,EACZ,IAAI,GAAG,QAAQ,IAAI,EAAE,EACrB,SAAoB,SAAS,EAC7B,YAAqB;IAErB,OAAO;QACL,QAAQ,EAAE,uCAAuC;QACjD,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,OAAO,EAAE;YACP,UAAU,EAAE,QAAQ,IAAI,EAAE;YAC1B,KAAK,EAAE,GAAG,IAAI,iBAAiB;YAC/B,IAAI,EAAE,GAAG,IAAI,cAAc;YAC3B,gFAAgF;YAChF,SAAS,EACP,CAAC,YAAY,IAAI,oCAAqB,CAAC,IAAI,oCAAqB;gBAC9D,CAAC,CAAC,CAAC,SAAS,CAAC;gBACb,CAAC,CAAC,GAAG,IAAI,mBAAmB;YAChC,QAAQ,EAAE,GAAG,IAAI,oBAAoB;YACrC,mBAAmB,EAAE,MAAM;YAC3B,uFAAuF;YACvF,MAAM,EAAE,EAAE;YACV,MAAM,EAAE,CAAC,GAAG,IAAI,kBAAkB,CAAC;YACnC,OAAO,EAAE,EAAE;SACZ;QACD,cAAc,EAAE;YACd,UAAU,EAAE,SAAS,CAAC,IAAI,EAAE,qBAAqB,EAAE,MAAM,CAAC;YAC1D,GAAG,EAAE,SAAS,CAAC,IAAI,EAAE,oBAAoB,EAAE,MAAM,CAAC;YAClD,WAAW,EAAE;gBACX,GAAG,CAAC,MAAM,KAAK,SAAS;oBACtB,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,oBAAoB,EAAE,MAAM,CAAC,CAAC,EAAE;oBAC5E,CAAC,CAAC,EAAE,CAAC;gBACP,cAAc,EAAE,KAAK;gBACrB,YAAY,EAAE,KAAK;gBACnB,WAAW,EAAE,IAAI;gBACjB,eAAe,EAAE,KAAK;gBACtB,SAAS,EAAE,IAAI;gBACf,WAAW,EAAE,IAAI;aAClB;SACF;QACD,oBAAoB,EAAE,YAAY;KACnC,CAAC;AACJ,CAAC;AA1CD,gDA0CC;AAED,SAAgB,kBAAkB,CAChC,IAAY,EACZ,IAAa,EACb,YAAqB;IAErB,MAAM,GAAG,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;IACzC,OAAO;QACL,QAAQ,EAAE,0CAA0C;QACpD,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,cAAc,EAAE;YACd,UAAU,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,mBAAmB,EAAE;YACjD,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,YAAY,EAAE;YACnC,WAAW,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,oBAAoB,EAAE;SACpD;QACD,oBAAoB,EAAE,aAAa;KACpC,CAAC;AACJ,CAAC;AAhBD,gDAgBC;AAED,SAAgB,oBAAoB,CAAC,IAAY,EAAE,IAAI,GAAG,QAAQ,IAAI,EAAE;IACtE,OAAO;QACL,QAAQ,EAAE,gCAAwB;QAClC,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,OAAO,EAAE;YACP,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,QAAQ,IAAI,EAAE;YAC1B,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,GAAG,IAAI,QAAQ;SAC7B;QACD,cAAc,EAAE,MAAM,CAAC,WAAW,CAChC,MAAM,CAAC,OAAO,CAAC,8BAAsB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAC5F;QACD,oBAAoB,EAAE,KAAK;KAC5B,CAAC;AACJ,CAAC;AAfD,oDAeC;AAEY,QAAA,cAAc,GAAG,gCAAgC,CAAC;AAE/D;;;GAGG;AACH,SAAgB,WAAW,CACzB,IAAY,EACZ,OAAiE,EAAE;IAEnE,MAAM,GAAG,GAAG,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACpE,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC,EAAE,YAAY,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IACtF,OAAO;QACL,QAAQ,EAAE,sBAAc;QACxB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;KAC/D,CAAC;AACJ,CAAC;AAVD,kCAUC;AAED,0EAA0E;AAC1E,SAAgB,qBAAqB,CACnC,IAAY,EACZ,IAAI,GAAG,QAAQ,IAAI,EAAE,EACrB,OAA6B,EAAE;IAE/B,OAAO;QACL,KAAK,EAAE,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,IAAI,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC;QACrF,KAAK,EAAE,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC;QAC7D,OAAO,EAAE,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC;QACzC,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC;QACxB,SAAS,EAAE,IAAA,yBAAe,EAAC,GAAG,IAAI,oBAAoB,CAAC;QACvD,IAAI,EAAE;YACJ,QAAQ,EAAE,iBAAiB;YAC3B,OAAO,EAAE,CAAC,sBAAsB,CAAC;YACjC,OAAO,EAAE,EAAE,gBAAgB,EAAE,CAAC,GAAG,IAAI,cAAc,EAAE,GAAG,IAAI,gBAAgB,CAAC,EAAE;SAChF;QACD,cAAc,EAAE;YACd,QAAQ,EAAE,4CAA4C;YACtD,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,GAAG,IAAI,QAAQ,EAAE;SAClE;KACF,CAAC;AACJ,CAAC;AArBD,sDAqBC;AAEY,QAAA,kBAAkB,GAAG,oCAAoC,CAAC;AAEvE,+GAA+G;AAC/G,SAAgB,mBAAmB,CACjC,IAAY,EACZ,IAAI,GAAG,QAAQ,IAAI,EAAE,EACrB,OAA6B,EAAE;IAE/B,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAyC,CAAC;IAC3E,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;IAClC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAuC,CAAC;IACrE,gDAAgD;IAChD,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,yCAAyC;QAChD,MAAM,EAAE,OAAO;KAChB,CAAC,CAAC;IACH,iGAAiG;IACjG,MAAM,MAAM,GAAG,QAAQ,IAAI,EAAE,CAAC;IAC9B,MAAM,KAAK,GAAG,MAAM,KAAK,aAAa,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/D,KAAK,MAAM,OAAO,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;QAC7C,OAAO,CAAC,OAAO,OAAO,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,0BAAkB,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;KAC9F;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAtBD,kDAsBC"}
|
package/dist/src/migrations/application-builder-flat-output/application-builder-flat-output.d.ts
ADDED
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Tree } from '@nx/devkit';
|
|
2
|
+
/**
|
|
3
|
+
* v1.11.11 (NX-113): release builds have no browser/ folder. Angular's application builder writes
|
|
4
|
+
* the app to <base>/browser/ unless outputPath.browser is "", so the build target a release target
|
|
5
|
+
* builds gets `outputPath: { base, browser: "" }` (a string outputPath becomes that object). The
|
|
6
|
+
* release build now refuses anything else. Layouts are kept; project.json files with comments,
|
|
7
|
+
* server-rendered builds and release outputPaths that are not the build base are listed.
|
|
8
|
+
*/
|
|
9
|
+
export default function applicationBuilderFlatOutput(tree: Tree): Promise<void>;
|
package/dist/src/migrations/application-builder-flat-output/application-builder-flat-output.js
ADDED
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const devkit_1 = require("@nx/devkit");
|
|
4
|
+
const json_layout_1 = require("../../lib/utils/json-layout");
|
|
5
|
+
const project_json_files_1 = require("../../lib/utils/project-json-files");
|
|
6
|
+
const angular_project_1 = require("../../lib/utils/angular-project");
|
|
7
|
+
const flat_output_1 = require("../../lib/release/flat-output");
|
|
8
|
+
const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
|
|
9
|
+
/**
|
|
10
|
+
* v1.11.11 (NX-113): release builds have no browser/ folder. Angular's application builder writes
|
|
11
|
+
* the app to <base>/browser/ unless outputPath.browser is "", so the build target a release target
|
|
12
|
+
* builds gets `outputPath: { base, browser: "" }` (a string outputPath becomes that object). The
|
|
13
|
+
* release build now refuses anything else. Layouts are kept; project.json files with comments,
|
|
14
|
+
* server-rendered builds and release outputPaths that are not the build base are listed.
|
|
15
|
+
*/
|
|
16
|
+
async function applicationBuilderFlatOutput(tree) {
|
|
17
|
+
const say = (s) => devkit_1.logger.info(`application-builder-flat-output: ${s}`);
|
|
18
|
+
const jsonc = (0, json_layout_1.loadJsonc)(tree.root);
|
|
19
|
+
for (const file of (0, project_json_files_1.projectJsonFiles)(tree)) {
|
|
20
|
+
const before = tree.read(file, 'utf8') ?? '';
|
|
21
|
+
let pj;
|
|
22
|
+
try {
|
|
23
|
+
pj = JSON.parse(before);
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
if (/application"/.test(before) && before.includes(angular_project_1.POLYSTACK_BUILD_EXECUTOR)) {
|
|
27
|
+
say(`${file} holds comments; set its build outputPath.browser to "" by hand.`);
|
|
28
|
+
}
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
const targets = isObject(pj['targets']) ? pj['targets'] : {};
|
|
32
|
+
const name = typeof pj['name'] === 'string' ? pj['name'] : '';
|
|
33
|
+
let changed = false;
|
|
34
|
+
for (const [releaseName, release] of Object.entries(targets)) {
|
|
35
|
+
if (!isObject(release) || release['executor'] !== angular_project_1.POLYSTACK_BUILD_EXECUTOR)
|
|
36
|
+
continue;
|
|
37
|
+
const options = isObject(release['options']) ? release['options'] : {};
|
|
38
|
+
const ref = typeof options['buildTarget'] === 'string' ? options['buildTarget'] : `${name}:build`;
|
|
39
|
+
const [project, buildName] = ref.split(':');
|
|
40
|
+
if (project !== name || !buildName)
|
|
41
|
+
continue;
|
|
42
|
+
const build = targets[buildName];
|
|
43
|
+
const result = (0, flat_output_1.flattenApplicationOutput)(build);
|
|
44
|
+
if (result === 'ssr') {
|
|
45
|
+
say(`${file} ${buildName}: server rendering; the release build refuses it.`);
|
|
46
|
+
continue;
|
|
47
|
+
}
|
|
48
|
+
if (result === 'set') {
|
|
49
|
+
changed = true;
|
|
50
|
+
say(`${file} ${buildName}: outputPath.browser set to "" (no browser/ folder).`);
|
|
51
|
+
}
|
|
52
|
+
if (result !== 'none') {
|
|
53
|
+
const base = (0, flat_output_1.outputBase)(build['options'] && build['options']['outputPath']);
|
|
54
|
+
const out = options['outputPath'];
|
|
55
|
+
if (base && typeof out === 'string' && !(0, flat_output_1.sameOutput)(base, out)) {
|
|
56
|
+
say(`${file} ${releaseName}: outputPath "${out}" is not the build base "${base}"; the ` +
|
|
57
|
+
`release build refuses that. Set it to "${base}".`);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
if (!changed)
|
|
62
|
+
continue;
|
|
63
|
+
const after = JSON.stringify(pj, null, 2) + '\n';
|
|
64
|
+
tree.write(file, (jsonc && (0, json_layout_1.keepJsonLayout)(jsonc, before, after)) || after);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
exports.default = applicationBuilderFlatOutput;
|
|
68
|
+
//# sourceMappingURL=application-builder-flat-output.js.map
|
package/dist/src/migrations/application-builder-flat-output/application-builder-flat-output.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"application-builder-flat-output.js","sourceRoot":"","sources":["../../../../src/migrations/application-builder-flat-output/application-builder-flat-output.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mouryaamit/nx-polystack",
|
|
3
|
-
"version": "1.11.
|
|
3
|
+
"version": "1.11.11",
|
|
4
4
|
"description": "Nx plugin and pstack CLI that scaffold and build multi-tech monorepos (Angular, Ionic, Flutter) with a hardened release pipeline.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "commonjs",
|