@abgov/nx-adsp 13.19.1 → 13.20.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/package.json +1 -1
- package/src/generators/angular-app/angular-app.js +1 -19
- package/src/generators/angular-app/angular-app.js.map +1 -1
- package/src/generators/express-service/express-service.js +11 -1
- package/src/generators/express-service/express-service.js.map +1 -1
- package/src/generators/express-service/express-service.spec.ts +195 -1
- package/src/generators/express-service/files/AGENTS.md__tmpl__ +18 -3
- package/src/generators/express-service/schema.d.ts +1 -0
- package/src/generators/express-service/schema.json +4 -0
- package/src/generators/react-app/react-app.js +1 -19
- package/src/generators/react-app/react-app.js.map +1 -1
- package/src/generators/vue-app/vue-app.js +1 -16
- package/src/generators/vue-app/vue-app.js.map +1 -1
- package/src/utils/frontend-app-port.d.ts +1 -0
- package/src/utils/frontend-app-port.js +11 -0
- package/src/utils/frontend-app-port.js.map +1 -0
- package/src/utils/paired-project.d.ts +13 -0
- package/src/utils/paired-project.js +123 -0
- package/src/utils/paired-project.js.map +1 -1
package/package.json
CHANGED
|
@@ -44,25 +44,7 @@ function addFiles(host, options) {
|
|
|
44
44
|
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
45
45
|
const addProxyConf = options.nginxProxies.length > 0;
|
|
46
46
|
if (addProxyConf) {
|
|
47
|
-
|
|
48
|
-
// TODO: Is this cleaner to add via template?
|
|
49
|
-
const devProxyConf = options.nginxProxies.reduce((proxyConf, nginxProxy) => {
|
|
50
|
-
const upstreamUrl = new URL(nginxProxy.proxyPass);
|
|
51
|
-
const proxy = {
|
|
52
|
-
target: `${upstreamUrl.protocol}//localhost${upstreamUrl.port ? ':' + upstreamUrl.port : ''}`,
|
|
53
|
-
secure: upstreamUrl.protocol === 'https:',
|
|
54
|
-
changeOrigin: false,
|
|
55
|
-
pathRewrite: {},
|
|
56
|
-
};
|
|
57
|
-
// If there is a path on the upstream url, then add a rewrite.
|
|
58
|
-
if (upstreamUrl.pathname.length > 1) {
|
|
59
|
-
proxy.pathRewrite = {
|
|
60
|
-
[`^${nginxProxy.location}`]: upstreamUrl.pathname,
|
|
61
|
-
};
|
|
62
|
-
}
|
|
63
|
-
return Object.assign(Object.assign({}, proxyConf), { [nginxProxy.location]: proxy });
|
|
64
|
-
}, {});
|
|
65
|
-
(0, devkit_1.writeJson)(host, `${options.projectRoot}/proxy.conf.json`, devProxyConf);
|
|
47
|
+
(0, devkit_1.writeJson)(host, `${options.projectRoot}/proxy.conf.json`, (0, paired_project_1.buildDevProxyConf)(options.nginxProxies));
|
|
66
48
|
}
|
|
67
49
|
return addProxyConf;
|
|
68
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/angular-app/angular-app.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"angular-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/angular-app/angular-app.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,15 +12,17 @@ const plugin_version_1 = require("../../utils/plugin-version");
|
|
|
12
12
|
const quality_1 = require("../../utils/quality");
|
|
13
13
|
const init_1 = require("../init/init");
|
|
14
14
|
const express_service_port_1 = require("../../utils/express-service-port");
|
|
15
|
+
const paired_project_1 = require("../../utils/paired-project");
|
|
15
16
|
function normalizeOptions(host, options) {
|
|
16
17
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
18
|
var _a;
|
|
18
19
|
const projectName = (0, devkit_1.names)(options.name).fileName;
|
|
19
20
|
const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
|
|
20
21
|
const adsp = yield (0, nx_oc_1.getAdspConfiguration)(host, options);
|
|
22
|
+
const pairedFrontend = (0, paired_project_1.resolvePairedFrontendApp)(host, options.pairedProject);
|
|
21
23
|
return Object.assign(Object.assign({}, options), { projectName,
|
|
22
24
|
projectRoot,
|
|
23
|
-
adsp, database: (_a = options.database) !== null && _a !== void 0 ? _a : 'none' });
|
|
25
|
+
adsp, database: (_a = options.database) !== null && _a !== void 0 ? _a : 'none', pairedProjectTag: pairedFrontend === null || pairedFrontend === void 0 ? void 0 : pairedFrontend.tag });
|
|
24
26
|
});
|
|
25
27
|
}
|
|
26
28
|
function addFiles(host, options) {
|
|
@@ -56,6 +58,13 @@ function default_1(host, options) {
|
|
|
56
58
|
? { 'drizzle-kit': '^0.31.0', '@types/pg': '^8.11.0' }
|
|
57
59
|
: {})), { 'eslint-plugin-security': '^3.0.0', 'eslint-plugin-no-secrets': '^2.0.0', 'eslint-plugin-jest': '^28.0.0' }));
|
|
58
60
|
addFiles(host, normalizedOptions);
|
|
61
|
+
// When the frontend already exists (standalone use: backend generated after frontend),
|
|
62
|
+
// retroactively apply the nginx/dev-proxy wiring that the frontend generator would have
|
|
63
|
+
// set up if it had been given --pairedProject. Safe to call when the frontend doesn't
|
|
64
|
+
// exist yet (composite generator ordering) — applyProxyToExistingFrontend returns early.
|
|
65
|
+
if (normalizedOptions.pairedProject) {
|
|
66
|
+
(0, paired_project_1.applyProxyToExistingFrontend)(host, normalizedOptions.pairedProject, normalizedOptions.projectName);
|
|
67
|
+
}
|
|
59
68
|
(0, quality_1.addEslintQualityRules)(host, normalizedOptions.projectRoot, [
|
|
60
69
|
'**/*.spec.ts',
|
|
61
70
|
'**/*.test.ts',
|
|
@@ -115,6 +124,7 @@ function default_1(host, options) {
|
|
|
115
124
|
const dbTag = `adsp:database:${normalizedOptions.database}`;
|
|
116
125
|
const newTags = [
|
|
117
126
|
...(normalizedOptions.database !== 'none' ? [dbTag] : []),
|
|
127
|
+
...(normalizedOptions.pairedProjectTag ? [normalizedOptions.pairedProjectTag] : []),
|
|
118
128
|
...(0, nx_oc_1.adspProjectTags)(normalizedOptions.env, normalizedOptions.adsp.tenant),
|
|
119
129
|
].filter((tag) => { var _a; return !((_a = projectConfig.tags) !== null && _a !== void 0 ? _a : []).includes(tag); });
|
|
120
130
|
const tags = [...((_d = projectConfig.tags) !== null && _d !== void 0 ? _d : []), ...newTags];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/express-service/express-service.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"express-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/express-service/express-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { readJson, readProjectConfiguration, writeJson } from '@nx/devkit';
|
|
1
|
+
import { addProjectConfiguration, readJson, readProjectConfiguration, writeJson } from '@nx/devkit';
|
|
2
2
|
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
|
|
3
3
|
|
|
4
4
|
import * as utils from '@abgov/nx-oc';
|
|
@@ -338,4 +338,198 @@ describe('Express Service Generator', () => {
|
|
|
338
338
|
expect(host.exists('apps/test/.env.local')).toBeFalsy();
|
|
339
339
|
expect(host.exists('apps/test/.env')).toBeFalsy();
|
|
340
340
|
}, 60000);
|
|
341
|
+
|
|
342
|
+
it('derives the sandbox tag from --pairedProject and adds it to the project', async () => {
|
|
343
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
344
|
+
addProjectConfiguration(host, 'test-app', { root: 'apps/test-app' });
|
|
345
|
+
await generator(host, { ...options, pairedProject: 'test-app' });
|
|
346
|
+
|
|
347
|
+
const config = readProjectConfiguration(host, 'test');
|
|
348
|
+
expect(config.tags).toContain('adsp:paired-frontend:test-app:4200');
|
|
349
|
+
}, 60000);
|
|
350
|
+
|
|
351
|
+
it('surfaces the paired project name in AGENTS.md', async () => {
|
|
352
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
353
|
+
addProjectConfiguration(host, 'test-app', { root: 'apps/test-app' });
|
|
354
|
+
await generator(host, { ...options, pairedProject: 'test-app' });
|
|
355
|
+
|
|
356
|
+
const agents = host.read('apps/test/AGENTS.md').toString();
|
|
357
|
+
expect(agents).toContain('test-app');
|
|
358
|
+
}, 60000);
|
|
359
|
+
|
|
360
|
+
describe('--pairedProject proxy wiring', () => {
|
|
361
|
+
// Simplified nginx.conf matching the template structure (no proxy entries yet).
|
|
362
|
+
const NGINX_CONF_NO_PROXY = `events {
|
|
363
|
+
worker_connections 1024;
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
http {
|
|
367
|
+
server {
|
|
368
|
+
listen 8080;
|
|
369
|
+
|
|
370
|
+
location / {
|
|
371
|
+
try_files $uri /index.html;
|
|
372
|
+
}
|
|
373
|
+
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
`;
|
|
377
|
+
|
|
378
|
+
it('writes vite.proxy.json and patches serve target and nginx.conf for a Vue frontend', async () => {
|
|
379
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
380
|
+
addProjectConfiguration(host, 'my-vue-app', {
|
|
381
|
+
root: 'apps/my-vue-app',
|
|
382
|
+
projectType: 'application',
|
|
383
|
+
targets: {
|
|
384
|
+
serve: { executor: '@nx/vite:dev-server', options: { port: 4200 } },
|
|
385
|
+
build: {
|
|
386
|
+
executor: '@nx/vite:build',
|
|
387
|
+
options: { outputPath: 'dist/apps/my-vue-app' },
|
|
388
|
+
},
|
|
389
|
+
},
|
|
390
|
+
tags: ['adsp:scaffold-env:dev'],
|
|
391
|
+
});
|
|
392
|
+
host.write('apps/my-vue-app/public/nginx.conf', NGINX_CONF_NO_PROXY);
|
|
393
|
+
|
|
394
|
+
await generator(host, { ...options, pairedProject: 'my-vue-app' });
|
|
395
|
+
|
|
396
|
+
// Dev proxy file written at the Vue location.
|
|
397
|
+
expect(host.exists('apps/my-vue-app/vite.proxy.json')).toBeTruthy();
|
|
398
|
+
const proxyConf = readJson(host, 'apps/my-vue-app/vite.proxy.json');
|
|
399
|
+
expect(proxyConf['/api/']).toBeDefined();
|
|
400
|
+
expect(proxyConf['/api/'].target).toBe('http://localhost:3333');
|
|
401
|
+
expect(proxyConf['/api/'].pathRewrite['^/api/']).toBe('/test/');
|
|
402
|
+
|
|
403
|
+
// serve target updated with proxyConfig.
|
|
404
|
+
const frontendConfig = readProjectConfiguration(host, 'my-vue-app');
|
|
405
|
+
expect(frontendConfig.targets.serve.options.proxyConfig).toBe(
|
|
406
|
+
'apps/my-vue-app/vite.proxy.json',
|
|
407
|
+
);
|
|
408
|
+
|
|
409
|
+
// nginx.conf updated with the proxy block.
|
|
410
|
+
const nginx = host
|
|
411
|
+
.read('apps/my-vue-app/public/nginx.conf')
|
|
412
|
+
.toString();
|
|
413
|
+
expect(nginx).toContain('location /api/');
|
|
414
|
+
expect(nginx).toContain('proxy_pass http://test:3333/test/');
|
|
415
|
+
|
|
416
|
+
// Frontend tagged for the sandbox executor.
|
|
417
|
+
expect(frontendConfig.tags).toContain('adsp:proxy-service:test:3333');
|
|
418
|
+
}, 120000);
|
|
419
|
+
|
|
420
|
+
it('writes proxy.conf.json, patches serve target, adds nginx asset, and updates nginx.conf for a React frontend', async () => {
|
|
421
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
422
|
+
addProjectConfiguration(host, 'my-react-app', {
|
|
423
|
+
root: 'apps/my-react-app',
|
|
424
|
+
projectType: 'application',
|
|
425
|
+
targets: {
|
|
426
|
+
serve: {
|
|
427
|
+
executor: '@nx/webpack:dev-server',
|
|
428
|
+
options: { port: 4200 },
|
|
429
|
+
},
|
|
430
|
+
build: {
|
|
431
|
+
executor: '@nx/webpack:webpack',
|
|
432
|
+
options: { outputPath: 'dist/apps/my-react-app', assets: [] },
|
|
433
|
+
},
|
|
434
|
+
},
|
|
435
|
+
tags: ['adsp:scaffold-env:dev'],
|
|
436
|
+
});
|
|
437
|
+
host.write('apps/my-react-app/nginx.conf', NGINX_CONF_NO_PROXY);
|
|
438
|
+
|
|
439
|
+
await generator(host, { ...options, pairedProject: 'my-react-app' });
|
|
440
|
+
|
|
441
|
+
// Dev proxy file written at the React location.
|
|
442
|
+
expect(host.exists('apps/my-react-app/proxy.conf.json')).toBeTruthy();
|
|
443
|
+
const proxyConf = readJson(host, 'apps/my-react-app/proxy.conf.json');
|
|
444
|
+
expect(proxyConf['/api/'].target).toBe('http://localhost:3333');
|
|
445
|
+
|
|
446
|
+
// serve target updated.
|
|
447
|
+
const frontendConfig = readProjectConfiguration(host, 'my-react-app');
|
|
448
|
+
expect(frontendConfig.targets.serve.options.proxyConfig).toBe(
|
|
449
|
+
'apps/my-react-app/proxy.conf.json',
|
|
450
|
+
);
|
|
451
|
+
|
|
452
|
+
// nginx.conf at project root updated.
|
|
453
|
+
const nginx = host.read('apps/my-react-app/nginx.conf').toString();
|
|
454
|
+
expect(nginx).toContain('location /api/');
|
|
455
|
+
|
|
456
|
+
// nginx.conf added as a webpack build asset.
|
|
457
|
+
const assets = frontendConfig.targets.build.options.assets ?? [];
|
|
458
|
+
expect(
|
|
459
|
+
assets.some(
|
|
460
|
+
(a: unknown) =>
|
|
461
|
+
typeof a === 'object' &&
|
|
462
|
+
(a as { glob?: string }).glob === 'nginx.conf' &&
|
|
463
|
+
(a as { input?: string }).input === 'apps/my-react-app',
|
|
464
|
+
),
|
|
465
|
+
).toBe(true);
|
|
466
|
+
|
|
467
|
+
// Frontend tagged.
|
|
468
|
+
expect(frontendConfig.tags).toContain('adsp:proxy-service:test:3333');
|
|
469
|
+
}, 120000);
|
|
470
|
+
|
|
471
|
+
it('writes proxy.conf.json, patches serve target, adds nginx asset, and updates nginx.conf for an Angular frontend', async () => {
|
|
472
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
473
|
+
addProjectConfiguration(host, 'my-angular-app', {
|
|
474
|
+
root: 'apps/my-angular-app',
|
|
475
|
+
projectType: 'application',
|
|
476
|
+
targets: {
|
|
477
|
+
serve: {
|
|
478
|
+
executor: '@angular-devkit/build-angular:dev-server',
|
|
479
|
+
options: { port: 4200 },
|
|
480
|
+
},
|
|
481
|
+
build: {
|
|
482
|
+
executor: '@angular-devkit/build-angular:browser',
|
|
483
|
+
options: {
|
|
484
|
+
outputPath: 'dist/apps/my-angular-app',
|
|
485
|
+
assets: [
|
|
486
|
+
`apps/my-angular-app/src/silent-check-sso.html`,
|
|
487
|
+
],
|
|
488
|
+
},
|
|
489
|
+
},
|
|
490
|
+
},
|
|
491
|
+
tags: ['adsp:scaffold-env:dev'],
|
|
492
|
+
});
|
|
493
|
+
host.write('apps/my-angular-app/nginx.conf', NGINX_CONF_NO_PROXY);
|
|
494
|
+
|
|
495
|
+
await generator(host, { ...options, pairedProject: 'my-angular-app' });
|
|
496
|
+
|
|
497
|
+
// Dev proxy file written at the root (same path Angular generators use).
|
|
498
|
+
expect(host.exists('apps/my-angular-app/proxy.conf.json')).toBeTruthy();
|
|
499
|
+
const proxyConf = readJson(host, 'apps/my-angular-app/proxy.conf.json');
|
|
500
|
+
expect(proxyConf['/api/'].target).toBe('http://localhost:3333');
|
|
501
|
+
|
|
502
|
+
// serve target updated.
|
|
503
|
+
const frontendConfig = readProjectConfiguration(host, 'my-angular-app');
|
|
504
|
+
expect(frontendConfig.targets.serve.options.proxyConfig).toBe(
|
|
505
|
+
'apps/my-angular-app/proxy.conf.json',
|
|
506
|
+
);
|
|
507
|
+
|
|
508
|
+
// nginx.conf at project root updated.
|
|
509
|
+
const nginx = host.read('apps/my-angular-app/nginx.conf').toString();
|
|
510
|
+
expect(nginx).toContain('location /api/');
|
|
511
|
+
|
|
512
|
+
// nginx.conf added as a build asset.
|
|
513
|
+
const assets = frontendConfig.targets.build.options.assets ?? [];
|
|
514
|
+
expect(
|
|
515
|
+
assets.some(
|
|
516
|
+
(a: unknown) =>
|
|
517
|
+
typeof a === 'object' &&
|
|
518
|
+
(a as { glob?: string }).glob === 'nginx.conf',
|
|
519
|
+
),
|
|
520
|
+
).toBe(true);
|
|
521
|
+
|
|
522
|
+
// Frontend tagged.
|
|
523
|
+
expect(frontendConfig.tags).toContain('adsp:proxy-service:test:3333');
|
|
524
|
+
}, 120000);
|
|
525
|
+
|
|
526
|
+
it('does not crash when the frontend does not exist yet (composite generator ordering)', async () => {
|
|
527
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
528
|
+
// No frontend project in the tree — composite generators scaffold
|
|
529
|
+
// express-service before the frontend.
|
|
530
|
+
await expect(
|
|
531
|
+
generator(host, { ...options, pairedProject: 'not-yet-scaffolded' }),
|
|
532
|
+
).resolves.toBeDefined();
|
|
533
|
+
}, 120000);
|
|
534
|
+
});
|
|
341
535
|
});
|
|
@@ -562,9 +562,24 @@ describe('GET /<%= projectName %>/v1/items', () => {
|
|
|
562
562
|
|
|
563
563
|
## Frontend proxy integration
|
|
564
564
|
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
nginx
|
|
565
|
+
This service has no paired frontend configured yet. All API routes live under
|
|
566
|
+
`/<%= projectName %>/v1/`. To wire up a Vue, React, or Angular frontend's
|
|
567
|
+
nginx proxy (production) and dev-server proxy (development) to this service,
|
|
568
|
+
run either:
|
|
569
|
+
|
|
570
|
+
```bash
|
|
571
|
+
# Re-run this generator against the existing frontend — preferred when the
|
|
572
|
+
# frontend already exists (both proxy files and the adsp:proxy-service: tag
|
|
573
|
+
# are updated automatically):
|
|
574
|
+
npx nx g @abgov/nx-adsp:express-service <%= projectName %> --pairedProject <frontend-name> --no-interactive
|
|
575
|
+
|
|
576
|
+
# Or run the frontend generator against its own existing project instead:
|
|
577
|
+
npx nx g @abgov/nx-adsp:vue-app <frontend-name> --pairedProject <%= projectName %> --no-interactive
|
|
578
|
+
# (substitute react-app or angular-app as appropriate)
|
|
579
|
+
```
|
|
580
|
+
|
|
581
|
+
Both paths produce the same result: the frontend routes `/api/` to
|
|
582
|
+
`/<%= projectName %>/` on port 3333 in dev and via nginx in production.
|
|
568
583
|
<% } %>
|
|
569
584
|
|
|
570
585
|
## OpenShift targets
|
|
@@ -67,6 +67,10 @@
|
|
|
67
67
|
"type": "boolean",
|
|
68
68
|
"description": "Skip the consultAgent interaction and generate base scaffolding only.",
|
|
69
69
|
"default": false
|
|
70
|
+
},
|
|
71
|
+
"pairedProject": {
|
|
72
|
+
"type": "string",
|
|
73
|
+
"description": "Name of a frontend app project (vue-app, react-app, or angular-app) to pair with this service. When that frontend already exists in the workspace, the generator automatically wires its nginx proxy config, dev-server proxy file (vite.proxy.json or proxy.conf.json), serve target proxyConfig, and adsp:proxy-service: tag. Set automatically by composite generators (pevn, pern, pean, mern, mean) — also valid standalone when the frontend was scaffolded first."
|
|
70
74
|
}
|
|
71
75
|
},
|
|
72
76
|
"required": ["name", "env"],
|
|
@@ -45,25 +45,7 @@ function addFiles(host, options) {
|
|
|
45
45
|
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
46
46
|
const addProxyConf = options.nginxProxies.length > 0;
|
|
47
47
|
if (addProxyConf) {
|
|
48
|
-
|
|
49
|
-
// TODO: Is this cleaner to add via template?
|
|
50
|
-
const devProxyConf = options.nginxProxies.reduce((proxyConf, nginxProxy) => {
|
|
51
|
-
const upstreamUrl = new URL(nginxProxy.proxyPass);
|
|
52
|
-
const proxy = {
|
|
53
|
-
target: `${upstreamUrl.protocol}//localhost${upstreamUrl.port ? ':' + upstreamUrl.port : ''}`,
|
|
54
|
-
secure: upstreamUrl.protocol === 'https:',
|
|
55
|
-
changeOrigin: false,
|
|
56
|
-
pathRewrite: {},
|
|
57
|
-
};
|
|
58
|
-
// If there is a path on the upstream url, then add a rewrite.
|
|
59
|
-
if (upstreamUrl.pathname.length > 1) {
|
|
60
|
-
proxy.pathRewrite = {
|
|
61
|
-
[`^${nginxProxy.location}`]: upstreamUrl.pathname,
|
|
62
|
-
};
|
|
63
|
-
}
|
|
64
|
-
return Object.assign(Object.assign({}, proxyConf), { [nginxProxy.location]: proxy });
|
|
65
|
-
}, {});
|
|
66
|
-
(0, devkit_1.writeJson)(host, `${options.projectRoot}/proxy.conf.json`, devProxyConf);
|
|
48
|
+
(0, devkit_1.writeJson)(host, `${options.projectRoot}/proxy.conf.json`, (0, paired_project_1.buildDevProxyConf)(options.nginxProxies));
|
|
67
49
|
}
|
|
68
50
|
return addProxyConf;
|
|
69
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-app/react-app.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"react-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-app/react-app.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,22 +48,7 @@ function addFiles(host, options) {
|
|
|
48
48
|
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
49
49
|
const addProxyConf = options.nginxProxies.length > 0;
|
|
50
50
|
if (addProxyConf) {
|
|
51
|
-
|
|
52
|
-
const upstreamUrl = new URL(nginxProxy.proxyPass);
|
|
53
|
-
const proxy = {
|
|
54
|
-
target: `${upstreamUrl.protocol}//localhost${upstreamUrl.port ? ':' + upstreamUrl.port : ''}`,
|
|
55
|
-
secure: upstreamUrl.protocol === 'https:',
|
|
56
|
-
changeOrigin: false,
|
|
57
|
-
pathRewrite: {},
|
|
58
|
-
};
|
|
59
|
-
if (upstreamUrl.pathname.length > 1) {
|
|
60
|
-
proxy.pathRewrite = {
|
|
61
|
-
[`^${nginxProxy.location}`]: upstreamUrl.pathname,
|
|
62
|
-
};
|
|
63
|
-
}
|
|
64
|
-
return Object.assign(Object.assign({}, proxyConf), { [nginxProxy.location]: proxy });
|
|
65
|
-
}, {});
|
|
66
|
-
(0, devkit_1.writeJson)(host, `${options.projectRoot}/vite.proxy.json`, devProxyConf);
|
|
51
|
+
(0, devkit_1.writeJson)(host, `${options.projectRoot}/vite.proxy.json`, (0, paired_project_1.buildDevProxyConf)(options.nginxProxies));
|
|
67
52
|
}
|
|
68
53
|
return addProxyConf;
|
|
69
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vue-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/vue-app/vue-app.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"vue-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/vue-app/vue-app.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const DEFAULT_FRONTEND_APP_PORT = 4200;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DEFAULT_FRONTEND_APP_PORT = void 0;
|
|
4
|
+
// Frontend app generators (vue-app, react-app, angular-app) have no --port option to source
|
|
5
|
+
// a real value from yet, so every consumer that needs to tag a paired frontend by convention
|
|
6
|
+
// (the `adsp:paired-frontend:` tag tooling reads to discover the pairing) has to agree on the
|
|
7
|
+
// same default. One exported constant, not a literal repeated at each call site — update this
|
|
8
|
+
// alongside the vue-app/react-app dev server default if frontends ever gain a real --port option
|
|
9
|
+
// to read instead.
|
|
10
|
+
exports.DEFAULT_FRONTEND_APP_PORT = 4200;
|
|
11
|
+
//# sourceMappingURL=frontend-app-port.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"frontend-app-port.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/frontend-app-port.ts"],"names":[],"mappings":";;;AAAA,4FAA4F;AAC5F,6FAA6F;AAC7F,8FAA8F;AAC9F,8FAA8F;AAC9F,iGAAiG;AACjG,mBAAmB;AACN,QAAA,yBAAyB,GAAG,IAAI,CAAA"}
|
|
@@ -4,4 +4,17 @@ export interface PairedProjectProxy {
|
|
|
4
4
|
proxy: NginxProxyConfiguration;
|
|
5
5
|
tag: string;
|
|
6
6
|
}
|
|
7
|
+
type DevProxyEntry = {
|
|
8
|
+
target: string;
|
|
9
|
+
secure: boolean;
|
|
10
|
+
changeOrigin: boolean;
|
|
11
|
+
pathRewrite: Record<string, string>;
|
|
12
|
+
};
|
|
13
|
+
export declare function buildDevProxyConf(nginxProxies: NginxProxyConfiguration[]): Record<string, DevProxyEntry>;
|
|
7
14
|
export declare function resolvePairedProjectProxy(host: Tree, pairedProject: string | undefined): PairedProjectProxy | undefined;
|
|
15
|
+
export interface PairedFrontendApp {
|
|
16
|
+
tag: string;
|
|
17
|
+
}
|
|
18
|
+
export declare function resolvePairedFrontendApp(host: Tree, pairedProject: string | undefined): PairedFrontendApp | undefined;
|
|
19
|
+
export declare function applyProxyToExistingFrontend(host: Tree, pairedFrontend: string, backendProjectName: string): void;
|
|
20
|
+
export {};
|
|
@@ -1,8 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.buildDevProxyConf = buildDevProxyConf;
|
|
3
4
|
exports.resolvePairedProjectProxy = resolvePairedProjectProxy;
|
|
5
|
+
exports.resolvePairedFrontendApp = resolvePairedFrontendApp;
|
|
6
|
+
exports.applyProxyToExistingFrontend = applyProxyToExistingFrontend;
|
|
4
7
|
const devkit_1 = require("@nx/devkit");
|
|
8
|
+
const path = require("path");
|
|
5
9
|
const express_service_port_1 = require("./express-service-port");
|
|
10
|
+
const frontend_app_port_1 = require("./frontend-app-port");
|
|
11
|
+
// Builds the dev-server proxy JSON (vite.proxy.json / proxy.conf.json) from a set of nginx
|
|
12
|
+
// proxy entries. Shared by vue-app, react-app, angular-app, and the retroactive express-service
|
|
13
|
+
// proxy wiring so the format stays consistent.
|
|
14
|
+
function buildDevProxyConf(nginxProxies) {
|
|
15
|
+
return nginxProxies.reduce((proxyConf, nginxProxy) => {
|
|
16
|
+
const upstreamUrl = new URL(nginxProxy.proxyPass);
|
|
17
|
+
const entry = {
|
|
18
|
+
target: `${upstreamUrl.protocol}//localhost${upstreamUrl.port ? ':' + upstreamUrl.port : ''}`,
|
|
19
|
+
secure: upstreamUrl.protocol === 'https:',
|
|
20
|
+
changeOrigin: false,
|
|
21
|
+
pathRewrite: upstreamUrl.pathname.length > 1
|
|
22
|
+
? { [`^${nginxProxy.location}`]: upstreamUrl.pathname }
|
|
23
|
+
: {},
|
|
24
|
+
};
|
|
25
|
+
return Object.assign(Object.assign({}, proxyConf), { [nginxProxy.location]: entry });
|
|
26
|
+
}, {});
|
|
27
|
+
}
|
|
6
28
|
const PAIRED_PROJECT_LOCATION = '/api/';
|
|
7
29
|
// Resolves a frontend's --pairedProject into the nginx/dev-server proxy entry that routes API
|
|
8
30
|
// calls to it, plus the `adsp:proxy-service:<name>:<port>` tag the sandbox executor reads to
|
|
@@ -26,4 +48,105 @@ function resolvePairedProjectProxy(host, pairedProject) {
|
|
|
26
48
|
tag: `adsp:proxy-service:${pairedService}:${port}`,
|
|
27
49
|
};
|
|
28
50
|
}
|
|
51
|
+
// Resolves an express-service's --pairedProject into the `adsp:paired-frontend:<name>:<port>`
|
|
52
|
+
// tag tooling reads to discover which frontend app this service is paired with. Unlike
|
|
53
|
+
// resolvePairedProjectProxy, this does NOT validate that the paired project exists: composite
|
|
54
|
+
// generators (pevn, pern, pean) scaffold express-service first and the frontend second, so the
|
|
55
|
+
// frontend's project configuration is not yet in the tree when this runs. The tag is fully
|
|
56
|
+
// derived from the name alone — no reads from the paired project are required.
|
|
57
|
+
function resolvePairedFrontendApp(host, pairedProject) {
|
|
58
|
+
if (!pairedProject) {
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
const pairedApp = (0, devkit_1.names)(pairedProject).fileName;
|
|
62
|
+
return {
|
|
63
|
+
tag: `adsp:paired-frontend:${pairedApp}:${frontend_app_port_1.DEFAULT_FRONTEND_APP_PORT}`,
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
// Retroactively applies proxy wiring to an existing frontend when an express-service is generated
|
|
67
|
+
// after it with --pairedProject. This is the mirror of what resolvePairedProjectProxy + the
|
|
68
|
+
// frontend generator does when the frontend runs first. Safe to call when the frontend doesn't
|
|
69
|
+
// exist yet (composite generator ordering — backend is scaffolded before frontend); returns early.
|
|
70
|
+
function applyProxyToExistingFrontend(host, pairedFrontend, backendProjectName) {
|
|
71
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
72
|
+
const frontendName = (0, devkit_1.names)(pairedFrontend).fileName;
|
|
73
|
+
let frontendConfig;
|
|
74
|
+
try {
|
|
75
|
+
frontendConfig = (0, devkit_1.readProjectConfiguration)(host, frontendName);
|
|
76
|
+
}
|
|
77
|
+
catch (_k) {
|
|
78
|
+
// Frontend not scaffolded yet (composite generator ordering).
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
const projectRoot = frontendConfig.root;
|
|
82
|
+
const port = express_service_port_1.DEFAULT_EXPRESS_SERVICE_PORT;
|
|
83
|
+
const backendService = (0, devkit_1.names)(backendProjectName).fileName;
|
|
84
|
+
const nginxProxy = {
|
|
85
|
+
location: PAIRED_PROJECT_LOCATION,
|
|
86
|
+
proxyPass: `http://${backendService}:${port}/${backendService}/`,
|
|
87
|
+
};
|
|
88
|
+
// Detect Vue vs React/Angular by nginx.conf location: Vue emits into public/ (Vite publicDir
|
|
89
|
+
// so it lands in the build output root automatically); React and Angular both emit at the
|
|
90
|
+
// project root and add an explicit webpack build asset glob.
|
|
91
|
+
const isVue = host.exists(path.join(projectRoot, 'public', 'nginx.conf'));
|
|
92
|
+
const isRootNginx = !isVue && host.exists(path.join(projectRoot, 'nginx.conf'));
|
|
93
|
+
if (!isVue && !isRootNginx) {
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
// 1. Patch nginx.conf — insert the proxy block before the server block's closing brace.
|
|
97
|
+
const nginxConfPath = isVue
|
|
98
|
+
? path.join(projectRoot, 'public', 'nginx.conf')
|
|
99
|
+
: path.join(projectRoot, 'nginx.conf');
|
|
100
|
+
const existingNginx = (_b = (_a = host.read(nginxConfPath)) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '';
|
|
101
|
+
if (!existingNginx.includes(`location ${nginxProxy.location}`)) {
|
|
102
|
+
const proxyBlock = [
|
|
103
|
+
` location ${nginxProxy.location} {`,
|
|
104
|
+
` proxy_pass ${nginxProxy.proxyPass};`,
|
|
105
|
+
` proxy_set_header Host $host;`,
|
|
106
|
+
` proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;`,
|
|
107
|
+
` proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;`,
|
|
108
|
+
` }`,
|
|
109
|
+
``,
|
|
110
|
+
].join('\n');
|
|
111
|
+
// Find the server block's closing brace (2-space indent — distinct from location
|
|
112
|
+
// blocks at 4-space indent) and insert the proxy block before it.
|
|
113
|
+
const serverCloseIdx = existingNginx.lastIndexOf('\n }');
|
|
114
|
+
if (serverCloseIdx !== -1) {
|
|
115
|
+
host.write(nginxConfPath, existingNginx.slice(0, serverCloseIdx) +
|
|
116
|
+
'\n' +
|
|
117
|
+
proxyBlock +
|
|
118
|
+
existingNginx.slice(serverCloseIdx));
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
// 2. Write (or merge into) the dev proxy config file.
|
|
122
|
+
const devProxyFilename = isVue ? 'vite.proxy.json' : 'proxy.conf.json';
|
|
123
|
+
const devProxyPath = path.join(projectRoot, devProxyFilename);
|
|
124
|
+
const existingProxy = host.exists(devProxyPath)
|
|
125
|
+
? (0, devkit_1.readJson)(host, devProxyPath)
|
|
126
|
+
: {};
|
|
127
|
+
if (!existingProxy[nginxProxy.location]) {
|
|
128
|
+
(0, devkit_1.writeJson)(host, devProxyPath, Object.assign(Object.assign({}, existingProxy), buildDevProxyConf([nginxProxy])));
|
|
129
|
+
}
|
|
130
|
+
// 3. Patch the frontend's project configuration.
|
|
131
|
+
const proxyTag = `adsp:proxy-service:${backendService}:${port}`;
|
|
132
|
+
if (!((_c = frontendConfig.tags) !== null && _c !== void 0 ? _c : []).includes(proxyTag)) {
|
|
133
|
+
frontendConfig.tags = [...((_d = frontendConfig.tags) !== null && _d !== void 0 ? _d : []), proxyTag];
|
|
134
|
+
}
|
|
135
|
+
if (((_f = (_e = frontendConfig.targets) === null || _e === void 0 ? void 0 : _e.serve) === null || _f === void 0 ? void 0 : _f.options) &&
|
|
136
|
+
!frontendConfig.targets.serve.options.proxyConfig) {
|
|
137
|
+
frontendConfig.targets.serve.options = Object.assign(Object.assign({}, frontendConfig.targets.serve.options), { proxyConfig: devProxyPath });
|
|
138
|
+
}
|
|
139
|
+
// React/Angular only: add nginx.conf as a webpack build asset so it lands in the output root.
|
|
140
|
+
// Vue's @nx/vite:build copies public/ automatically — no asset glob needed.
|
|
141
|
+
if (isRootNginx && ((_h = (_g = frontendConfig.targets) === null || _g === void 0 ? void 0 : _g.build) === null || _h === void 0 ? void 0 : _h.options)) {
|
|
142
|
+
const assets = (_j = frontendConfig.targets.build.options.assets) !== null && _j !== void 0 ? _j : [];
|
|
143
|
+
const hasNginxAsset = assets.some((a) => typeof a === 'object' &&
|
|
144
|
+
a.glob === 'nginx.conf' &&
|
|
145
|
+
a.input === projectRoot);
|
|
146
|
+
if (!hasNginxAsset) {
|
|
147
|
+
frontendConfig.targets.build.options = Object.assign(Object.assign({}, frontendConfig.targets.build.options), { assets: [...assets, { glob: 'nginx.conf', input: projectRoot, output: './' }] });
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
(0, devkit_1.updateProjectConfiguration)(host, frontendName, frontendConfig);
|
|
151
|
+
}
|
|
29
152
|
//# sourceMappingURL=paired-project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paired-project.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/paired-project.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"paired-project.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/paired-project.ts"],"names":[],"mappings":"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"}
|