@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
|
@@ -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
|
utilsMock.deploymentGenerator.mockResolvedValue(undefined);
|
|
24
24
|
utilsMock.ensureAdspToken.mockResolvedValue('test-token');
|
|
@@ -41,7 +41,9 @@ describe('Express Service Generator', () => {
|
|
|
41
41
|
|
|
42
42
|
expect(host.exists('apps/test/src/main.ts')).toBeTruthy();
|
|
43
43
|
expect(host.exists('apps/test/src/environment.ts')).toBeTruthy();
|
|
44
|
-
expect(
|
|
44
|
+
expect(
|
|
45
|
+
host.exists('apps/test/src/environments/environment.ts'),
|
|
46
|
+
).toBeFalsy();
|
|
45
47
|
}, 60000);
|
|
46
48
|
|
|
47
49
|
it('serves generated OpenAPI docs, discoverable via the root _links convention', async () => {
|
|
@@ -61,7 +63,9 @@ describe('Express Service Generator', () => {
|
|
|
61
63
|
const mainTs = host.read('apps/test/src/main.ts').toString();
|
|
62
64
|
expect(mainTs).toContain('OpenApiGeneratorV3');
|
|
63
65
|
expect(mainTs).toContain('/swagger/docs/v1');
|
|
64
|
-
expect(mainTs).toContain(
|
|
66
|
+
expect(mainTs).toContain(
|
|
67
|
+
"docs: { href: new URL('/swagger/docs/v1', rootUrl).href }",
|
|
68
|
+
);
|
|
65
69
|
// Document-level default security — without it, routes with no explicit
|
|
66
70
|
// `security` override (e.g. /private) would inherit nothing at all,
|
|
67
71
|
// rather than the accessToken requirement they actually enforce.
|
|
@@ -109,7 +113,10 @@ describe('Express Service Generator', () => {
|
|
|
109
113
|
// Unrelated server preserved.
|
|
110
114
|
expect(mcp.mcpServers.other).toEqual({ command: 'other-cmd', args: [] });
|
|
111
115
|
// A team's customized adsp-sdk entry is not overwritten.
|
|
112
|
-
expect(mcp.mcpServers['adsp-sdk']).toEqual({
|
|
116
|
+
expect(mcp.mcpServers['adsp-sdk']).toEqual({
|
|
117
|
+
command: 'node',
|
|
118
|
+
args: ['/local/build/main.js'],
|
|
119
|
+
});
|
|
113
120
|
}, 60000);
|
|
114
121
|
|
|
115
122
|
it('factors routes into a router module mounted in main.ts (not inlined)', async () => {
|
|
@@ -119,7 +126,9 @@ describe('Express Service Generator', () => {
|
|
|
119
126
|
// main.ts holds infra + the mount, not route handlers.
|
|
120
127
|
const mainTs = host.read('apps/test/src/main.ts').toString();
|
|
121
128
|
expect(mainTs).toContain('createErrorHandler');
|
|
122
|
-
expect(mainTs).toContain(
|
|
129
|
+
expect(mainTs).toContain(
|
|
130
|
+
"import { exampleRouter } from './routes/example'",
|
|
131
|
+
);
|
|
123
132
|
expect(mainTs).toContain('exampleRouter(eventService)');
|
|
124
133
|
// The handler internals moved out of main.ts.
|
|
125
134
|
expect(mainTs).not.toContain('authorize');
|
|
@@ -128,7 +137,9 @@ describe('Express Service Generator', () => {
|
|
|
128
137
|
// The router module carries the handlers, capabilities passed in as args.
|
|
129
138
|
expect(host.exists('apps/test/src/routes/example.ts')).toBeTruthy();
|
|
130
139
|
const routerTs = host.read('apps/test/src/routes/example.ts').toString();
|
|
131
|
-
expect(routerTs).toContain(
|
|
140
|
+
expect(routerTs).toContain(
|
|
141
|
+
'export function exampleRouter(eventService: EventService)',
|
|
142
|
+
);
|
|
132
143
|
expect(routerTs).toContain('authorize');
|
|
133
144
|
expect(routerTs).toContain('createValidationHandler');
|
|
134
145
|
expect(routerTs).toContain('eventService.send');
|
|
@@ -170,14 +181,17 @@ describe('Express Service Generator', () => {
|
|
|
170
181
|
expect(config.targets['serve'].dependsOn).toContain('dev-db');
|
|
171
182
|
|
|
172
183
|
// Drizzle has no client codegen, so build must NOT depend on db:generate.
|
|
173
|
-
expect(config.targets['build'].dependsOn ?? []).not.toContain(
|
|
184
|
+
expect(config.targets['build'].dependsOn ?? []).not.toContain(
|
|
185
|
+
'db:generate',
|
|
186
|
+
);
|
|
174
187
|
// The SQL migrations are shipped as a build asset.
|
|
175
188
|
const assets = config.targets['build'].options.assets ?? [];
|
|
176
189
|
expect(
|
|
177
190
|
assets.some(
|
|
178
191
|
(a: unknown) =>
|
|
179
|
-
typeof a === 'object' &&
|
|
180
|
-
|
|
192
|
+
typeof a === 'object' &&
|
|
193
|
+
(a as { output?: string }).output === 'drizzle',
|
|
194
|
+
),
|
|
181
195
|
).toBe(true);
|
|
182
196
|
|
|
183
197
|
// Tagged so the sandbox generator wires the DB without a --database flag.
|
|
@@ -212,9 +226,9 @@ describe('Express Service Generator', () => {
|
|
|
212
226
|
|
|
213
227
|
const config = readProjectConfiguration(host, 'test');
|
|
214
228
|
expect(config.targets['dev-db']).toBeFalsy();
|
|
215
|
-
expect(
|
|
216
|
-
|
|
217
|
-
);
|
|
229
|
+
expect(
|
|
230
|
+
(config.tags ?? []).some((t) => t.startsWith('adsp:database:')),
|
|
231
|
+
).toBe(false);
|
|
218
232
|
}, 60000);
|
|
219
233
|
|
|
220
234
|
it('writes a provisioned CLIENT_SECRET to .env.local, not .env', async () => {
|
|
@@ -222,7 +236,9 @@ describe('Express Service Generator', () => {
|
|
|
222
236
|
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
223
237
|
await generator(host, { ...options, accessToken: 'test-token' });
|
|
224
238
|
|
|
225
|
-
expect(host.read('apps/test/.env.local').toString()).toContain(
|
|
239
|
+
expect(host.read('apps/test/.env.local').toString()).toContain(
|
|
240
|
+
'CLIENT_SECRET=super-secret',
|
|
241
|
+
);
|
|
226
242
|
expect(host.exists('apps/test/.env')).toBeFalsy();
|
|
227
243
|
}, 60000);
|
|
228
244
|
|
|
@@ -236,7 +252,9 @@ describe('Express Service Generator', () => {
|
|
|
236
252
|
}, 60000);
|
|
237
253
|
|
|
238
254
|
it('does not overwrite or duplicate an existing CLIENT_SECRET in .env.local', async () => {
|
|
239
|
-
keycloakAdminMock.ensureServiceClient.mockResolvedValueOnce(
|
|
255
|
+
keycloakAdminMock.ensureServiceClient.mockResolvedValueOnce(
|
|
256
|
+
'freshly-provisioned-secret',
|
|
257
|
+
);
|
|
240
258
|
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
241
259
|
// express-service is a one-shot scaffolder (re-running it against an
|
|
242
260
|
// existing project throws in @nx/express), so this exercises the guard
|
|
@@ -254,11 +272,16 @@ describe('Express Service Generator', () => {
|
|
|
254
272
|
it('preserves an existing .env.local value (e.g. a prior dev-db run) alongside CLIENT_SECRET', async () => {
|
|
255
273
|
keycloakAdminMock.ensureServiceClient.mockResolvedValueOnce('super-secret');
|
|
256
274
|
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
257
|
-
host.write(
|
|
275
|
+
host.write(
|
|
276
|
+
'apps/test/.env.local',
|
|
277
|
+
'DATABASE_URL=postgresql://test:test@localhost:5432/test_dev\n',
|
|
278
|
+
);
|
|
258
279
|
await generator(host, { ...options, accessToken: 'test-token' });
|
|
259
280
|
|
|
260
281
|
const envLocal = host.read('apps/test/.env.local').toString();
|
|
261
|
-
expect(envLocal).toContain(
|
|
282
|
+
expect(envLocal).toContain(
|
|
283
|
+
'DATABASE_URL=postgresql://test:test@localhost:5432/test_dev',
|
|
284
|
+
);
|
|
262
285
|
expect(envLocal).toContain('CLIENT_SECRET=super-secret');
|
|
263
286
|
}, 60000);
|
|
264
287
|
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = default_1;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
|
+
const quality_1 = require("../../utils/quality");
|
|
7
|
+
// Every app/service generator (express-service, react-app, angular-app,
|
|
8
|
+
// vue-app) calls this as one of its own steps — it's also the standalone
|
|
9
|
+
// entry point for the same workspace-root setup. That setup previously only
|
|
10
|
+
// ever arrived as a side effect of scaffolding a specific app, which meant
|
|
11
|
+
// grounded ADSP platform knowledge (tenant/realm/role model, SDK reference)
|
|
12
|
+
// was never available for a decision made before any app exists — a
|
|
13
|
+
// Design-stage pass, for instance. A single, prescriptive, re-runnable entry
|
|
14
|
+
// point — same shape as @abgov/nx-agent:init — rather than a generator per
|
|
15
|
+
// workspace-root concern.
|
|
16
|
+
function default_1(host) {
|
|
17
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
18
|
+
(0, quality_1.addAdspMcpServer)(host);
|
|
19
|
+
(0, quality_1.addVsCodeSettings)(host);
|
|
20
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=init.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/init/init.ts"],"names":[],"mappings":";;AAYA,4BAIC;;AAhBD,uCAA+C;AAC/C,iDAA0E;AAE1E,wEAAwE;AACxE,yEAAyE;AACzE,4EAA4E;AAC5E,2EAA2E;AAC3E,4EAA4E;AAC5E,oEAAoE;AACpE,6EAA6E;AAC7E,2EAA2E;AAC3E,0BAA0B;AAC1B,mBAA+B,IAAU;;QACvC,IAAA,0BAAgB,EAAC,IAAI,CAAC,CAAC;QACvB,IAAA,2BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { readJson, Tree, writeJson } from '@nx/devkit';
|
|
2
|
+
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
|
|
3
|
+
import generator from './init';
|
|
4
|
+
|
|
5
|
+
describe('nx-adsp init generator', () => {
|
|
6
|
+
let host: Tree;
|
|
7
|
+
|
|
8
|
+
beforeEach(() => {
|
|
9
|
+
host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
it('wires the ADSP SDK MCP server into the workspace .mcp.json, standalone', async () => {
|
|
13
|
+
await generator(host);
|
|
14
|
+
|
|
15
|
+
expect(host.exists('.mcp.json')).toBeTruthy();
|
|
16
|
+
const mcp = readJson(host, '.mcp.json');
|
|
17
|
+
expect(mcp.mcpServers['adsp-sdk']).toEqual({
|
|
18
|
+
command: 'npx',
|
|
19
|
+
args: ['-y', '@abgov/adsp-sdk-mcp-server'],
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
it('merges .mcp.json without clobbering other servers or a customized entry', async () => {
|
|
24
|
+
writeJson(host, '.mcp.json', {
|
|
25
|
+
mcpServers: {
|
|
26
|
+
other: { command: 'other-cmd', args: [] },
|
|
27
|
+
'adsp-sdk': { command: 'node', args: ['/local/build/main.js'] },
|
|
28
|
+
},
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
await generator(host);
|
|
32
|
+
|
|
33
|
+
const mcp = readJson(host, '.mcp.json');
|
|
34
|
+
expect(mcp.mcpServers.other).toEqual({ command: 'other-cmd', args: [] });
|
|
35
|
+
expect(mcp.mcpServers['adsp-sdk']).toEqual({
|
|
36
|
+
command: 'node',
|
|
37
|
+
args: ['/local/build/main.js'],
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
it('reminds that a session reconnect is needed before the MCP server is usable', async () => {
|
|
42
|
+
const logSpy = jest.spyOn(console, 'log').mockImplementation();
|
|
43
|
+
|
|
44
|
+
await generator(host);
|
|
45
|
+
|
|
46
|
+
expect(logSpy.mock.calls.flat().join('\n')).toContain('reconnect');
|
|
47
|
+
logSpy.mockRestore();
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
it('writes shared VS Code settings, standalone', async () => {
|
|
51
|
+
await generator(host);
|
|
52
|
+
|
|
53
|
+
expect(host.exists('.vscode/settings.json')).toBeTruthy();
|
|
54
|
+
const settings = readJson(host, '.vscode/settings.json');
|
|
55
|
+
expect(settings['editor.formatOnSave']).toBe(true);
|
|
56
|
+
expect(settings['editor.defaultFormatter']).toBe('esbenp.prettier-vscode');
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
it('merges into existing VS Code settings without dropping unrelated ones', async () => {
|
|
60
|
+
writeJson(host, '.vscode/settings.json', {
|
|
61
|
+
'files.exclude': { '**/.git': true },
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
await generator(host);
|
|
65
|
+
|
|
66
|
+
const settings = readJson(host, '.vscode/settings.json');
|
|
67
|
+
expect(settings['files.exclude']).toEqual({ '**/.git': true });
|
|
68
|
+
expect(settings['editor.formatOnSave']).toBe(true);
|
|
69
|
+
});
|
|
70
|
+
});
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/schema",
|
|
3
|
+
"id": "NxAdspInit",
|
|
4
|
+
"title": "nx-adsp workspace setup",
|
|
5
|
+
"description": "Sets up nx-adsp's own workspace-root concerns: registers the @abgov/adsp-sdk-mcp-server MCP server in .mcp.json, and shared VS Code settings. Run once per workspace, right after installing @abgov/nx-adsp — every app/service generator (express-service, react-app, angular-app, vue-app) already calls this as one of its own steps, but running it standalone lets grounded ADSP platform knowledge be available before any app exists, e.g. during a design pass. Idempotent — safe to re-run, never clobbers a customized entry.",
|
|
6
|
+
"type": "object",
|
|
7
|
+
"properties": {},
|
|
8
|
+
"required": [],
|
|
9
|
+
"additionalProperties": false
|
|
10
|
+
}
|
|
@@ -65,9 +65,10 @@ function default_1(host, options) {
|
|
|
65
65
|
'app/src/app/app.component.html': (_o = (_m = host.read(`${appRoot}/src/app/app.component.html`)) === null || _m === void 0 ? void 0 : _m.toString()) !== null && _o !== void 0 ? _o : '',
|
|
66
66
|
'app/src/app/app.config.ts': (_q = (_p = host.read(`${appRoot}/src/app/app.config.ts`)) === null || _p === void 0 ? void 0 : _p.toString()) !== null && _q !== void 0 ? _q : '',
|
|
67
67
|
'app/src/app/app.routes.ts': (_s = (_r = host.read(`${appRoot}/src/app/app.routes.ts`)) === null || _r === void 0 ? void 0 : _r.toString()) !== null && _s !== void 0 ? _s : '',
|
|
68
|
-
'app/src/environments/environment.ts': (_u = (_t = host
|
|
68
|
+
'app/src/environments/environment.ts': (_u = (_t = host
|
|
69
|
+
.read(`${appRoot}/src/environments/environment.ts`)) === null || _t === void 0 ? void 0 : _t.toString()) !== null && _u !== void 0 ? _u : '',
|
|
69
70
|
},
|
|
70
|
-
}, host, serviceRoot, { additionalRoots: {
|
|
71
|
+
}, host, serviceRoot, { additionalRoots: { app: appRoot } }));
|
|
71
72
|
}
|
|
72
73
|
yield (0, devkit_1.formatFiles)(host);
|
|
73
74
|
return () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mean.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mean/mean.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"mean.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mean/mean.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,10 @@ import { environments } from '@abgov/nx-oc';
|
|
|
5
5
|
import { Schema } from './schema';
|
|
6
6
|
import generator from './mean';
|
|
7
7
|
|
|
8
|
-
jest.mock('@nx/devkit', () => ({
|
|
8
|
+
jest.mock('@nx/devkit', () => ({
|
|
9
|
+
...jest.requireActual('@nx/devkit'),
|
|
10
|
+
formatFiles: jest.fn().mockResolvedValue(undefined),
|
|
11
|
+
}));
|
|
9
12
|
jest.mock('@abgov/nx-oc');
|
|
10
13
|
jest.mock('../../utils/agent', () => ({
|
|
11
14
|
consultAgent: jest.fn().mockResolvedValue(null),
|
|
@@ -21,7 +24,7 @@ utilsMock.getAdspConfiguration.mockResolvedValue({
|
|
|
21
24
|
// jest.mock('@abgov/nx-oc') automocks adspProjectTags too — restore the real
|
|
22
25
|
// (pure, no I/O) implementation so tag-writing behavior is actually exercised.
|
|
23
26
|
utilsMock.adspProjectTags.mockImplementation(
|
|
24
|
-
jest.requireActual('@abgov/nx-oc').adspProjectTags
|
|
27
|
+
jest.requireActual('@abgov/nx-oc').adspProjectTags,
|
|
25
28
|
);
|
|
26
29
|
utilsMock.deploymentGenerator.mockResolvedValue(undefined);
|
|
27
30
|
utilsMock.ensureAdspToken.mockResolvedValue('test-token');
|
|
@@ -63,11 +63,12 @@ function default_1(host, options) {
|
|
|
63
63
|
'service/src/events.ts': (_j = (_h = host.read(`${serviceRoot}/src/events.ts`)) === null || _h === void 0 ? void 0 : _h.toString()) !== null && _j !== void 0 ? _j : '',
|
|
64
64
|
'app/src/app/app.tsx': (_l = (_k = host.read(`${appRoot}/src/app/app.tsx`)) === null || _k === void 0 ? void 0 : _k.toString()) !== null && _l !== void 0 ? _l : '',
|
|
65
65
|
'app/src/store.ts': (_o = (_m = host.read(`${appRoot}/src/store.ts`)) === null || _m === void 0 ? void 0 : _m.toString()) !== null && _o !== void 0 ? _o : '',
|
|
66
|
-
'app/src/environments/environment.ts': (_q = (_p = host
|
|
66
|
+
'app/src/environments/environment.ts': (_q = (_p = host
|
|
67
|
+
.read(`${appRoot}/src/environments/environment.ts`)) === null || _p === void 0 ? void 0 : _p.toString()) !== null && _q !== void 0 ? _q : '',
|
|
67
68
|
'app/src/app/config.slice.ts': (_s = (_r = host.read(`${appRoot}/src/app/config.slice.ts`)) === null || _r === void 0 ? void 0 : _r.toString()) !== null && _s !== void 0 ? _s : '',
|
|
68
69
|
'app/src/app/intake.slice.ts': (_u = (_t = host.read(`${appRoot}/src/app/intake.slice.ts`)) === null || _t === void 0 ? void 0 : _t.toString()) !== null && _u !== void 0 ? _u : '',
|
|
69
70
|
},
|
|
70
|
-
}, host, serviceRoot, { additionalRoots: {
|
|
71
|
+
}, host, serviceRoot, { additionalRoots: { app: appRoot } }));
|
|
71
72
|
}
|
|
72
73
|
yield (0, devkit_1.formatFiles)(host);
|
|
73
74
|
return () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mern/mern.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"mern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mern/mern.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,10 @@ import { environments } from '@abgov/nx-oc';
|
|
|
6
6
|
import { Schema } from './schema';
|
|
7
7
|
import generator from './mern';
|
|
8
8
|
|
|
9
|
-
jest.mock('@nx/devkit', () => ({
|
|
9
|
+
jest.mock('@nx/devkit', () => ({
|
|
10
|
+
...jest.requireActual('@nx/devkit'),
|
|
11
|
+
formatFiles: jest.fn().mockResolvedValue(undefined),
|
|
12
|
+
}));
|
|
10
13
|
jest.mock('@abgov/nx-oc');
|
|
11
14
|
jest.mock('../../utils/agent', () => ({
|
|
12
15
|
consultAgent: jest.fn().mockResolvedValue(null),
|
|
@@ -22,7 +25,7 @@ utilsMock.getAdspConfiguration.mockResolvedValue({
|
|
|
22
25
|
// jest.mock('@abgov/nx-oc') automocks adspProjectTags too — restore the real
|
|
23
26
|
// (pure, no I/O) implementation so tag-writing behavior is actually exercised.
|
|
24
27
|
utilsMock.adspProjectTags.mockImplementation(
|
|
25
|
-
jest.requireActual('@abgov/nx-oc').adspProjectTags
|
|
28
|
+
jest.requireActual('@abgov/nx-oc').adspProjectTags,
|
|
26
29
|
);
|
|
27
30
|
utilsMock.ensureAdspToken.mockResolvedValue('test-token');
|
|
28
31
|
|
|
@@ -55,9 +55,10 @@ function default_1(host, options) {
|
|
|
55
55
|
'app/src/App.vue': (_l = (_k = host.read(`${appRoot}/src/App.vue`)) === null || _k === void 0 ? void 0 : _k.toString()) !== null && _l !== void 0 ? _l : '',
|
|
56
56
|
'app/src/main.ts': (_o = (_m = host.read(`${appRoot}/src/main.ts`)) === null || _m === void 0 ? void 0 : _m.toString()) !== null && _o !== void 0 ? _o : '',
|
|
57
57
|
'app/src/router/index.ts': (_q = (_p = host.read(`${appRoot}/src/router/index.ts`)) === null || _p === void 0 ? void 0 : _p.toString()) !== null && _q !== void 0 ? _q : '',
|
|
58
|
-
'app/src/environments/environment.ts': (_s = (_r = host
|
|
58
|
+
'app/src/environments/environment.ts': (_s = (_r = host
|
|
59
|
+
.read(`${appRoot}/src/environments/environment.ts`)) === null || _r === void 0 ? void 0 : _r.toString()) !== null && _s !== void 0 ? _s : '',
|
|
59
60
|
},
|
|
60
|
-
}, host, serviceRoot, { additionalRoots: {
|
|
61
|
+
}, host, serviceRoot, { additionalRoots: { app: appRoot } }));
|
|
61
62
|
}
|
|
62
63
|
yield (0, devkit_1.formatFiles)(host);
|
|
63
64
|
return () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mevn.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mevn/mevn.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"mevn.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mevn/mevn.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,10 @@ import { environments } from '@abgov/nx-oc';
|
|
|
6
6
|
import { Schema } from './schema';
|
|
7
7
|
import generator from './mevn';
|
|
8
8
|
|
|
9
|
-
jest.mock('@nx/devkit', () => ({
|
|
9
|
+
jest.mock('@nx/devkit', () => ({
|
|
10
|
+
...jest.requireActual('@nx/devkit'),
|
|
11
|
+
formatFiles: jest.fn().mockResolvedValue(undefined),
|
|
12
|
+
}));
|
|
10
13
|
jest.mock('@abgov/nx-oc');
|
|
11
14
|
jest.mock('../../utils/agent', () => ({
|
|
12
15
|
consultAgent: jest.fn().mockResolvedValue(null),
|
|
@@ -22,7 +25,7 @@ utilsMock.getAdspConfiguration.mockResolvedValue({
|
|
|
22
25
|
// jest.mock('@abgov/nx-oc') automocks adspProjectTags too — restore the real
|
|
23
26
|
// (pure, no I/O) implementation so tag-writing behavior is actually exercised.
|
|
24
27
|
utilsMock.adspProjectTags.mockImplementation(
|
|
25
|
-
jest.requireActual('@abgov/nx-oc').adspProjectTags
|
|
28
|
+
jest.requireActual('@abgov/nx-oc').adspProjectTags,
|
|
26
29
|
);
|
|
27
30
|
utilsMock.ensureAdspToken.mockResolvedValue('test-token');
|
|
28
31
|
|
|
@@ -65,9 +65,10 @@ function default_1(host, options) {
|
|
|
65
65
|
'app/src/app/app.component.html': (_o = (_m = host.read(`${appRoot}/src/app/app.component.html`)) === null || _m === void 0 ? void 0 : _m.toString()) !== null && _o !== void 0 ? _o : '',
|
|
66
66
|
'app/src/app/app.config.ts': (_q = (_p = host.read(`${appRoot}/src/app/app.config.ts`)) === null || _p === void 0 ? void 0 : _p.toString()) !== null && _q !== void 0 ? _q : '',
|
|
67
67
|
'app/src/app/app.routes.ts': (_s = (_r = host.read(`${appRoot}/src/app/app.routes.ts`)) === null || _r === void 0 ? void 0 : _r.toString()) !== null && _s !== void 0 ? _s : '',
|
|
68
|
-
'app/src/environments/environment.ts': (_u = (_t = host
|
|
68
|
+
'app/src/environments/environment.ts': (_u = (_t = host
|
|
69
|
+
.read(`${appRoot}/src/environments/environment.ts`)) === null || _t === void 0 ? void 0 : _t.toString()) !== null && _u !== void 0 ? _u : '',
|
|
69
70
|
},
|
|
70
|
-
}, host, serviceRoot, { additionalRoots: {
|
|
71
|
+
}, host, serviceRoot, { additionalRoots: { app: appRoot } }));
|
|
71
72
|
}
|
|
72
73
|
yield (0, devkit_1.formatFiles)(host);
|
|
73
74
|
return () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pean.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/pean/pean.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"pean.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/pean/pean.ts"],"names":[],"mappings":";;AAiCA,4BAyGC;;AA1ID,uCAMoB;AACpB,wCAAoD;AACpD,4DAAwD;AACxD,wEAAoE;AAEpE,6CAA6E;AAC7E,+DAGoC;AACpC,+DAA4D;AAE5D,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;;QAEf,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvD,wEAAwE;QACxE,+EAA+E;QAC/E,0DAA0D;QAC1D,uCACK,OAAO,KACV,WAAW,EAAE,MAAA,IAAI,CAAC,WAAW,mCAAI,OAAO,CAAC,WAAW,EACpD,IAAI,IACJ;IACJ,CAAC;CAAA;AAED,mBAA+B,IAAU,EAAE,OAAe;;;QACxD,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QACjD,MAAM,WAAW,GAAG,GAAG,WAAW,UAAU,CAAC;QAC7C,MAAM,OAAO,GAAG,GAAG,WAAW,MAAM,CAAC;QACrC,MAAM,OAAO,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;QACjD,MAAM,WAAW,GAAG,GAAG,OAAO,IAAI,WAAW,EAAE,CAAC;QAChD,MAAM,OAAO,GAAG,GAAG,OAAO,IAAI,OAAO,EAAE,CAAC;QAExC,gFAAgF;QAChF,MAAM,IAAA,yBAAkB,EAAC,IAAI,kCACxB,iBAAiB,KACpB,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,UAAU,EACpB,aAAa,EAAE,OAAO,IACtB,CAAC;QACH,MAAM,IAAA,qBAAc,EAAC,IAAI,kCACpB,iBAAiB,KACpB,IAAI,EAAE,OAAO,EACb,KAAK,EAAE;gBACL,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,UAAU,WAAW,SAAS,WAAW,GAAG;aACxD,EACD,SAAS,EAAE,IAAI,EACf,aAAa,EAAE,WAAW,IAC1B,CAAC;QAEH,IAAI,iBAAiB,CAAC,IAAI,EAAE,CAAC;YAC3B,MAAM,WAAW,GACf,MAAA,iBAAiB,CAAC,IAAI,CAAC,WAAW,mCAAI,iBAAiB,CAAC,WAAW,CAAC;YACtE,MAAM,eAAe,GAAG,WAAW,iBAAiB,CAAC,IAAI,CAAC,MAAM,IAAI,WAAW,EAAE,CAAC;YAClF,MAAM,WAAW,GAAG,WAAW,iBAAiB,CAAC,IAAI,CAAC,MAAM,IAAI,OAAO,EAAE,CAAC;YAC1E,MAAM,IAAA,qCAAoB,EACxB,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,EACvC,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAClC,WAAW,EACX,eAAe,EACf,WAAW,CACZ,CAAC;YACF,MAAM,IAAA,sCAAqB,EACzB,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,EACvC,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAClC,WAAW,EACX,eAAe,EACf,cAAc,EACd,WAAW,CACZ,CAAC;QACJ,CAAC;QAED,IAAI,iBAAiB,CAAC,IAAI,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC;YAC3D,4EAA4E;YAC5E,2EAA2E;YAC3E,2DAA2D;YAC3D,6EAA6E;YAC7E,8EAA8E;YAC9E,8EAA8E;YAC9E,6DAA6D;YAC7D,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC;YACvD,MAAM,IAAA,kCAA0B,EAC9B,MAAM,IAAA,oBAAY,EAChB,iBAAiB,CAAC,IAAI,CAAC,mBAAmB,EAC1C,WAAW,EACX;gBACE,WAAW;gBACX,WAAW,EAAE,MAAM;gBACnB,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM;gBACrC,aAAa,EAAE,+BAAc;gBAC7B,aAAa,EAAE;oBACb,qBAAqB,EACnB,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,WAAW,cAAc,CAAC,0CAAE,QAAQ,EAAE,mCAAI,EAAE;oBAC3D,4BAA4B,EAC1B,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,WAAW,qBAAqB,CAAC,0CAAE,QAAQ,EAAE,mCAAI,EAAE;oBAClE,yBAAyB,EACvB,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,WAAW,kBAAkB,CAAC,0CAAE,QAAQ,EAAE,mCAAI,EAAE;oBAC/D,uBAAuB,EACrB,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,WAAW,gBAAgB,CAAC,0CAAE,QAAQ,EAAE,mCAAI,EAAE;oBAC7D,8BAA8B,EAC5B,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,2BAA2B,CAAC,0CAAE,QAAQ,EAAE,mCAC5D,EAAE;oBACJ,gCAAgC,EAC9B,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,6BAA6B,CAAC,0CAAE,QAAQ,EAAE,mCAC9D,EAAE;oBACJ,2BAA2B,EACzB,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,CAAC,0CAAE,QAAQ,EAAE,mCAAI,EAAE;oBACjE,2BAA2B,EACzB,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,CAAC,0CAAE,QAAQ,EAAE,mCAAI,EAAE;oBACjE,qCAAqC,EACnC,MAAA,MAAA,IAAI;yBACD,IAAI,CAAC,GAAG,OAAO,kCAAkC,CAAC,0CACjD,QAAQ,EAAE,mCAAI,EAAE;iBACvB;aACF,EACD,IAAI,EACJ,WAAW,EACX,EAAE,eAAe,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,CACtC,CACF,CAAC;QACJ,CAAC;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA"}
|
|
@@ -6,7 +6,10 @@ import { environments } from '@abgov/nx-oc';
|
|
|
6
6
|
import { Schema } from './schema';
|
|
7
7
|
import generator from './pean';
|
|
8
8
|
|
|
9
|
-
jest.mock('@nx/devkit', () => ({
|
|
9
|
+
jest.mock('@nx/devkit', () => ({
|
|
10
|
+
...jest.requireActual('@nx/devkit'),
|
|
11
|
+
formatFiles: jest.fn().mockResolvedValue(undefined),
|
|
12
|
+
}));
|
|
10
13
|
jest.mock('@abgov/nx-oc');
|
|
11
14
|
jest.mock('../../utils/agent', () => ({
|
|
12
15
|
consultAgent: jest.fn().mockResolvedValue(null),
|
|
@@ -22,7 +25,7 @@ utilsMock.getAdspConfiguration.mockResolvedValue({
|
|
|
22
25
|
// jest.mock('@abgov/nx-oc') automocks adspProjectTags too — restore the real
|
|
23
26
|
// (pure, no I/O) implementation so tag-writing behavior is actually exercised.
|
|
24
27
|
utilsMock.adspProjectTags.mockImplementation(
|
|
25
|
-
jest.requireActual('@abgov/nx-oc').adspProjectTags
|
|
28
|
+
jest.requireActual('@abgov/nx-oc').adspProjectTags,
|
|
26
29
|
);
|
|
27
30
|
utilsMock.ensureAdspToken.mockResolvedValue('test-token');
|
|
28
31
|
|
|
@@ -63,11 +63,12 @@ function default_1(host, options) {
|
|
|
63
63
|
'service/src/events.ts': (_j = (_h = host.read(`${serviceRoot}/src/events.ts`)) === null || _h === void 0 ? void 0 : _h.toString()) !== null && _j !== void 0 ? _j : '',
|
|
64
64
|
'app/src/app/app.tsx': (_l = (_k = host.read(`${appRoot}/src/app/app.tsx`)) === null || _k === void 0 ? void 0 : _k.toString()) !== null && _l !== void 0 ? _l : '',
|
|
65
65
|
'app/src/store.ts': (_o = (_m = host.read(`${appRoot}/src/store.ts`)) === null || _m === void 0 ? void 0 : _m.toString()) !== null && _o !== void 0 ? _o : '',
|
|
66
|
-
'app/src/environments/environment.ts': (_q = (_p = host
|
|
66
|
+
'app/src/environments/environment.ts': (_q = (_p = host
|
|
67
|
+
.read(`${appRoot}/src/environments/environment.ts`)) === null || _p === void 0 ? void 0 : _p.toString()) !== null && _q !== void 0 ? _q : '',
|
|
67
68
|
'app/src/app/config.slice.ts': (_s = (_r = host.read(`${appRoot}/src/app/config.slice.ts`)) === null || _r === void 0 ? void 0 : _r.toString()) !== null && _s !== void 0 ? _s : '',
|
|
68
69
|
'app/src/app/intake.slice.ts': (_u = (_t = host.read(`${appRoot}/src/app/intake.slice.ts`)) === null || _t === void 0 ? void 0 : _t.toString()) !== null && _u !== void 0 ? _u : '',
|
|
69
70
|
},
|
|
70
|
-
}, host, serviceRoot, { additionalRoots: {
|
|
71
|
+
}, host, serviceRoot, { additionalRoots: { app: appRoot } }));
|
|
71
72
|
}
|
|
72
73
|
yield (0, devkit_1.formatFiles)(host);
|
|
73
74
|
return () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/pern/pern.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"pern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/pern/pern.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,10 @@ import { environments } from '@abgov/nx-oc';
|
|
|
6
6
|
import { Schema } from './schema';
|
|
7
7
|
import generator from './pern';
|
|
8
8
|
|
|
9
|
-
jest.mock('@nx/devkit', () => ({
|
|
9
|
+
jest.mock('@nx/devkit', () => ({
|
|
10
|
+
...jest.requireActual('@nx/devkit'),
|
|
11
|
+
formatFiles: jest.fn().mockResolvedValue(undefined),
|
|
12
|
+
}));
|
|
10
13
|
jest.mock('@abgov/nx-oc');
|
|
11
14
|
jest.mock('../../utils/agent', () => ({
|
|
12
15
|
consultAgent: jest.fn().mockResolvedValue(null),
|
|
@@ -22,7 +25,7 @@ utilsMock.getAdspConfiguration.mockResolvedValue({
|
|
|
22
25
|
// jest.mock('@abgov/nx-oc') automocks adspProjectTags too — restore the real
|
|
23
26
|
// (pure, no I/O) implementation so tag-writing behavior is actually exercised.
|
|
24
27
|
utilsMock.adspProjectTags.mockImplementation(
|
|
25
|
-
jest.requireActual('@abgov/nx-oc').adspProjectTags
|
|
28
|
+
jest.requireActual('@abgov/nx-oc').adspProjectTags,
|
|
26
29
|
);
|
|
27
30
|
utilsMock.ensureAdspToken.mockResolvedValue('test-token');
|
|
28
31
|
|
|
@@ -55,9 +55,10 @@ function default_1(host, options) {
|
|
|
55
55
|
'app/src/App.vue': (_l = (_k = host.read(`${appRoot}/src/App.vue`)) === null || _k === void 0 ? void 0 : _k.toString()) !== null && _l !== void 0 ? _l : '',
|
|
56
56
|
'app/src/main.ts': (_o = (_m = host.read(`${appRoot}/src/main.ts`)) === null || _m === void 0 ? void 0 : _m.toString()) !== null && _o !== void 0 ? _o : '',
|
|
57
57
|
'app/src/router/index.ts': (_q = (_p = host.read(`${appRoot}/src/router/index.ts`)) === null || _p === void 0 ? void 0 : _p.toString()) !== null && _q !== void 0 ? _q : '',
|
|
58
|
-
'app/src/environments/environment.ts': (_s = (_r = host
|
|
58
|
+
'app/src/environments/environment.ts': (_s = (_r = host
|
|
59
|
+
.read(`${appRoot}/src/environments/environment.ts`)) === null || _r === void 0 ? void 0 : _r.toString()) !== null && _s !== void 0 ? _s : '',
|
|
59
60
|
},
|
|
60
|
-
}, host, serviceRoot, { additionalRoots: {
|
|
61
|
+
}, host, serviceRoot, { additionalRoots: { app: appRoot } }));
|
|
61
62
|
}
|
|
62
63
|
yield (0, devkit_1.formatFiles)(host);
|
|
63
64
|
return () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pevn.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/pevn/pevn.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"pevn.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/pevn/pevn.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,10 @@ import { environments } from '@abgov/nx-oc';
|
|
|
6
6
|
import { Schema } from './schema';
|
|
7
7
|
import generator from './pevn';
|
|
8
8
|
|
|
9
|
-
jest.mock('@nx/devkit', () => ({
|
|
9
|
+
jest.mock('@nx/devkit', () => ({
|
|
10
|
+
...jest.requireActual('@nx/devkit'),
|
|
11
|
+
formatFiles: jest.fn().mockResolvedValue(undefined),
|
|
12
|
+
}));
|
|
10
13
|
jest.mock('@abgov/nx-oc');
|
|
11
14
|
jest.mock('../../utils/agent', () => ({
|
|
12
15
|
consultAgent: jest.fn().mockResolvedValue(null),
|
|
@@ -22,7 +25,7 @@ utilsMock.getAdspConfiguration.mockResolvedValue({
|
|
|
22
25
|
// jest.mock('@abgov/nx-oc') automocks adspProjectTags too — restore the real
|
|
23
26
|
// (pure, no I/O) implementation so tag-writing behavior is actually exercised.
|
|
24
27
|
utilsMock.adspProjectTags.mockImplementation(
|
|
25
|
-
jest.requireActual('@abgov/nx-oc').adspProjectTags
|
|
28
|
+
jest.requireActual('@abgov/nx-oc').adspProjectTags,
|
|
26
29
|
);
|
|
27
30
|
utilsMock.ensureAdspToken.mockResolvedValue('test-token');
|
|
28
31
|
|