@abgov/nx-adsp 13.9.0 → 13.10.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 +72 -43
- package/generators.json +5 -0
- package/package.json +1 -1
- package/src/build-assets.spec.ts +3 -3
- package/src/generators/angular-app/angular-app.js +27 -8
- package/src/generators/angular-app/angular-app.js.map +1 -1
- package/src/generators/angular-app/angular-app.spec.ts +15 -5
- package/src/generators/dotnet-service/dotnet-service.spec.ts +1 -1
- package/src/generators/express-service/express-service.js +21 -8
- package/src/generators/express-service/express-service.js.map +1 -1
- package/src/generators/express-service/express-service.spec.ts +39 -16
- package/src/generators/init/init.d.ts +2 -0
- package/src/generators/init/init.js +23 -0
- package/src/generators/init/init.js.map +1 -0
- package/src/generators/init/init.spec.ts +70 -0
- package/src/generators/init/schema.d.ts +2 -0
- package/src/generators/init/schema.json +10 -0
- package/src/generators/mean/mean.js +3 -2
- package/src/generators/mean/mean.js.map +1 -1
- package/src/generators/mean/mean.spec.ts +5 -2
- package/src/generators/mern/mern.js +3 -2
- package/src/generators/mern/mern.js.map +1 -1
- package/src/generators/mern/mern.spec.ts +5 -2
- package/src/generators/mevn/mevn.js +3 -2
- package/src/generators/mevn/mevn.js.map +1 -1
- package/src/generators/mevn/mevn.spec.ts +5 -2
- package/src/generators/pean/pean.js +3 -2
- package/src/generators/pean/pean.js.map +1 -1
- package/src/generators/pean/pean.spec.ts +5 -2
- package/src/generators/pern/pern.js +3 -2
- package/src/generators/pern/pern.js.map +1 -1
- package/src/generators/pern/pern.spec.ts +5 -2
- package/src/generators/pevn/pevn.js +3 -2
- package/src/generators/pevn/pevn.js.map +1 -1
- package/src/generators/pevn/pevn.spec.ts +5 -2
- package/src/generators/react-app/react-app.js +17 -6
- package/src/generators/react-app/react-app.js.map +1 -1
- package/src/generators/react-app/react-app.spec.ts +12 -4
- package/src/generators/react-dotnet/react-dotnet.spec.ts +1 -1
- package/src/generators/react-form/react-form.js.map +1 -1
- package/src/generators/react-form/react-forms.spec.ts +3 -3
- package/src/generators/react-task-list/react-task-list.js.map +1 -1
- package/src/generators/react-task-list/react-task-list.spec.ts +2 -2
- package/src/generators/vue-app/vue-app.js +18 -6
- package/src/generators/vue-app/vue-app.js.map +1 -1
- package/src/generators/vue-app/vue-app.spec.ts +31 -9
- package/src/generators/vue-components/vue-components.js +7 -2
- package/src/generators/vue-components/vue-components.js.map +1 -1
- package/src/generators/vue-components/vue-components.spec.ts +41 -13
- package/src/types/nx-angular-generators.d.ts +1 -1
- package/src/utils/agent.js +23 -9
- package/src/utils/agent.js.map +1 -1
- package/src/utils/agent.spec.ts +74 -17
- package/src/utils/keycloak-admin.js +16 -5
- package/src/utils/keycloak-admin.js.map +1 -1
- package/src/utils/quality.d.ts +6 -0
- package/src/utils/quality.js +9 -0
- package/src/utils/quality.js.map +1 -1
- package/src/utils/quality.spec.ts +5 -3
|
@@ -7,6 +7,7 @@ const agent_1 = require("../../utils/agent");
|
|
|
7
7
|
const keycloak_admin_1 = require("../../utils/keycloak-admin");
|
|
8
8
|
const plugin_version_1 = require("../../utils/plugin-version");
|
|
9
9
|
const quality_1 = require("../../utils/quality");
|
|
10
|
+
const init_1 = require("../init/init");
|
|
10
11
|
const devkit_1 = require("@nx/devkit");
|
|
11
12
|
const eslint_1 = require("@nx/eslint");
|
|
12
13
|
const path = require("path");
|
|
@@ -102,10 +103,16 @@ function default_1(host, options) {
|
|
|
102
103
|
const addedProxy = addFiles(host, normalizedOptions);
|
|
103
104
|
removeFiles(host, normalizedOptions);
|
|
104
105
|
(0, quality_1.addEslintQualityRules)(host, normalizedOptions.projectRoot, [
|
|
105
|
-
'**/*.spec.ts',
|
|
106
|
+
'**/*.spec.ts',
|
|
107
|
+
'**/*.spec.tsx',
|
|
108
|
+
'**/*.test.ts',
|
|
109
|
+
'**/*.test.tsx',
|
|
106
110
|
]);
|
|
107
111
|
(0, quality_1.addJestCoverageConfig)(host, normalizedOptions.projectRoot);
|
|
108
|
-
(
|
|
112
|
+
// nx-adsp's own workspace-root setup (ADSP SDK MCP server + shared VS Code
|
|
113
|
+
// settings), run as one step here in case `nx-adsp:init` hasn't been run
|
|
114
|
+
// standalone yet.
|
|
115
|
+
yield (0, init_1.default)(host);
|
|
109
116
|
const config = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
110
117
|
// Remove the generated fileReplacements for production — we use a single
|
|
111
118
|
// environment.ts with runtime env vars rather than a build-time swap.
|
|
@@ -142,11 +149,15 @@ function default_1(host, options) {
|
|
|
142
149
|
}
|
|
143
150
|
if (normalizedOptions.adsp && !options.skipAgent) {
|
|
144
151
|
const accessToken = (_e = normalizedOptions.adsp.accessToken) !== null && _e !== void 0 ? _e : options.accessToken;
|
|
145
|
-
const appTs = (_g = (_f = host
|
|
152
|
+
const appTs = (_g = (_f = host
|
|
153
|
+
.read(`${normalizedOptions.projectRoot}/src/app/app.tsx`)) === null || _f === void 0 ? void 0 : _f.toString()) !== null && _g !== void 0 ? _g : '';
|
|
146
154
|
const storeTs = (_j = (_h = host.read(`${normalizedOptions.projectRoot}/src/store.ts`)) === null || _h === void 0 ? void 0 : _h.toString()) !== null && _j !== void 0 ? _j : '';
|
|
147
|
-
const environmentTs = (_l = (_k = host
|
|
148
|
-
|
|
149
|
-
const
|
|
155
|
+
const environmentTs = (_l = (_k = host
|
|
156
|
+
.read(`${normalizedOptions.projectRoot}/src/environments/environment.ts`)) === null || _k === void 0 ? void 0 : _k.toString()) !== null && _l !== void 0 ? _l : '';
|
|
157
|
+
const configSliceTs = (_o = (_m = host
|
|
158
|
+
.read(`${normalizedOptions.projectRoot}/src/app/config.slice.ts`)) === null || _m === void 0 ? void 0 : _m.toString()) !== null && _o !== void 0 ? _o : '';
|
|
159
|
+
const intakeSliceTs = (_q = (_p = host
|
|
160
|
+
.read(`${normalizedOptions.projectRoot}/src/app/intake.slice.ts`)) === null || _p === void 0 ? void 0 : _p.toString()) !== null && _q !== void 0 ? _q : '';
|
|
150
161
|
yield (0, agent_1.confirmAfterAgentInterrupt)(yield (0, agent_1.consultAgent)(normalizedOptions.adsp.directoryServiceUrl, accessToken, {
|
|
151
162
|
projectName: normalizedOptions.projectName,
|
|
152
163
|
projectType: 'react-app',
|
|
@@ -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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"}
|
|
@@ -17,7 +17,7 @@ utilsMock.getAdspConfiguration.mockResolvedValue({
|
|
|
17
17
|
// jest.mock('@abgov/nx-oc') automocks adspProjectTags too — restore the real
|
|
18
18
|
// (pure, no I/O) implementation so tag-writing behavior is actually exercised.
|
|
19
19
|
utilsMock.adspProjectTags.mockImplementation(
|
|
20
|
-
jest.requireActual('@abgov/nx-oc').adspProjectTags
|
|
20
|
+
jest.requireActual('@abgov/nx-oc').adspProjectTags,
|
|
21
21
|
);
|
|
22
22
|
|
|
23
23
|
describe('React App Generator', () => {
|
|
@@ -36,13 +36,21 @@ describe('React App Generator', () => {
|
|
|
36
36
|
expect(host.exists('apps/test/nginx.conf')).toBeTruthy();
|
|
37
37
|
}, 30000);
|
|
38
38
|
|
|
39
|
+
it("runs nx-adsp's own workspace-root setup (ADSP SDK MCP server + VS Code settings)", async () => {
|
|
40
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
41
|
+
await generator(host, options);
|
|
42
|
+
|
|
43
|
+
expect(host.exists('.mcp.json')).toBeTruthy();
|
|
44
|
+
expect(host.exists('.vscode/settings.json')).toBeTruthy();
|
|
45
|
+
}, 30000);
|
|
46
|
+
|
|
39
47
|
it('scaffolds a Playwright e2e project (consistent across frontends)', async () => {
|
|
40
48
|
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
41
49
|
await generator(host, options);
|
|
42
50
|
expect(host.exists('apps/test-e2e/project.json')).toBeTruthy();
|
|
43
51
|
expect(
|
|
44
52
|
host.exists('apps/test-e2e/playwright.config.ts') ||
|
|
45
|
-
host.exists('apps/test-e2e/playwright.config.mts')
|
|
53
|
+
host.exists('apps/test-e2e/playwright.config.mts'),
|
|
46
54
|
).toBe(true);
|
|
47
55
|
expect(host.exists('apps/test-e2e/cypress.config.ts')).toBeFalsy();
|
|
48
56
|
// webServer guarded so CI can target a deployed URL (BASE_URL) instead of a local server
|
|
@@ -76,7 +84,7 @@ describe('React App Generator', () => {
|
|
|
76
84
|
|
|
77
85
|
expect(host.exists('apps/test/nginx.conf')).toBeTruthy();
|
|
78
86
|
expect(host.read('apps/test/nginx.conf').toString()).toContain(
|
|
79
|
-
'http://test-service:3333/'
|
|
87
|
+
'http://test-service:3333/',
|
|
80
88
|
);
|
|
81
89
|
});
|
|
82
90
|
|
|
@@ -121,7 +129,7 @@ describe('React App Generator', () => {
|
|
|
121
129
|
expect(host.exists('apps/test/proxy.conf.json')).toBeTruthy();
|
|
122
130
|
|
|
123
131
|
const proxyConf = JSON.parse(
|
|
124
|
-
host.read('apps/test/proxy.conf.json').toString()
|
|
132
|
+
host.read('apps/test/proxy.conf.json').toString(),
|
|
125
133
|
);
|
|
126
134
|
expect(proxyConf['/test/'].target).toBe('http://localhost:3333');
|
|
127
135
|
expect(proxyConf['/test/'].pathRewrite['^/test/']).toBe('/api/');
|
|
@@ -18,7 +18,7 @@ utilsMock.getAdspConfiguration.mockResolvedValue({
|
|
|
18
18
|
// jest.mock('@abgov/nx-oc') automocks adspProjectTags too — restore the real
|
|
19
19
|
// (pure, no I/O) implementation so tag-writing behavior is actually exercised.
|
|
20
20
|
utilsMock.adspProjectTags.mockImplementation(
|
|
21
|
-
jest.requireActual('@abgov/nx-oc').adspProjectTags
|
|
21
|
+
jest.requireActual('@abgov/nx-oc').adspProjectTags,
|
|
22
22
|
);
|
|
23
23
|
|
|
24
24
|
jest.mock('../dotnet-service/dotnet-service');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-form.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-form/react-form.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"react-form.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-form/react-form.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,13 +94,13 @@ describe('React Form Generator', () => {
|
|
|
94
94
|
|
|
95
95
|
await generator(host, options);
|
|
96
96
|
expect(
|
|
97
|
-
host.exists('apps/test/src/app/some-intake/some-intake.tsx')
|
|
97
|
+
host.exists('apps/test/src/app/some-intake/some-intake.tsx'),
|
|
98
98
|
).toBeTruthy();
|
|
99
99
|
expect(
|
|
100
|
-
host.exists('apps/test/src/app/some-intake/some-intake.slice.ts')
|
|
100
|
+
host.exists('apps/test/src/app/some-intake/some-intake.slice.ts'),
|
|
101
101
|
).toBeTruthy();
|
|
102
102
|
expect(
|
|
103
|
-
host.exists('apps/test/src/app/some-intake/some-intake.module.css')
|
|
103
|
+
host.exists('apps/test/src/app/some-intake/some-intake.module.css'),
|
|
104
104
|
).toBeTruthy();
|
|
105
105
|
}, 30000);
|
|
106
106
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-task-list.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-task-list/react-task-list.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"react-task-list.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-task-list/react-task-list.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,10 +61,10 @@ describe('React Task List Generator', () => {
|
|
|
61
61
|
await generator(host, options);
|
|
62
62
|
expect(host.exists('apps/test/src/app/run-test/run-test.tsx')).toBeTruthy();
|
|
63
63
|
expect(
|
|
64
|
-
host.exists('apps/test/src/app/run-test/run-test.slice.ts')
|
|
64
|
+
host.exists('apps/test/src/app/run-test/run-test.slice.ts'),
|
|
65
65
|
).toBeTruthy();
|
|
66
66
|
expect(
|
|
67
|
-
host.exists('apps/test/src/app/run-test/run-test.module.css')
|
|
67
|
+
host.exists('apps/test/src/app/run-test/run-test.module.css'),
|
|
68
68
|
).toBeTruthy();
|
|
69
69
|
}, 30000);
|
|
70
70
|
});
|
|
@@ -7,6 +7,7 @@ const agent_1 = require("../../utils/agent");
|
|
|
7
7
|
const keycloak_admin_1 = require("../../utils/keycloak-admin");
|
|
8
8
|
const plugin_version_1 = require("../../utils/plugin-version");
|
|
9
9
|
const quality_1 = require("../../utils/quality");
|
|
10
|
+
const init_1 = require("../init/init");
|
|
10
11
|
const devkit_1 = require("@nx/devkit");
|
|
11
12
|
const path = require("path");
|
|
12
13
|
const vue_components_1 = require("../vue-components/vue-components");
|
|
@@ -21,7 +22,11 @@ function normalizeOptions(host, options) {
|
|
|
21
22
|
: options.proxy
|
|
22
23
|
? [options.proxy]
|
|
23
24
|
: [];
|
|
24
|
-
return Object.assign(Object.assign({}, options), { projectName,
|
|
25
|
+
return Object.assign(Object.assign({}, options), { projectName,
|
|
26
|
+
projectRoot,
|
|
27
|
+
openshiftDirectory,
|
|
28
|
+
adsp,
|
|
29
|
+
nginxProxies });
|
|
25
30
|
});
|
|
26
31
|
}
|
|
27
32
|
function addFiles(host, options) {
|
|
@@ -41,7 +46,9 @@ function addFiles(host, options) {
|
|
|
41
46
|
pathRewrite: {},
|
|
42
47
|
};
|
|
43
48
|
if (upstreamUrl.pathname.length > 1) {
|
|
44
|
-
proxy.pathRewrite = {
|
|
49
|
+
proxy.pathRewrite = {
|
|
50
|
+
[`^${nginxProxy.location}`]: upstreamUrl.pathname,
|
|
51
|
+
};
|
|
45
52
|
}
|
|
46
53
|
return Object.assign(Object.assign({}, proxyConf), { [nginxProxy.location]: proxy });
|
|
47
54
|
}, {});
|
|
@@ -81,7 +88,7 @@ function default_1(host, options) {
|
|
|
81
88
|
// keycloak-js is a transitive dependency of @dsb-norge/vue-keycloak-js;
|
|
82
89
|
// don't pin it directly or the versions diverge into two copies.
|
|
83
90
|
'@dsb-norge/vue-keycloak-js': '^3.0.0',
|
|
84
|
-
|
|
91
|
+
pinia: '^2.0.0',
|
|
85
92
|
'vue-router': '^4.0.0',
|
|
86
93
|
}, {
|
|
87
94
|
'eslint-plugin-security': '^3.0.0',
|
|
@@ -108,7 +115,10 @@ function default_1(host, options) {
|
|
|
108
115
|
}
|
|
109
116
|
const addedProxy = addFiles(host, normalizedOptions);
|
|
110
117
|
(0, quality_1.addJestCoverageConfig)(host, normalizedOptions.projectRoot);
|
|
111
|
-
(
|
|
118
|
+
// nx-adsp's own workspace-root setup (ADSP SDK MCP server + shared VS Code
|
|
119
|
+
// settings), run as one step here in case `nx-adsp:init` hasn't been run
|
|
120
|
+
// standalone yet.
|
|
121
|
+
yield (0, init_1.default)(host);
|
|
112
122
|
const config = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
113
123
|
// Wire the vite dev-server proxy when nginx proxy locations are configured.
|
|
114
124
|
if (addedProxy && ((_a = config.targets.serve) === null || _a === void 0 ? void 0 : _a.options)) {
|
|
@@ -166,8 +176,10 @@ function default_1(host, options) {
|
|
|
166
176
|
const accessToken = (_f = normalizedOptions.adsp.accessToken) !== null && _f !== void 0 ? _f : options.accessToken;
|
|
167
177
|
const appVue = (_h = (_g = host.read(`${normalizedOptions.projectRoot}/src/App.vue`)) === null || _g === void 0 ? void 0 : _g.toString()) !== null && _h !== void 0 ? _h : '';
|
|
168
178
|
const mainTs = (_k = (_j = host.read(`${normalizedOptions.projectRoot}/src/main.ts`)) === null || _j === void 0 ? void 0 : _j.toString()) !== null && _k !== void 0 ? _k : '';
|
|
169
|
-
const routerTs = (_m = (_l = host
|
|
170
|
-
|
|
179
|
+
const routerTs = (_m = (_l = host
|
|
180
|
+
.read(`${normalizedOptions.projectRoot}/src/router/index.ts`)) === null || _l === void 0 ? void 0 : _l.toString()) !== null && _m !== void 0 ? _m : '';
|
|
181
|
+
const environmentTs = (_p = (_o = host
|
|
182
|
+
.read(`${normalizedOptions.projectRoot}/src/environments/environment.ts`)) === null || _o === void 0 ? void 0 : _o.toString()) !== null && _p !== void 0 ? _p : '';
|
|
171
183
|
yield (0, agent_1.confirmAfterAgentInterrupt)(yield (0, agent_1.consultAgent)(normalizedOptions.adsp.directoryServiceUrl, accessToken, {
|
|
172
184
|
projectName: normalizedOptions.projectName,
|
|
173
185
|
projectType: 'vue-app',
|
|
@@ -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":";;AAsGA,4BAwNC;;AA9TD,wCAIsB;AACtB,6CAA6E;AAC7E,+DAIoC;AACpC,+DAA4D;AAC5D,iDAI6B;AAC7B,uCAAyC;AACzC,uCAYoB;AACpB,6BAA6B;AAC7B,qEAE0C;AAG1C,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;QAEf,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QACjD,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;QACzE,MAAM,kBAAkB,GAAG,cAAc,WAAW,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;YAC/C,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;YACpB,CAAC,CAAC,OAAO,CAAC,KAAK;gBACb,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;gBACjB,CAAC,CAAC,EAAE,CAAC;QACT,uCACK,OAAO,KACV,WAAW;YACX,WAAW;YACX,kBAAkB;YAClB,IAAI;YACJ,YAAY,IACZ;IACJ,CAAC;CAAA;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,OAAO,CAAC,IAAI,KACf,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnD,aAAa,EAAE,MAAA,OAAO,CAAC,aAAa,mCAAI,IAAI;QAC5C,6EAA6E;QAC7E,aAAa,EAAE,IAAA,wCAAuB,EAAC,IAAI,CAAC,EAC5C,IAAI,EAAE,EAAE,GACT,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IAEF,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;IACrD,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAC9C,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE;YACxB,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAClD,MAAM,KAAK,GAAG;gBACZ,MAAM,EAAE,GAAG,WAAW,CAAC,QAAQ,cAAc,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC7F,MAAM,EAAE,WAAW,CAAC,QAAQ,KAAK,QAAQ;gBACzC,YAAY,EAAE,KAAK;gBACnB,WAAW,EAAE,EAAE;aAChB,CAAC;YACF,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpC,KAAK,CAAC,WAAW,GAAG;oBAClB,CAAC,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,QAAQ;iBAClD,CAAC;YACJ,CAAC;YACD,uCAAY,SAAS,KAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAK,IAAG;QACxD,CAAC,EACD,EAAE,CACH,CAAC;QACF,IAAA,kBAAS,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,kBAAkB,EAAE,YAAY,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;;QACxD,4EAA4E;QAC5E,2EAA2E;QAC3E,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,GAAG,MAAM,qCAAO,SAAS,GAAE,KAAK,CACrE,GAAG,EAAE;YACH,MAAM,IAAI,KAAK,CACb,mGAAmG,CACpG,CAAC;QACJ,CAAC,CACF,CAAC;QAEF,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,OAAO,CAAC,IAAI,EAAE;YAClB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,KAAK;YACZ,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,QAAQ;YAChB,cAAc,EAAE,QAAQ;YACxB,aAAa,EAAE,YAAY;YAC3B,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,iBAAiB,CAAC,WAAW;SACzC,CAAC,CAAC;QAEH,6EAA6E;QAC7E,0EAA0E;QAC1E,IAAA,kCAAwB,EAAC,IAAI,EAAE,GAAG,iBAAiB,CAAC,WAAW,MAAM,CAAC,CAAC;QAEvE,8EAA8E;QAC9E,+EAA+E;QAC/E,6EAA6E;QAC7E,MAAM,IAAA,wBAAsB,EAAC,IAAI,CAAC,CAAC;QAEnC,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,sBAAsB,EAAE,OAAO;YAC/B,uBAAuB,EAAE,OAAO;YAChC,wEAAwE;YACxE,iEAAiE;YACjE,4BAA4B,EAAE,QAAQ;YACtC,KAAK,EAAE,QAAQ;YACf,YAAY,EAAE,QAAQ;SACvB,EACD;YACE,wBAAwB,EAAE,QAAQ;YAClC,0BAA0B,EAAE,QAAQ;SACrC,CACF,CAAC;QAEF,gFAAgF;QAChF,0EAA0E;QAC1E,0EAA0E;QAC1E,4EAA4E;QAC5E,wEAAwE;QACxE,4EAA4E;QAC5E,KAAK,MAAM,CAAC,IAAI;YACd,aAAa;YACb,iBAAiB;YACjB,qBAAqB;YACrB,uBAAuB;YACvB,+BAA+B;YAC/B,yBAAyB;YACzB,iBAAiB;SAClB,EAAE,CAAC;YACF,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,iBAAiB,CAAC,WAAW,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBACzD,IAAI,CAAC,MAAM,CAAC,GAAG,iBAAiB,CAAC,WAAW,IAAI,CAAC,EAAE,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAErD,IAAA,+BAAqB,EAAC,IAAI,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAC3D,2EAA2E;QAC3E,yEAAyE;QACzE,kBAAkB;QAClB,MAAM,IAAA,cAAa,EAAC,IAAI,CAAC,CAAC;QAE1B,MAAM,MAAM,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAE5D,4EAA4E;QAC5E,IAAI,UAAU,KAAI,MAAA,MAAM,CAAC,OAAO,CAAC,KAAK,0CAAE,OAAO,CAAA,EAAE,CAAC;YAChD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,mCACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KAC/B,WAAW,EAAE,GAAG,iBAAiB,CAAC,WAAW,kBAAkB,GAChE,CAAC;QACJ,CAAC;QAED,yCAAyC;QACzC,wEAAwE;QACxE,4EAA4E;QAC5E,yEAAyE;QACzE,oCAAoC;QACpC,IAAI,MAAA,MAAM,CAAC,OAAO,CAAC,KAAK,0CAAE,OAAO,EAAE,CAAC;YAClC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,mCACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KAC/B,UAAU,EAAE,QAAQ,iBAAiB,CAAC,WAAW,EAAE,GACpD,CAAC;QACJ,CAAC;QAED,8EAA8E;QAC9E,0EAA0E;QAC1E,4EAA4E;QAC5E,2EAA2E;QAC3E,IAAI,iBAAiB,CAAC,aAAa,EAAE,CAAC;YACpC,MAAM,aAAa,GAAG,IAAA,cAAK,EAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC;YACtE,MAAM,KAAK,GAAG,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBACtD,IAAI,CAAC;oBACH,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,KAAK,aAAa,CAAC;gBACzD,CAAC;gBAAC,WAAM,CAAC;oBACP,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC,CAAC,CAAC;YACH,IAAI,IAAI,GAAG,IAAI,CAAC;YAChB,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBACrC,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,CAAC,IAAI,GAAG;gBACZ,GAAG,CAAC,MAAA,MAAM,CAAC,IAAI,mCAAI,EAAE,CAAC;gBACtB,sBAAsB,aAAa,IAAI,IAAI,EAAE;aAC9C,CAAC;QACJ,CAAC;QAED,MAAM,CAAC,IAAI,GAAG;YACZ,GAAG,CAAC,MAAA,MAAM,CAAC,IAAI,mCAAI,EAAE,CAAC;YACtB,GAAG,IAAA,uBAAe,EAChB,iBAAiB,CAAC,GAAG,EACrB,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAC9B,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,CAAC,CAAC,MAAA,MAAM,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA,EAAA,CAAC;SACtD,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEvD,IAAA,0BAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,iBAAiB,CAAC,IAAI,EAAE,CAAC;YAC3B,MAAM,WAAW,GACf,MAAA,iBAAiB,CAAC,IAAI,CAAC,WAAW,mCAAI,OAAO,CAAC,WAAW,CAAC;YAC5D,MAAM,QAAQ,GAAG,WAAW,iBAAiB,CAAC,IAAI,CAAC,MAAM,IAAI,iBAAiB,CAAC,WAAW,EAAE,CAAC;YAC7F,MAAM,IAAA,mCAAkB,EACtB,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,EACvC,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAClC,QAAQ,EACR,WAAW,CACZ,CAAC;YACF,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;gBAC5B,MAAM,IAAA,qCAAoB,EACxB,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,EACvC,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAClC,QAAQ,EACR,OAAO,CAAC,eAAe,EACvB,WAAW,CACZ,CAAC;gBACF,MAAM,IAAA,sCAAqB,EACzB,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,EACvC,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAClC,QAAQ,EACR,OAAO,CAAC,eAAe,EACvB,cAAc,EACd,WAAW,CACZ,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,iBAAiB,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YACjD,MAAM,WAAW,GACf,MAAA,iBAAiB,CAAC,IAAI,CAAC,WAAW,mCAAI,OAAO,CAAC,WAAW,CAAC;YAC5D,MAAM,MAAM,GACV,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,WAAW,cAAc,CAAC,0CAAE,QAAQ,EAAE,mCACrE,EAAE,CAAC;YACL,MAAM,MAAM,GACV,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,WAAW,cAAc,CAAC,0CAAE,QAAQ,EAAE,mCACrE,EAAE,CAAC;YACL,MAAM,QAAQ,GACZ,MAAA,MAAA,IAAI;iBACD,IAAI,CAAC,GAAG,iBAAiB,CAAC,WAAW,sBAAsB,CAAC,0CAC3D,QAAQ,EAAE,mCAAI,EAAE,CAAC;YACvB,MAAM,aAAa,GACjB,MAAA,MAAA,IAAI;iBACD,IAAI,CACH,GAAG,iBAAiB,CAAC,WAAW,kCAAkC,CACnE,0CACC,QAAQ,EAAE,mCAAI,EAAE,CAAC;YACvB,MAAM,IAAA,kCAA0B,EAC9B,MAAM,IAAA,oBAAY,EAChB,iBAAiB,CAAC,IAAI,CAAC,mBAAmB,EAC1C,WAAW,EACX;gBACE,WAAW,EAAE,iBAAiB,CAAC,WAAW;gBAC1C,WAAW,EAAE,SAAS;gBACtB,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM;gBACrC,aAAa,EAAE,+BAAc;gBAC7B,aAAa,EAAE;oBACb,aAAa,EAAE,MAAM;oBACrB,aAAa,EAAE,MAAM;oBACrB,qBAAqB,EAAE,QAAQ;oBAC/B,iCAAiC,EAAE,aAAa;iBACjD;aACF,EACD,IAAI,EACJ,iBAAiB,CAAC,WAAW,CAC9B,CACF,CAAC;QACJ,CAAC;QAED,MAAM,IAAA,2BAAmB,EAAC,IAAI,kCACzB,iBAAiB,KACpB,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,iBAAiB,CAAC,WAAW,IACtC,CAAC;QAEH,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA"}
|
|
@@ -26,7 +26,7 @@ utilsMock.getAdspConfiguration.mockResolvedValue({
|
|
|
26
26
|
// jest.mock('@abgov/nx-oc') automocks adspProjectTags too — restore the real
|
|
27
27
|
// (pure, no I/O) implementation so tag-writing behavior is actually exercised.
|
|
28
28
|
utilsMock.adspProjectTags.mockImplementation(
|
|
29
|
-
jest.requireActual('@abgov/nx-oc').adspProjectTags
|
|
29
|
+
jest.requireActual('@abgov/nx-oc').adspProjectTags,
|
|
30
30
|
);
|
|
31
31
|
|
|
32
32
|
describe('Vue App Generator', () => {
|
|
@@ -46,7 +46,9 @@ describe('Vue App Generator', () => {
|
|
|
46
46
|
expect(host.exists('apps/test/src/main.ts')).toBeTruthy();
|
|
47
47
|
expect(host.exists('apps/test/src/App.vue')).toBeTruthy();
|
|
48
48
|
expect(host.exists('apps/test/src/router/index.ts')).toBeTruthy();
|
|
49
|
-
expect(
|
|
49
|
+
expect(
|
|
50
|
+
host.exists('apps/test/src/environments/environment.ts'),
|
|
51
|
+
).toBeTruthy();
|
|
50
52
|
expect(host.exists('apps/test/vite.config.ts')).toBeTruthy();
|
|
51
53
|
// The duplicate @nx/vue-generated config is removed.
|
|
52
54
|
expect(host.exists('apps/test/vite.config.mts')).toBeFalsy();
|
|
@@ -54,6 +56,13 @@ describe('Vue App Generator', () => {
|
|
|
54
56
|
expect(config.targets.build.options.outputPath).toBe('dist/apps/test');
|
|
55
57
|
}, 30000);
|
|
56
58
|
|
|
59
|
+
it("runs nx-adsp's own workspace-root setup (ADSP SDK MCP server + VS Code settings)", async () => {
|
|
60
|
+
await generator(host, options);
|
|
61
|
+
|
|
62
|
+
expect(host.exists('.mcp.json')).toBeTruthy();
|
|
63
|
+
expect(host.exists('.vscode/settings.json')).toBeTruthy();
|
|
64
|
+
}, 30000);
|
|
65
|
+
|
|
57
66
|
it('records the resolved env/tenant as project tags for the sandbox generator', async () => {
|
|
58
67
|
await generator(host, options);
|
|
59
68
|
const config = readProjectConfiguration(host, 'test');
|
|
@@ -66,7 +75,7 @@ describe('Vue App Generator', () => {
|
|
|
66
75
|
expect(host.exists('apps/test-e2e/project.json')).toBeTruthy();
|
|
67
76
|
expect(
|
|
68
77
|
host.exists('apps/test-e2e/playwright.config.ts') ||
|
|
69
|
-
host.exists('apps/test-e2e/playwright.config.mts')
|
|
78
|
+
host.exists('apps/test-e2e/playwright.config.mts'),
|
|
70
79
|
).toBe(true);
|
|
71
80
|
expect(host.exists('apps/test-e2e/cypress.config.ts')).toBeFalsy();
|
|
72
81
|
// webServer guarded so CI can target a deployed URL (BASE_URL) instead of a local server
|
|
@@ -89,7 +98,9 @@ describe('Vue App Generator', () => {
|
|
|
89
98
|
|
|
90
99
|
// Shared layout component provides the content gutter for every view.
|
|
91
100
|
expect(host.exists('apps/test/src/components/AppLayout.vue')).toBeTruthy();
|
|
92
|
-
const layout = host
|
|
101
|
+
const layout = host
|
|
102
|
+
.read('apps/test/src/components/AppLayout.vue')
|
|
103
|
+
.toString();
|
|
93
104
|
// Three named width variants, token-driven padding.
|
|
94
105
|
expect(layout).toContain('form-content');
|
|
95
106
|
expect(layout).toContain('wide-content');
|
|
@@ -108,8 +119,13 @@ describe('Vue App Generator', () => {
|
|
|
108
119
|
// Wrappers live in a shared workspace lib, not copied into the app.
|
|
109
120
|
const base = 'libs/vue-components/src/lib';
|
|
110
121
|
for (const name of [
|
|
111
|
-
'GoabInput',
|
|
112
|
-
'
|
|
122
|
+
'GoabInput',
|
|
123
|
+
'GoabTextarea',
|
|
124
|
+
'GoabDropdown',
|
|
125
|
+
'GoabCheckbox',
|
|
126
|
+
'GoabRadioGroup',
|
|
127
|
+
'GoabButton',
|
|
128
|
+
'GoabModal',
|
|
113
129
|
]) {
|
|
114
130
|
expect(host.exists(`${base}/${name}.vue`)).toBeTruthy();
|
|
115
131
|
}
|
|
@@ -199,7 +215,9 @@ describe('Vue App Generator', () => {
|
|
|
199
215
|
it('vite.config.ts marks goa-* elements as custom elements', async () => {
|
|
200
216
|
await generator(host, options);
|
|
201
217
|
const viteConfig = host.read('apps/test/vite.config.ts').toString();
|
|
202
|
-
expect(viteConfig).toContain(
|
|
218
|
+
expect(viteConfig).toContain(
|
|
219
|
+
"isCustomElement: (tag) => tag.startsWith('goa-')",
|
|
220
|
+
);
|
|
203
221
|
}, 30000);
|
|
204
222
|
|
|
205
223
|
it('shows the Sign in button without gating on Keycloak readiness', async () => {
|
|
@@ -225,7 +243,9 @@ describe('Vue App Generator', () => {
|
|
|
225
243
|
|
|
226
244
|
it('environment.ts is pre-populated with tenant config', async () => {
|
|
227
245
|
await generator(host, options);
|
|
228
|
-
const env = host
|
|
246
|
+
const env = host
|
|
247
|
+
.read('apps/test/src/environments/environment.ts')
|
|
248
|
+
.toString();
|
|
229
249
|
expect(env).toContain(environments.test.accessServiceUrl);
|
|
230
250
|
expect(env).toContain(environments.test.directoryServiceUrl);
|
|
231
251
|
expect(env).toContain('urn:ads:test:test');
|
|
@@ -259,7 +279,9 @@ describe('Vue App Generator', () => {
|
|
|
259
279
|
proxy: { location: '/test/', proxyPass: 'http://test-service:3333/api/' },
|
|
260
280
|
});
|
|
261
281
|
expect(host.exists('apps/test/vite.proxy.json')).toBeTruthy();
|
|
262
|
-
const proxyConf = JSON.parse(
|
|
282
|
+
const proxyConf = JSON.parse(
|
|
283
|
+
host.read('apps/test/vite.proxy.json').toString(),
|
|
284
|
+
);
|
|
263
285
|
expect(proxyConf['/test/'].target).toBe('http://localhost:3333');
|
|
264
286
|
expect(proxyConf['/test/'].pathRewrite['^/test/']).toBe('/api/');
|
|
265
287
|
});
|
|
@@ -56,7 +56,11 @@ function disableSlotAttributeRule(host, libRoot) {
|
|
|
56
56
|
}
|
|
57
57
|
// `files` is `string | string[]` per the Linter type — normalize before checking.
|
|
58
58
|
const isVueOverride = (o) => (Array.isArray(o.files) ? o.files : o.files ? [o.files] : []).some((f) => f.includes('vue'));
|
|
59
|
-
const alreadyDisabled = (0, internal_1.lintConfigHasOverride)(host, libRoot, (o) => {
|
|
59
|
+
const alreadyDisabled = (0, internal_1.lintConfigHasOverride)(host, libRoot, (o) => {
|
|
60
|
+
var _a;
|
|
61
|
+
return isVueOverride(o) &&
|
|
62
|
+
((_a = o.rules) === null || _a === void 0 ? void 0 : _a['vue/no-deprecated-slot-attribute']) === 'off';
|
|
63
|
+
});
|
|
60
64
|
if (alreadyDisabled) {
|
|
61
65
|
return;
|
|
62
66
|
}
|
|
@@ -74,7 +78,8 @@ function vueComponentsImportPath(host) {
|
|
|
74
78
|
var _a, _b;
|
|
75
79
|
let name = 'workspace';
|
|
76
80
|
try {
|
|
77
|
-
name =
|
|
81
|
+
name =
|
|
82
|
+
JSON.parse((_b = (_a = host.read('package.json')) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '{}').name || name;
|
|
78
83
|
}
|
|
79
84
|
catch (_c) {
|
|
80
85
|
/* keep fallback */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vue-components.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/vue-components/vue-components.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"vue-components.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/vue-components/vue-components.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { readProjectConfiguration, Tree } from '@nx/devkit';
|
|
2
2
|
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
|
|
3
|
-
import generator, {
|
|
3
|
+
import generator, {
|
|
4
|
+
ensurePackageExports,
|
|
5
|
+
vueComponentsImportPath,
|
|
6
|
+
} from './vue-components';
|
|
4
7
|
|
|
5
8
|
jest.mock('@nx/devkit', () => ({
|
|
6
9
|
...jest.requireActual('@nx/devkit'),
|
|
@@ -22,18 +25,25 @@ describe('Vue Components Generator', () => {
|
|
|
22
25
|
|
|
23
26
|
const base = 'libs/vue-components/src/lib';
|
|
24
27
|
for (const name of [
|
|
25
|
-
'GoabInput',
|
|
26
|
-
'
|
|
28
|
+
'GoabInput',
|
|
29
|
+
'GoabTextarea',
|
|
30
|
+
'GoabDropdown',
|
|
31
|
+
'GoabCheckbox',
|
|
32
|
+
'GoabRadioGroup',
|
|
33
|
+
'GoabButton',
|
|
34
|
+
'GoabModal',
|
|
27
35
|
]) {
|
|
28
36
|
expect(host.exists(`${base}/${name}.vue`)).toBeTruthy();
|
|
29
37
|
}
|
|
30
38
|
const index = host.read('libs/vue-components/src/index.ts').toString();
|
|
31
|
-
expect(index).toContain(
|
|
39
|
+
expect(index).toContain('export { default as GoabInput }');
|
|
32
40
|
expect(index).toContain('@abgov/vue-components'); // interim marker
|
|
33
41
|
|
|
34
42
|
// Ships a spec so the vitest test target isn't empty (vitest exits non-zero
|
|
35
43
|
// on "no test files found").
|
|
36
|
-
expect(
|
|
44
|
+
expect(
|
|
45
|
+
host.exists('libs/vue-components/src/vue-components.spec.ts'),
|
|
46
|
+
).toBeTruthy();
|
|
37
47
|
|
|
38
48
|
// GoabModal uses goa-modal's native `slot` attribute (web component, not the
|
|
39
49
|
// deprecated Vue 2 slot syntax) — the rule is turned off for this lib.
|
|
@@ -59,14 +69,18 @@ describe('Vue Components Generator', () => {
|
|
|
59
69
|
|
|
60
70
|
expect(host.exists('libs/vue-components/eslint.config.mjs')).toBeTruthy();
|
|
61
71
|
expect(host.exists('libs/vue-components/.eslintrc.json')).toBeFalsy();
|
|
62
|
-
const flatConfig = host
|
|
72
|
+
const flatConfig = host
|
|
73
|
+
.read('libs/vue-components/eslint.config.mjs')
|
|
74
|
+
.toString();
|
|
63
75
|
expect(flatConfig).toContain('"vue/no-deprecated-slot-attribute": "off"');
|
|
64
76
|
}, 30000);
|
|
65
77
|
|
|
66
78
|
it('is idempotent — a second run does not throw and keeps the wrappers', async () => {
|
|
67
79
|
await generator(host);
|
|
68
80
|
await expect(generator(host)).resolves.not.toThrow();
|
|
69
|
-
expect(
|
|
81
|
+
expect(
|
|
82
|
+
host.exists('libs/vue-components/src/lib/GoabInput.vue'),
|
|
83
|
+
).toBeTruthy();
|
|
70
84
|
}, 30000);
|
|
71
85
|
|
|
72
86
|
it('does not duplicate the ESLint override on a second run (legacy or flat)', async () => {
|
|
@@ -74,8 +88,12 @@ describe('Vue Components Generator', () => {
|
|
|
74
88
|
await generator(host);
|
|
75
89
|
await generator(host);
|
|
76
90
|
|
|
77
|
-
const flatConfig = host
|
|
78
|
-
|
|
91
|
+
const flatConfig = host
|
|
92
|
+
.read('libs/vue-components/eslint.config.mjs')
|
|
93
|
+
.toString();
|
|
94
|
+
expect(
|
|
95
|
+
flatConfig.split('vue/no-deprecated-slot-attribute').length - 1,
|
|
96
|
+
).toBe(1);
|
|
79
97
|
}, 30000);
|
|
80
98
|
|
|
81
99
|
it('derives the import path from the workspace scope', () => {
|
|
@@ -84,10 +102,15 @@ describe('Vue Components Generator', () => {
|
|
|
84
102
|
|
|
85
103
|
describe('ensurePackageExports (TS-solution resolution fix)', () => {
|
|
86
104
|
it('backfills exports/main/types when a lib package.json exists', () => {
|
|
87
|
-
host.write(
|
|
105
|
+
host.write(
|
|
106
|
+
'libs/vue-components/package.json',
|
|
107
|
+
JSON.stringify({ name: '@proj/vue-components' }),
|
|
108
|
+
);
|
|
88
109
|
ensurePackageExports(host, 'libs/vue-components');
|
|
89
110
|
|
|
90
|
-
const pkg = JSON.parse(
|
|
111
|
+
const pkg = JSON.parse(
|
|
112
|
+
host.read('libs/vue-components/package.json').toString(),
|
|
113
|
+
);
|
|
91
114
|
expect(pkg.main).toBe('./src/index.ts');
|
|
92
115
|
expect(pkg.types).toBe('./src/index.ts');
|
|
93
116
|
expect(pkg.exports['.'].import).toBe('./src/index.ts');
|
|
@@ -96,11 +119,16 @@ describe('Vue Components Generator', () => {
|
|
|
96
119
|
it('does not clobber exports @nx/vue already wrote', () => {
|
|
97
120
|
host.write(
|
|
98
121
|
'libs/vue-components/package.json',
|
|
99
|
-
JSON.stringify({
|
|
122
|
+
JSON.stringify({
|
|
123
|
+
name: '@proj/vue-components',
|
|
124
|
+
exports: { '.': './dist/index.js' },
|
|
125
|
+
}),
|
|
100
126
|
);
|
|
101
127
|
ensurePackageExports(host, 'libs/vue-components');
|
|
102
128
|
|
|
103
|
-
const pkg = JSON.parse(
|
|
129
|
+
const pkg = JSON.parse(
|
|
130
|
+
host.read('libs/vue-components/package.json').toString(),
|
|
131
|
+
);
|
|
104
132
|
expect(pkg.exports['.']).toBe('./dist/index.js');
|
|
105
133
|
});
|
|
106
134
|
|