@abgov/nx-adsp 12.22.0 → 12.23.1
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/mevn/mevn.spec.ts +2 -2
- package/src/generators/pevn/pevn.spec.ts +4 -2
- package/src/generators/vue-app/vue-app.js +34 -10
- package/src/generators/vue-app/vue-app.js.map +1 -1
- package/src/generators/vue-app/vue-app.spec.ts +9 -3
- /package/src/generators/vue-app/files/{nginx.conf__tmpl__ → public/nginx.conf__tmpl__} +0 -0
- /package/src/generators/vue-app/files/{src → public}/silent-check-sso.html__tmpl__ +0 -0
package/package.json
CHANGED
|
@@ -37,8 +37,8 @@ describe('MEVN Generator', () => {
|
|
|
37
37
|
const serviceConfig = readProjectConfiguration(host, 'test-service');
|
|
38
38
|
expect(serviceConfig.root).toBe('apps/test-service');
|
|
39
39
|
|
|
40
|
-
expect(host.exists('apps/test-app/nginx.conf')).toBeTruthy();
|
|
41
|
-
const nginxConf = host.read('apps/test-app/nginx.conf').toString();
|
|
40
|
+
expect(host.exists('apps/test-app/public/nginx.conf')).toBeTruthy();
|
|
41
|
+
const nginxConf = host.read('apps/test-app/public/nginx.conf').toString();
|
|
42
42
|
expect(nginxConf).toContain('http://test-service:3333/');
|
|
43
43
|
|
|
44
44
|
expect(host.exists('apps/test-app/src/App.vue')).toBeTruthy();
|
|
@@ -33,12 +33,14 @@ describe('PEVN Generator', () => {
|
|
|
33
33
|
|
|
34
34
|
const appConfig = readProjectConfiguration(host, 'test-app');
|
|
35
35
|
expect(appConfig.root).toBe('apps/test-app');
|
|
36
|
+
// The paired backend (name + port) is recorded so the sandbox generator ensures its Service first.
|
|
37
|
+
expect(appConfig.tags).toContain('adsp:proxy-service:test-service:3333');
|
|
36
38
|
|
|
37
39
|
const serviceConfig = readProjectConfiguration(host, 'test-service');
|
|
38
40
|
expect(serviceConfig.root).toBe('apps/test-service');
|
|
39
41
|
|
|
40
|
-
expect(host.exists('apps/test-app/nginx.conf')).toBeTruthy();
|
|
41
|
-
const nginxConf = host.read('apps/test-app/nginx.conf').toString();
|
|
42
|
+
expect(host.exists('apps/test-app/public/nginx.conf')).toBeTruthy();
|
|
43
|
+
const nginxConf = host.read('apps/test-app/public/nginx.conf').toString();
|
|
42
44
|
expect(nginxConf).toContain('http://test-service:3333/');
|
|
43
45
|
|
|
44
46
|
expect(host.exists('apps/test-app/src/App.vue')).toBeTruthy();
|
|
@@ -72,11 +72,14 @@ function default_1(host, options) {
|
|
|
72
72
|
'eslint-plugin-security': '^3.0.0',
|
|
73
73
|
'eslint-plugin-no-secrets': '^2.0.0',
|
|
74
74
|
});
|
|
75
|
-
// Remove Nx scaffold files replaced by our templates.
|
|
75
|
+
// Remove Nx scaffold files replaced by our templates. The @nx/vue generator
|
|
76
|
+
// emits vite.config.mts; we provide a GoA-aware vite.config.ts, so drop the
|
|
77
|
+
// duplicate to avoid two competing configs.
|
|
76
78
|
for (const f of [
|
|
77
79
|
'src/App.vue',
|
|
78
80
|
'src/components/HelloWorld.vue',
|
|
79
81
|
'src/views/AboutView.vue',
|
|
82
|
+
'vite.config.mts',
|
|
80
83
|
]) {
|
|
81
84
|
if (host.exists(`${normalizedOptions.projectRoot}/${f}`)) {
|
|
82
85
|
host.delete(`${normalizedOptions.projectRoot}/${f}`);
|
|
@@ -90,16 +93,37 @@ function default_1(host, options) {
|
|
|
90
93
|
if (addedProxy && ((_a = config.targets.serve) === null || _a === void 0 ? void 0 : _a.options)) {
|
|
91
94
|
config.targets.serve.options = Object.assign(Object.assign({}, config.targets.serve.options), { proxyConfig: `${normalizedOptions.projectRoot}/vite.proxy.json` });
|
|
92
95
|
}
|
|
93
|
-
//
|
|
96
|
+
// nginx.conf and silent-check-sso.html live in the Vite publicDir
|
|
97
|
+
// (<projectRoot>/public) so they are emitted to the build output root — the
|
|
98
|
+
// @nx/vite:build executor ignores webpack-style `assets`. Pin outputPath to
|
|
99
|
+
// the workspace-root dist so it matches the vite config's outDir and the
|
|
100
|
+
// generated Dockerfile's COPY path.
|
|
94
101
|
if ((_b = config.targets.build) === null || _b === void 0 ? void 0 : _b.options) {
|
|
95
|
-
config.targets.build.options = Object.assign(Object.assign({}, config.targets.build.options), {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
102
|
+
config.targets.build.options = Object.assign(Object.assign({}, config.targets.build.options), { outputPath: `dist/${normalizedOptions.projectRoot}` });
|
|
103
|
+
}
|
|
104
|
+
// Record the paired backend (name + port) so the sandbox generator can ensure
|
|
105
|
+
// its Service exists before this frontend's nginx starts — nginx resolves
|
|
106
|
+
// proxy_pass upstreams at startup, so a missing Service would crashloop the
|
|
107
|
+
// pod. Only the Service is needed (for DNS), not the backend's deployment.
|
|
108
|
+
if (normalizedOptions.pairedProject) {
|
|
109
|
+
const pairedService = (0, devkit_1.names)(normalizedOptions.pairedProject).fileName;
|
|
110
|
+
const proxy = normalizedOptions.nginxProxies.find((p) => {
|
|
111
|
+
try {
|
|
112
|
+
return new URL(p.proxyPass).hostname === pairedService;
|
|
113
|
+
}
|
|
114
|
+
catch (_a) {
|
|
115
|
+
return false;
|
|
116
|
+
}
|
|
117
|
+
});
|
|
118
|
+
let port = 3333;
|
|
119
|
+
if (proxy) {
|
|
120
|
+
const url = new URL(proxy.proxyPass);
|
|
121
|
+
port = Number(url.port) || (url.protocol === 'https:' ? 443 : 80);
|
|
122
|
+
}
|
|
123
|
+
config.tags = [
|
|
124
|
+
...((_c = config.tags) !== null && _c !== void 0 ? _c : []),
|
|
125
|
+
`adsp:proxy-service:${pairedService}:${port}`,
|
|
126
|
+
];
|
|
103
127
|
}
|
|
104
128
|
(0, devkit_1.updateProjectConfiguration)(host, options.name, config);
|
|
105
129
|
(0, quality_1.addSemgrepTarget)(host, options.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vue-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/vue-app/vue-app.ts"],"names":[],"mappings":";;AAgEA,
|
|
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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"}
|
|
@@ -36,12 +36,18 @@ describe('Vue App Generator', () => {
|
|
|
36
36
|
await generator(host, options);
|
|
37
37
|
const config = readProjectConfiguration(host, 'test');
|
|
38
38
|
expect(config.root).toBe('apps/test');
|
|
39
|
-
|
|
39
|
+
// nginx.conf + silent-check-sso live in the Vite publicDir so they end up in the build output.
|
|
40
|
+
expect(host.exists('apps/test/public/nginx.conf')).toBeTruthy();
|
|
41
|
+
expect(host.exists('apps/test/public/silent-check-sso.html')).toBeTruthy();
|
|
40
42
|
expect(host.exists('apps/test/src/main.ts')).toBeTruthy();
|
|
41
43
|
expect(host.exists('apps/test/src/App.vue')).toBeTruthy();
|
|
42
44
|
expect(host.exists('apps/test/src/router/index.ts')).toBeTruthy();
|
|
43
45
|
expect(host.exists('apps/test/src/environments/environment.ts')).toBeTruthy();
|
|
44
46
|
expect(host.exists('apps/test/vite.config.ts')).toBeTruthy();
|
|
47
|
+
// The duplicate @nx/vue-generated config is removed.
|
|
48
|
+
expect(host.exists('apps/test/vite.config.mts')).toBeFalsy();
|
|
49
|
+
// build output mirrors the workspace layout under the root dist/.
|
|
50
|
+
expect(config.targets.build.options.outputPath).toBe('dist/apps/test');
|
|
45
51
|
}, 30000);
|
|
46
52
|
|
|
47
53
|
it('vite.config.ts marks goa-* elements as custom elements', async () => {
|
|
@@ -63,7 +69,7 @@ describe('Vue App Generator', () => {
|
|
|
63
69
|
...options,
|
|
64
70
|
proxy: { location: '/test/', proxyPass: 'http://test-service:3333/' },
|
|
65
71
|
});
|
|
66
|
-
const nginxConf = host.read('apps/test/nginx.conf').toString();
|
|
72
|
+
const nginxConf = host.read('apps/test/public/nginx.conf').toString();
|
|
67
73
|
expect(nginxConf).toContain('http://test-service:3333/');
|
|
68
74
|
});
|
|
69
75
|
|
|
@@ -75,7 +81,7 @@ describe('Vue App Generator', () => {
|
|
|
75
81
|
{ location: '/test2/', proxyPass: 'http://test-service2:3333/' },
|
|
76
82
|
],
|
|
77
83
|
});
|
|
78
|
-
const nginxConf = host.read('apps/test/nginx.conf').toString();
|
|
84
|
+
const nginxConf = host.read('apps/test/public/nginx.conf').toString();
|
|
79
85
|
expect(nginxConf).toContain('http://test-service:3333/');
|
|
80
86
|
expect(nginxConf).toContain('http://test-service2:3333/');
|
|
81
87
|
});
|
|
File without changes
|
|
File without changes
|