@mouryaamit/nx-polystack 1.5.0 → 1.7.0
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 +5 -2
- package/dist/migrations.json +5 -0
- package/dist/src/cli/commands/csp.js +55 -11
- package/dist/src/cli/commands/csp.js.map +1 -1
- package/dist/src/cli/help.js +4 -1
- package/dist/src/cli/help.js.map +1 -1
- package/dist/src/cli/launcher.js +1 -1
- package/dist/src/cli/launcher.js.map +1 -1
- package/dist/src/executors/build/executor.js +20 -0
- package/dist/src/executors/build/executor.js.map +1 -1
- package/dist/src/executors/build/schema.d.ts +5 -0
- package/dist/src/executors/build/schema.json +5 -0
- package/dist/src/executors/capacitor/executor.js +13 -0
- package/dist/src/executors/capacitor/executor.js.map +1 -1
- package/dist/src/executors/flutter-build/executor.js +33 -4
- package/dist/src/executors/flutter-build/executor.js.map +1 -1
- package/dist/src/executors/flutter-build/schema.d.ts +6 -1
- package/dist/src/executors/flutter-build/schema.json +10 -1
- package/dist/src/generators/app/files/angular/.eslintrc.json__template__ +2 -1
- package/dist/src/generators/app/files/angular/server/README.md__template__ +7 -3
- package/dist/src/generators/app/files/angular/src/app/app.component.ts__template__ +2 -1
- package/dist/src/generators/app/from.js +56 -21
- package/dist/src/generators/app/from.js.map +1 -1
- package/dist/src/generators/app/generator.d.ts +2 -0
- package/dist/src/generators/app/generator.js +19 -3
- package/dist/src/generators/app/generator.js.map +1 -1
- package/dist/src/generators/env/generator.js +110 -17
- package/dist/src/generators/env/generator.js.map +1 -1
- package/dist/src/generators/lib/angular-lib.js +2 -0
- package/dist/src/generators/lib/angular-lib.js.map +1 -1
- package/dist/src/generators/lib/files/angular/component/src/lib/__fileName__/__fileName__.component.ts__template__ +2 -1
- package/dist/src/generators/lib/files/angular/config/.eslintrc.json__template__ +2 -1
- package/dist/src/generators/lib/files/ionic/src/lib/__fileName__/__fileName__.page.ts__template__ +2 -1
- package/dist/src/generators/lib/files/pii/src/lib/pii-mask.directive.ts__template__ +1 -1
- package/dist/src/generators/lib/files/pii/src/lib/pii-mask.pipe.ts__template__ +1 -1
- package/dist/src/generators/lib/files/session/src/lib/session-warning/session-warning.component.ts__template__ +2 -1
- package/dist/src/generators/migrate/adapters/angular-cli.js +17 -6
- package/dist/src/generators/migrate/adapters/angular-cli.js.map +1 -1
- package/dist/src/generators/migrate/adapters/angular-workspace.js +12 -0
- package/dist/src/generators/migrate/adapters/angular-workspace.js.map +1 -1
- package/dist/src/generators/migrate/adapters/flutter.js +13 -7
- package/dist/src/generators/migrate/adapters/flutter.js.map +1 -1
- package/dist/src/generators/migrate/adapters/npm-workspaces.js +6 -0
- package/dist/src/generators/migrate/adapters/npm-workspaces.js.map +1 -1
- package/dist/src/generators/migrate/adapters/nx-workspace.js +19 -5
- package/dist/src/generators/migrate/adapters/nx-workspace.js.map +1 -1
- package/dist/src/generators/migrate/adapters/types.d.ts +10 -0
- package/dist/src/generators/migrate/adapters/types.js.map +1 -1
- package/dist/src/generators/migrate/generator.js +3 -0
- package/dist/src/generators/migrate/generator.js.map +1 -1
- package/dist/src/generators/preset/schema.json +1 -1
- package/dist/src/lib/csp/allowlist.d.ts +11 -1
- package/dist/src/lib/csp/allowlist.js +73 -15
- package/dist/src/lib/csp/allowlist.js.map +1 -1
- package/dist/src/lib/csp/render.d.ts +8 -0
- package/dist/src/lib/csp/render.js +37 -1
- package/dist/src/lib/csp/render.js.map +1 -1
- package/dist/src/lib/release/htaccess-adopt.d.ts +22 -0
- package/dist/src/lib/release/htaccess-adopt.js +108 -0
- package/dist/src/lib/release/htaccess-adopt.js.map +1 -0
- package/dist/src/lib/release/htaccess.d.ts +23 -0
- package/dist/src/lib/release/htaccess.js +81 -0
- package/dist/src/lib/release/htaccess.js.map +1 -0
- package/dist/src/lib/utils/angular-deps.d.ts +7 -1
- package/dist/src/lib/utils/angular-deps.js +11 -3
- package/dist/src/lib/utils/angular-deps.js.map +1 -1
- package/dist/src/lib/utils/angular-project.js +2 -1
- package/dist/src/lib/utils/angular-project.js.map +1 -1
- package/dist/src/lib/utils/env-files.d.ts +19 -4
- package/dist/src/lib/utils/env-files.js +48 -4
- package/dist/src/lib/utils/env-files.js.map +1 -1
- package/dist/src/lib/utils/env-move.d.ts +37 -0
- package/dist/src/lib/utils/env-move.js +186 -0
- package/dist/src/lib/utils/env-move.js.map +1 -0
- package/dist/src/lib/utils/llm-block.js +8 -3
- package/dist/src/lib/utils/llm-block.js.map +1 -1
- package/dist/src/migrations/env-files-layout/env-files-layout.d.ts +22 -0
- package/dist/src/migrations/env-files-layout/env-files-layout.js +180 -0
- package/dist/src/migrations/env-files-layout/env-files-layout.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.renderNginx = exports.renderHtaccess = exports.noncePlaceholder = exports.CSP_NONCE_SSI = exports.GENERATED_MARKER = void 0;
|
|
3
|
+
exports.renderFlutterHtaccess = exports.FLUTTER_HTACCESS_MARKER = exports.renderNginx = exports.renderHtaccess = exports.noncePlaceholder = exports.CSP_NONCE_SSI = exports.GENERATED_MARKER = void 0;
|
|
4
4
|
const allowlist_1 = require("./allowlist");
|
|
5
5
|
/** First line of every file `pstack csp` writes; files without it are hand-written. */
|
|
6
6
|
exports.GENERATED_MARKER = '# Generated by pstack csp from csp-allowlist.json';
|
|
@@ -163,4 +163,40 @@ function renderNginx(app, a) {
|
|
|
163
163
|
].join('\n');
|
|
164
164
|
}
|
|
165
165
|
exports.renderNginx = renderNginx;
|
|
166
|
+
/** First line of the Flutter web .htaccess `pstack app` writes (pstack never rewrites it). */
|
|
167
|
+
exports.FLUTTER_HTACCESS_MARKER = '# Written by pstack app for a Flutter web build';
|
|
168
|
+
/**
|
|
169
|
+
* Apache config for a Flutter web build, the counterpart of its server/nginx.conf: SPA routing,
|
|
170
|
+
* the wasm MIME type, security headers and a CSP for the CanvasKit renderer, no-cache for the
|
|
171
|
+
* bootstrap files Flutter does not hash. One per env (environments/<app>/htaccess.<env>).
|
|
172
|
+
*/
|
|
173
|
+
function renderFlutterHtaccess(app, env) {
|
|
174
|
+
return [
|
|
175
|
+
`${exports.FLUTTER_HTACCESS_MARKER} — ${app}, ${env}. Edit it freely; pstack does not rewrite it.`,
|
|
176
|
+
'# Needs mod_rewrite and mod_headers, and AllowOverride FileInfo (or All) for this folder.',
|
|
177
|
+
'',
|
|
178
|
+
'# Single-page app: anything that is not a file or a folder gets index.html.',
|
|
179
|
+
'RewriteEngine On',
|
|
180
|
+
'RewriteCond %{REQUEST_FILENAME} !-f',
|
|
181
|
+
'RewriteCond %{REQUEST_FILENAME} !-d',
|
|
182
|
+
'RewriteRule ^ index.html [L]',
|
|
183
|
+
'',
|
|
184
|
+
'# WebAssembly (CanvasKit renderer)',
|
|
185
|
+
'AddType application/wasm .wasm',
|
|
186
|
+
'',
|
|
187
|
+
'# Security headers. CanvasKit needs wasm-unsafe-eval and blob: workers; test before tightening.',
|
|
188
|
+
'Header always set X-Frame-Options "SAMEORIGIN"',
|
|
189
|
+
'Header always set X-Content-Type-Options "nosniff"',
|
|
190
|
+
`Header always set Referrer-Policy "${allowlist_1.DEFAULT_REFERRER_POLICY}"`,
|
|
191
|
+
'Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains"',
|
|
192
|
+
"Header always set Content-Security-Policy \"default-src 'self'; script-src 'self' 'wasm-unsafe-eval' blob:; style-src 'self' 'unsafe-inline'; img-src 'self' data: blob:; font-src 'self' data:; connect-src 'self'; worker-src blob:; frame-ancestors 'none'\"",
|
|
193
|
+
'',
|
|
194
|
+
'# Flutter does not hash these: always revalidate them.',
|
|
195
|
+
'<FilesMatch "^(index\\.html|flutter_bootstrap\\.js|flutter_service_worker\\.js|version\\.json|manifest\\.json)$">',
|
|
196
|
+
' Header set Cache-Control "no-cache"',
|
|
197
|
+
'</FilesMatch>',
|
|
198
|
+
'',
|
|
199
|
+
].join('\n');
|
|
200
|
+
}
|
|
201
|
+
exports.renderFlutterHtaccess = renderFlutterHtaccess;
|
|
166
202
|
//# sourceMappingURL=render.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../src/lib/csp/render.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../src/lib/csp/render.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Tree } from '@nx/devkit';
|
|
2
|
+
export interface AdoptHtaccessResult {
|
|
3
|
+
/** The .htaccess the build target copied (workspace-relative), when there was one. */
|
|
4
|
+
source?: string;
|
|
5
|
+
/** environments/<envProject>/htaccess.<env> files written. */
|
|
6
|
+
written: string[];
|
|
7
|
+
/** Files that already existed and were kept. */
|
|
8
|
+
kept: string[];
|
|
9
|
+
/** The release target got htaccess: false (no .htaccess was built before). */
|
|
10
|
+
disabled: boolean;
|
|
11
|
+
/** Release envs without an htaccess.<env> while others have one (nothing was written). */
|
|
12
|
+
missing: string[];
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Moves an app to environment-specific .htaccess files, keeping what its release builds contain:
|
|
16
|
+
* the .htaccess its build target copied becomes environments/<envProject>/htaccess.<env> for every
|
|
17
|
+
* release env (identical copies) and leaves the build assets; an app that built none gets
|
|
18
|
+
* htaccess: false on its release target. Existing env files are never replaced.
|
|
19
|
+
*/
|
|
20
|
+
export declare function adoptHtaccess(tree: Tree, projectJsonPath: string): AdoptHtaccessResult;
|
|
21
|
+
/** What adoptHtaccess did, as a migration report note (none when nothing changed). */
|
|
22
|
+
export declare function htaccessNote(r: AdoptHtaccessResult, name: string, notes: string[]): void;
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.htaccessNote = exports.adoptHtaccess = void 0;
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const htaccess_1 = require("./htaccess");
|
|
6
|
+
const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
|
|
7
|
+
const RELEASE_EXECUTOR = '@mouryaamit/nx-polystack:build';
|
|
8
|
+
/** The workspace path a build `assets` entry copies when it is a .htaccess file, else undefined. */
|
|
9
|
+
function htaccessAsset(entry) {
|
|
10
|
+
if (typeof entry === 'string')
|
|
11
|
+
return /(^|\/)\.htaccess$/.test(entry) ? entry : undefined;
|
|
12
|
+
if (isObject(entry) && entry['glob'] === '.htaccess' && typeof entry['input'] === 'string') {
|
|
13
|
+
return `${entry['input'].replace(/\/+$/, '')}/.htaccess`;
|
|
14
|
+
}
|
|
15
|
+
return undefined;
|
|
16
|
+
}
|
|
17
|
+
/** Drops .htaccess entries from an assets list; returns the paths they copied. */
|
|
18
|
+
function dropHtaccessAssets(options) {
|
|
19
|
+
if (!isObject(options) || !Array.isArray(options['assets']))
|
|
20
|
+
return [];
|
|
21
|
+
const found = [];
|
|
22
|
+
options['assets'] = options['assets'].filter((a) => {
|
|
23
|
+
const p = htaccessAsset(a);
|
|
24
|
+
if (p)
|
|
25
|
+
found.push(p);
|
|
26
|
+
return p === undefined;
|
|
27
|
+
});
|
|
28
|
+
return found;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Moves an app to environment-specific .htaccess files, keeping what its release builds contain:
|
|
32
|
+
* the .htaccess its build target copied becomes environments/<envProject>/htaccess.<env> for every
|
|
33
|
+
* release env (identical copies) and leaves the build assets; an app that built none gets
|
|
34
|
+
* htaccess: false on its release target. Existing env files are never replaced.
|
|
35
|
+
*/
|
|
36
|
+
function adoptHtaccess(tree, projectJsonPath) {
|
|
37
|
+
const result = { written: [], kept: [], disabled: false, missing: [] };
|
|
38
|
+
const pj = (0, devkit_1.readJson)(tree, projectJsonPath);
|
|
39
|
+
const targets = isObject(pj['targets']) ? pj['targets'] : {};
|
|
40
|
+
const release = Object.values(targets).find((t) => t['executor'] === RELEASE_EXECUTOR);
|
|
41
|
+
if (!release)
|
|
42
|
+
return result;
|
|
43
|
+
const options = isObject(release['options']) ? release['options'] : (release['options'] = {});
|
|
44
|
+
if (options['htaccess'] === false)
|
|
45
|
+
return result;
|
|
46
|
+
// The Angular target the release builds (options.buildTarget "project:target[:config]").
|
|
47
|
+
const buildTargetName = typeof options['buildTarget'] === 'string'
|
|
48
|
+
? String(options['buildTarget']).split(':')[1] ?? 'build'
|
|
49
|
+
: 'build';
|
|
50
|
+
const build = targets[buildTargetName] ?? targets['build'];
|
|
51
|
+
const copied = [
|
|
52
|
+
...dropHtaccessAssets(build?.['options']),
|
|
53
|
+
...Object.values(isObject(build?.['configurations']) ? build?.['configurations'] : {}).flatMap((c) => dropHtaccessAssets(c)),
|
|
54
|
+
];
|
|
55
|
+
const source = copied.find((p) => tree.exists(p) && tree.isFile(p));
|
|
56
|
+
const envProject = String(options['envProject'] ?? pj['name']);
|
|
57
|
+
const configs = isObject(release['configurations']) ? release['configurations'] : {};
|
|
58
|
+
const envs = [
|
|
59
|
+
...new Set(Object.entries(configs).map(([name, c]) => String((isObject(c) ? c['env'] : undefined) ?? name).toLowerCase())),
|
|
60
|
+
];
|
|
61
|
+
const existing = envs.filter((env) => tree.exists((0, htaccess_1.htaccessSourcePath)(envProject, env)));
|
|
62
|
+
if (!source && existing.length > 0) {
|
|
63
|
+
// Already on env files (an app made by pstack app 1.5.1 or later, or by hand): kept as is.
|
|
64
|
+
result.kept.push(...existing.map((env) => (0, htaccess_1.htaccessSourcePath)(envProject, env)));
|
|
65
|
+
result.missing = envs.filter((env) => !existing.includes(env));
|
|
66
|
+
}
|
|
67
|
+
else if (!source || envs.length === 0) {
|
|
68
|
+
options['htaccess'] = false;
|
|
69
|
+
result.disabled = true;
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
result.source = source;
|
|
73
|
+
const content = tree.read(source);
|
|
74
|
+
for (const env of envs) {
|
|
75
|
+
const file = (0, htaccess_1.htaccessSourcePath)(envProject, env);
|
|
76
|
+
if (tree.exists(file)) {
|
|
77
|
+
result.kept.push(file);
|
|
78
|
+
continue;
|
|
79
|
+
}
|
|
80
|
+
tree.write(file, content);
|
|
81
|
+
result.written.push(file);
|
|
82
|
+
}
|
|
83
|
+
// Moved: the build no longer copies it, and the env files are the only copies.
|
|
84
|
+
tree.delete(source);
|
|
85
|
+
}
|
|
86
|
+
(0, devkit_1.writeJson)(tree, projectJsonPath, pj);
|
|
87
|
+
return result;
|
|
88
|
+
}
|
|
89
|
+
exports.adoptHtaccess = adoptHtaccess;
|
|
90
|
+
/** What adoptHtaccess did, as a migration report note (none when nothing changed). */
|
|
91
|
+
function htaccessNote(r, name, notes) {
|
|
92
|
+
const code = (s) => `\`${s}\``;
|
|
93
|
+
if (r.disabled) {
|
|
94
|
+
notes.push('release builds make no `.htaccess` (`htaccess: false`: the app had none); for one, add ' +
|
|
95
|
+
`${code(`environments/${name}/htaccess.<env>`)} for each env and remove the option`);
|
|
96
|
+
}
|
|
97
|
+
else if (r.missing.length > 0) {
|
|
98
|
+
notes.push(`no ${r.missing.map((e) => code(`htaccess.${e}`)).join(', ')} next to ` +
|
|
99
|
+
`${r.kept.map(code).join(', ')}; release builds of ${r.missing.join(', ')} fail until it ` +
|
|
100
|
+
'is added (`pstack csp` writes it)');
|
|
101
|
+
}
|
|
102
|
+
else if (r.source) {
|
|
103
|
+
notes.push(`${code(r.source)} became the env files ${[...r.written, ...r.kept].map(code).join(', ')} ` +
|
|
104
|
+
'(each release build copies its own env file as `.htaccess`)');
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
exports.htaccessNote = htaccessNote;
|
|
108
|
+
//# sourceMappingURL=htaccess-adopt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"htaccess-adopt.js","sourceRoot":"","sources":["../../../../src/lib/release/htaccess-adopt.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Environment-specific Apache config for web release builds (Angular, Ionic, Flutter web):
|
|
3
|
+
* environments/<envProject>/htaccess.<env> is copied into the served root as .htaccess. There is
|
|
4
|
+
* no fallback to another env's file or to a generic one.
|
|
5
|
+
*/
|
|
6
|
+
/** Env folder of a project: environments/<envProject> (workspace-relative). */
|
|
7
|
+
export declare const ENVIRONMENTS_DIR = "environments";
|
|
8
|
+
/** environments/<envProject>/htaccess.<env> (workspace-relative, env lower-cased). */
|
|
9
|
+
export declare function htaccessSourcePath(envProject: string, env: string): string;
|
|
10
|
+
/**
|
|
11
|
+
* The absolute path of the env's .htaccess source. Throws when it is missing, naming the app, the
|
|
12
|
+
* env and the expected file.
|
|
13
|
+
*/
|
|
14
|
+
export declare function requireHtaccessSource(repoRoot: string, app: string, envProject: string, env: string, hint?: string): string;
|
|
15
|
+
/** The .htaccess-like files under root, relative to root (forward slashes) and sorted. */
|
|
16
|
+
export declare function findHtaccessFiles(root: string): string[];
|
|
17
|
+
/** Removes every .htaccess-like file under root. Returns them (relative to root, sorted). */
|
|
18
|
+
export declare function removeHtaccessFiles(root: string): string[];
|
|
19
|
+
/**
|
|
20
|
+
* Puts source into servedDir as .htaccess after removing every other .htaccess-like file from
|
|
21
|
+
* outputDir, then checks that it is the only one. Returns the files that were removed.
|
|
22
|
+
*/
|
|
23
|
+
export declare function placeHtaccess(source: string, outputDir: string, servedDir: string): string[];
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.placeHtaccess = exports.removeHtaccessFiles = exports.findHtaccessFiles = exports.requireHtaccessSource = exports.htaccessSourcePath = exports.ENVIRONMENTS_DIR = 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
|
+
/**
|
|
8
|
+
* Environment-specific Apache config for web release builds (Angular, Ionic, Flutter web):
|
|
9
|
+
* environments/<envProject>/htaccess.<env> is copied into the served root as .htaccess. There is
|
|
10
|
+
* no fallback to another env's file or to a generic one.
|
|
11
|
+
*/
|
|
12
|
+
/** Env folder of a project: environments/<envProject> (workspace-relative). */
|
|
13
|
+
exports.ENVIRONMENTS_DIR = 'environments';
|
|
14
|
+
/** A .htaccess or a per-env copy of one (htaccess.uat, .htaccess.prod, .htaccess.bak, …). */
|
|
15
|
+
const HTACCESS_NAME = /^\.?htaccess(\..+)?$/i;
|
|
16
|
+
/** environments/<envProject>/htaccess.<env> (workspace-relative, env lower-cased). */
|
|
17
|
+
function htaccessSourcePath(envProject, env) {
|
|
18
|
+
return `${exports.ENVIRONMENTS_DIR}/${envProject}/htaccess.${env.toLowerCase()}`;
|
|
19
|
+
}
|
|
20
|
+
exports.htaccessSourcePath = htaccessSourcePath;
|
|
21
|
+
/**
|
|
22
|
+
* The absolute path of the env's .htaccess source. Throws when it is missing, naming the app, the
|
|
23
|
+
* env and the expected file.
|
|
24
|
+
*/
|
|
25
|
+
function requireHtaccessSource(repoRoot, app, envProject, env, hint = `set "htaccess": false on its build target to build without one`) {
|
|
26
|
+
const rel = htaccessSourcePath(envProject, env);
|
|
27
|
+
const abs = path.join(repoRoot, rel);
|
|
28
|
+
if (!fs.existsSync(abs) || !fs.statSync(abs).isFile()) {
|
|
29
|
+
throw new Error(`${app}: the ${env.toLowerCase()} build needs ${rel} (htaccess is on), and it does not ` +
|
|
30
|
+
`exist. Create it (pstack csp --app=${app} writes every env's file), or ${hint}.`);
|
|
31
|
+
}
|
|
32
|
+
return abs;
|
|
33
|
+
}
|
|
34
|
+
exports.requireHtaccessSource = requireHtaccessSource;
|
|
35
|
+
/** The .htaccess-like files under root, relative to root (forward slashes) and sorted. */
|
|
36
|
+
function findHtaccessFiles(root) {
|
|
37
|
+
const found = [];
|
|
38
|
+
const walk = (dir) => {
|
|
39
|
+
if (!fs.existsSync(dir))
|
|
40
|
+
return;
|
|
41
|
+
for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
|
|
42
|
+
const full = path.join(dir, entry.name);
|
|
43
|
+
if (entry.isDirectory())
|
|
44
|
+
walk(full);
|
|
45
|
+
else if (HTACCESS_NAME.test(entry.name)) {
|
|
46
|
+
found.push(path.relative(root, full).split(path.sep).join('/'));
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
walk(root);
|
|
51
|
+
return found.sort();
|
|
52
|
+
}
|
|
53
|
+
exports.findHtaccessFiles = findHtaccessFiles;
|
|
54
|
+
/** Removes every .htaccess-like file under root. Returns them (relative to root, sorted). */
|
|
55
|
+
function removeHtaccessFiles(root) {
|
|
56
|
+
const found = findHtaccessFiles(root);
|
|
57
|
+
for (const rel of found)
|
|
58
|
+
fs.rmSync(path.join(root, rel), { force: true });
|
|
59
|
+
return found;
|
|
60
|
+
}
|
|
61
|
+
exports.removeHtaccessFiles = removeHtaccessFiles;
|
|
62
|
+
/**
|
|
63
|
+
* Puts source into servedDir as .htaccess after removing every other .htaccess-like file from
|
|
64
|
+
* outputDir, then checks that it is the only one. Returns the files that were removed.
|
|
65
|
+
*/
|
|
66
|
+
function placeHtaccess(source, outputDir, servedDir) {
|
|
67
|
+
const removed = removeHtaccessFiles(outputDir);
|
|
68
|
+
fs.mkdirSync(servedDir, { recursive: true });
|
|
69
|
+
fs.copyFileSync(source, path.join(servedDir, '.htaccess'));
|
|
70
|
+
const expected = path
|
|
71
|
+
.relative(outputDir, path.join(servedDir, '.htaccess'))
|
|
72
|
+
.split(path.sep)
|
|
73
|
+
.join('/');
|
|
74
|
+
const left = findHtaccessFiles(outputDir);
|
|
75
|
+
if (left.length !== 1 || left[0] !== expected) {
|
|
76
|
+
throw new Error(`htaccess: expected only ${expected} in the output, found ${left.join(', ')}`);
|
|
77
|
+
}
|
|
78
|
+
return removed;
|
|
79
|
+
}
|
|
80
|
+
exports.placeHtaccess = placeHtaccess;
|
|
81
|
+
//# sourceMappingURL=htaccess.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"htaccess.js","sourceRoot":"","sources":["../../../../src/lib/release/htaccess.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,12 @@ export declare const GENERATOR_ANGULAR_MAJORS: readonly number[];
|
|
|
12
12
|
* (Angular 18 deprecates HttpClientModule; its own migration writes the same providers).
|
|
13
13
|
*/
|
|
14
14
|
export declare const PROVIDE_HTTP_CLIENT_MAJOR = 18;
|
|
15
|
+
/**
|
|
16
|
+
* From this major, components, directives and pipes are standalone unless they say otherwise, so
|
|
17
|
+
* generated NgModule declarations get `standalone: false` (what Angular 19's own migration writes),
|
|
18
|
+
* and their ESLint configs turn off angular-eslint 19's `prefer-standalone` (as Nx 20.2's migration does).
|
|
19
|
+
*/
|
|
20
|
+
export declare const STANDALONE_FALSE_MAJOR = 19;
|
|
15
21
|
/** Versions the generators add for one Angular major (only where a package is missing). */
|
|
16
22
|
export interface AngularGeneratorVersions {
|
|
17
23
|
angular: string;
|
|
@@ -41,7 +47,7 @@ export interface EnsureAngularOptions {
|
|
|
41
47
|
* never upgraded:
|
|
42
48
|
* - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
|
|
43
49
|
* and @types/node;
|
|
44
|
-
* - a generator major installed (15–
|
|
50
|
+
* - a generator major installed (15–19) → missing build/lint packages at the installed Angular
|
|
45
51
|
* version (plus the imported runtime packages when `includeRuntime`);
|
|
46
52
|
* - another Angular major → nothing; warns which build/lint packages are missing.
|
|
47
53
|
*/
|
|
@@ -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.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.STANDALONE_FALSE_MAJOR = exports.PROVIDE_HTTP_CLIENT_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,17 +11,24 @@ 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];
|
|
14
|
+
exports.GENERATOR_ANGULAR_MAJORS = [15, 16, 17, 18, 19];
|
|
15
15
|
/**
|
|
16
16
|
* From this major, generated apps provide HttpClient with `provideHttpClient(withInterceptorsFromDi())`
|
|
17
17
|
* (Angular 18 deprecates HttpClientModule; its own migration writes the same providers).
|
|
18
18
|
*/
|
|
19
19
|
exports.PROVIDE_HTTP_CLIENT_MAJOR = 18;
|
|
20
|
+
/**
|
|
21
|
+
* From this major, components, directives and pipes are standalone unless they say otherwise, so
|
|
22
|
+
* generated NgModule declarations get `standalone: false` (what Angular 19's own migration writes),
|
|
23
|
+
* and their ESLint configs turn off angular-eslint 19's `prefer-standalone` (as Nx 20.2's migration does).
|
|
24
|
+
*/
|
|
25
|
+
exports.STANDALONE_FALSE_MAJOR = 19;
|
|
20
26
|
const ZONE_JS = {
|
|
21
27
|
15: '~0.12.0',
|
|
22
28
|
16: '~0.13.0',
|
|
23
29
|
17: '~0.14.0',
|
|
24
30
|
18: '~0.14.0',
|
|
31
|
+
19: '~0.15.0',
|
|
25
32
|
};
|
|
26
33
|
/** @types/node the major's TypeScript can parse (a latest one uses newer syntax: TS1139). */
|
|
27
34
|
const TYPES_NODE = {
|
|
@@ -29,6 +36,7 @@ const TYPES_NODE = {
|
|
|
29
36
|
16: '~20.10.0',
|
|
30
37
|
17: '~20.10.0',
|
|
31
38
|
18: '~20.10.0',
|
|
39
|
+
19: '~20.10.0',
|
|
32
40
|
};
|
|
33
41
|
function angularGeneratorVersions(major) {
|
|
34
42
|
if (major === 15) {
|
|
@@ -120,7 +128,7 @@ function typeScriptPackages(v) {
|
|
|
120
128
|
* never upgraded:
|
|
121
129
|
* - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
|
|
122
130
|
* and @types/node;
|
|
123
|
-
* - a generator major installed (15–
|
|
131
|
+
* - a generator major installed (15–19) → missing build/lint packages at the installed Angular
|
|
124
132
|
* version (plus the imported runtime packages when `includeRuntime`);
|
|
125
133
|
* - another Angular major → nothing; warns which build/lint packages are missing.
|
|
126
134
|
*/
|
|
@@ -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,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"angular-deps.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-deps.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,7 +63,8 @@ function angularBuildTarget(name, root = `apps/${name}`, layout = 'default') {
|
|
|
63
63
|
polyfills: ['zone.js'],
|
|
64
64
|
tsConfig: `${root}/tsconfig.app.json`,
|
|
65
65
|
inlineStyleLanguage: 'scss',
|
|
66
|
-
|
|
66
|
+
// .htaccess is per env (environments/<app>/htaccess.<env>): the release build adds it.
|
|
67
|
+
assets: [],
|
|
67
68
|
styles: [`${root}/src/styles.scss`],
|
|
68
69
|
scripts: [],
|
|
69
70
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-project.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-project.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"angular-project.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,28 @@ import { EnvLayout } from './angular-project';
|
|
|
6
6
|
* (created when missing) that the app imports and its build configurations replace.
|
|
7
7
|
*/
|
|
8
8
|
export declare function generateAngularEnvFiles(tree: Tree, projectName: string, layout?: EnvLayout): void;
|
|
9
|
+
/** Every env file of a project lives in environments/<envProject>/ (Angular, Ionic and Flutter). */
|
|
10
|
+
export declare const ENV_ROOT = "environments";
|
|
11
|
+
/** environments/<envProject>/environment.<env>.json: a Flutter app's --dart-define-from-file. */
|
|
12
|
+
export declare function flutterEnvFile(envProject: string, env: string): string;
|
|
13
|
+
/** The env names of a Flutter app's environment.<env>.json files, sorted. */
|
|
14
|
+
export declare function flutterEnvNames(tree: Tree, envProject: string): string[];
|
|
9
15
|
export interface FlutterEnvFilesOptions {
|
|
10
|
-
/** Leave env
|
|
16
|
+
/** Leave env files that already exist in the tree as they are. */
|
|
11
17
|
keepExisting?: boolean;
|
|
12
18
|
/** Write `{}` instead of the example values (for apps with their own configuration). */
|
|
13
19
|
empty?: boolean;
|
|
14
|
-
/** Project root (default apps/<name>). */
|
|
15
|
-
root?: string;
|
|
16
20
|
}
|
|
17
|
-
/**
|
|
21
|
+
/** environments/<name>/environment.{dev,uat,prod}.json; returns the files written. */
|
|
18
22
|
export declare function generateFlutterEnvFiles(tree: Tree, projectName: string, opts?: FlutterEnvFilesOptions): string[];
|
|
23
|
+
export interface MovedEnvFiles {
|
|
24
|
+
/** [from, to] pairs. */
|
|
25
|
+
moved: [string, string][];
|
|
26
|
+
/** Files left where they were: the target already existed. */
|
|
27
|
+
kept: string[];
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Moves a Flutter app's <root>/env/<env>.json files to environments/<envProject>/
|
|
31
|
+
* environment.<env>.json (an existing target is never replaced; the file then stays).
|
|
32
|
+
*/
|
|
33
|
+
export declare function moveFlutterEnvFiles(tree: Tree, root: string, envProject: string): MovedEnvFiles;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.generateFlutterEnvFiles = exports.generateAngularEnvFiles = void 0;
|
|
3
|
+
exports.moveFlutterEnvFiles = exports.generateFlutterEnvFiles = exports.flutterEnvNames = exports.flutterEnvFile = exports.ENV_ROOT = exports.generateAngularEnvFiles = void 0;
|
|
4
4
|
const angular_project_1 = require("./angular-project");
|
|
5
5
|
/**
|
|
6
6
|
* environments/<app>/environment.ts (dev), .uat.ts and .prod.ts; in the per-env layout
|
|
@@ -19,9 +19,27 @@ function generateAngularEnvFiles(tree, projectName, layout = 'default') {
|
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
21
|
exports.generateAngularEnvFiles = generateAngularEnvFiles;
|
|
22
|
-
/**
|
|
22
|
+
/** Every env file of a project lives in environments/<envProject>/ (Angular, Ionic and Flutter). */
|
|
23
|
+
exports.ENV_ROOT = 'environments';
|
|
24
|
+
/** environments/<envProject>/environment.<env>.json: a Flutter app's --dart-define-from-file. */
|
|
25
|
+
function flutterEnvFile(envProject, env) {
|
|
26
|
+
return `${exports.ENV_ROOT}/${envProject}/environment.${env}.json`;
|
|
27
|
+
}
|
|
28
|
+
exports.flutterEnvFile = flutterEnvFile;
|
|
29
|
+
/** The env names of a Flutter app's environment.<env>.json files, sorted. */
|
|
30
|
+
function flutterEnvNames(tree, envProject) {
|
|
31
|
+
const dir = `${exports.ENV_ROOT}/${envProject}`;
|
|
32
|
+
if (!tree.exists(dir) || tree.isFile(dir))
|
|
33
|
+
return [];
|
|
34
|
+
return tree
|
|
35
|
+
.children(dir)
|
|
36
|
+
.map((f) => /^environment\.(.+)\.json$/.exec(f)?.[1])
|
|
37
|
+
.filter((e) => e !== undefined && tree.isFile(flutterEnvFile(envProject, e)))
|
|
38
|
+
.sort();
|
|
39
|
+
}
|
|
40
|
+
exports.flutterEnvNames = flutterEnvNames;
|
|
41
|
+
/** environments/<name>/environment.{dev,uat,prod}.json; returns the files written. */
|
|
23
42
|
function generateFlutterEnvFiles(tree, projectName, opts = {}) {
|
|
24
|
-
const base = `${opts.root ?? `apps/${projectName}`}/env`;
|
|
25
43
|
const files = {
|
|
26
44
|
dev: { FLUTTER_ENV: 'dev', API_BASE_URL: 'https://dev.example.com' },
|
|
27
45
|
uat: { FLUTTER_ENV: 'uat', API_BASE_URL: 'https://uat.example.com' },
|
|
@@ -29,7 +47,7 @@ function generateFlutterEnvFiles(tree, projectName, opts = {}) {
|
|
|
29
47
|
};
|
|
30
48
|
const written = [];
|
|
31
49
|
for (const [env, content] of Object.entries(files)) {
|
|
32
|
-
const file =
|
|
50
|
+
const file = flutterEnvFile(projectName, env);
|
|
33
51
|
if (opts.keepExisting && tree.exists(file))
|
|
34
52
|
continue;
|
|
35
53
|
tree.write(file, opts.empty ? '{}\n' : JSON.stringify(content, null, 2) + '\n');
|
|
@@ -38,4 +56,30 @@ function generateFlutterEnvFiles(tree, projectName, opts = {}) {
|
|
|
38
56
|
return written;
|
|
39
57
|
}
|
|
40
58
|
exports.generateFlutterEnvFiles = generateFlutterEnvFiles;
|
|
59
|
+
/**
|
|
60
|
+
* Moves a Flutter app's <root>/env/<env>.json files to environments/<envProject>/
|
|
61
|
+
* environment.<env>.json (an existing target is never replaced; the file then stays).
|
|
62
|
+
*/
|
|
63
|
+
function moveFlutterEnvFiles(tree, root, envProject) {
|
|
64
|
+
const out = { moved: [], kept: [] };
|
|
65
|
+
const dir = `${root}/env`;
|
|
66
|
+
if (!tree.exists(dir) || tree.isFile(dir))
|
|
67
|
+
return out;
|
|
68
|
+
for (const f of [...tree.children(dir)].sort()) {
|
|
69
|
+
const m = /^(.+)\.json$/.exec(f);
|
|
70
|
+
const from = `${dir}/${f}`;
|
|
71
|
+
if (!m || !tree.isFile(from))
|
|
72
|
+
continue;
|
|
73
|
+
const to = flutterEnvFile(envProject, m[1]);
|
|
74
|
+
if (tree.exists(to)) {
|
|
75
|
+
out.kept.push(from);
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
tree.write(to, tree.read(from));
|
|
79
|
+
tree.delete(from);
|
|
80
|
+
out.moved.push([from, to]);
|
|
81
|
+
}
|
|
82
|
+
return out;
|
|
83
|
+
}
|
|
84
|
+
exports.moveFlutterEnvFiles = moveFlutterEnvFiles;
|
|
41
85
|
//# sourceMappingURL=env-files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-files.js","sourceRoot":"","sources":["../../../../src/lib/utils/env-files.ts"],"names":[],"mappings":";;;AAEA,uDAAiE;AAEjE;;;;GAIG;AACH,SAAgB,uBAAuB,CACrC,IAAU,EACV,WAAmB,EACnB,SAAoB,SAAS;IAE7B,MAAM,IAAI,GAAG,gBAAgB,WAAW,EAAE,CAAC;IAC3C,IAAI,CAAC,KAAK,CACR,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,qBAAqB,CAAC,CAAC,CAAC,GAAG,IAAI,iBAAiB,EAC9E,6EAA6E,CAC9E,CAAC;IACF,IAAI,CAAC,KAAK,CACR,GAAG,IAAI,qBAAqB,EAC5B,6EAA6E,CAC9E,CAAC;IACF,IAAI,CAAC,KAAK,CACR,GAAG,IAAI,sBAAsB,EAC7B,6EAA6E,CAC9E,CAAC;IACF,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mCAAiB,CAAC,EAAE;QAC3D,IAAI,CAAC,KAAK,CACR,mCAAiB,EACjB,mFAAmF;YACjF,2EAA2E;YAC3E,6EAA6E,CAChF,CAAC;KACH;AACH,CAAC;AA1BD,0DA0BC;
|
|
1
|
+
{"version":3,"file":"env-files.js","sourceRoot":"","sources":["../../../../src/lib/utils/env-files.ts"],"names":[],"mappings":"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"}
|