@mouryaamit/nx-polystack 1.11.3 → 1.11.10
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/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/schema.json +6 -2
- 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 +176 -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/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/package.json +1 -1
|
@@ -0,0 +1,239 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.removeScriptReferences = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const path = tslib_1.__importStar(require("path"));
|
|
6
|
+
const json_layout_1 = require("../../lib/utils/json-layout");
|
|
7
|
+
/**
|
|
8
|
+
* What still names the old build scripts after `pstack adopt --remove-old-scripts` deleted them:
|
|
9
|
+
* ignore files, config lists, code comments and docs. Executing references (package.json,
|
|
10
|
+
* project.json, CI, hooks, imports) never get here: a script something still starts is not
|
|
11
|
+
* removed (old-scripts.ts).
|
|
12
|
+
*/
|
|
13
|
+
const posix = path.posix;
|
|
14
|
+
/** The release target that replaced the old scripts, as docs should name it. */
|
|
15
|
+
const RELEASE = '`nx run <app>:release:<env>`';
|
|
16
|
+
const SKIP_DIRS = new Set([
|
|
17
|
+
'node_modules',
|
|
18
|
+
'dist',
|
|
19
|
+
'tmp',
|
|
20
|
+
'coverage',
|
|
21
|
+
'.git',
|
|
22
|
+
'.nx',
|
|
23
|
+
'.angular',
|
|
24
|
+
'release-packages',
|
|
25
|
+
]);
|
|
26
|
+
const LINE_LISTS = /^(\.gitignore|\.prettierignore|\.eslintignore|\.npmignore|\.dockerignore|\.secretlintignore|\.stylelintignore|CODEOWNERS)$/;
|
|
27
|
+
const JSON_FILE = /\.json$|^\.(eslintrc|lintstagedrc|prettierrc)$/;
|
|
28
|
+
const DOC = /\.(md|mdx|markdown|txt|adoc)$/i;
|
|
29
|
+
/** Files with // and /* *\/ comments. */
|
|
30
|
+
const SLASH_COMMENTS = /\.(?:[cm]?[jt]sx?|scss|less|css|java|kt|swift|dart|gradle|groovy)$|^Jenkinsfile/;
|
|
31
|
+
/** Files with # comments. */
|
|
32
|
+
const HASH_COMMENTS = /\.(?:sh|bash|zsh|ya?ml|toml|properties|rb|py|ps1)$|^Dockerfile|^Makefile$|^\.env/;
|
|
33
|
+
function textFiles(tree, skip) {
|
|
34
|
+
const out = [];
|
|
35
|
+
const walk = (dir, depth) => {
|
|
36
|
+
if (depth > 10)
|
|
37
|
+
return;
|
|
38
|
+
for (const name of tree.children(dir)) {
|
|
39
|
+
if (SKIP_DIRS.has(name))
|
|
40
|
+
continue;
|
|
41
|
+
const rel = dir === '.' || dir === '' ? name : `${dir}/${name}`;
|
|
42
|
+
if (tree.isFile(rel)) {
|
|
43
|
+
if (!skip.has(rel))
|
|
44
|
+
out.push(rel);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
walk(rel, depth + 1);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
walk('.', 0);
|
|
52
|
+
return out.sort();
|
|
53
|
+
}
|
|
54
|
+
const esc = (s) => s.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
|
|
55
|
+
/** A pattern for one script: its workspace path, with or without ./ or ../ in front. */
|
|
56
|
+
function scriptPattern(script) {
|
|
57
|
+
return new RegExp(`(?:\\.{1,2}/)*${esc(script)}(?![\\w/-]|\\.\\w)`);
|
|
58
|
+
}
|
|
59
|
+
/** Lines of a text, with their line ending kept. */
|
|
60
|
+
const lines = (text) => text.match(/[^\n]*\n|[^\n]+$/g) ?? [];
|
|
61
|
+
/** Removes JSON array items (strings) that name a script; other mentions are reported. */
|
|
62
|
+
function editJson(root, file, text, names, res) {
|
|
63
|
+
let json;
|
|
64
|
+
try {
|
|
65
|
+
json = JSON.parse(text);
|
|
66
|
+
}
|
|
67
|
+
catch {
|
|
68
|
+
// jsonc with comments: handled as a slash-comment file below.
|
|
69
|
+
return editComments(file, text, names, res, true);
|
|
70
|
+
}
|
|
71
|
+
const removed = [];
|
|
72
|
+
let other = false;
|
|
73
|
+
const visit = (v) => {
|
|
74
|
+
if (Array.isArray(v)) {
|
|
75
|
+
return v
|
|
76
|
+
.filter((x) => {
|
|
77
|
+
if (typeof x === 'string' && names.test(x)) {
|
|
78
|
+
removed.push(x);
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
return true;
|
|
82
|
+
})
|
|
83
|
+
.map(visit);
|
|
84
|
+
}
|
|
85
|
+
if (v && typeof v === 'object') {
|
|
86
|
+
for (const [k, x] of Object.entries(v)) {
|
|
87
|
+
if (typeof x === 'string' && names.test(x))
|
|
88
|
+
other = true;
|
|
89
|
+
else
|
|
90
|
+
v[k] = visit(x);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return v;
|
|
94
|
+
};
|
|
95
|
+
const after = visit(json);
|
|
96
|
+
if (other) {
|
|
97
|
+
lines(text).forEach((l, i) => {
|
|
98
|
+
if (names.test(l) && !removed.some((r) => l.includes(JSON.stringify(r)))) {
|
|
99
|
+
res.review.push(`${file}:${i + 1}`);
|
|
100
|
+
}
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
if (removed.length === 0)
|
|
104
|
+
return text;
|
|
105
|
+
const out = JSON.stringify(after, null, 2);
|
|
106
|
+
const jsonc = (0, json_layout_1.loadJsonc)(root);
|
|
107
|
+
res.edited.push(`${file}: removed ${removed.map((r) => `"${r}"`).join(', ')}`);
|
|
108
|
+
return (jsonc && (0, json_layout_1.keepJsonLayout)(jsonc, text, out)) || `${out}\n`;
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* Comment lines that name a script are deleted; a trailing comment that does is cut from its
|
|
112
|
+
* line. Mentions outside comments are reported, not edited.
|
|
113
|
+
*/
|
|
114
|
+
function editComments(file, text, names, res, slash) {
|
|
115
|
+
const out = [];
|
|
116
|
+
let inBlock = false;
|
|
117
|
+
lines(text).forEach((line, i) => {
|
|
118
|
+
const where = `${file}:${i + 1}`;
|
|
119
|
+
const body = line.replace(/\r?\n$/, '');
|
|
120
|
+
const startsBlock = slash && /^\s*\/\*/.test(body) && !/\*\//.test(body);
|
|
121
|
+
const blockLine = inBlock || startsBlock;
|
|
122
|
+
if (slash) {
|
|
123
|
+
if (startsBlock)
|
|
124
|
+
inBlock = true;
|
|
125
|
+
if (inBlock && /\*\//.test(body))
|
|
126
|
+
inBlock = false;
|
|
127
|
+
}
|
|
128
|
+
if (!names.test(body)) {
|
|
129
|
+
out.push(line);
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
// A line that is only comment: `// …`, a ` * …` line of a block, a plain line inside a
|
|
133
|
+
// block, a one-line `/* … */`, or `# …`. Lines that open or close a block stay.
|
|
134
|
+
const whole = slash
|
|
135
|
+
? /^\s*\/\//.test(body) ||
|
|
136
|
+
/^\s*\/\*.*\*\/\s*$/.test(body) ||
|
|
137
|
+
(blockLine && !startsBlock && !/\*\//.test(body))
|
|
138
|
+
: /^\s*#/.test(body);
|
|
139
|
+
if (whole) {
|
|
140
|
+
res.edited.push(`${where}: comment line removed`);
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
const marker = slash ? body.search(/\s\/\/\s/) : body.search(/\s#\s/);
|
|
144
|
+
if (marker >= 0 && names.test(body.slice(marker)) && !names.test(body.slice(0, marker))) {
|
|
145
|
+
out.push(body.slice(0, marker).replace(/\s+$/, '') + line.slice(body.length));
|
|
146
|
+
res.edited.push(`${where}: trailing comment removed`);
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
res.review.push(where);
|
|
150
|
+
out.push(line);
|
|
151
|
+
});
|
|
152
|
+
return out.join('');
|
|
153
|
+
}
|
|
154
|
+
/** Docs: a code span or command naming a script becomes the release target; prose likewise. */
|
|
155
|
+
function editDoc(file, text, scripts, res) {
|
|
156
|
+
let fenced = false;
|
|
157
|
+
const out = lines(text).map((line, i) => {
|
|
158
|
+
if (/^\s*(```|~~~)/.test(line))
|
|
159
|
+
fenced = !fenced;
|
|
160
|
+
let next = line;
|
|
161
|
+
for (const s of scripts) {
|
|
162
|
+
const p = scriptPattern(s);
|
|
163
|
+
if (!p.test(next))
|
|
164
|
+
continue;
|
|
165
|
+
if (fenced) {
|
|
166
|
+
// A command line in a code block: the release target command.
|
|
167
|
+
next = next.replace(/^(\s*(?:\$\s*)?)(?:npx\s+)?node\s+\S+.*?(\r?\n)?$/, (_m, lead, nl) => `${lead}npx nx run <app>:release:<env>${nl ?? ''}`);
|
|
168
|
+
if (p.test(next))
|
|
169
|
+
next = next.replace(new RegExp(p.source, 'g'), 'the release target');
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
next = next
|
|
173
|
+
.replace(new RegExp('`[^`\\n]*' + p.source + '[^`\\n]*`', 'g'), RELEASE)
|
|
174
|
+
.replace(new RegExp(p.source, 'g'), `the release target (${RELEASE})`);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
if (next !== line)
|
|
178
|
+
res.edited.push(`${file}:${i + 1}: now names the release target`);
|
|
179
|
+
return next;
|
|
180
|
+
});
|
|
181
|
+
return out.join('');
|
|
182
|
+
}
|
|
183
|
+
/**
|
|
184
|
+
* Removes or rewrites what still names the removed scripts. `keep` lists files left as they are
|
|
185
|
+
* (the adopt report, which records what was removed). Changelogs are history and are kept too.
|
|
186
|
+
*/
|
|
187
|
+
function removeScriptReferences(tree, scripts, keep = []) {
|
|
188
|
+
const res = { edited: [], review: [] };
|
|
189
|
+
if (scripts.length === 0)
|
|
190
|
+
return res;
|
|
191
|
+
const names = new RegExp(scripts.map((s) => scriptPattern(s).source).join('|'));
|
|
192
|
+
for (const file of textFiles(tree, new Set(keep))) {
|
|
193
|
+
const base = posix.basename(file);
|
|
194
|
+
if (/^CHANGELOG/i.test(base) || base === 'package-lock.json')
|
|
195
|
+
continue;
|
|
196
|
+
const buf = tree.read(file);
|
|
197
|
+
if (!buf || buf.includes(0))
|
|
198
|
+
continue;
|
|
199
|
+
const text = buf.toString('utf8');
|
|
200
|
+
if (!names.test(text))
|
|
201
|
+
continue;
|
|
202
|
+
let out = text;
|
|
203
|
+
if (LINE_LISTS.test(base)) {
|
|
204
|
+
out = lines(text)
|
|
205
|
+
.filter((l, i) => {
|
|
206
|
+
if (!names.test(l))
|
|
207
|
+
return true;
|
|
208
|
+
res.edited.push(`${file}:${i + 1}: entry removed`);
|
|
209
|
+
return false;
|
|
210
|
+
})
|
|
211
|
+
.join('');
|
|
212
|
+
}
|
|
213
|
+
else if (JSON_FILE.test(base)) {
|
|
214
|
+
out = editJson(tree.root, file, text, names, res);
|
|
215
|
+
}
|
|
216
|
+
else if (DOC.test(base)) {
|
|
217
|
+
out = editDoc(file, text, scripts, res);
|
|
218
|
+
}
|
|
219
|
+
else if (SLASH_COMMENTS.test(base) || /\.html$/.test(base)) {
|
|
220
|
+
out = /\.html$/.test(base)
|
|
221
|
+
? text // HTML: comments are <!-- -->; report only.
|
|
222
|
+
: editComments(file, text, names, res, true);
|
|
223
|
+
if (/\.html$/.test(base)) {
|
|
224
|
+
lines(text).forEach((l, i) => names.test(l) && res.review.push(`${file}:${i + 1}`));
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
else if (HASH_COMMENTS.test(base)) {
|
|
228
|
+
out = editComments(file, text, names, res, false);
|
|
229
|
+
}
|
|
230
|
+
else {
|
|
231
|
+
lines(text).forEach((l, i) => names.test(l) && res.review.push(`${file}:${i + 1}`));
|
|
232
|
+
}
|
|
233
|
+
if (out !== text)
|
|
234
|
+
tree.write(file, out);
|
|
235
|
+
}
|
|
236
|
+
return res;
|
|
237
|
+
}
|
|
238
|
+
exports.removeScriptReferences = removeScriptReferences;
|
|
239
|
+
//# sourceMappingURL=old-script-refs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"old-script-refs.js","sourceRoot":"","sources":["../../../../src/generators/adopt/old-script-refs.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,10 +8,12 @@ export interface SourcePipeline {
|
|
|
8
8
|
/** CSP nonce written into index.html; undefined when no step writes one. */
|
|
9
9
|
nonce?: {
|
|
10
10
|
placeholder?: string;
|
|
11
|
-
tags?: 'all' | 'legacy';
|
|
11
|
+
tags?: 'all' | 'legacy' | 'every';
|
|
12
12
|
position?: 'end' | 'after-tag-name';
|
|
13
13
|
replaceTokens: string[];
|
|
14
14
|
addMeta: boolean;
|
|
15
|
+
/** Root element given ngCspNonce (Angular 16+ runtime styles), e.g. app-root. */
|
|
16
|
+
ngCspNonce?: string;
|
|
15
17
|
};
|
|
16
18
|
/** HTML comments removed from index.html in every env. */
|
|
17
19
|
stripHtmlComments: boolean;
|
|
@@ -76,13 +76,24 @@ function nonceOf(text) {
|
|
|
76
76
|
return undefined;
|
|
77
77
|
const placeholder = /\bconst\s+NONCE\s*=\s*(['"`])((?:(?!\1).)*)\1/.exec(text)?.[2];
|
|
78
78
|
// Inline scripts only: the <script pattern skips tags with src.
|
|
79
|
-
const
|
|
79
|
+
const inlineOnly = /<script\(\?!\[\^>\]\*\\bsrc=\)/.test(text);
|
|
80
|
+
// Every link: a <link pattern with no rel filter.
|
|
81
|
+
const everyLink = /<link\(\?!\[\^>\]\*\\bnonce=\)\(\[\^>\]\*\)>/.test(text);
|
|
82
|
+
const tags = inlineOnly ? 'legacy' : everyLink ? 'every' : undefined;
|
|
83
|
+
const ngCspNonce = /<([a-z][\w]*(?:-[\w]+)+)\(\?!\[\^>\]\*ngCspNonce\)/i.exec(text)?.[1];
|
|
80
84
|
const position = /`<(?:script|link|style) nonce=/.test(text) ? 'after-tag-name' : undefined;
|
|
81
85
|
const replaceTokens = [
|
|
82
86
|
...new Set([...text.matchAll(/\.replace\(\/([A-Za-z0-9_-]{4,})\/g,\s*NONCE\)/g)].map((m) => m[1])),
|
|
83
87
|
].sort();
|
|
84
88
|
const addMeta = /property=\\?["']csp-nonce/.test(text);
|
|
85
|
-
return {
|
|
89
|
+
return {
|
|
90
|
+
placeholder,
|
|
91
|
+
tags,
|
|
92
|
+
position,
|
|
93
|
+
replaceTokens,
|
|
94
|
+
addMeta,
|
|
95
|
+
...(ngCspNonce ? { ngCspNonce: ngCspNonce.toLowerCase() } : {}),
|
|
96
|
+
};
|
|
86
97
|
}
|
|
87
98
|
/** Reads the custom build scripts and the step scripts they run. */
|
|
88
99
|
function readSourcePipeline(root, buildScripts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../../src/generators/adopt/pipeline.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;
|
|
1
|
+
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../../src/generators/adopt/pipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,13 +3,13 @@
|
|
|
3
3
|
"cli": "nx",
|
|
4
4
|
"id": "adopt",
|
|
5
5
|
"title": "Adopt Apps",
|
|
6
|
-
"description": "Move the Angular apps of this workspace that build without the plugin to its release target, in place:
|
|
6
|
+
"description": "Move the Angular and Flutter apps of this workspace that build without the plugin to its release target (Angular) or flutter-build target (Flutter web), in place: base hrefs and post-build steps read from the workspace's own build script, environments/<app>/htaccess.<env> and env files, env encryption settings, build:<app>:<env> npm scripts. Old scripts are kept.",
|
|
7
7
|
"type": "object",
|
|
8
8
|
"properties": {
|
|
9
9
|
"projects": {
|
|
10
10
|
"type": "array",
|
|
11
11
|
"items": { "type": "string" },
|
|
12
|
-
"description": "Apps to adopt (default: every Angular app without a release target)."
|
|
12
|
+
"description": "Apps to adopt (default: every Angular app without a release target and every Flutter app whose web build does not use flutter-build)."
|
|
13
13
|
},
|
|
14
14
|
"scripts": {
|
|
15
15
|
"type": "boolean",
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"outDir": "<%= up %>dist/out-tsc",
|
|
5
5
|
"types": []
|
|
6
6
|
},
|
|
7
|
-
"files": ["src/main.ts"],
|
|
7
|
+
"files": ["src/main.ts"<% if (polyfillsFile) { %>, "src/polyfills.ts"<% } %>],
|
|
8
8
|
"include": ["src/**/*.d.ts"],
|
|
9
9
|
"exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"]
|
|
10
10
|
}
|
|
@@ -102,6 +102,10 @@ async function appGenerator(tree, options) {
|
|
|
102
102
|
const major = (0, angular_deps_1.workspaceGeneratorMajor)(tree);
|
|
103
103
|
const style = (0, angular_style_1.resolveAngularStyle)(tree, { standalone: options.standalone, module: options.module }, 'app generator');
|
|
104
104
|
const standalone = style === 'standalone';
|
|
105
|
+
if (standalone)
|
|
106
|
+
(0, angular_deps_1.assertStandaloneSupported)(major, 'app generator');
|
|
107
|
+
// Angular 14: zone.js from src/polyfills.ts, ES2020.
|
|
108
|
+
const polyfillsFile = major < angular_deps_1.POLYFILLS_ARRAY_MAJOR;
|
|
105
109
|
const vars = {
|
|
106
110
|
name: projectName,
|
|
107
111
|
// Capacitor for the workspace's Angular (5 on 15, 6 on 16–17, 7 on 18–20, 8 on 21); Angular itself is added below.
|
|
@@ -115,6 +119,8 @@ async function appGenerator(tree, options) {
|
|
|
115
119
|
// ApplicationConfig moved from @angular/platform-browser to @angular/core in Angular 16.
|
|
116
120
|
applicationConfigFromCore: major >= 16,
|
|
117
121
|
zoneProviders: major >= angular_deps_1.ZONE_PROVIDER_MAJOR,
|
|
122
|
+
polyfillsFile,
|
|
123
|
+
tsTarget: polyfillsFile ? 'es2020' : 'es2022',
|
|
118
124
|
ionicImport: (0, angular_deps_1.ionicAngularImport)(major),
|
|
119
125
|
ionicStandaloneImport: (0, angular_deps_1.ionicStandaloneImport)(major),
|
|
120
126
|
className,
|
|
@@ -132,6 +138,9 @@ async function appGenerator(tree, options) {
|
|
|
132
138
|
// NgModule apps: AppModule, AppRoutingModule, bootstrapModule; standalone apps: app.config.ts,
|
|
133
139
|
// app.routes.ts, bootstrapApplication.
|
|
134
140
|
(0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files', `angular-${style}`), projectPath, vars);
|
|
141
|
+
if (polyfillsFile) {
|
|
142
|
+
tree.write(`${projectPath}/src/polyfills.ts`, "// Loaded before the app (the build's polyfills option). Zone.js is required by Angular.\nimport 'zone.js';\n");
|
|
143
|
+
}
|
|
135
144
|
if (type === 'ionic') {
|
|
136
145
|
// Overlays the Angular files: <ion-app>, Ionic styles, Capacitor config (and IonicModule).
|
|
137
146
|
(0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files', 'ionic'), projectPath, vars);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/app/generator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/app/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,12 +13,14 @@ const base_href_1 = require("../../lib/utils/base-href");
|
|
|
13
13
|
const env_files_1 = require("../../lib/utils/env-files");
|
|
14
14
|
const llm_block_1 = require("../../lib/utils/llm-block");
|
|
15
15
|
const npm_scripts_1 = require("../../lib/utils/npm-scripts");
|
|
16
|
-
|
|
16
|
+
// uat is one of the standard envs, but apps without one (migrated or adopted with dev and prod
|
|
17
|
+
// only) can add it; an app that has it already is refused per app.
|
|
18
|
+
const RESERVED = new Set(['dev', 'development', 'prod', 'production']);
|
|
17
19
|
const NAME_RE = /^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/;
|
|
18
20
|
async function envGenerator(tree, options) {
|
|
19
21
|
const { name, apiUrl, production, baseHref } = options;
|
|
20
22
|
// Without --from: uat, else prod (migrated apps may only have production).
|
|
21
|
-
const sources = options.from ? [options.from] : ['uat', 'prod'];
|
|
23
|
+
const sources = options.from ? [options.from] : name === 'uat' ? ['prod'] : ['uat', 'prod'];
|
|
22
24
|
if (!NAME_RE.test(name)) {
|
|
23
25
|
throw new Error(`env generator: --name="${name}" must be lowercase kebab-case (e.g. qa, sit, staging).`);
|
|
24
26
|
}
|
|
@@ -216,7 +218,9 @@ async function envGenerator(tree, options) {
|
|
|
216
218
|
const targets = (json['targets'] ?? {});
|
|
217
219
|
for (const targetName of ['build-web', 'build-android', 'build-ios']) {
|
|
218
220
|
const target = targets[targetName];
|
|
219
|
-
|
|
221
|
+
// Targets that do not build with flutter-build (an adopted app's run-commands apk /
|
|
222
|
+
// ios builds) have no env configurations to copy.
|
|
223
|
+
if (!target || !isFlutterBuild(target))
|
|
220
224
|
continue;
|
|
221
225
|
const configs = (target['configurations'] ?? {});
|
|
222
226
|
const sourceName = sources
|
|
@@ -234,9 +238,17 @@ async function envGenerator(tree, options) {
|
|
|
234
238
|
json['targets'] = targets;
|
|
235
239
|
return json;
|
|
236
240
|
});
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
241
|
+
const built = ((0, devkit_1.readJson)(tree, `${app.root}/project.json`).targets ?? {});
|
|
242
|
+
const flutterTargets = [
|
|
243
|
+
['web', 'build-web'],
|
|
244
|
+
['apk', 'build-android'],
|
|
245
|
+
['ios', 'build-ios'],
|
|
246
|
+
];
|
|
247
|
+
for (const [kind, t] of flutterTargets) {
|
|
248
|
+
if (built[t] && isFlutterBuild(built[t])) {
|
|
249
|
+
npmScripts[`build:${app.name}:${name}:${kind}`] = `nx run ${app.name}:${t}:${name}`;
|
|
250
|
+
}
|
|
251
|
+
}
|
|
240
252
|
}
|
|
241
253
|
else {
|
|
242
254
|
// run-commands: env is passed at runtime via {args.env} — no project.json patch needed
|
|
@@ -395,7 +407,7 @@ function planFlutter(tree, app, name, sources, explicit) {
|
|
|
395
407
|
const targets = ((0, devkit_1.readJson)(tree, `${app.root}/project.json`).targets ?? {});
|
|
396
408
|
for (const t of ['build-web', 'build-android', 'build-ios']) {
|
|
397
409
|
const target = targets[t];
|
|
398
|
-
if (!target)
|
|
410
|
+
if (!target || !isFlutterBuild(target))
|
|
399
411
|
continue;
|
|
400
412
|
if (target.configurations?.[name]) {
|
|
401
413
|
problems.push(`${app.name}: ${t} configuration "${name}" already exists`);
|
|
@@ -408,6 +420,10 @@ function planFlutter(tree, app, name, sources, explicit) {
|
|
|
408
420
|
}
|
|
409
421
|
return { app, newEnvFile: file, sourceJson: source, htaccess, problems };
|
|
410
422
|
}
|
|
423
|
+
/** A target that builds with the plugin's flutter-build executor. */
|
|
424
|
+
function isFlutterBuild(target) {
|
|
425
|
+
return /:flutter-build$/.test(String(target['executor'] ?? ''));
|
|
426
|
+
}
|
|
411
427
|
/** The polystack release target (any name), else a target named release. */
|
|
412
428
|
function releaseTargetOf(targets) {
|
|
413
429
|
const entry = Object.entries(targets).find(([, t]) => t?.['executor'] === angular_project_1.POLYSTACK_BUILD_EXECUTOR) ??
|