@mouryaamit/nx-polystack 1.22.0 → 1.24.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 +120 -1
- package/USER-MANUAL.md +42 -4
- package/dist/bin/cli.js +6 -0
- package/dist/bin/cli.js.map +1 -1
- package/dist/src/cli/commands/update.js +25 -9
- package/dist/src/cli/commands/update.js.map +1 -1
- package/dist/src/cli/context.d.ts +13 -0
- package/dist/src/cli/context.js +44 -2
- package/dist/src/cli/context.js.map +1 -1
- package/dist/src/cli/install-source.d.ts +14 -2
- package/dist/src/cli/install-source.js +18 -3
- package/dist/src/cli/install-source.js.map +1 -1
- package/dist/src/cli/update-plan.d.ts +9 -1
- package/dist/src/cli/update-plan.js +20 -9
- package/dist/src/cli/update-plan.js.map +1 -1
- package/dist/src/cli/versions.d.ts +27 -7
- package/dist/src/cli/versions.js +62 -17
- package/dist/src/cli/versions.js.map +1 -1
- package/dist/src/generators/infra/generator.js +8 -0
- package/dist/src/generators/infra/generator.js.map +1 -1
- package/dist/src/lib/utils/devkit-deps.js +14 -1
- package/dist/src/lib/utils/devkit-deps.js.map +1 -1
- package/dist/src/migrations/plugin-repo-dev/plugin-repo-dev.js +2 -2
- package/dist/src/migrations/plugin-repo-dev/plugin-repo-dev.js.map +1 -1
- package/package.json +8 -1
- package/runtime/csp-nonce.js +22 -2
- package/runtime/csp-style-attr.js +51 -0
package/README.md
CHANGED
|
@@ -10,7 +10,7 @@ pipeline into every app, so they are all built the same way.
|
|
|
10
10
|
## Install
|
|
11
11
|
|
|
12
12
|
```bash
|
|
13
|
-
npm i -g @mouryaamit/nx-polystack
|
|
13
|
+
npm i -g @mouryaamit/nx-polystack nx@22 @nx/devkit@22
|
|
14
14
|
pstack new my-workspace --npmScope=acme --ci=github-actions
|
|
15
15
|
cd my-workspace
|
|
16
16
|
pstack app --type=angular --name=portal
|
|
@@ -23,6 +23,10 @@ pstack app --from=portal --name=partner-portal # a copy of portal, env values
|
|
|
23
23
|
pinned copy, so output always matches the workspace's version. Move a workspace to a new release
|
|
24
24
|
with `pstack update`, which installs it and runs its migrations.
|
|
25
25
|
|
|
26
|
+
`nx` and `@nx/devkit` are optional peer dependencies (since 1.24.0, so apps that only import a
|
|
27
|
+
runtime file do not get Nx), which is why the global install names them; without them, commands
|
|
28
|
+
that need them stop with this install hint.
|
|
29
|
+
|
|
26
30
|
Requires Node 20 and npm 10+. `pstack new` creates Nx 17 workspaces on Angular 15 or, with
|
|
27
31
|
`--angular=16`, Angular 16, and Nx 18 workspaces with `--angular=17`; the plugin itself loads in workspaces on Nx 17 to 22.
|
|
28
32
|
|
|
@@ -134,6 +138,121 @@ npx nx list @mouryaamit/nx-polystack
|
|
|
134
138
|
npx nx g @mouryaamit/nx-polystack:app --type=angular --name=portal
|
|
135
139
|
```
|
|
136
140
|
|
|
141
|
+
## Phase 1 – runtime only
|
|
142
|
+
|
|
143
|
+
An Angular 15 app that is not in a pstack workspace yet (a plain Angular CLI repo) can use the CSP
|
|
144
|
+
nonce runtime on its own. It needs no `nx.json` and no workspace config, and the install brings in
|
|
145
|
+
no Nx and runs no install scripts (only `tslib` comes with it):
|
|
146
|
+
|
|
147
|
+
```bash
|
|
148
|
+
npm i -E @mouryaamit/nx-polystack@1.24.0 # or the team's git copy, e.g. "<package>@git+https://…#dist-v1.24.0"
|
|
149
|
+
```
|
|
150
|
+
|
|
151
|
+
First line of `src/main.ts` (a renamed copy uses its own package name):
|
|
152
|
+
|
|
153
|
+
```ts
|
|
154
|
+
import '@mouryaamit/nx-polystack/runtime/csp-nonce';
|
|
155
|
+
```
|
|
156
|
+
|
|
157
|
+
It gives the page nonce to the `<style>`, `<script>` and `<link rel="stylesheet">` elements that
|
|
158
|
+
Angular 15 and webpack add at runtime (inserted via `appendChild`, `insertBefore`, `append`, … on
|
|
159
|
+
the document, elements and shadow roots). Runtime 1.24.0 behaves the same as the 1.2.2 runtime
|
|
160
|
+
(the file is unchanged apart from the warning below).
|
|
161
|
+
|
|
162
|
+
**Server side.** The nonce must be new on every response, and the same value must appear in the CSP
|
|
163
|
+
header and in `index.html`:
|
|
164
|
+
|
|
165
|
+
- `<meta property="csp-nonce" content="…">` in `<head>` (preferred: the runtime reads it even
|
|
166
|
+
when an inline script is not allowed), or an inline
|
|
167
|
+
`<script nonce="…">window.__cspNonce = '…';</script>` before the app's scripts. The runtime
|
|
168
|
+
reads `window.__cspNonce` first, then the meta tag (`property="csp-nonce"` or `name="csp-nonce"`).
|
|
169
|
+
- `nonce="…"` on every `<script>`, `<link rel="stylesheet">` and `<style>` in the built
|
|
170
|
+
`index.html`. Angular 15 does not add these; pstack's release build does, and outside a workspace
|
|
171
|
+
the app's own post-build step must (for example one that writes the SSI directive below).
|
|
172
|
+
|
|
173
|
+
With Apache, mod_include (SSI) fills the value. In `index.html` (single quotes inside the
|
|
174
|
+
directive, so an unprocessed directive cannot end the double-quoted attribute):
|
|
175
|
+
|
|
176
|
+
```html
|
|
177
|
+
<meta property="csp-nonce" content="<!--#echo var='CSP_NONCE' -->" />
|
|
178
|
+
<script src="main.js" type="module" nonce="<!--#echo var='CSP_NONCE' -->"></script>
|
|
179
|
+
```
|
|
180
|
+
|
|
181
|
+
`.htaccess` next to `index.html` (needs `mod_rewrite`, `mod_headers`, `mod_include`,
|
|
182
|
+
`mod_unique_id` and `mod_setenvif`, and `AllowOverride FileInfo Options=IncludesNOEXEC` for the
|
|
183
|
+
folder). This is what `pstack csp` writes, reduced to the CSP parts:
|
|
184
|
+
|
|
185
|
+
```apache
|
|
186
|
+
RewriteEngine On
|
|
187
|
+
RewriteCond %{REQUEST_FILENAME} !-f
|
|
188
|
+
RewriteCond %{REQUEST_FILENAME} !-d
|
|
189
|
+
RewriteRule ^ index.html [L]
|
|
190
|
+
|
|
191
|
+
# Per-request nonce: UNIQUE_ID without "@" (not allowed in a nonce). reqenv() reads the
|
|
192
|
+
# environment only, so request headers cannot set it. Repeat the second line 8 times in all.
|
|
193
|
+
SetEnvIfExpr "reqenv('UNIQUE_ID') =~ /^(.+)$/" CSP_NONCE=$1
|
|
194
|
+
SetEnvIfExpr "reqenv('CSP_NONCE') =~ /^([^@]*)@(.*)$/" CSP_NONCE=$1_$2
|
|
195
|
+
|
|
196
|
+
Options +IncludesNOEXEC
|
|
197
|
+
<Files "index.html">
|
|
198
|
+
SetOutputFilter INCLUDES
|
|
199
|
+
Header always set Cache-Control "no-store"
|
|
200
|
+
</Files>
|
|
201
|
+
|
|
202
|
+
Header always set Content-Security-Policy "script-src 'self' 'nonce-%{CSP_NONCE}e' 'strict-dynamic'; style-src 'self' 'nonce-%{CSP_NONCE}e'; object-src 'none'; base-uri 'self'"
|
|
203
|
+
```
|
|
204
|
+
|
|
205
|
+
**When the value is not filled in.** A value that is not a real nonce (the SSI directive left as
|
|
206
|
+
is, Apache's `(none)` for an unset variable, or a placeholder such as `random-csp-nonce`) counts as
|
|
207
|
+
no nonce: nothing is patched, so runtime styles and scripts are blocked. Since 1.24.0 the runtime
|
|
208
|
+
then logs one console warning, `[pstack csp-nonce] The CSP nonce was not filled in …`. No value at
|
|
209
|
+
all (e.g. `ng serve` without a CSP) stays silent. If the server fills nothing, the browser usually
|
|
210
|
+
blocks the app's own scripts first (their `nonce` attributes are unfilled too, and Angular 16+
|
|
211
|
+
copies `ngCspNonce` onto its script tags), so the runtime never runs: the browser's CSP errors
|
|
212
|
+
are then the signal.
|
|
213
|
+
|
|
214
|
+
## Style attributes under a strict CSP: runtime/csp-style-attr (opt-in, 1.24.0)
|
|
215
|
+
|
|
216
|
+
Under `style-src` without `'unsafe-inline'`, `element.setAttribute('style', …)` is blocked
|
|
217
|
+
(`style-src-attr`), but the same declarations written through the CSSOM (`element.style.cssText`)
|
|
218
|
+
are allowed. Angular writes static `style="…"` in templates, host styles and `[attr.style]` with
|
|
219
|
+
`setAttribute('style')`, and so do libraries (NgbModal backdrop, NgbTooltip, NgbPopover,
|
|
220
|
+
ngx-extended-pdf-viewer). This opt-in runtime routes those writes to the CSSOM. Angular 15–21 need
|
|
221
|
+
it (Angular 21 for the NgbModal backdrop and NgbPopover). Import it right after the nonce runtime:
|
|
222
|
+
|
|
223
|
+
```ts
|
|
224
|
+
import '@mouryaamit/nx-polystack/runtime/csp-nonce';
|
|
225
|
+
import '@mouryaamit/nx-polystack/runtime/csp-style-attr';
|
|
226
|
+
```
|
|
227
|
+
|
|
228
|
+
It replaces `Element.prototype.setAttribute` and `setAttributeNS` so that only
|
|
229
|
+
`setAttribute('style', v)` (any case) and `setAttributeNS(null, 'style', v)` become
|
|
230
|
+
`el.style.cssText = v`; every other attribute and namespace goes to the original method. It does
|
|
231
|
+
not depend on the nonce. Angular 21's builder warns that the two runtime files are not ESM; that is
|
|
232
|
+
harmless (they are side-effect-only scripts), and `allowedCommonJsDependencies` silences it.
|
|
233
|
+
|
|
234
|
+
Conditions of use (any change to the patch needs a new security review):
|
|
235
|
+
|
|
236
|
+
- **F1 – no user-controlled data** in `[attr.style]`, `[style]`, `[ngStyle]` or
|
|
237
|
+
`setAttribute('style', …)`. The patch lifts the CSP block on these writes, so CSS from user input
|
|
238
|
+
would be applied (CSS injection: overlays, data exfiltration through `url()`).
|
|
239
|
+
- **F2 – no CSP reports for these writes.** They no longer raise `securitypolicyviolation` events
|
|
240
|
+
or reports. Keep CSP reporting on for everything else.
|
|
241
|
+
- **F3 – only `setAttribute` / `setAttributeNS` are patched.** `setAttributeNode`,
|
|
242
|
+
`attributes.setNamedItem` and `Attr.value` still set the attribute and stay blocked.
|
|
243
|
+
- **F4 – `getAttribute('style')` returns normalised text.** The browser's serialisation is
|
|
244
|
+
returned, not the string written, and declarations the browser does not support are dropped
|
|
245
|
+
(`'color: rgb(0, 0, 255); -x-unknown: 1'` reads back as `'color: rgb(0, 0, 255);'`).
|
|
246
|
+
- **F5 – import order and rollback.** Import it right after `runtime/csp-nonce`. To roll back,
|
|
247
|
+
remove the line.
|
|
248
|
+
|
|
249
|
+
Not covered (still blocked by `style-src-attr`): `style="…"` in markup parsed by the HTML parser,
|
|
250
|
+
i.e. `innerHTML`, `insertAdjacentHTML`, `[innerHTML]` content and static `index.html` markup
|
|
251
|
+
(for example ngx-extended-pdf-viewer's thumbnails, one report per page, which it builds with `innerHTML`).
|
|
252
|
+
Static `style="…"` written in Angular templates is not parser markup: Angular sets it with
|
|
253
|
+
`setAttribute`, so it is covered. Trusted Types and inline event handlers
|
|
254
|
+
(`setAttribute('onclick', …)`) are unaffected.
|
|
255
|
+
|
|
137
256
|
## Contributing and security
|
|
138
257
|
|
|
139
258
|
See [CONTRIBUTING.md](CONTRIBUTING.md) and [SECURITY.md](SECURITY.md). Changes are listed in
|
package/USER-MANUAL.md
CHANGED
|
@@ -67,12 +67,15 @@ that target Angular, Ionic, Flutter, Android, and iOS from a single workspace. I
|
|
|
67
67
|
### Option A — global install (recommended)
|
|
68
68
|
|
|
69
69
|
```bash
|
|
70
|
-
npm i -g @mouryaamit/nx-polystack
|
|
70
|
+
npm i -g @mouryaamit/nx-polystack nx@22 @nx/devkit@22
|
|
71
71
|
pstack --version
|
|
72
72
|
pstack --help
|
|
73
73
|
```
|
|
74
74
|
|
|
75
|
-
Requires npm 7
|
|
75
|
+
Requires npm 7+. Since v1.24.0 `nx` and `@nx/devkit` are optional peer dependencies (so an app that
|
|
76
|
+
only imports a runtime file, such as `runtime/csp-nonce`, does not get Nx), so the global install
|
|
77
|
+
names them. `pstack new`, `preset`, `upgrade` and `migrate` need them; without them those commands
|
|
78
|
+
stop with the install command. `pstack --help` and `pstack update` print it too.
|
|
76
79
|
|
|
77
80
|
Note: `npm install` inside a new workspace (run by `pstack new`) downloads sharp's prebuilt binaries, so it needs network access.
|
|
78
81
|
|
|
@@ -291,6 +294,27 @@ through to the migration step.
|
|
|
291
294
|
either `git checkout -- . && npm install` and then `pstack update` again, or, after fixing the cause, rerun only
|
|
292
295
|
the migrations with `npx pstack _migrate --from=<from> --to=<to>`.
|
|
293
296
|
|
|
297
|
+
**Installing from another git server (v1.23.0).** A team can keep its own copy of the published package on
|
|
298
|
+
an internal git server, one tag per version, and point pstack at it. In that copy's `package.json`:
|
|
299
|
+
|
|
300
|
+
```json
|
|
301
|
+
"pstack": { "installSource": "git+https://git.example.com/acme/nx-polystack.git#dist-v{version}" }
|
|
302
|
+
```
|
|
303
|
+
|
|
304
|
+
`{version}` appears once, in the `#` ref, and is replaced by the version: `pstack new` and `pstack update` pin
|
|
305
|
+
`git+https://git.example.com/acme/nx-polystack.git#dist-v1.23.0` and install it with
|
|
306
|
+
`npm install <package>@<that URL>` (no `--save-exact`); `pstack --help` shows
|
|
307
|
+
`npm i -g "<package>@<that URL>"` for the global CLI. The copy must be prebuilt, like the npm package (no
|
|
308
|
+
`prepare` script), because npm does not build git dependencies of a global install. npm uses the machine's git
|
|
309
|
+
credentials; nothing goes in the URL. `git+ssh://` and `git+file://` URLs work too.
|
|
310
|
+
|
|
311
|
+
The copy may also have its own package name (for example `@acme/nx-polystack`). A global CLI under the original
|
|
312
|
+
name finds it through the workspace's `dependencies`/`devDependencies` (an installed package with a `pstack` bin
|
|
313
|
+
and an install source it can read), hands workspace commands to it, and `pstack update` moves that package with
|
|
314
|
+
its own URL. A copy older than 1.23.0 still names npm as its install source; `pstack update` then keeps the git URL
|
|
315
|
+
the workspace pins it to, with the new version in the ref. The executor and generator names in `nx.json` and
|
|
316
|
+
`project.json` follow the package name.
|
|
317
|
+
|
|
294
318
|
**The 0.4.1 migration.** `add-lint-dependencies` adds the ESLint packages the root `.eslintrc.json` needs
|
|
295
319
|
(`eslint`, `@nx/eslint`, `@nx/eslint-plugin`, `@typescript-eslint/*`, `eslint-config-prettier`) when missing, and,
|
|
296
320
|
for Angular 15 workspaces, any missing build/lint package (`@angular-devkit/build-angular`, `@angular/compiler-cli`,
|
|
@@ -925,9 +949,23 @@ blocks them (Angular 15 has no built-in nonce support).
|
|
|
925
949
|
- `append`/`prepend`/`before`/`after`/`replaceWith`/`insertAdjacentElement`.
|
|
926
950
|
- **Where the nonce comes from:** `window.__cspNonce`, or the `csp-nonce` meta tag that
|
|
927
951
|
`release --secure` writes. An SSI directive the server did not process, or a placeholder such as
|
|
928
|
-
`random-csp-nonce`, counts as no nonce, and nothing is patched.
|
|
952
|
+
`random-csp-nonce`, counts as no nonce, and nothing is patched. Since v1.24.0 that case logs one
|
|
953
|
+
console warning (`[pstack csp-nonce] The CSP nonce was not filled in …`); no value at all
|
|
954
|
+
(e.g. `ng serve` without a CSP) stays silent.
|
|
929
955
|
- **Existing apps:** `pstack update` (migration `add-csp-nonce-import`) adds the import to apps
|
|
930
956
|
with the polystack release target. It never removes a local nonce patch import.
|
|
957
|
+
- **Outside a workspace:** an Angular CLI app can install the package and import only this file;
|
|
958
|
+
see "Phase 1 – runtime only" in the README for the server side.
|
|
959
|
+
|
|
960
|
+
#### Style attributes at runtime (v1.24.0, opt-in)
|
|
961
|
+
|
|
962
|
+
`@mouryaamit/nx-polystack/runtime/csp-style-attr`, imported right after `runtime/csp-nonce`, routes
|
|
963
|
+
`setAttribute('style', v)` and `setAttributeNS(null, 'style', v)` to `el.style.cssText = v`, which
|
|
964
|
+
`style-src` without `'unsafe-inline'` allows. That covers static template and host styles,
|
|
965
|
+
`[attr.style]` and libraries such as NgbModal, NgbTooltip, NgbPopover and ngx-extended-pdf-viewer,
|
|
966
|
+
on Angular 15–21. Its conditions of use (no user-controlled data, no CSP reports for these writes,
|
|
967
|
+
what stays blocked, normalised `getAttribute('style')`, import order and rollback) are in the
|
|
968
|
+
README section "Style attributes under a strict CSP". pstack does not add the import; apps opt in.
|
|
931
969
|
|
|
932
970
|
#### Env encryption settings (v0.25.0)
|
|
933
971
|
|
|
@@ -2032,7 +2070,7 @@ if it was stripped by the TypeScript compiler.
|
|
|
2032
2070
|
version shown differs from what was installed, you may have a stale global install:
|
|
2033
2071
|
|
|
2034
2072
|
```bash
|
|
2035
|
-
npm i -g @mouryaamit/nx-polystack@latest
|
|
2073
|
+
npm i -g @mouryaamit/nx-polystack@latest nx@22 @nx/devkit@22
|
|
2036
2074
|
```
|
|
2037
2075
|
|
|
2038
2076
|
Inside a workspace whose local plugin version differs from the global CLI, `pstack -v` prints the global
|
package/dist/bin/cli.js
CHANGED
|
@@ -10,6 +10,7 @@ const context_1 = require("../src/cli/context");
|
|
|
10
10
|
const help_1 = require("../src/cli/help");
|
|
11
11
|
const launcher_1 = require("../src/cli/launcher");
|
|
12
12
|
const types_1 = require("../src/cli/types");
|
|
13
|
+
const versions_1 = require("../src/cli/versions");
|
|
13
14
|
async function main(argv) {
|
|
14
15
|
const { command, positionals, flags } = (0, args_1.parseArgs)(argv);
|
|
15
16
|
const selfRoot = (0, context_1.selfPackageRoot)(__dirname);
|
|
@@ -85,6 +86,11 @@ async function main(argv) {
|
|
|
85
86
|
return await handler(ctx);
|
|
86
87
|
}
|
|
87
88
|
catch (err) {
|
|
89
|
+
const hint = (0, versions_1.missingNxPeerHint)(err);
|
|
90
|
+
if (hint) {
|
|
91
|
+
console.error(`\nError: ${hint}`);
|
|
92
|
+
return 1;
|
|
93
|
+
}
|
|
88
94
|
const message = err instanceof Error ? err.message : String(err);
|
|
89
95
|
console.error(`\nError: ${message}`);
|
|
90
96
|
if (verbose && !(err instanceof types_1.CliError) && err instanceof Error && err.stack) {
|
package/dist/bin/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../bin/cli.ts"],"names":[],"mappings":";AAAA,wEAAwE;;;AAExE,mDAA6B;AAE7B,0CAAyD;AACzD,kDAA+C;AAC/C,gDAK4B;AAC5B,0CAA2C;AAC3C,kDAQ6B;AAC7B,4CAA4D;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../bin/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ const json_layout_1 = require("../../lib/utils/json-layout");
|
|
|
9
9
|
const args_1 = require("../args");
|
|
10
10
|
const context_1 = require("../context");
|
|
11
11
|
const exec_1 = require("../exec");
|
|
12
|
-
const install_source_1 = require("../install-source");
|
|
13
12
|
const launcher_1 = require("../launcher");
|
|
14
13
|
const types_1 = require("../types");
|
|
15
14
|
const update_plan_1 = require("../update-plan");
|
|
@@ -113,8 +112,22 @@ async function runUpdate(ctx, deps = defaultDeps) {
|
|
|
113
112
|
}
|
|
114
113
|
const toVersion = requestedVersion(ctx.positionals, (0, args_1.flagString)(ctx.flags, 'to'));
|
|
115
114
|
const pkgText = fs.readFileSync(pkgPath, 'utf8');
|
|
116
|
-
const
|
|
117
|
-
const
|
|
115
|
+
const installedNow = (0, context_1.resolveLocalPlugin)(root);
|
|
116
|
+
const installedVersion = installedNow?.version;
|
|
117
|
+
// A workspace on a renamed copy of the plugin keeps that name and its install source.
|
|
118
|
+
const pkgJson = JSON.parse(pkgText.replace(/^\uFEFF/, ''));
|
|
119
|
+
let plugin = installedNow?.other ?? (0, update_plan_1.selfIdentity)();
|
|
120
|
+
if (installedNow?.other) {
|
|
121
|
+
// An installed copy older than git install sources says "npm": keep the git URL it is pinned to.
|
|
122
|
+
const spec = pkgJson.devDependencies?.[plugin.name] ?? pkgJson.dependencies?.[plugin.name];
|
|
123
|
+
const fromPin = plugin.source.kind !== 'git' && typeof spec === 'string'
|
|
124
|
+
? (0, versions_1.templateFromPin)(spec, installedNow.version)
|
|
125
|
+
: null;
|
|
126
|
+
if (fromPin)
|
|
127
|
+
plugin = { name: plugin.name, source: fromPin };
|
|
128
|
+
console.log(`The workspace uses the plugin as ${plugin.name}; updating that package.`);
|
|
129
|
+
}
|
|
130
|
+
const pin = (0, update_plan_1.findPluginPin)(pkgJson, ctx.selfVersion, installedVersion, plugin);
|
|
118
131
|
if (pin.fromInstalled) {
|
|
119
132
|
console.log(`${pin.field}: "${pin.spec}" is not a version pin; migrating from the installed v${pin.version}.`);
|
|
120
133
|
}
|
|
@@ -136,7 +149,7 @@ async function runUpdate(ctx, deps = defaultDeps) {
|
|
|
136
149
|
console.log(`\n${cipher}`);
|
|
137
150
|
return 0;
|
|
138
151
|
}
|
|
139
|
-
console.log(`${pin.field}: ${pin.spec} → ${(0, versions_1.formatPluginSpec)(target.to)}`);
|
|
152
|
+
console.log(`${pin.field}: ${pin.spec} → ${(0, versions_1.formatPluginSpec)(target.to, plugin.source)}`);
|
|
140
153
|
if (ctx.dryRun) {
|
|
141
154
|
console.log('Dry run — nothing changed. Pending migrations ship with the target version and run after it is installed.');
|
|
142
155
|
return 0;
|
|
@@ -162,11 +175,13 @@ async function runUpdate(ctx, deps = defaultDeps) {
|
|
|
162
175
|
try {
|
|
163
176
|
deps.exec('npm', [
|
|
164
177
|
'install',
|
|
165
|
-
`${
|
|
178
|
+
`${plugin.name}@${(0, versions_1.formatPluginSpec)(target.to, plugin.source)}`,
|
|
166
179
|
...(devkit ? [`@nx/devkit@${devkit}`] : []),
|
|
167
180
|
pin.field === 'dependencies' ? '--save-prod' : '--save-dev',
|
|
168
|
-
...(0, versions_1.pinInstallFlags)(),
|
|
169
|
-
...(devkit && !(0, versions_1.pinInstallFlags)().includes('--save-exact')
|
|
181
|
+
...(0, versions_1.pinInstallFlags)(plugin.source),
|
|
182
|
+
...(devkit && !(0, versions_1.pinInstallFlags)(plugin.source).includes('--save-exact')
|
|
183
|
+
? ['--save-exact']
|
|
184
|
+
: []),
|
|
170
185
|
], root);
|
|
171
186
|
if (devkit)
|
|
172
187
|
console.log(`@nx/devkit pinned to ${devkit} (the workspace's Nx).`);
|
|
@@ -206,8 +221,9 @@ async function runUpdate(ctx, deps = defaultDeps) {
|
|
|
206
221
|
}
|
|
207
222
|
console.log(`\nUpdated nx-polystack v${pin.version} → v${target.to}. Review with "git diff".`);
|
|
208
223
|
const stale = githubWorkflows(root);
|
|
209
|
-
if (
|
|
210
|
-
|
|
224
|
+
if (plugin.source.kind !== 'github' && stale.length > 0) {
|
|
225
|
+
const from = plugin.source.kind === 'npm' ? 'npm' : 'its git install source';
|
|
226
|
+
console.log(`\nThe plugin now comes from ${from}, but ${stale.join(', ')} still install it from GitHub ` +
|
|
211
227
|
'(PSTACK_REPO_TOKEN, gh release). Rewrite them with: pstack infra --with=ci,upgrades --force');
|
|
212
228
|
}
|
|
213
229
|
const cipher = cipherNote(root);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/cli/commands/update.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/cli/commands/update.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B,2DAAgG;AAChG,6DAAiG;AACjG,kCAAkD;AAClD,wCAAmE;AACnE,kCAAiD;AACjD,0CAAuC;AACvC,oCAAoD;AACpD,gDAA4F;AAC5F,0CAMqB;AAkBrB,qEAAqE;AACxD,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAE7C,kDAAkD;AAClD,SAAgB,WAAW,CAAC,IAAY,EAAE,EAAU,EAAE,OAAO,GAAG,KAAK;IACnE,OAAO,CAAC,UAAU,EAAE,UAAU,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACzF,CAAC;AAFD,kCAEC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAC9B,WAAqB,EACrB,MAA0B;IAE1B,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;QAC1B,MAAM,IAAI,gBAAQ,CAAC,yCAAyC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KACtF;IACD,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAC3B,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IACrC,MAAM,OAAO,GAAG,IAAA,2BAAgB,EAAC,GAAG,CAAC,CAAC;IACtC,IAAI,MAAM,KAAK,SAAS,IAAI,IAAA,2BAAgB,EAAC,MAAM,CAAC,KAAK,OAAO,EAAE;QAChE,MAAM,IAAI,gBAAQ,CAAC,IAAI,GAAG,cAAc,MAAM,qCAAqC,CAAC,CAAC;KACtF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAdD,4CAcC;AAED,MAAM,WAAW,GAAe;IAC9B,IAAI,EAAE,kBAAW;IACjB,SAAS,EAAT,gBAAS;IACT,eAAe,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,CACnD,IAAA,mBAAQ,EAAC,OAAO,EAAE,WAAW,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC;IACxD,QAAQ,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,IAAA,mBAAQ,EAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC;CAC/D,CAAC;AAEF;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,GAAmB,EAAE,IAAY,EAAE,IAAgB;IAC7E,MAAM,KAAK,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,CAAC;IACvC,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,gBAAQ,CAAC,yEAAyE,CAAC,CAAC;KAC/F;IACD,IAAI,IAAA,0BAAe,EAAC,KAAK,CAAC,OAAO,EAAE,6BAAqB,CAAC,GAAG,CAAC,EAAE;QAC7D,MAAM,IAAI,gBAAQ,CAChB,mCAAmC,KAAK,CAAC,OAAO,0CAA0C;YACxF,mEAAmE,CACtE,CAAC;KACH;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,IAAA,mBAAQ,EAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IAC5E,IAAI,IAAA,kBAAW,EAAC,GAAG,CAAC,KAAK,EAAE,gBAAgB,CAAC,EAAE;QAC5C,OAAO,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;KACzD;IACD,MAAM,KAAK,GAAG,IAAA,iBAAU,EAAC,GAAG,CAAC,KAAK,EAAE,cAAc,CAAC;QACjD,EAAE,KAAK,CAAC,GAAG,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,MAAM,IAAI,gBAAQ,CAChB,mFAAmF;YACjF,+CAA+C,CAClD,CAAC;KACH;IACD,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC3C,MAAM,IAAI,gBAAQ,CAChB,sFAAsF,CACvF,CAAC;SACH;KACF;IACD,MAAM,KAAK,GAAG,IAAA,uBAAS,EAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,IAAA,iCAAmB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1D,MAAM,IAAI,GAAG,GAAG,CACd,KAAK,CAAC,OAAO,EACb;QACE,UAAU;QACV,UAAU,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAC3B,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACrC,EACD,IAAI,CACL,CAAC;IACF,IAAI,KAAK,IAAI,QAAQ,EAAE;QACrB,MAAM,IAAI,GAAG,IAAA,gCAAkB,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QACvD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;SAC9F;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAEM,KAAK,UAAU,SAAS,CAC7B,GAAmB,EACnB,OAAmB,WAAW;IAE9B,MAAM,IAAI,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACxC,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,gBAAQ,CAChB,2FAA2F,CAC5F,CAAC;KACH;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IACtD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,MAAM,IAAI,gBAAQ,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC;IAC9E,IAAI,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,SAAS,EAAE;QACxF,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;YAC/D,MAAM,IAAI,gBAAQ,CAChB,kFAAkF,CACnF,CAAC;SACH;QACD,OAAO,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;KAC5C;IACD,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;QAC5B,MAAM,IAAI,gBAAQ,CAAC,0CAA0C,CAAC,CAAC;KAChE;IACD,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAA,iBAAU,EAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IACjF,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,YAAY,EAAE,OAAO,CAAC;IAC/C,sFAAsF;IACtF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3D,IAAI,MAAM,GAAmB,YAAY,EAAE,KAAK,IAAI,IAAA,0BAAY,GAAE,CAAC;IACnE,IAAI,YAAY,EAAE,KAAK,EAAE;QACvB,iGAAiG;QACjG,MAAM,IAAI,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3F,MAAM,OAAO,GACX,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,IAAI,OAAO,IAAI,KAAK,QAAQ;YACtD,CAAC,CAAC,IAAA,0BAAe,EAAC,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC;YAC7C,CAAC,CAAC,IAAI,CAAC;QACX,IAAI,OAAO;YAAE,MAAM,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;QAC7D,OAAO,CAAC,GAAG,CAAC,oCAAoC,MAAM,CAAC,IAAI,0BAA0B,CAAC,CAAC;KACxF;IACD,MAAM,GAAG,GAAG,IAAA,2BAAa,EAAC,OAAO,EAAE,GAAG,CAAC,WAAW,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAC9E,IAAI,GAAG,CAAC,aAAa,EAAE;QACrB,OAAO,CAAC,GAAG,CACT,GAAG,GAAG,CAAC,KAAK,MAAM,GAAG,CAAC,IAAI,yDAAyD,GAAG,CAAC,OAAO,GAAG,CAClG,CAAC;KACH;IACD,IAAI,GAAG,CAAC,KAAK,EAAE;QACb,6EAA6E;QAC7E,MAAM,SAAS,GAAG,gBAAgB,CAAC;QACnC,IACE,SAAS;YACT,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC;YACjC,IAAA,0BAAe,EAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAC3C;YACA,GAAG,CAAC,OAAO,GAAG,SAAS,CAAC;SACzB;KACF;IACD,MAAM,MAAM,GAAG,IAAA,2BAAa,EAAC,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAE5F,+EAA+E;IAC/E,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE;QAClD,OAAO,CAAC,GAAG,CAAC,4BAA4B,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,MAAM;YAAE,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC;QACvC,OAAO,CAAC,CAAC;KACV;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,IAAI,MAAM,IAAA,2BAAgB,EAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAEzF,IAAI,GAAG,CAAC,MAAM,EAAE;QACd,OAAO,CAAC,GAAG,CACT,2GAA2G,CAC5G,CAAC;QACF,OAAO,CAAC,CAAC;KACV;IAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC3C,MAAM,IAAI,gBAAQ,CAChB,sFAAsF,CACvF,CAAC;SACH;KACF;IAED,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACpF,MAAM,OAAO,GAAG,GAAS,EAAE;QACzB,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACnC,IAAI,QAAQ,KAAK,IAAI;YAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;;YACvD,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC,CAAC;IAEF,4FAA4F;IAC5F,8FAA8F;IAC9F,oFAAoF;IACpF,MAAM,MAAM,GAAG,IAAA,yBAAY,EACzB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,EAC1C,IAAA,6BAAgB,EAAC,IAAI,EAAE,IAAI,CAAC,CAC7B,CAAC;IACF,IAAI;QACF,IAAI,CAAC,IAAI,CACP,KAAK,EACL;YACE,SAAS;YACT,GAAG,MAAM,CAAC,IAAI,IAAI,IAAA,2BAAgB,EAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE;YAC9D,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3C,GAAG,CAAC,KAAK,KAAK,cAAc,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY;YAC3D,GAAG,IAAA,0BAAe,EAAC,MAAM,CAAC,MAAM,CAAC;YACjC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAA,0BAAe,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC;gBACpE,CAAC,CAAC,CAAC,cAAc,CAAC;gBAClB,CAAC,CAAC,EAAE,CAAC;SACR,EACD,IAAI,CACL,CAAC;QACF,IAAI,MAAM;YAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,MAAM,wBAAwB,CAAC,CAAC;KACjF;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,EAAE,CAAC;QACV,MAAM,IAAI,gBAAQ,CAChB,yEAAyE;YACvE,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CACrD,CAAC;KACH;IAED,MAAM,KAAK,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,CAAC;IACvC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,KAAK,MAAM,CAAC,EAAE,EAAE;QACzC,OAAO,EAAE,CAAC;QACV,MAAM,IAAI,gBAAQ,CAChB,0BAA0B,MAAM,CAAC,EAAE,wCAAwC;YACzE,GACE,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,SAChC,sDAAsD;YACtD,wEAAwE,CAC3E,CAAC;KACH;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE;QAC5B,OAAO,CAAC,GAAG,CAAC,0BAA0B,MAAM,CAAC,EAAE,2BAA2B,CAAC,CAAC;QAC5E,OAAO,CAAC,CAAC;KACV;IAED,8FAA8F;IAC9F,8EAA8E;IAC9E,MAAM,KAAK,GAAG,IAAA,uBAAS,EAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,IAAA,iCAAmB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAC5F,IAAI,KAAK,IAAI,QAAQ,EAAE;QACrB,MAAM,IAAI,GAAG,IAAA,gCAAkB,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QACvD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;SAC9F;KACF;IACD,IAAI,IAAI,KAAK,CAAC,EAAE;QACd,OAAO,CAAC,KAAK,CACX,+BAA+B,MAAM,CAAC,EAAE,0BAA0B,GAAG,CAAC,OAAO,uBAAuB;YAClG,4FAA4F;YAC5F,qFAAqF,GAAG,CAAC,OAAO,SAAS,MAAM,CAAC,EAAE,EAAE,CACvH,CAAC;QACF,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CAAC,GAAG,CAAC,2BAA2B,GAAG,CAAC,OAAO,OAAO,MAAM,CAAC,EAAE,2BAA2B,CAAC,CAAC;IAC/F,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACvD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC;QAC7E,OAAO,CAAC,GAAG,CACT,+BAA+B,IAAI,SAAS,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gCAAgC;YAC1F,6FAA6F,CAChG,CAAC;KACH;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,MAAM;QAAE,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC;IACvC,OAAO,CAAC,CAAC;AACX,CAAC;AA9KD,8BA8KC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAAY;IACrC,IAAI,MAAe,CAAC;IACpB,IAAI;QACF,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QAC3E,MAAM,GAAG,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC;KAC5C;IAAC,MAAM;QACN,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC3C,OAAO,CACL,6FAA6F;QAC7F,8FAA8F;QAC9F,sBAAsB,CACvB,CAAC;AACJ,CAAC;AAdD,gCAcC;AAED,0EAA0E;AAC1E,SAAS,eAAe,CAAC,IAAY;IACnC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IACpD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,OAAO,EAAE;SACN,WAAW,CAAC,GAAG,CAAC;SAChB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;SACnF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -1,15 +1,28 @@
|
|
|
1
|
+
import { InstallSource } from './install-source';
|
|
1
2
|
export interface LocalPlugin {
|
|
2
3
|
/** Package root inside the workspace's node_modules. */
|
|
3
4
|
root: string;
|
|
4
5
|
version: string;
|
|
5
6
|
/** Built CLI entry to delegate to. */
|
|
6
7
|
cliPath: string;
|
|
8
|
+
/**
|
|
9
|
+
* Set when the workspace installs the plugin under another package name (a renamed copy, e.g.
|
|
10
|
+
* from another git server): that name and its package.json pstack.installSource (v1.23.0).
|
|
11
|
+
*/
|
|
12
|
+
other?: {
|
|
13
|
+
name: string;
|
|
14
|
+
source: InstallSource;
|
|
15
|
+
};
|
|
7
16
|
}
|
|
8
17
|
/** Walk up from `start` until a directory containing nx.json is found. */
|
|
9
18
|
export declare function findWorkspaceRoot(start: string): string | null;
|
|
10
19
|
export declare function readPackageVersion(pkgJsonPath: string): string;
|
|
11
20
|
/** Root of the running @mouryaamit/nx-polystack package (works from source and from dist/). */
|
|
12
21
|
export declare function selfPackageRoot(from?: string): string;
|
|
22
|
+
/**
|
|
23
|
+
* The plugin installed in the workspace: under this package's name, else under another name (a
|
|
24
|
+
* renamed copy, found through the workspace's dependencies).
|
|
25
|
+
*/
|
|
13
26
|
export declare function resolveLocalPlugin(workspaceRoot: string): LocalPlugin | null;
|
|
14
27
|
/**
|
|
15
28
|
* Directory that generators.json / migrations.json paths ("./src/...") resolve against:
|
package/dist/src/cli/context.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.manifestRoot = exports.resolveLocalPlugin = exports.selfPackageRoot = ex
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const fs = tslib_1.__importStar(require("fs"));
|
|
6
6
|
const path = tslib_1.__importStar(require("path"));
|
|
7
|
+
const install_source_1 = require("./install-source");
|
|
7
8
|
const versions_1 = require("./versions");
|
|
8
9
|
/** Walk up from `start` until a directory containing nx.json is found. */
|
|
9
10
|
function findWorkspaceRoot(start) {
|
|
@@ -40,8 +41,9 @@ function selfPackageRoot(from = __dirname) {
|
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
43
|
exports.selfPackageRoot = selfPackageRoot;
|
|
43
|
-
|
|
44
|
-
|
|
44
|
+
/** The plugin installed under `name` in the workspace, or null. */
|
|
45
|
+
function installedPlugin(workspaceRoot, name) {
|
|
46
|
+
const root = path.join(workspaceRoot, 'node_modules', ...name.split('/'));
|
|
45
47
|
const pkg = path.join(root, 'package.json');
|
|
46
48
|
const cliPath = path.join(root, 'dist', 'bin', 'cli.js');
|
|
47
49
|
if (!fs.existsSync(pkg) || !fs.existsSync(cliPath))
|
|
@@ -53,6 +55,46 @@ function resolveLocalPlugin(workspaceRoot) {
|
|
|
53
55
|
return null;
|
|
54
56
|
}
|
|
55
57
|
}
|
|
58
|
+
/**
|
|
59
|
+
* A dependency of the workspace that is this plugin under another name: its installed package.json
|
|
60
|
+
* has a `pstack` bin, a pstack.installSource this build understands and a built CLI.
|
|
61
|
+
*/
|
|
62
|
+
function renamedPlugin(workspaceRoot) {
|
|
63
|
+
let names;
|
|
64
|
+
try {
|
|
65
|
+
const ws = JSON.parse(fs.readFileSync(path.join(workspaceRoot, 'package.json'), 'utf8').replace(/^\uFEFF/, ''));
|
|
66
|
+
names = Object.keys({ ...ws.dependencies, ...ws.devDependencies }).sort();
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
return null;
|
|
70
|
+
}
|
|
71
|
+
for (const name of names) {
|
|
72
|
+
if (name === versions_1.PLUGIN_NAME)
|
|
73
|
+
continue;
|
|
74
|
+
try {
|
|
75
|
+
const pkg = JSON.parse(fs.readFileSync(path.join(workspaceRoot, 'node_modules', ...name.split('/'), 'package.json'), 'utf8'));
|
|
76
|
+
if (pkg.name !== name || pkg.bin?.pstack === undefined)
|
|
77
|
+
continue;
|
|
78
|
+
if (typeof pkg.pstack?.installSource !== 'string')
|
|
79
|
+
continue;
|
|
80
|
+
const source = (0, install_source_1.parseInstallSource)(pkg.pstack.installSource);
|
|
81
|
+
const found = installedPlugin(workspaceRoot, name);
|
|
82
|
+
if (found)
|
|
83
|
+
return { ...found, other: { name, source } };
|
|
84
|
+
}
|
|
85
|
+
catch {
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
return null;
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* The plugin installed in the workspace: under this package's name, else under another name (a
|
|
93
|
+
* renamed copy, found through the workspace's dependencies).
|
|
94
|
+
*/
|
|
95
|
+
function resolveLocalPlugin(workspaceRoot) {
|
|
96
|
+
return installedPlugin(workspaceRoot, versions_1.PLUGIN_NAME) ?? renamedPlugin(workspaceRoot);
|
|
97
|
+
}
|
|
56
98
|
exports.resolveLocalPlugin = resolveLocalPlugin;
|
|
57
99
|
/**
|
|
58
100
|
* Directory that generators.json / migrations.json paths ("./src/...") resolve against:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/cli/context.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B,yCAAyC;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/cli/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,25 @@
|
|
|
1
|
-
/**
|
|
1
|
+
/**
|
|
2
|
+
* Where the plugin is installed from: a GitHub repo (git tags + release assets), npm, or any git
|
|
3
|
+
* URL whose ref names the version (`git+https://host/org/repo.git#dist-v{version}`), for a
|
|
4
|
+
* prebuilt copy of the package kept in another git server (v1.23.0).
|
|
5
|
+
*/
|
|
2
6
|
export type InstallSource = {
|
|
3
7
|
kind: 'github';
|
|
4
8
|
repo: string;
|
|
5
9
|
} | {
|
|
6
10
|
kind: 'npm';
|
|
11
|
+
} | {
|
|
12
|
+
kind: 'git';
|
|
13
|
+
template: string;
|
|
7
14
|
};
|
|
15
|
+
/** The placeholder a git install source's ref holds for the plugin version. */
|
|
16
|
+
export declare const VERSION_PLACEHOLDER = "{version}";
|
|
8
17
|
/** The private development repo; also the source when package.json does not say. */
|
|
9
18
|
export declare const DEV_GITHUB_REPO = "example-org/private-plugin";
|
|
10
|
-
/**
|
|
19
|
+
/**
|
|
20
|
+
* `"npm"`, `"github:<owner>/<repo>"` or `"git+<url>#<ref with {version}>"` (package.json
|
|
21
|
+
* `pstack.installSource`).
|
|
22
|
+
*/
|
|
11
23
|
export declare function parseInstallSource(value: unknown): InstallSource;
|
|
12
24
|
/** pstack.installSource from the plugin's own package.json (the first one above `from`). */
|
|
13
25
|
export declare function readInstallSource(from?: string): InstallSource;
|
|
@@ -1,14 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setInstallSourceForTests = exports.installSource = exports.readInstallSource = exports.parseInstallSource = exports.DEV_GITHUB_REPO = void 0;
|
|
3
|
+
exports.setInstallSourceForTests = exports.installSource = exports.readInstallSource = exports.parseInstallSource = exports.DEV_GITHUB_REPO = exports.VERSION_PLACEHOLDER = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const fs = tslib_1.__importStar(require("fs"));
|
|
6
6
|
const path = tslib_1.__importStar(require("path"));
|
|
7
|
+
/** The placeholder a git install source's ref holds for the plugin version. */
|
|
8
|
+
exports.VERSION_PLACEHOLDER = '{version}';
|
|
9
|
+
/** git+https, git+http, git+ssh or git+file URL with a #ref (no spaces). */
|
|
10
|
+
const GIT_URL = /^git\+(?:https?|ssh|file):\/\/[^\s#]+#[^\s#]+$/;
|
|
7
11
|
const PACKAGE = '@mouryaamit/nx-polystack';
|
|
8
12
|
/** The private development repo; also the source when package.json does not say. */
|
|
9
13
|
exports.DEV_GITHUB_REPO = 'example-org/private-plugin';
|
|
10
14
|
const DEFAULT = { kind: 'github', repo: exports.DEV_GITHUB_REPO };
|
|
11
|
-
/**
|
|
15
|
+
/** A git URL template: one {version}, in the #ref. */
|
|
16
|
+
function isGitTemplate(value) {
|
|
17
|
+
const at = value.indexOf(exports.VERSION_PLACEHOLDER);
|
|
18
|
+
return (GIT_URL.test(value) && at > value.indexOf('#') && value.split(exports.VERSION_PLACEHOLDER).length === 2);
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* `"npm"`, `"github:<owner>/<repo>"` or `"git+<url>#<ref with {version}>"` (package.json
|
|
22
|
+
* `pstack.installSource`).
|
|
23
|
+
*/
|
|
12
24
|
function parseInstallSource(value) {
|
|
13
25
|
if (value === undefined)
|
|
14
26
|
return DEFAULT;
|
|
@@ -17,7 +29,10 @@ function parseInstallSource(value) {
|
|
|
17
29
|
const m = typeof value === 'string' ? /^github:([\w.-]+\/[\w.-]+)$/.exec(value) : null;
|
|
18
30
|
if (m)
|
|
19
31
|
return { kind: 'github', repo: m[1] };
|
|
20
|
-
|
|
32
|
+
if (typeof value === 'string' && isGitTemplate(value))
|
|
33
|
+
return { kind: 'git', template: value };
|
|
34
|
+
throw new Error(`${PACKAGE}: package.json pstack.installSource must be "npm", "github:<owner>/<repo>" or ` +
|
|
35
|
+
`"git+<url>#<ref with ${exports.VERSION_PLACEHOLDER}>", not ${JSON.stringify(value)}.`);
|
|
21
36
|
}
|
|
22
37
|
exports.parseInstallSource = parseInstallSource;
|
|
23
38
|
/** pstack.installSource from the plugin's own package.json (the first one above `from`). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-source.js","sourceRoot":"","sources":["../../../src/cli/install-source.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;
|
|
1
|
+
{"version":3,"file":"install-source.js","sourceRoot":"","sources":["../../../src/cli/install-source.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAY7B,+EAA+E;AAClE,QAAA,mBAAmB,GAAG,WAAW,CAAC;AAC/C,4EAA4E;AAC5E,MAAM,OAAO,GAAG,gDAAgD,CAAC;AAEjE,MAAM,OAAO,GAAG,0BAA0B,CAAC;AAC3C,oFAAoF;AACvE,QAAA,eAAe,GAAG,4BAA4B,CAAC;AAC5D,MAAM,OAAO,GAAkB,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,uBAAe,EAAE,CAAC;AAEzE,sDAAsD;AACtD,SAAS,aAAa,CAAC,KAAa;IAClC,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,2BAAmB,CAAC,CAAC;IAC9C,OAAO,CACL,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,2BAAmB,CAAC,CAAC,MAAM,KAAK,CAAC,CAChG,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAgB,kBAAkB,CAAC,KAAc;IAC/C,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC;IACxC,IAAI,KAAK,KAAK,KAAK;QAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC5C,MAAM,CAAC,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,6BAA6B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACvF,IAAI,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,aAAa,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC/F,MAAM,IAAI,KAAK,CACb,GAAG,OAAO,gFAAgF;QACxF,wBAAwB,2BAAmB,WAAW,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CACjF,CAAC;AACJ,CAAC;AAVD,gDAUC;AAED,4FAA4F;AAC5F,SAAgB,iBAAiB,CAAC,OAAe,SAAS;IACxD,KAAK,IAAI,GAAG,GAAG,IAAI,IAAM;QACvB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QAC5C,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACvB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;YACtD,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO;gBAAE,OAAO,kBAAkB,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;SAChF;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,MAAM,KAAK,GAAG;YAAE,OAAO,OAAO,CAAC;QACnC,GAAG,GAAG,MAAM,CAAC;KACd;AACH,CAAC;AAXD,8CAWC;AAED,IAAI,OAAkC,CAAC;AAEvC,SAAgB,aAAa;IAC3B,OAAO,CAAC,OAAO,KAAK,iBAAiB,EAAE,CAAC,CAAC;AAC3C,CAAC;AAFD,sCAEC;AAED,gGAAgG;AAChG,SAAgB,wBAAwB,CAAC,MAAiC;IACxE,OAAO,GAAG,MAAM,CAAC;AACnB,CAAC;AAFD,4DAEC"}
|
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
import { InstallSource } from './install-source';
|
|
2
|
+
/** The plugin as a workspace names it: package name and where it is installed from. */
|
|
3
|
+
export interface PluginIdentity {
|
|
4
|
+
name: string;
|
|
5
|
+
source: InstallSource;
|
|
6
|
+
}
|
|
7
|
+
/** This build of the plugin. */
|
|
8
|
+
export declare function selfIdentity(): PluginIdentity;
|
|
1
9
|
export type DepField = 'devDependencies' | 'dependencies';
|
|
2
10
|
export interface PluginPin {
|
|
3
11
|
field: DepField;
|
|
@@ -21,5 +29,5 @@ export interface UpdateTarget {
|
|
|
21
29
|
* `installed` (the version in node_modules), so `pstack update` can move such a workspace to a
|
|
22
30
|
* normal pin; without an installed copy it is an error.
|
|
23
31
|
*/
|
|
24
|
-
export declare function findPluginPin(pkg: any, example?: string, installed?: string): PluginPin;
|
|
32
|
+
export declare function findPluginPin(pkg: any, example?: string, installed?: string, plugin?: PluginIdentity): PluginPin;
|
|
25
33
|
export declare function resolveTarget(from: string, toFlag: string | undefined, selfVersion: string, force: boolean): UpdateTarget;
|
|
@@ -1,11 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolveTarget = exports.findPluginPin = void 0;
|
|
3
|
+
exports.resolveTarget = exports.findPluginPin = exports.selfIdentity = void 0;
|
|
4
|
+
const install_source_1 = require("./install-source");
|
|
4
5
|
const types_1 = require("./types");
|
|
5
6
|
const versions_1 = require("./versions");
|
|
7
|
+
/** This build of the plugin. */
|
|
8
|
+
function selfIdentity() {
|
|
9
|
+
return { name: versions_1.PLUGIN_NAME, source: (0, install_source_1.installSource)() };
|
|
10
|
+
}
|
|
11
|
+
exports.selfIdentity = selfIdentity;
|
|
6
12
|
/** `npm i -D …` command that pins the plugin at `version` the way pstack update does. */
|
|
7
|
-
function pinCommand(version) {
|
|
8
|
-
|
|
13
|
+
function pinCommand(version, plugin) {
|
|
14
|
+
const spec = `${plugin.name}@${(0, versions_1.formatPluginSpec)(version, plugin.source)}`;
|
|
15
|
+
return [
|
|
16
|
+
'npm i -D',
|
|
17
|
+
plugin.source.kind === 'git' ? `"${spec}"` : spec,
|
|
18
|
+
...(0, versions_1.pinInstallFlags)(plugin.source),
|
|
19
|
+
].join(' ');
|
|
9
20
|
}
|
|
10
21
|
/**
|
|
11
22
|
* The plugin entry of package.json. A spec pstack cannot read a version from falls back to
|
|
@@ -14,22 +25,22 @@ function pinCommand(version) {
|
|
|
14
25
|
*/
|
|
15
26
|
function findPluginPin(
|
|
16
27
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
17
|
-
pkg, example = '0.3.0', installed) {
|
|
28
|
+
pkg, example = '0.3.0', installed, plugin = selfIdentity()) {
|
|
18
29
|
for (const field of ['devDependencies', 'dependencies']) {
|
|
19
|
-
const spec = pkg?.[field]?.[
|
|
30
|
+
const spec = pkg?.[field]?.[plugin.name];
|
|
20
31
|
if (spec === undefined)
|
|
21
32
|
continue;
|
|
22
|
-
const version = (0, versions_1.parsePluginSpec)(spec);
|
|
33
|
+
const version = (0, versions_1.parsePluginSpec)(spec, plugin.source);
|
|
23
34
|
if (!version && installed && /^\d+\.\d+\.\d+$/.test(installed)) {
|
|
24
35
|
return { field, version: installed, spec, range: false, fromInstalled: true };
|
|
25
36
|
}
|
|
26
37
|
if (!version) {
|
|
27
|
-
throw new types_1.CliError(`${
|
|
28
|
-
`pstack update needs a pinned version — pin one first: ${pinCommand(example)}`);
|
|
38
|
+
throw new types_1.CliError(`${plugin.name} is "${spec}" in ${field} and no installed copy was found. ` +
|
|
39
|
+
`pstack update needs a pinned version — pin one first: ${pinCommand(example, plugin)}`);
|
|
29
40
|
}
|
|
30
41
|
return { field, version, spec, range: /^\s*[\^~]/.test(spec) };
|
|
31
42
|
}
|
|
32
|
-
throw new types_1.CliError(`${
|
|
43
|
+
throw new types_1.CliError(`${plugin.name} is not listed in package.json. Add it first: ${pinCommand(example, plugin)}`);
|
|
33
44
|
}
|
|
34
45
|
exports.findPluginPin = findPluginPin;
|
|
35
46
|
function resolveTarget(from, toFlag, selfVersion, force) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-plan.js","sourceRoot":"","sources":["../../../src/cli/update-plan.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,yCAQoB;
|
|
1
|
+
{"version":3,"file":"update-plan.js","sourceRoot":"","sources":["../../../src/cli/update-plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
import { InstallSource } from './install-source';
|
|
2
3
|
export declare const PLUGIN_NAME = "@mouryaamit/nx-polystack";
|
|
3
4
|
/** owner/repo of the private development repo on GitHub. */
|
|
4
5
|
export declare const PLUGIN_GITHUB_REPO = "example-org/private-plugin";
|
|
@@ -6,8 +7,18 @@ export declare const PLUGIN_GITHUB_REPO = "example-org/private-plugin";
|
|
|
6
7
|
export declare const LEGACY_GITHUB_REPOS: string[];
|
|
7
8
|
export declare function normalizeVersion(v: string): string;
|
|
8
9
|
export declare function compareVersions(a: string, b: string): number;
|
|
9
|
-
/**
|
|
10
|
-
|
|
10
|
+
/**
|
|
11
|
+
* A git install source read off a workspace pin: the pin's git URL with `version` in its #ref
|
|
12
|
+
* (once) replaced by {version}, e.g. `git+https://host/org/repo.git#dist-v1.22.0` at 1.22.0. Lets
|
|
13
|
+
* `pstack update` move a renamed copy whose installed version predates git install sources
|
|
14
|
+
* (v1.23.0) along the URL the workspace already uses. Null for any other spec.
|
|
15
|
+
*/
|
|
16
|
+
export declare function templateFromPin(spec: string, version: string): InstallSource | null;
|
|
17
|
+
/**
|
|
18
|
+
* The pin `pstack new` / `pstack update` write: a git tag of the repo, an exact npm version, or
|
|
19
|
+
* the git install source's URL with the version filled in.
|
|
20
|
+
*/
|
|
21
|
+
export declare function formatPluginSpec(version: string, source?: InstallSource): string;
|
|
11
22
|
/**
|
|
12
23
|
* Dev-only: the plugin spec a new workspace pins instead of formatPluginSpec, from
|
|
13
24
|
* PSTACK_PLUGIN_SPEC (e.g. `file:/path/to/mouryaamit-nx-polystack-vX.tgz`), so a build that has no
|
|
@@ -15,19 +26,28 @@ export declare function formatPluginSpec(version: string): string;
|
|
|
15
26
|
*/
|
|
16
27
|
export declare function pluginSpecOverride(env?: NodeJS.ProcessEnv): string | null;
|
|
17
28
|
/** Extra `npm install` flags for a pin, so npm saves it as formatPluginSpec wrote it. */
|
|
18
|
-
export declare function pinInstallFlags(): string[];
|
|
29
|
+
export declare function pinInstallFlags(source?: InstallSource): string[];
|
|
19
30
|
/**
|
|
20
31
|
* The pinned version, or null when the spec is neither a tag of the plugin repo (github:,
|
|
21
|
-
* git+https, git+ssh or owner/repo form; earlier repo names too)
|
|
22
|
-
* ^x.y.z, ~x.y.z or =x.y.z).
|
|
32
|
+
* git+https, git+ssh or owner/repo form; earlier repo names too), the git install source's URL,
|
|
33
|
+
* nor an npm version (x.y.z, ^x.y.z, ~x.y.z or =x.y.z).
|
|
23
34
|
*/
|
|
24
|
-
export declare function parsePluginSpec(spec: string): string | null;
|
|
35
|
+
export declare function parsePluginSpec(spec: string, source?: InstallSource): string | null;
|
|
25
36
|
/**
|
|
26
37
|
* Shell command that installs the global CLI.
|
|
27
38
|
* - npm source: `npm i -g <package>@<version>`.
|
|
39
|
+
* - git source: the URL with the version (a prebuilt package: nothing is built on install).
|
|
28
40
|
* - GitHub source: the prebuilt release asset. Not `npm i -g github:…#vX`: npm prepares git deps
|
|
29
41
|
* of a global install in global mode, so devDependencies (typescript) are missing and the
|
|
30
42
|
* build fails. Not the release download URL: the repo is private, and npm can't authenticate
|
|
31
43
|
* to GitHub; `gh` downloads with the user's GitHub login.
|
|
32
44
|
*/
|
|
33
|
-
export declare function globalInstallCommand(version: string): string;
|
|
45
|
+
export declare function globalInstallCommand(version: string, source?: InstallSource, name?: string): string;
|
|
46
|
+
/**
|
|
47
|
+
* nx and @nx/devkit are optional peers since 1.24.0 (so apps that only import a runtime file do
|
|
48
|
+
* not get Nx), so the global CLI is installed with them: `pstack new` writes the new workspace
|
|
49
|
+
* through @nx/devkit before that workspace has its own.
|
|
50
|
+
*/
|
|
51
|
+
export declare const GLOBAL_NX_PEERS = "nx@22 @nx/devkit@22";
|
|
52
|
+
/** The fix for a command that failed to load because nx / @nx/devkit is missing, else undefined. */
|
|
53
|
+
export declare function missingNxPeerHint(err: unknown): string | undefined;
|
package/dist/src/cli/versions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.globalInstallCommand = exports.parsePluginSpec = exports.pinInstallFlags = exports.pluginSpecOverride = exports.formatPluginSpec = exports.compareVersions = exports.normalizeVersion = exports.LEGACY_GITHUB_REPOS = exports.PLUGIN_GITHUB_REPO = exports.PLUGIN_NAME = void 0;
|
|
3
|
+
exports.missingNxPeerHint = exports.GLOBAL_NX_PEERS = exports.globalInstallCommand = exports.parsePluginSpec = exports.pinInstallFlags = exports.pluginSpecOverride = exports.formatPluginSpec = exports.templateFromPin = exports.compareVersions = exports.normalizeVersion = exports.LEGACY_GITHUB_REPOS = exports.PLUGIN_GITHUB_REPO = exports.PLUGIN_NAME = void 0;
|
|
4
4
|
const install_source_1 = require("./install-source");
|
|
5
5
|
const types_1 = require("./types");
|
|
6
6
|
exports.PLUGIN_NAME = '@mouryaamit/nx-polystack';
|
|
@@ -13,8 +13,7 @@ const escapeRegExp = (s) => s.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
|
|
|
13
13
|
/** npm forms of a version pin: exact, ^, ~ or = (the lower bound is the pinned version). */
|
|
14
14
|
const NPM_SPEC = /^[\^~=]?v?(\d+\.\d+\.\d+)$/;
|
|
15
15
|
/** Git-tag specs npm may save for the plugin's repos (".git" optional). */
|
|
16
|
-
function gitSpec() {
|
|
17
|
-
const source = (0, install_source_1.installSource)();
|
|
16
|
+
function gitSpec(source) {
|
|
18
17
|
const repos = new Set([exports.PLUGIN_GITHUB_REPO, ...exports.LEGACY_GITHUB_REPOS]);
|
|
19
18
|
if (source.kind === 'github')
|
|
20
19
|
repos.add(source.repo);
|
|
@@ -39,11 +38,37 @@ function compareVersions(a, b) {
|
|
|
39
38
|
return 0;
|
|
40
39
|
}
|
|
41
40
|
exports.compareVersions = compareVersions;
|
|
42
|
-
/** The
|
|
43
|
-
function
|
|
41
|
+
/** The spec of a git install source's template, as a pattern capturing the version. */
|
|
42
|
+
function templateSpec(source) {
|
|
43
|
+
if (source.kind !== 'git')
|
|
44
|
+
return null;
|
|
45
|
+
const [before, after] = source.template.split(install_source_1.VERSION_PLACEHOLDER).map(escapeRegExp);
|
|
46
|
+
return new RegExp(`^${before}(\\d+\\.\\d+\\.\\d+)${after}$`);
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* A git install source read off a workspace pin: the pin's git URL with `version` in its #ref
|
|
50
|
+
* (once) replaced by {version}, e.g. `git+https://host/org/repo.git#dist-v1.22.0` at 1.22.0. Lets
|
|
51
|
+
* `pstack update` move a renamed copy whose installed version predates git install sources
|
|
52
|
+
* (v1.23.0) along the URL the workspace already uses. Null for any other spec.
|
|
53
|
+
*/
|
|
54
|
+
function templateFromPin(spec, version) {
|
|
55
|
+
const m = /^(git\+(?:https?|ssh|file):\/\/[^\s#]+#)([^\s#]+)$/.exec(spec.trim());
|
|
56
|
+
if (!m || !/^\d+\.\d+\.\d+$/.test(version) || m[2].split(version).length !== 2)
|
|
57
|
+
return null;
|
|
58
|
+
return { kind: 'git', template: m[1] + m[2].replace(version, install_source_1.VERSION_PLACEHOLDER) };
|
|
59
|
+
}
|
|
60
|
+
exports.templateFromPin = templateFromPin;
|
|
61
|
+
/**
|
|
62
|
+
* The pin `pstack new` / `pstack update` write: a git tag of the repo, an exact npm version, or
|
|
63
|
+
* the git install source's URL with the version filled in.
|
|
64
|
+
*/
|
|
65
|
+
function formatPluginSpec(version, source = (0, install_source_1.installSource)()) {
|
|
44
66
|
const v = normalizeVersion(version);
|
|
45
|
-
|
|
46
|
-
|
|
67
|
+
if (source.kind === 'npm')
|
|
68
|
+
return v;
|
|
69
|
+
if (source.kind === 'git')
|
|
70
|
+
return source.template.split(install_source_1.VERSION_PLACEHOLDER).join(v);
|
|
71
|
+
return `github:${source.repo}#v${v}`;
|
|
47
72
|
}
|
|
48
73
|
exports.formatPluginSpec = formatPluginSpec;
|
|
49
74
|
/**
|
|
@@ -57,37 +82,57 @@ function pluginSpecOverride(env = process.env) {
|
|
|
57
82
|
}
|
|
58
83
|
exports.pluginSpecOverride = pluginSpecOverride;
|
|
59
84
|
/** Extra `npm install` flags for a pin, so npm saves it as formatPluginSpec wrote it. */
|
|
60
|
-
function pinInstallFlags() {
|
|
61
|
-
return
|
|
85
|
+
function pinInstallFlags(source = (0, install_source_1.installSource)()) {
|
|
86
|
+
return source.kind === 'npm' ? ['--save-exact'] : [];
|
|
62
87
|
}
|
|
63
88
|
exports.pinInstallFlags = pinInstallFlags;
|
|
64
89
|
/**
|
|
65
90
|
* The pinned version, or null when the spec is neither a tag of the plugin repo (github:,
|
|
66
|
-
* git+https, git+ssh or owner/repo form; earlier repo names too)
|
|
67
|
-
* ^x.y.z, ~x.y.z or =x.y.z).
|
|
91
|
+
* git+https, git+ssh or owner/repo form; earlier repo names too), the git install source's URL,
|
|
92
|
+
* nor an npm version (x.y.z, ^x.y.z, ~x.y.z or =x.y.z).
|
|
68
93
|
*/
|
|
69
|
-
function parsePluginSpec(spec) {
|
|
94
|
+
function parsePluginSpec(spec, source = (0, install_source_1.installSource)()) {
|
|
70
95
|
const s = spec.trim();
|
|
71
|
-
const m = gitSpec().exec(s) ?? NPM_SPEC.exec(s);
|
|
96
|
+
const m = templateSpec(source)?.exec(s) ?? gitSpec(source).exec(s) ?? NPM_SPEC.exec(s);
|
|
72
97
|
return m ? m[1] : null;
|
|
73
98
|
}
|
|
74
99
|
exports.parsePluginSpec = parsePluginSpec;
|
|
75
100
|
/**
|
|
76
101
|
* Shell command that installs the global CLI.
|
|
77
102
|
* - npm source: `npm i -g <package>@<version>`.
|
|
103
|
+
* - git source: the URL with the version (a prebuilt package: nothing is built on install).
|
|
78
104
|
* - GitHub source: the prebuilt release asset. Not `npm i -g github:…#vX`: npm prepares git deps
|
|
79
105
|
* of a global install in global mode, so devDependencies (typescript) are missing and the
|
|
80
106
|
* build fails. Not the release download URL: the repo is private, and npm can't authenticate
|
|
81
107
|
* to GitHub; `gh` downloads with the user's GitHub login.
|
|
82
108
|
*/
|
|
83
|
-
function globalInstallCommand(version) {
|
|
109
|
+
function globalInstallCommand(version, source = (0, install_source_1.installSource)(), name = exports.PLUGIN_NAME) {
|
|
84
110
|
const v = normalizeVersion(version);
|
|
85
|
-
const source = (0, install_source_1.installSource)();
|
|
86
111
|
if (source.kind === 'npm')
|
|
87
|
-
return `npm i -g ${
|
|
112
|
+
return `npm i -g ${name}@${v} ${exports.GLOBAL_NX_PEERS}`;
|
|
113
|
+
if (source.kind === 'git') {
|
|
114
|
+
return `npm i -g "${name}@${formatPluginSpec(v, source)}" ${exports.GLOBAL_NX_PEERS}`;
|
|
115
|
+
}
|
|
88
116
|
const asset = `mouryaamit-nx-polystack-v${v}.tgz`;
|
|
89
117
|
return (`gh release download v${v} -R ${source.repo} -p ${asset} -D /tmp --clobber` +
|
|
90
|
-
` && npm i -g /tmp/${asset}`);
|
|
118
|
+
` && npm i -g /tmp/${asset} ${exports.GLOBAL_NX_PEERS}`);
|
|
91
119
|
}
|
|
92
120
|
exports.globalInstallCommand = globalInstallCommand;
|
|
121
|
+
/**
|
|
122
|
+
* nx and @nx/devkit are optional peers since 1.24.0 (so apps that only import a runtime file do
|
|
123
|
+
* not get Nx), so the global CLI is installed with them: `pstack new` writes the new workspace
|
|
124
|
+
* through @nx/devkit before that workspace has its own.
|
|
125
|
+
*/
|
|
126
|
+
exports.GLOBAL_NX_PEERS = 'nx@22 @nx/devkit@22';
|
|
127
|
+
/** The fix for a command that failed to load because nx / @nx/devkit is missing, else undefined. */
|
|
128
|
+
function missingNxPeerHint(err) {
|
|
129
|
+
if (!(err instanceof Error) || err.code !== 'MODULE_NOT_FOUND') {
|
|
130
|
+
return undefined;
|
|
131
|
+
}
|
|
132
|
+
if (!/Cannot find module '(@nx\/devkit|nx)(\/[^']*)?'/.test(err.message))
|
|
133
|
+
return undefined;
|
|
134
|
+
return ('This command needs nx and @nx/devkit next to the global pstack CLI (optional peers since ' +
|
|
135
|
+
`1.24.0). Install them: npm i -g ${exports.GLOBAL_NX_PEERS}`);
|
|
136
|
+
}
|
|
137
|
+
exports.missingNxPeerHint = missingNxPeerHint;
|
|
93
138
|
//# sourceMappingURL=versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../src/cli/versions.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../src/cli/versions.ts"],"names":[],"mappings":"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"}
|
|
@@ -293,6 +293,14 @@ function applyInfra(tree, schema) {
|
|
|
293
293
|
'workflows can install the private nx-polystack plugin' +
|
|
294
294
|
(o.parts.includes('upgrades') ? ' and the upgrade workflow can find its releases.' : '.'));
|
|
295
295
|
}
|
|
296
|
+
if (github &&
|
|
297
|
+
source.kind === 'git' &&
|
|
298
|
+
o.parts.includes('upgrades') &&
|
|
299
|
+
[...report.written, ...report.overwritten].includes('.github/workflows/dependency-upgrade.yml')) {
|
|
300
|
+
report.notes.push('The dependency-upgrade workflow looks up new nx-polystack versions on npm; this plugin ' +
|
|
301
|
+
'comes from a git install source (pstack.installSource), so it will not find them. ' +
|
|
302
|
+
'Move the plugin with pstack update instead.');
|
|
303
|
+
}
|
|
296
304
|
return report;
|
|
297
305
|
}
|
|
298
306
|
exports.applyInfra = applyInfra;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/infra/generator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/infra/generator.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B,uCAAmG;AAEnG,6DAAyD;AACzD,iDAAqE;AACrE,+DAAuF;AACvF,yDAAgF;AAChF,6DAMqC;AACrC,6DAA4D;AAC5D,qDAAiD;AACjD,qDAaiC;AAEjC,uCAamB;AAGnB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC5C,MAAM,OAAO,GAAG,iBAAiB,CAAC;AAClC,MAAM,YAAY,GAAG,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;AAEjE,6FAA6F;AAC7F,MAAM,kBAAkB,GAAG;IACzB,sBAAsB;IACtB,uBAAuB;IACvB,uBAAuB;IACvB,sBAAsB;IACtB,eAAe;IACf,oBAAoB;IACpB,oBAAoB;IACpB,mBAAmB;IACnB,kBAAkB;IAClB,mBAAmB;CACpB,CAAC;AAEF,4FAA4F;AAC/E,QAAA,cAAc,GAAG,8DAA8D,CAAC;AAE7F,MAAM,KAAK,GAAG,yCAAyC,CAAC;AAE3C,QAAA,aAAa,GAAG;IAC3B,cAAc,EAAE,oCAAoC;IACpD,YAAY,EAAE,qBAAqB;IACnC,0FAA0F;IAC1F,gGAAgG;IAChG,eAAe,EACb,yBAAyB,KAAK,wDAAwD;QACtF,yDAAyD;IAC3D,aAAa,EAAE,KAAK;CACZ,CAAC;AAEX,MAAM,eAAe,GAAG;IACtB,iBAAiB,EAAE,SAAS;IAC5B,iCAAiC,EAAE,SAAS;CAC7C,CAAC;AACF,MAAM,YAAY,GAAG;IACnB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE,QAAQ;IACpB,8CAA8C,EAAE,QAAQ;IACxD,KAAK,EAAE,QAAQ;CAChB,CAAC;AAmCF,oFAAoF;AACpF,SAAgB,qBAAqB,CAAC,MAA4B;IAChE,OAAO;QACL,KAAK,EAAE,IAAA,oBAAU,EAAC,MAAM,CAAC,IAAI,CAAC;QAC9B,EAAE,EAAE,IAAA,0BAAgB,EAAC,MAAM,CAAC,EAAE,CAAC;QAC/B,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO;QACzB,OAAO,EAAE,IAAA,0BAAgB,EAAC,MAAM,CAAC,OAAO,CAAC;QACzC,eAAe,EAAE,IAAA,8BAAoB,EAAC,MAAM,CAAC,eAAe,CAAC;QAC7D,YAAY,EAAE,IAAA,2BAAiB,EAAC,MAAM,CAAC,YAAY,CAAC;QACpD,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC;QAC9C,IAAI,EAAE,IAAA,2BAAa,EAAC,MAAM,CAAC,IAAI,CAAC;QAChC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;KACtB,CAAC;AACJ,CAAC;AAZD,sDAYC;AAED,SAAS,eAAe,CAAC,KAAyB;IAChD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IACvB,IAAI,CAAE,2BAAuC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QACzD,MAAM,IAAI,KAAK,CAAC,yBAAyB,2BAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,KAAK,CAAC,CAAC;KAC9F;IACD,OAAO,CAAmB,CAAC;AAC7B,CAAC;AAED,mDAAmD;AACnD,SAAgB,mBAAmB,CAAC,IAAU;IAC5C,IAAI;QACF,MAAM,IAAI,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC;QAC9D,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE;YAAE,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;KACjE;IAAC,MAAM;QACN,2BAA2B;KAC5B;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AARD,kDAQC;AAED,SAAS,gBAAgB,CAAC,IAAU;IAClC,IAAI;QACF,MAAM,GAAG,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,EAAE,cAAc,CAAC;QACtD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,EAAE;YAAE,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;KACnF;IAAC,MAAM;QACN,eAAe;KAChB;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,6EAA6E;AAC7E,SAAS,MAAM,CAAC,GAAW,EAAE,IAA6B;IACxD,2EAA2E;IAC3E,MAAM,OAAO,GAAG,IAAA,gBAAM,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,uBAAuB,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACrF,IAAA,sBAAa,EAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;IAC9E,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;IACtC,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,WAAW,EAAE,EAAE;QACrC,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO;YAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;KACnF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU;IACrC,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAChE,IAAI;QACF,OAAO,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,EAAE,UAAU,KAAK,SAAS,CAAC;KACjE;IAAC,MAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,0EAA0E;AAC1E,SAAS,YAAY,CAAC,IAAU,EAAE,CAAe,EAAE,MAAmB;IACpE,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,MAAM,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC/C,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChD,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC1B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACvB,IAAI,MAAM;YAAE,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC3C,IAAI,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;KACtE;IACD,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACtD,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAChC,IAAI,MAAM;YAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC7B;YACH,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,wFAAwF;gBACtF,uCAAuC,CAC1C,CAAC;SACH;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,SAAS,CAAC,IAAU,EAAE,IAAY,EAAE,OAAe,EAAE,CAAe,EAAE,CAAc;IAC3F,IAAI,IAAI,KAAK,OAAO,EAAE;QACpB,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAC/B,OAAO;KACR;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACtB,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,OAAO;KACR;IACD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,OAAO,EAAE;QACvC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,OAAO;KACR;IACD,IAAI,CAAC,CAAC,KAAK,EAAE;QACX,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,OAAO;KACR;IACD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC;AAED,sFAAsF;AACtF,SAAS,YAAY,CAAC,IAAU,EAAE,OAAe,EAAE,CAAc;IAC/D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;QACzB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxB,OAAO;KACR;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IACjD,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,wBAAc,CAAC,EAAE;QACzE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1B,OAAO;KACR;IACD,MAAM,GAAG,GAAG,OAAO,KAAK,EAAE,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACjE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,GAAG,GAAG,OAAO,CAAC,CAAC;IAC7C,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,UAAU,CAAC,IAAU,EAAE,MAA8B,EAAE,CAAc;IAC5E,MAAM,QAAQ,GAA2B,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC;IACtF,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAChD,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;aACjD,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG;YAAE,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAC3D;IACD,wEAAwE;IACxE,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC;QAAE,IAAA,2BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACpE,CAAC;AAED;;;GAGG;AACH,SAAgB,UAAU,CAAC,IAAU,EAAE,MAA4B;IACjE,MAAM,CAAC,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,MAAM,GAAgB;QAC1B,OAAO,EAAE,EAAE;QACX,WAAW,EAAE,EAAE;QACf,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,EAAE;QACb,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;QAChB,KAAK,EAAE,EAAE;KACV,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,8BAAa,GAAE,CAAC;IAC/B,MAAM,IAAI,GAAG;QACX,UAAU,EAAE,mBAAmB,CAAC,IAAI,CAAC;QACrC,cAAc,EAAE,gBAAgB,CAAC,IAAI,CAAC;QACtC,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,OAAO,EAAE,CAAC,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,KAAK,MAAM,IAAI,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAChF,eAAe,EAAE,CAAC,CAAC,eAAe;QAClC,WAAW,EAAE,sBAAY,CAAC,CAAC,CAAC,eAAe,CAAC;QAC5C,YAAY,EAAE,CAAC,CAAC,YAAY;QAC5B,UAAU,EAAE,sBAAW;QACvB,UAAU,EAAE,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,6BAAkB;QACvE,gBAAgB,EAAE,MAAM,CAAC,IAAI,KAAK,QAAQ;QAC1C,aAAa,EAAE,wBAAc;KAC9B,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC3C,KAAK,MAAM,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE;QAC/C,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC;YAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC9E;IACD,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;QAC9C,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;KAC5D;IAED,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,EAAE;QACpE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;gBAAE,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;SACpF;KACF;IAED,6DAA6D;IAC7D,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAC/B,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC1B,OAAO,CAAC,cAAc,CAAC,GAAG,qBAAa,CAAC,cAAc,CAAC,CAAC;YACxD,IAAI,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;SAC9E;QACD,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YAC/B,OAAO,CAAC,YAAY,CAAC,GAAG,qBAAa,CAAC,YAAY,CAAC,CAAC;YACpD,OAAO,CAAC,eAAe,CAAC,GAAG,qBAAa,CAAC,eAAe,CAAC,CAAC;YAC1D,OAAO,CAAC,aAAa,CAAC,GAAG,qBAAa,CAAC,aAAa,CAAC,CAAC;YACtD,8CAA8C;YAC9C,IAAI,IAAA,8BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,KAAK,SAAS;gBAAE,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC;YAC/E,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACrC,IAAI,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,OAAO,EAAE;gBAChD,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAA,mCAAyB,EAAC,IAAI,CAAC,CAAC,CAAC;aACzD;SACF;QACD,IAAI,CAAC,CAAC,IAAI;YAAE,SAAS,CAAC,IAAA,yBAAW,EAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACjE,IAAI,CAAC,CAAC,UAAU,EAAE;YAChB,MAAM,CAAC,GAAG,IAAA,2BAAiB,EAAC,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;YAChD,IAAI,CAAC,KAAK,KAAK;gBACb,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,2BACE,CAAC,CAAC,UAAU,KAAK,MAAM;oBACrB,CAAC,CAAC,qCAAqC;oBACvC,CAAC,CAAC,6BACN,GAAG,CACJ,CAAC;iBACC,IAAI,CAAC,KAAK,cAAc;gBAC3B,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,qJAAqJ,CACtJ,CAAC;iBACC,IAAI,CAAC,KAAK,WAAW;gBACxB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;iBAC9E,IAAI,CAAC,KAAK,gBAAgB;gBAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;SACvF;QACD,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAClC,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;QACvE,MAAM,CAAC,WAAW,GAAG,IAAA,qCAAsB,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;KAChE;IAED,MAAM,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC/C,IACE,MAAM;QACN,MAAM,CAAC,IAAI,KAAK,QAAQ;QACxB,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACxD,CAAC,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,EAC1F;QACA,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,6DAA6D,MAAM,CAAC,IAAI,WAAW;YACjF,uDAAuD;YACvD,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,kDAAkD,CAAC,CAAC,CAAC,GAAG,CAAC,CAC5F,CAAC;KACH;IACD,IACE,MAAM;QACN,MAAM,CAAC,IAAI,KAAK,KAAK;QACrB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC5B,CAAC,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,0CAA0C,CAAC,EAC/F;QACA,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,yFAAyF;YACvF,oFAAoF;YACpF,6CAA6C,CAChD,CAAC;KACH;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAjHD,gCAiHC;AAED,SAAS,SAAS,CAAC,CAAiB,EAAE,IAAc,EAAE,MAAmB;IACvE,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;KAC5F;IACD,IAAI,CAAC,CAAC,UAAU,KAAK,KAAK,EAAE;QAC1B,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,IAAI,KAAK,KAAK;YACZ,CAAC,CAAC,qFAAqF;YACvF,CAAC,CAAC,wEAAwE,CAC7E,CAAC;KACH;IACD,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS;QAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;IAC/F,IAAI,CAAC,CAAC,UAAU,KAAK,cAAc,EAAE;QACnC,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,sDAAsD,mCAAqB,kBAAkB;YAC3F,kEAAkE,CACrE,CAAC;KACH;IACD,IAAI,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,IAAI,KAAK,KAAK;YACZ,CAAC,CAAC,+BAA+B,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YAC3D,CAAC,CAAC,0DAA0D,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACzF,CAAC;KACH;IACD,IAAI,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,wCAAwC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CACvD,IAAI,CACL,uCAAuC,CACzC,CAAC;KACH;AACH,CAAC;AAED,6FAA6F;AAC7F,SAAgB,kBAAkB,CAAC,IAAU,EAAE,MAA2B;IACxE,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,IAAA,6BAAmB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACnD,IAAA,gCAAsB,EAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,uBAAuB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,8CAA8C;YACvF,gCAAgC,CACnC,CAAC;KACH;IACD,MAAM,MAAM,GAAG,IAAA,6BAAmB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,4BAAkB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC7E,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,wDAAwD,0BAAgB,eAAe;YACrF,gBAAgB,CACnB,CAAC;KACH;IACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,6BAA6B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,0CAA0C;YACrF,uFAAuF,CAC1F,CAAC;KACH;IACD,MAAM,EAAE,GAAG,IAAA,0BAAgB,EAAC,IAAI,CAAC,CAAC;IAClC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,8CAA8C,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC3F;IACD,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,+CAA+C,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW;YAC7E,kDAAkD,CACrD,CAAC;KACH;IACD,MAAM,MAAM,GAAG,IAAA,+BAAqB,EAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC;AAChB,CAAC;AApCD,gDAoCC;AAED,yEAAyE;AACzE,SAAgB,UAAU,CAAC,MAAoB;IAC7C,MAAM,KAAK,GACT,6FAA6F,CAAC;IAChG,IAAI,MAAM,KAAK,gBAAgB,EAAE;QAC/B,OAAO,CAAC,gDAAgD,KAAK,WAAW,CAAC,CAAC;KAC3E;IACD,IAAI,MAAM,KAAK,cAAc,EAAE;QAC7B,OAAO,CAAC,gEAAgE,KAAK,WAAW,CAAC,CAAC;KAC3F;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAVD,gCAUC;AAED,SAAS,SAAS,CAAC,CAAc;IAC/B,MAAM,KAAK,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzE,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,eAAM,CAAC,IAAI,CAAC,qCAAqC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;KACvE;IACD,IAAI,CAAC,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5B,eAAM,CAAC,IAAI,CACT,6CAA6C,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI;YACnE,yDAAyD,CAC5D,CAAC;KACH;IACD,IAAI,CAAC,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7B,eAAM,CAAC,IAAI,CACT,aAAa,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,WAAW,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACvF,CAAC;KACH;IACD,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC,KAAK;QAAE,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,eAAM,CAAC,IAAI,CAAC,qDAAqD,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;KACtF;AACH,CAAC;AAEc,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,MAA4B;IAE5B,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,IAAI,CAAC,MAAM,CAAC,UAAU;QAAE,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAChD,uEAAuE;IACvE,IAAA,4BAAgB,EAAC,IAAI,CAAC,CAAC;IACvB,SAAS,CAAC,MAAM,CAAC,CAAC;IAClB,OAAO,MAAM,CAAC,WAAW,CAAC;AAC5B,CAAC;AAVD,iCAUC"}
|
|
@@ -8,8 +8,21 @@ const module_1 = require("module");
|
|
|
8
8
|
* plugin declaring its own copies.
|
|
9
9
|
*/
|
|
10
10
|
const fromDevkit = (0, module_1.createRequire)(require.resolve('@nx/devkit/package.json'));
|
|
11
|
+
/**
|
|
12
|
+
* `ignore` is a dependency of nx, not of @nx/devkit 22: it resolved through @nx/devkit only when
|
|
13
|
+
* both were installed in one tree. Since 1.24.0 they can be separate global installs, so fall
|
|
14
|
+
* back to nx.
|
|
15
|
+
*/
|
|
16
|
+
function fromDevkitOrNx(id) {
|
|
17
|
+
try {
|
|
18
|
+
return fromDevkit(id);
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
return (0, module_1.createRequire)(require.resolve('nx/package.json'))(id);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
11
24
|
exports.semver = fromDevkit('semver');
|
|
12
|
-
const ignoreModule =
|
|
25
|
+
const ignoreModule = fromDevkitOrNx('ignore');
|
|
13
26
|
exports.createIgnore = ignoreModule.default ?? ignoreModule;
|
|
14
27
|
/**
|
|
15
28
|
* True when two version specs can be satisfied together. Ranges that semver understands are
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devkit-deps.js","sourceRoot":"","sources":["../../../../src/lib/utils/devkit-deps.ts"],"names":[],"mappings":";;;AAAA,mCAAuC;AAEvC;;;;GAIG;AACH,MAAM,UAAU,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"devkit-deps.js","sourceRoot":"","sources":["../../../../src/lib/utils/devkit-deps.ts"],"names":[],"mappings":";;;AAAA,mCAAuC;AAEvC;;;;GAIG;AACH,MAAM,UAAU,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC;AAc7E;;;;GAIG;AACH,SAAS,cAAc,CAAC,EAAU;IAChC,IAAI;QACF,OAAO,UAAU,CAAC,EAAE,CAAC,CAAC;KACvB;IAAC,MAAM;QACN,OAAO,IAAA,sBAAa,EAAC,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;KAC9D;AACH,CAAC;AAEY,QAAA,MAAM,GAAW,UAAU,CAAC,QAAQ,CAAC,CAAC;AACnD,MAAM,YAAY,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;AACjC,QAAA,YAAY,GAAiB,YAAY,CAAC,OAAO,IAAI,YAAY,CAAC;AAE/E;;;;GAIG;AACH,SAAgB,aAAa,CAAC,CAAS,EAAE,CAAS;IAChD,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,EAAE,GAAG,cAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,EAAE,GAAG,cAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC;IAC7B,IAAI;QACF,OAAO,cAAM,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;KAClC;IAAC,MAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAVD,sCAUC"}
|
|
@@ -19,8 +19,8 @@ exports.renamePluginRepo = renamePluginRepo;
|
|
|
19
19
|
* `pstack update` itself moves the package.json pin.
|
|
20
20
|
*/
|
|
21
21
|
async function pluginRepoDev(tree) {
|
|
22
|
-
// In the npm build the earlier name is the public repo: nothing to point elsewhere.
|
|
23
|
-
if ((0, install_source_1.installSource)().kind
|
|
22
|
+
// In the npm (or git) build the earlier name is the public repo: nothing to point elsewhere.
|
|
23
|
+
if ((0, install_source_1.installSource)().kind !== 'github' || !tree.exists(WORKFLOWS))
|
|
24
24
|
return;
|
|
25
25
|
const changed = [];
|
|
26
26
|
for (const name of tree.children(WORKFLOWS)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-repo-dev.js","sourceRoot":"","sources":["../../../../src/migrations/plugin-repo-dev/plugin-repo-dev.ts"],"names":[],"mappings":";;;AAAA,uCAA0C;AAE1C,6DAAyD;AACzD,iDAA6E;AAE7E,MAAM,SAAS,GAAG,mBAAmB,CAAC;AAEtC,MAAM,YAAY,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;AAEtF,gGAAgG;AAChG,MAAM,MAAM,GAAG,IAAI,MAAM,CACvB,mBAAmB,8BAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EAC/E,GAAG,CACJ,CAAC;AAEF,wEAAwE;AACxE,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,6BAAkB,CAAC,CAAC;AAClD,CAAC;AAFD,4CAEC;AAED;;;;GAIG;AACY,KAAK,UAAU,aAAa,CAAC,IAAU;IACpD,
|
|
1
|
+
{"version":3,"file":"plugin-repo-dev.js","sourceRoot":"","sources":["../../../../src/migrations/plugin-repo-dev/plugin-repo-dev.ts"],"names":[],"mappings":";;;AAAA,uCAA0C;AAE1C,6DAAyD;AACzD,iDAA6E;AAE7E,MAAM,SAAS,GAAG,mBAAmB,CAAC;AAEtC,MAAM,YAAY,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;AAEtF,gGAAgG;AAChG,MAAM,MAAM,GAAG,IAAI,MAAM,CACvB,mBAAmB,8BAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EAC/E,GAAG,CACJ,CAAC;AAEF,wEAAwE;AACxE,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,6BAAkB,CAAC,CAAC;AAClD,CAAC;AAFD,4CAEC;AAED;;;;GAIG;AACY,KAAK,UAAU,aAAa,CAAC,IAAU;IACpD,6FAA6F;IAC7F,IAAI,IAAA,8BAAa,GAAE,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;QAAE,OAAO;IACzE,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QAC3C,MAAM,IAAI,GAAG,GAAG,SAAS,IAAI,IAAI,EAAE,CAAC;QACpC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YAAE,SAAS;QAC3D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5C,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpB;KACF;IACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,eAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,6BAAkB,GAAG,CAAC,CAAC;KACvF;AACH,CAAC;AAjBD,gCAiBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mouryaamit/nx-polystack",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.24.0",
|
|
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",
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
"default": "./dist/src/migrate-sdk.js"
|
|
17
17
|
},
|
|
18
18
|
"./runtime/csp-nonce": "./runtime/csp-nonce.js",
|
|
19
|
+
"./runtime/csp-style-attr": "./runtime/csp-style-attr.js",
|
|
19
20
|
"./runtime/env-secret": {
|
|
20
21
|
"types": "./runtime/env-secret.d.ts",
|
|
21
22
|
"import": "./runtime/env-secret.mjs",
|
|
@@ -70,6 +71,12 @@
|
|
|
70
71
|
"sharp": "^0.33.0 || ^0.34.0 || ^0.35.0"
|
|
71
72
|
},
|
|
72
73
|
"peerDependenciesMeta": {
|
|
74
|
+
"@nx/devkit": {
|
|
75
|
+
"optional": true
|
|
76
|
+
},
|
|
77
|
+
"nx": {
|
|
78
|
+
"optional": true
|
|
79
|
+
},
|
|
73
80
|
"crypto-js": {
|
|
74
81
|
"optional": true
|
|
75
82
|
},
|
package/runtime/csp-nonce.js
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* The nonce is read from `window.__cspNonce`, else from <meta property="csp-nonce" content="…">
|
|
15
15
|
* (written by the pstack release build) or <meta name="csp-nonce">. A value the server did not
|
|
16
16
|
* fill in (an SSI directive left as is, or a placeholder such as "random-csp-nonce") counts as no
|
|
17
|
-
* nonce: nothing is patched.
|
|
17
|
+
* nonce: nothing is patched, and one console warning says the nonce was not filled in.
|
|
18
18
|
*
|
|
19
19
|
* Plain browser JavaScript with no imports, safe to load more than once.
|
|
20
20
|
*/
|
|
@@ -47,11 +47,31 @@
|
|
|
47
47
|
|
|
48
48
|
var raw = window.__cspNonce;
|
|
49
49
|
var nonce = valid(raw) ? raw : undefined;
|
|
50
|
+
var meta;
|
|
50
51
|
if (!nonce) {
|
|
51
|
-
|
|
52
|
+
meta = fromMeta();
|
|
52
53
|
nonce = valid(meta) ? meta : undefined;
|
|
53
54
|
}
|
|
54
55
|
if (!nonce) {
|
|
56
|
+
// A value is there but was not filled in (the server did not replace it): say so once.
|
|
57
|
+
// No value at all (e.g. ng serve without a CSP) stays silent; '' is what this runtime writes.
|
|
58
|
+
var unfilled =
|
|
59
|
+
typeof raw === 'string' && raw !== '' ? raw : typeof meta === 'string' ? meta : undefined;
|
|
60
|
+
if (
|
|
61
|
+
unfilled !== undefined &&
|
|
62
|
+
!window.__pstackCspNonceWarned &&
|
|
63
|
+
typeof console !== 'undefined'
|
|
64
|
+
) {
|
|
65
|
+
window.__pstackCspNonceWarned = true;
|
|
66
|
+
console.warn(
|
|
67
|
+
'[pstack csp-nonce] The CSP nonce was not filled in (found "' +
|
|
68
|
+
unfilled.slice(0, 40) +
|
|
69
|
+
'"), so no nonce is added: under a nonce-based CSP, runtime <style>, <script> and ' +
|
|
70
|
+
'<link rel="stylesheet"> elements will be blocked. The server must replace the ' +
|
|
71
|
+
'placeholder in index.html on every response (e.g. Apache SSI: Options +IncludesNOEXEC ' +
|
|
72
|
+
'and the INCLUDES output filter for index.html).',
|
|
73
|
+
);
|
|
74
|
+
}
|
|
55
75
|
window.__cspNonce = '';
|
|
56
76
|
return;
|
|
57
77
|
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/* eslint-env browser */
|
|
2
|
+
/**
|
|
3
|
+
* @mouryaamit/nx-polystack/runtime/csp-style-attr (opt-in)
|
|
4
|
+
*
|
|
5
|
+
* Import right after runtime/csp-nonce in main.ts:
|
|
6
|
+
* import '@mouryaamit/nx-polystack/runtime/csp-nonce';
|
|
7
|
+
* import '@mouryaamit/nx-polystack/runtime/csp-style-attr';
|
|
8
|
+
*
|
|
9
|
+
* Under style-src without 'unsafe-inline', element.setAttribute('style', v) is blocked
|
|
10
|
+
* (style-src-attr), but the same declarations written through the CSSOM (style.cssText = v) are
|
|
11
|
+
* allowed. Angular writes static template / host style attributes with setAttribute('style'), so
|
|
12
|
+
* this routes setAttribute('style', v) and setAttributeNS(null, 'style', v) to style.cssText.
|
|
13
|
+
* Nothing else changes: other attributes, setAttributeNode, attributes.setNamedItem, Attr.value
|
|
14
|
+
* and style attributes parsed by the HTML parser (innerHTML, insertAdjacentHTML, static
|
|
15
|
+
* index.html markup) stay blocked. Static style="" in Angular templates is covered: Angular
|
|
16
|
+
* writes it with setAttribute.
|
|
17
|
+
* getAttribute('style') then returns the browser's normalised text, without declarations it does
|
|
18
|
+
* not support. Never pass user-controlled data to these writes. Rollback: remove the import.
|
|
19
|
+
*
|
|
20
|
+
* Plain browser JavaScript with no imports, safe to load more than once.
|
|
21
|
+
*/
|
|
22
|
+
(function pstackCspStyleAttr() {
|
|
23
|
+
if (typeof window === 'undefined' || typeof Element === 'undefined') return;
|
|
24
|
+
if (window.__pstackCspStyleAttrPatched) return;
|
|
25
|
+
window.__pstackCspStyleAttrPatched = true;
|
|
26
|
+
|
|
27
|
+
var proto = Element.prototype;
|
|
28
|
+
var setAttribute = proto.setAttribute;
|
|
29
|
+
var setAttributeNS = proto.setAttributeNS;
|
|
30
|
+
|
|
31
|
+
/** The element's CSSOM declaration when name is the style attribute, else undefined. */
|
|
32
|
+
function styleOf(el, name) {
|
|
33
|
+
if (typeof name !== 'string' || name.toLowerCase() !== 'style') return undefined;
|
|
34
|
+
var style = el.style;
|
|
35
|
+
return style && typeof style === 'object' && 'cssText' in style ? style : undefined;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
proto.setAttribute = function (name, value) {
|
|
39
|
+
var style = arguments.length >= 2 ? styleOf(this, name) : undefined;
|
|
40
|
+
if (!style) return setAttribute.apply(this, arguments);
|
|
41
|
+
style.cssText = String(value);
|
|
42
|
+
};
|
|
43
|
+
|
|
44
|
+
if (typeof setAttributeNS === 'function') {
|
|
45
|
+
proto.setAttributeNS = function (ns, name, value) {
|
|
46
|
+
var style = arguments.length >= 3 && !ns ? styleOf(this, name) : undefined;
|
|
47
|
+
if (!style) return setAttributeNS.apply(this, arguments);
|
|
48
|
+
style.cssText = String(value);
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
})();
|