@abgov/nx-adsp 5.9.1 → 6.0.0-beta.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/README.md +11 -11
- package/package.json +8 -8
- package/src/generators/angular-app/angular-app.d.ts +1 -1
- package/src/generators/angular-app/angular-app.js +2 -2
- package/src/generators/angular-app/angular-app.js.map +1 -1
- package/src/generators/angular-app/angular-app.spec.ts +6 -6
- package/src/generators/angular-app/schema.json +1 -2
- package/src/generators/dotnet-service/dotnet-service.d.ts +1 -1
- package/src/generators/dotnet-service/dotnet-service.js +3 -3
- package/src/generators/dotnet-service/dotnet-service.js.map +1 -1
- package/src/generators/dotnet-service/dotnet-service.spec.ts +3 -3
- package/src/generators/dotnet-service/schema.json +1 -2
- package/src/generators/express-service/express-service.d.ts +1 -1
- package/src/generators/express-service/express-service.js +3 -3
- package/src/generators/express-service/express-service.js.map +1 -1
- package/src/generators/express-service/express-service.spec.ts +3 -3
- package/src/generators/express-service/schema.json +1 -2
- package/src/generators/mern/mern.d.ts +1 -1
- package/src/generators/mern/mern.js +1 -1
- package/src/generators/mern/mern.js.map +1 -1
- package/src/generators/mern/mern.spec.ts +3 -3
- package/src/generators/mern/schema.json +1 -2
- package/src/generators/react-app/files/webpack.config.js__tmpl__ +2 -2
- package/src/generators/react-app/react-app.d.ts +1 -1
- package/src/generators/react-app/react-app.js +4 -5
- package/src/generators/react-app/react-app.js.map +1 -1
- package/src/generators/react-app/react-app.spec.ts +6 -6
- package/src/generators/react-app/schema.json +1 -2
- package/src/generators/react-dotnet/react-dotnet.d.ts +1 -1
- package/src/generators/react-dotnet/react-dotnet.js +1 -1
- package/src/generators/react-dotnet/react-dotnet.js.map +1 -1
- package/src/generators/react-dotnet/react-dotnet.spec.ts +3 -3
- package/src/generators/react-dotnet/schema.json +1 -2
- package/src/generators/react-form/react-form.d.ts +1 -1
- package/src/generators/react-form/react-form.js +1 -1
- package/src/generators/react-form/react-form.js.map +1 -1
- package/src/generators/react-form/react-forms.spec.ts +4 -4
- package/src/generators/react-form/schema.json +1 -2
- package/src/generators/react-task-list/react-task-list.d.ts +1 -1
- package/src/generators/react-task-list/react-task-list.js +1 -1
- package/src/generators/react-task-list/react-task-list.js.map +1 -1
- package/src/generators/react-task-list/react-task-list.spec.ts +4 -4
- package/src/generators/react-task-list/schema.json +1 -2
package/README.md
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
# About this project
|
|
2
|
+
|
|
2
3
|
This is the Government of Alberta - Nx plugin for ADSP apps.
|
|
3
4
|
|
|
4
|
-
The plugin includes generators for application, service, and fullstack solution quick starts. If the peer dependency `@abgov/nx-oc` is found, then OpenShift yml files are also included in the quickstarts. Application stack peer dependencies are required for the associated ADSP application type; for example, `@
|
|
5
|
+
The plugin includes generators for application, service, and fullstack solution quick starts. If the peer dependency `@abgov/nx-oc` is found, then OpenShift yml files are also included in the quickstarts. Application stack peer dependencies are required for the associated ADSP application type; for example, `@nx/angular` is required for the angular-app, and [@nx-dotnet/core](https://github.com/nx-dotnet/nx-dotnet) is required for dotnet-service.
|
|
5
6
|
|
|
6
7
|
## TLDR
|
|
7
8
|
|
|
@@ -9,14 +10,13 @@ The plugin includes generators for application, service, and fullstack solution
|
|
|
9
10
|
2. Install plugin: `npm i -D @abgov/nx-adsp`
|
|
10
11
|
3. Generate a quick start `npx g @abgov/nx-adsp:express-service my-app`
|
|
11
12
|
|
|
12
|
-
|
|
13
13
|
# Dev Features
|
|
14
14
|
|
|
15
15
|
Stuff inside [] needs to be replaced with your own names
|
|
16
16
|
|
|
17
17
|
## To add a plugin to @abgov/nx-adsp
|
|
18
18
|
|
|
19
|
-
nx g @
|
|
19
|
+
nx g @nx/plugin:plugin [pluginName] --importPath .
|
|
20
20
|
move the code generated into packages/ns-adsp and make changes in the plugin directory you've just generated
|
|
21
21
|
|
|
22
22
|
## To test the plugin locally
|
|
@@ -24,12 +24,12 @@ move the code generated into packages/ns-adsp and make changes in the plugin dir
|
|
|
24
24
|
1. Generate a temp folder with a local nx-adsp using `nx run nx-adsp-e2e:e2e`
|
|
25
25
|
2. Generate a new project somewhere with `npx create-nx-workspace`, following the prompts
|
|
26
26
|
|
|
27
|
-
3. Inside the new workspace,
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
27
|
+
3. Inside the new workspace,
|
|
28
|
+
i) run
|
|
29
|
+
npm i -D [location-of-nx-tools]/dist/packages/nx-adsp //to update package.json
|
|
30
|
+
npm i -D @nx/angular //(this assumes you are building an angular plugin)
|
|
31
31
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
32
|
+
ii) generate the plugin - tenantRealm is the realm UUID used to generate a login feature that will log into that particular tenant (eg '2a9a2c30-a094-4097-9247-8d41b39cb80e')
|
|
33
|
+
`npx nx g @abgov/nx-adsp:[pluginName] my-ang-app --tenant tenantRealm`
|
|
34
|
+
iii) run `npm install`
|
|
35
|
+
iv) serve the plugin using `nx serve [pluginName]
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abgov/nx-adsp",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.0-beta.1",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
|
-
"main": "src/index.js",
|
|
5
|
+
"main": "./src/index.js",
|
|
6
6
|
"description": "Government of Alberta - Nx plugin for ADSP apps.",
|
|
7
7
|
"repository": {
|
|
8
8
|
"type": "git",
|
|
@@ -10,12 +10,12 @@
|
|
|
10
10
|
"directory": "packages/nx-adsp"
|
|
11
11
|
},
|
|
12
12
|
"peerDependencies": {
|
|
13
|
-
"@nrwl/angular": "^15.0.0",
|
|
14
|
-
"@nrwl/devkit": "^15.0.0",
|
|
15
|
-
"@nrwl/express": "^15.0.0",
|
|
16
|
-
"@nrwl/react": "^15.0.0",
|
|
17
13
|
"@nx-dotnet/core": "^1.16.0",
|
|
18
|
-
"
|
|
14
|
+
"@nx/angular": "16.0.0",
|
|
15
|
+
"@nx/devkit": "^16.0.0",
|
|
16
|
+
"@nx/express": "16.0.0",
|
|
17
|
+
"@nx/react": "16.0.0",
|
|
18
|
+
"jest-mock": "29.7.0"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"@abgov/nx-oc": "^5.5.0",
|
|
@@ -29,5 +29,5 @@
|
|
|
29
29
|
"simple-oauth2": "^5.0.0"
|
|
30
30
|
},
|
|
31
31
|
"generators": "./generators.json",
|
|
32
|
-
"
|
|
32
|
+
"type": "commonjs"
|
|
33
33
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const nx_oc_1 = require("@abgov/nx-oc");
|
|
5
|
-
const devkit_1 = require("@
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const path = require("path");
|
|
7
7
|
function normalizeOptions(host, options) {
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -58,7 +58,7 @@ function removeFiles(host, options) {
|
|
|
58
58
|
function default_1(host, options) {
|
|
59
59
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
60
60
|
const normalizedOptions = yield normalizeOptions(host, options);
|
|
61
|
-
const { applicationGenerator: initAngular } = yield Promise.resolve().then(() => require('@
|
|
61
|
+
const { applicationGenerator: initAngular } = yield Promise.resolve().then(() => require('@nx/angular/generators'));
|
|
62
62
|
yield initAngular(host, { name: options.name });
|
|
63
63
|
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
64
64
|
'@abgov/angular-components': '^1.7.1',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/angular-app/angular-app.ts"],"names":[],"mappings":";;;AAAA,wCAAyE;AACzE,
|
|
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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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { createTreeWithEmptyWorkspace } from '@
|
|
2
|
-
import { Tree, readProjectConfiguration } from '@
|
|
1
|
+
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
|
|
2
|
+
import { Tree, readProjectConfiguration } from '@nx/devkit';
|
|
3
3
|
|
|
4
4
|
import * as utils from '@abgov/nx-oc';
|
|
5
5
|
import { environments } from '@abgov/nx-oc';
|
|
@@ -23,7 +23,7 @@ describe('angular app generator', () => {
|
|
|
23
23
|
};
|
|
24
24
|
|
|
25
25
|
beforeEach(() => {
|
|
26
|
-
appTree = createTreeWithEmptyWorkspace();
|
|
26
|
+
appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
27
27
|
});
|
|
28
28
|
|
|
29
29
|
it('should run successfully', async () => {
|
|
@@ -35,7 +35,7 @@ describe('angular app generator', () => {
|
|
|
35
35
|
}, 30000);
|
|
36
36
|
|
|
37
37
|
it('can add nginx proxy', async () => {
|
|
38
|
-
const host = createTreeWithEmptyWorkspace();
|
|
38
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
39
39
|
await angularApp(host, {
|
|
40
40
|
...options,
|
|
41
41
|
proxy: {
|
|
@@ -54,7 +54,7 @@ describe('angular app generator', () => {
|
|
|
54
54
|
});
|
|
55
55
|
|
|
56
56
|
it('can add multiple nginx proxy', async () => {
|
|
57
|
-
const host = createTreeWithEmptyWorkspace();
|
|
57
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
58
58
|
await angularApp(host, {
|
|
59
59
|
...options,
|
|
60
60
|
proxy: [
|
|
@@ -79,7 +79,7 @@ describe('angular app generator', () => {
|
|
|
79
79
|
});
|
|
80
80
|
|
|
81
81
|
it('can add webpack dev server proxy', async () => {
|
|
82
|
-
const host = createTreeWithEmptyWorkspace();
|
|
82
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
83
83
|
await angularApp(host, {
|
|
84
84
|
...options,
|
|
85
85
|
proxy: {
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const nx_oc_1 = require("@abgov/nx-oc");
|
|
5
|
-
const devkit_1 = require("@
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const path = require("path");
|
|
7
7
|
function normalizeOptions(host, options) {
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -24,8 +24,8 @@ function default_1(host, options) {
|
|
|
24
24
|
throw new Error('nx-dotnet/core is required to generate dotnet service');
|
|
25
25
|
}
|
|
26
26
|
const normalizedOptions = yield normalizeOptions(host, options);
|
|
27
|
-
const { default: appGenerator } = yield Promise.resolve(
|
|
28
|
-
const { default: refGenerator } = yield Promise.resolve(
|
|
27
|
+
const { default: appGenerator } = yield Promise.resolve(`${`${'@nx-dotnet/core/src/generators/app/generator'}`}`).then(s => require(s));
|
|
28
|
+
const { default: refGenerator } = yield Promise.resolve(`${`${'@nx-dotnet/core/src/generators/nuget-reference/generator'}`}`).then(s => require(s));
|
|
29
29
|
yield appGenerator(host, {
|
|
30
30
|
name: normalizedOptions.projectName,
|
|
31
31
|
template: 'webapi',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotnet-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/dotnet-service/dotnet-service.ts"],"names":[],"mappings":";;;AAAA,wCAIsB;AACtB,
|
|
1
|
+
{"version":3,"file":"dotnet-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/dotnet-service/dotnet-service.ts"],"names":[],"mappings":";;;AAAA,wCAIsB;AACtB,uCAMoB;AACpB,6BAA6B;AAG7B,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;QAEzE,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEvD,uCACK,OAAO,KACV,WAAW;YACX,WAAW;YACX,IAAI,IACJ;IACJ,CAAC;CAAA;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,OAAO,CAAC,IAAI,KACf,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;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,IAAI,CAAC,IAAA,qBAAa,EAAC,IAAI,EAAE,iBAAiB,CAAC,EAAE;YAC3C,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;SAC1E;QAED,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,yBAChC,GAAG,8CAA8C,EAAE,yBACpD,CAAC;QAEF,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,yBAChC,GAAG,0DAA0D,EAAE,yBAChE,CAAC;QAEF,MAAM,YAAY,CAAC,IAAI,EAAE;YACvB,IAAI,EAAE,iBAAiB,CAAC,WAAW;YACnC,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,MAAM;YACpB,YAAY,EAAE,KAAK;YACnB,cAAc,EAAE,IAAI;YACpB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,YAAY,CAAC,IAAI,EAAE;YACvB,OAAO,EAAE,iBAAiB,CAAC,WAAW;YACtC,WAAW,EAAE,UAAU;YACvB,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAElC,MAAM,IAAA,2BAAmB,EAAC,IAAI,kCACzB,iBAAiB,KACpB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,iBAAiB,CAAC,WAAW,IACtC,CAAC;QAEH,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AA1CD,4BA0CC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { addDependenciesToPackageJson } from '@
|
|
2
|
-
import {
|
|
1
|
+
import { addDependenciesToPackageJson } from '@nx/devkit';
|
|
2
|
+
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
|
|
3
3
|
import appGenerator from '@nx-dotnet/core/src/generators/app/generator';
|
|
4
4
|
import refGenerator from '@nx-dotnet/core/src/generators/nuget-reference/generator';
|
|
5
5
|
|
|
@@ -35,7 +35,7 @@ describe('Dotnet Service Generator', () => {
|
|
|
35
35
|
};
|
|
36
36
|
|
|
37
37
|
it('can run', async () => {
|
|
38
|
-
const host =
|
|
38
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
39
39
|
addDependenciesToPackageJson(
|
|
40
40
|
host,
|
|
41
41
|
{},
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const nx_oc_1 = require("@abgov/nx-oc");
|
|
5
|
-
const devkit_1 = require("@
|
|
6
|
-
const linter_1 = require("@
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
|
+
const linter_1 = require("@nx/linter");
|
|
7
7
|
const path = require("path");
|
|
8
8
|
function normalizeOptions(host, options) {
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -22,7 +22,7 @@ function addFiles(host, options) {
|
|
|
22
22
|
function default_1(host, options) {
|
|
23
23
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
24
24
|
const normalizedOptions = yield normalizeOptions(host, options);
|
|
25
|
-
const { applicationGenerator: initExpress } = yield Promise.resolve().then(() => require('@
|
|
25
|
+
const { applicationGenerator: initExpress } = yield Promise.resolve().then(() => require('@nx/express'));
|
|
26
26
|
yield initExpress(host, Object.assign(Object.assign({}, options), { skipFormat: true, skipPackageJson: false, linter: linter_1.Linter.EsLint, unitTestRunner: 'jest', pascalCaseFiles: false, js: false }));
|
|
27
27
|
(0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
28
28
|
'@abgov/adsp-service-sdk': '^1.18.0',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/express-service/express-service.ts"],"names":[],"mappings":";;;AAAA,wCAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"express-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/express-service/express-service.ts"],"names":[],"mappings":";;;AAAA,wCAAyE;AACzE,uCAQoB;AACpB,uCAAoC;AACpC,6BAA6B;AAG7B,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;QAEzE,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEvD,uCACK,OAAO,KACV,WAAW;YACX,WAAW;YACX,IAAI,IACJ;IACJ,CAAC;CAAA;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,OAAO,CAAC,IAAI,KACf,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;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,EAAE,oBAAoB,EAAE,WAAW,EAAE,GAAG,2CAAa,aAAa,EAAC,CAAC;QAC1E,MAAM,WAAW,CAAC,IAAI,kCACjB,OAAO,KACV,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,KAAK,EACtB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,KAAK,EACtB,EAAE,EAAE,KAAK,IACT,CAAC;QAEH,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,yBAAyB,EAAE,SAAS;YACpC,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,QAAQ;YAClB,oBAAoB,EAAE,QAAQ;SAC/B,EACD;YACE,iBAAiB,EAAE,QAAQ;YAC3B,2BAA2B,EAAE,QAAQ;SACtC,CACF,CAAC;QAEF,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAClC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,MAAM,IAAA,2BAAmB,EAAC,IAAI,kCACzB,iBAAiB,KACpB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,iBAAiB,CAAC,WAAW,IACtC,CAAC;QAEH,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAxCD,4BAwCC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { readProjectConfiguration } from '@
|
|
2
|
-
import {
|
|
1
|
+
import { readProjectConfiguration } from '@nx/devkit';
|
|
2
|
+
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
|
|
3
3
|
|
|
4
4
|
import * as utils from '@abgov/nx-oc';
|
|
5
5
|
import { environments } from '@abgov/nx-oc';
|
|
@@ -22,7 +22,7 @@ describe('Express Service Generator', () => {
|
|
|
22
22
|
};
|
|
23
23
|
|
|
24
24
|
it('can run', async () => {
|
|
25
|
-
const host =
|
|
25
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
26
26
|
await generator(host, options);
|
|
27
27
|
|
|
28
28
|
const config = readProjectConfiguration(host, 'test');
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
const devkit_1 = require("@
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const nx_oc_1 = require("@abgov/nx-oc");
|
|
7
7
|
const express_service_1 = require("../express-service/express-service");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mern/mern.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"mern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mern/mern.ts"],"names":[],"mappings":";;;AAAA,uCAQoB;AACpB,6BAA6B;AAC7B,wCAAoD;AACpD,wEAAoE;AACpE,sDAAkD;AAGlD,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;QAEf,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC;QAC9B,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;QACxE,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,gBAAgB,EAAE,CAAC;QAC9E,MAAM,kBAAkB,GAAG,cAAc,gBAAgB,EAAE,CAAC;QAE5D,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEvD,uCACK,OAAO,KACV,WAAW;YACX,WAAW;YACX,gBAAgB;YAChB,kBAAkB;YAClB,IAAI,IACJ;IACJ,CAAC;CAAA;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,KACtB,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnD,QAAQ,EAAE,EAAE,GACb,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EACjC,GAAG,OAAO,CAAC,kBAAkB,EAAE,EAC/B,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,mBAA8B,IAAU,EAAE,OAAe;;QACvD,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,IAAA,yBAAkB,EAAC,IAAI,kCACxB,iBAAiB,KACpB,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,UAAU,IAC/B,CAAC;QAEH,MAAM,IAAA,mBAAY,EAAC,IAAI,kCAClB,iBAAiB,KACpB,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,KAAK,EAAE;gBACL,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,UAAU,OAAO,CAAC,IAAI,iBAAiB,OAAO,CAAC,IAAI,WAAW;aAC1E,IACD,CAAC;QAEH,iDAAiD;QACjD,qCAAqC;QACrC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAxBD,4BAwBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { readProjectConfiguration } from '@
|
|
2
|
-
import {
|
|
1
|
+
import { readProjectConfiguration } from '@nx/devkit';
|
|
2
|
+
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
|
|
3
3
|
|
|
4
4
|
import * as utils from '@abgov/nx-oc';
|
|
5
5
|
import { environments } from '@abgov/nx-oc';
|
|
@@ -22,7 +22,7 @@ describe('React App Generator', () => {
|
|
|
22
22
|
};
|
|
23
23
|
|
|
24
24
|
it('can run', async () => {
|
|
25
|
-
const host =
|
|
25
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
26
26
|
await generator(host, options);
|
|
27
27
|
|
|
28
28
|
const appConfig = readProjectConfiguration(host, 'test-app');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const { composePlugins, withNx } = require('@
|
|
2
|
-
const { withReact } = require('@
|
|
1
|
+
const { composePlugins, withNx } = require('@nx/webpack');
|
|
2
|
+
const { withReact } = require('@nx/react');
|
|
3
3
|
const HtmlWebpackPlugin = require('html-webpack-plugin');
|
|
4
4
|
|
|
5
5
|
// Nx plugins for webpack.
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const nx_oc_1 = require("@abgov/nx-oc");
|
|
5
|
-
const devkit_1 = require("@
|
|
6
|
-
const linter_1 = require("@
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
|
+
const linter_1 = require("@nx/linter");
|
|
7
7
|
const path = require("path");
|
|
8
8
|
function normalizeOptions(host, options) {
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -57,8 +57,8 @@ function removeFiles(host, options) {
|
|
|
57
57
|
function default_1(host, options) {
|
|
58
58
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
59
59
|
const normalizedOptions = yield normalizeOptions(host, options);
|
|
60
|
-
const { applicationGenerator: initReact } = yield Promise.resolve().then(() => require('@
|
|
61
|
-
const { reduxGenerator: initRedux } = yield Promise.resolve().then(() => require('@
|
|
60
|
+
const { applicationGenerator: initReact } = yield Promise.resolve().then(() => require('@nx/react'));
|
|
61
|
+
const { reduxGenerator: initRedux } = yield Promise.resolve().then(() => require('@nx/react'));
|
|
62
62
|
// Setting strict to false because of: https://github.com/nrwl/nx/issues/8180
|
|
63
63
|
yield initReact(host, {
|
|
64
64
|
name: options.name,
|
|
@@ -67,7 +67,6 @@ function default_1(host, options) {
|
|
|
67
67
|
linter: linter_1.Linter.EsLint,
|
|
68
68
|
unitTestRunner: 'jest',
|
|
69
69
|
e2eTestRunner: 'cypress',
|
|
70
|
-
babelJest: false,
|
|
71
70
|
strict: false,
|
|
72
71
|
});
|
|
73
72
|
yield initRedux(host, { name: 'intake', project: options.name });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-app/react-app.ts"],"names":[],"mappings":";;;AAAA,wCAAyE;AACzE,
|
|
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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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { readProjectConfiguration } from '@
|
|
2
|
-
import {
|
|
1
|
+
import { readProjectConfiguration } from '@nx/devkit';
|
|
2
|
+
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
|
|
3
3
|
|
|
4
4
|
import * as utils from '@abgov/nx-oc';
|
|
5
5
|
import { environments } from '@abgov/nx-oc';
|
|
@@ -22,7 +22,7 @@ describe('React App Generator', () => {
|
|
|
22
22
|
};
|
|
23
23
|
|
|
24
24
|
it('can run', async () => {
|
|
25
|
-
const host =
|
|
25
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
26
26
|
await generator(host, options);
|
|
27
27
|
|
|
28
28
|
const config = readProjectConfiguration(host, 'test');
|
|
@@ -32,7 +32,7 @@ describe('React App Generator', () => {
|
|
|
32
32
|
}, 30000);
|
|
33
33
|
|
|
34
34
|
it('can add nginx proxy', async () => {
|
|
35
|
-
const host =
|
|
35
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
36
36
|
await generator(host, {
|
|
37
37
|
...options,
|
|
38
38
|
proxy: {
|
|
@@ -51,7 +51,7 @@ describe('React App Generator', () => {
|
|
|
51
51
|
});
|
|
52
52
|
|
|
53
53
|
it('can add multiple nginx proxy', async () => {
|
|
54
|
-
const host =
|
|
54
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
55
55
|
await generator(host, {
|
|
56
56
|
...options,
|
|
57
57
|
proxy: [
|
|
@@ -76,7 +76,7 @@ describe('React App Generator', () => {
|
|
|
76
76
|
});
|
|
77
77
|
|
|
78
78
|
it('can add webpack dev server proxy', async () => {
|
|
79
|
-
const host =
|
|
79
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
80
80
|
await generator(host, {
|
|
81
81
|
...options,
|
|
82
82
|
proxy: {
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const nx_oc_1 = require("@abgov/nx-oc");
|
|
5
|
-
const devkit_1 = require("@
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const dotnet_service_1 = require("../dotnet-service/dotnet-service");
|
|
7
7
|
const react_app_1 = require("../react-app/react-app");
|
|
8
8
|
function normalizeOptions(host, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-dotnet.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-dotnet/react-dotnet.ts"],"names":[],"mappings":";;;AAAA,wCAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"react-dotnet.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-dotnet/react-dotnet.ts"],"names":[],"mappings":";;;AAAA,wCAAoD;AACpD,uCAKoB;AACpB,qEAAiE;AACjE,sDAAkD;AAGlD,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;QAEf,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC;QAC9B,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;QACxE,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,gBAAgB,EAAE,CAAC;QAC9E,MAAM,kBAAkB,GAAG,cAAc,gBAAgB,EAAE,CAAC;QAE5D,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEvD,uCACK,OAAO,KACV,WAAW;YACX,WAAW;YACX,gBAAgB;YAChB,kBAAkB;YAClB,IAAI,IACJ;IACJ,CAAC;CAAA;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,IAAA,wBAAiB,EAAC,IAAI,kCACvB,iBAAiB,KACpB,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,UAAU,IAC/B,CAAC;QAEH,MAAM,IAAA,mBAAY,EAAC,IAAI,kCAClB,iBAAiB,KACpB,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,KAAK,EAAE;gBACL,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,UAAU,OAAO,CAAC,IAAI,iBAAiB,OAAO,CAAC,IAAI,WAAW;aAC1E,IACD,CAAC;QAEH,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AApBD,4BAoBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { readProjectConfiguration } from '@
|
|
2
|
-
import {
|
|
1
|
+
import { readProjectConfiguration } from '@nx/devkit';
|
|
2
|
+
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
|
|
3
3
|
|
|
4
4
|
import * as utils from '@abgov/nx-oc';
|
|
5
5
|
import { environments } from '@abgov/nx-oc';
|
|
@@ -28,7 +28,7 @@ describe('React App Generator', () => {
|
|
|
28
28
|
};
|
|
29
29
|
|
|
30
30
|
it('can run', async () => {
|
|
31
|
-
const host =
|
|
31
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
32
32
|
await generator(host, options);
|
|
33
33
|
|
|
34
34
|
const appConfig = readProjectConfiguration(host, 'test-app');
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const nx_oc_1 = require("@abgov/nx-oc");
|
|
5
|
-
const devkit_1 = require("@
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const axios_1 = require("axios");
|
|
7
7
|
const enquirer_1 = require("enquirer");
|
|
8
8
|
const path = require("path");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-form.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-form/react-form.ts"],"names":[],"mappings":";;;AAAA,wCAKsB;AACtB,
|
|
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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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as utils from '@abgov/nx-oc';
|
|
2
|
-
import { addProjectConfiguration } from '@
|
|
3
|
-
import {
|
|
2
|
+
import { addProjectConfiguration } from '@nx/devkit';
|
|
3
|
+
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
|
|
4
4
|
import axios from 'axios';
|
|
5
5
|
import { prompt } from 'enquirer';
|
|
6
6
|
|
|
@@ -81,14 +81,14 @@ describe('React Form Generator', () => {
|
|
|
81
81
|
};
|
|
82
82
|
|
|
83
83
|
it('can run', async () => {
|
|
84
|
-
const host =
|
|
84
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
85
85
|
|
|
86
86
|
addProjectConfiguration(host, 'test', {
|
|
87
87
|
root: 'apps/test',
|
|
88
88
|
projectType: 'application',
|
|
89
89
|
targets: {
|
|
90
90
|
build: {
|
|
91
|
-
executor: '@
|
|
91
|
+
executor: '@nx/web:webpack',
|
|
92
92
|
},
|
|
93
93
|
},
|
|
94
94
|
});
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const nx_oc_1 = require("@abgov/nx-oc");
|
|
5
|
-
const devkit_1 = require("@
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const axios_1 = require("axios");
|
|
7
7
|
const enquirer_1 = require("enquirer");
|
|
8
8
|
const path = require("path");
|
|
@@ -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":";;;AAAA,wCAKsB;AACtB,
|
|
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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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as utils from '@abgov/nx-oc';
|
|
2
|
-
import { addProjectConfiguration } from '@
|
|
3
|
-
import {
|
|
2
|
+
import { addProjectConfiguration } from '@nx/devkit';
|
|
3
|
+
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
|
|
4
4
|
import axios from 'axios';
|
|
5
5
|
import { prompt } from 'enquirer';
|
|
6
6
|
|
|
@@ -47,14 +47,14 @@ describe('React Task List Generator', () => {
|
|
|
47
47
|
};
|
|
48
48
|
|
|
49
49
|
it('can run', async () => {
|
|
50
|
-
const host =
|
|
50
|
+
const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
|
|
51
51
|
|
|
52
52
|
addProjectConfiguration(host, 'test', {
|
|
53
53
|
root: 'apps/test',
|
|
54
54
|
projectType: 'application',
|
|
55
55
|
targets: {
|
|
56
56
|
build: {
|
|
57
|
-
executor: '@
|
|
57
|
+
executor: '@nx/web:webpack',
|
|
58
58
|
},
|
|
59
59
|
},
|
|
60
60
|
});
|