@abgov/nx-adsp 2.0.0 → 3.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +9 -9
- package/src/generators/angular-app/angular-app.js +17 -17
- package/src/generators/angular-app/angular-app.js.map +1 -1
- package/src/generators/angular-app/angular-app.spec.ts +4 -4
- package/src/generators/dotnet-service/dotnet-service.js +13 -13
- package/src/generators/dotnet-service/dotnet-service.js.map +1 -1
- package/src/generators/express-service/express-service.js +10 -10
- package/src/generators/express-service/express-service.js.map +1 -1
- package/src/generators/mern/mern.js +12 -12
- package/src/generators/mern/mern.js.map +1 -1
- package/src/generators/mern/mern.spec.ts +1 -1
- package/src/generators/react-app/files/webpack.conf.js__tmpl__ +2 -2
- package/src/generators/react-app/react-app.js +24 -15
- package/src/generators/react-app/react-app.js.map +1 -1
- package/src/generators/react-dotnet/react-dotnet.js +4 -4
- package/src/generators/react-dotnet/react-dotnet.js.map +1 -1
- package/src/utils/adsp-utils.js +1 -1
- package/src/utils/adsp-utils.js.map +1 -1
- package/src/generators/angular-app/files/webpack.conf.js__tmpl__ +0 -17
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abgov/nx-adsp",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"description": "Government of Alberta - DIO - Nx plugin for ADSP apps.",
|
|
@@ -10,17 +10,17 @@
|
|
|
10
10
|
"directory": "packages/nx-adsp"
|
|
11
11
|
},
|
|
12
12
|
"peerDependencies": {
|
|
13
|
-
"@abgov/nx-dotnet": "^
|
|
14
|
-
"@abgov/nx-oc": "^
|
|
15
|
-
"@nrwl/express": "^
|
|
16
|
-
"@nrwl/react": "^
|
|
17
|
-
"@nrwl/angular": "^
|
|
13
|
+
"@abgov/nx-dotnet": "^3.0.0",
|
|
14
|
+
"@abgov/nx-oc": "^3.0.0",
|
|
15
|
+
"@nrwl/express": "^13.4.3",
|
|
16
|
+
"@nrwl/react": "^13.4.3",
|
|
17
|
+
"@nrwl/angular": "^13.4.3"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@angular-devkit/core": "^
|
|
21
|
-
"@angular-devkit/schematics": "^
|
|
20
|
+
"@angular-devkit/core": "^13.1.0",
|
|
21
|
+
"@angular-devkit/schematics": "^13.1.0",
|
|
22
22
|
"camelcase": "^5.3.1",
|
|
23
|
-
"@nrwl/devkit": "
|
|
23
|
+
"@nrwl/devkit": "13.4.3"
|
|
24
24
|
},
|
|
25
25
|
"generators": "./generators.json",
|
|
26
26
|
"typings": "./src/index.d.ts"
|
|
@@ -6,11 +6,11 @@ const path = require("path");
|
|
|
6
6
|
const adsp_utils_1 = require("../../utils/adsp-utils");
|
|
7
7
|
const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
8
8
|
function normalizeOptions(host, options) {
|
|
9
|
-
const projectName = devkit_1.names(options.name).fileName;
|
|
10
|
-
const projectRoot = `${devkit_1.getWorkspaceLayout(host).appsDir}/${projectName}`;
|
|
11
|
-
const projectOrg = devkit_1.getWorkspaceLayout(host).npmScope;
|
|
9
|
+
const projectName = (0, devkit_1.names)(options.name).fileName;
|
|
10
|
+
const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
|
|
11
|
+
const projectOrg = (0, devkit_1.getWorkspaceLayout)(host).npmScope;
|
|
12
12
|
const openshiftDirectory = `.openshift/${projectName}`;
|
|
13
|
-
const adsp = adsp_utils_1.getAdspConfiguration(host, options);
|
|
13
|
+
const adsp = (0, adsp_utils_1.getAdspConfiguration)(host, options);
|
|
14
14
|
const nginxProxies = Array.isArray(options.proxy) ?
|
|
15
15
|
[...options.proxy] :
|
|
16
16
|
(options.proxy ?
|
|
@@ -24,8 +24,8 @@ function normalizeOptions(host, options) {
|
|
|
24
24
|
nginxProxies });
|
|
25
25
|
}
|
|
26
26
|
function addFiles(host, options) {
|
|
27
|
-
const templateOptions = Object.assign(Object.assign(Object.assign(Object.assign({}, options), options.adsp), devkit_1.names(options.name)), { offsetFromRoot: devkit_1.offsetFromRoot(options.projectRoot), tmpl: '' });
|
|
28
|
-
devkit_1.generateFiles(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
27
|
+
const templateOptions = Object.assign(Object.assign(Object.assign(Object.assign({}, options), options.adsp), (0, devkit_1.names)(options.name)), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), tmpl: '' });
|
|
28
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
29
29
|
const addProxyConf = options.nginxProxies.length > 0;
|
|
30
30
|
if (addProxyConf) {
|
|
31
31
|
// Add a webpack dev server proxy configuration ...
|
|
@@ -46,7 +46,7 @@ function addFiles(host, options) {
|
|
|
46
46
|
}
|
|
47
47
|
return Object.assign(Object.assign({}, proxyConf), { [nginxProxy.location]: proxy });
|
|
48
48
|
}, {});
|
|
49
|
-
devkit_1.writeJson(host, `${options.projectRoot}/proxy.conf.json`, devProxyConf);
|
|
49
|
+
(0, devkit_1.writeJson)(host, `${options.projectRoot}/proxy.conf.json`, devProxyConf);
|
|
50
50
|
}
|
|
51
51
|
return addProxyConf;
|
|
52
52
|
}
|
|
@@ -55,11 +55,11 @@ function removeFiles(host, options) {
|
|
|
55
55
|
host.delete(`${options.projectRoot}/src/app/star.svg`);
|
|
56
56
|
}
|
|
57
57
|
function default_1(host, options) {
|
|
58
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
58
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
59
59
|
const normalizedOptions = normalizeOptions(host, options);
|
|
60
|
-
const initAngular = ngcli_adapter_1.wrapAngularDevkitSchematic('@nrwl/angular', 'application');
|
|
61
|
-
yield initAngular(host, options);
|
|
62
|
-
devkit_1.addDependenciesToPackageJson(host, {}, {
|
|
60
|
+
const initAngular = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@nrwl/angular', 'application');
|
|
61
|
+
yield initAngular(host, { name: options.name });
|
|
62
|
+
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
63
63
|
'@abgov/angular-components': '1.0.1',
|
|
64
64
|
'@abgov/core-css': '^0.7.56',
|
|
65
65
|
'@angular/cdk': "^11.2.0",
|
|
@@ -70,8 +70,8 @@ function default_1(host, options) {
|
|
|
70
70
|
});
|
|
71
71
|
const addedProxy = addFiles(host, normalizedOptions);
|
|
72
72
|
removeFiles(host, normalizedOptions);
|
|
73
|
-
const layout = devkit_1.getWorkspaceLayout(host);
|
|
74
|
-
const config = devkit_1.readProjectConfiguration(host, options.name);
|
|
73
|
+
const layout = (0, devkit_1.getWorkspaceLayout)(host);
|
|
74
|
+
const config = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
75
75
|
config.targets.build.options = Object.assign(Object.assign({}, config.targets.build.options), { assets: [
|
|
76
76
|
...config.targets.build.options.assets,
|
|
77
77
|
{
|
|
@@ -84,14 +84,14 @@ function default_1(host, options) {
|
|
|
84
84
|
// Add the webpack dev server proxy if there is proxy configuration.
|
|
85
85
|
config.targets.serve.options = Object.assign(Object.assign({}, config.targets.serve.options), { proxyConfig: `${normalizedOptions.projectRoot}/proxy.conf.json` });
|
|
86
86
|
}
|
|
87
|
-
devkit_1.updateProjectConfiguration(host, options.name, config);
|
|
88
|
-
yield devkit_1.formatFiles(host);
|
|
89
|
-
if (adsp_utils_1.hasDependency(host, '@abgov/nx-oc')) {
|
|
87
|
+
(0, devkit_1.updateProjectConfiguration)(host, options.name, config);
|
|
88
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
89
|
+
if ((0, adsp_utils_1.hasDependency)(host, '@abgov/nx-oc')) {
|
|
90
90
|
const { deploymentGenerator } = yield Promise.resolve().then(() => require(`${'@abgov/nx-oc'}`));
|
|
91
91
|
yield deploymentGenerator(host, Object.assign(Object.assign({}, options), { project: normalizedOptions.projectName }));
|
|
92
92
|
}
|
|
93
93
|
return () => {
|
|
94
|
-
devkit_1.installPackagesTask(host);
|
|
94
|
+
(0, devkit_1.installPackagesTask)(host);
|
|
95
95
|
};
|
|
96
96
|
});
|
|
97
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/angular-app/angular-app.ts"],"names":[],"mappings":";;;AAAA,yCAYsB;AACtB,6BAA6B;AAC7B,uDAA6E;AAC7E,8DAAwE;AAGxE,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAkC;IAElC,MAAM,WAAW,GAAG,cAAK,
|
|
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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"}
|
|
@@ -9,7 +9,7 @@ describe('angular app generator', () => {
|
|
|
9
9
|
const options: AngularAppGeneratorSchema = { name: 'test', tenant: 'testtenant' };
|
|
10
10
|
|
|
11
11
|
beforeEach(() => {
|
|
12
|
-
appTree = createTreeWithEmptyWorkspace();
|
|
12
|
+
appTree = createTreeWithEmptyWorkspace(2);
|
|
13
13
|
jest.setTimeout(28000)
|
|
14
14
|
});
|
|
15
15
|
afterAll(() => {
|
|
@@ -25,7 +25,7 @@ describe('angular app generator', () => {
|
|
|
25
25
|
}, 10000);
|
|
26
26
|
|
|
27
27
|
it ('can add nginx proxy', async () => {
|
|
28
|
-
const host = createTreeWithEmptyWorkspace();
|
|
28
|
+
const host = createTreeWithEmptyWorkspace(2);
|
|
29
29
|
await angularApp(
|
|
30
30
|
host,
|
|
31
31
|
{
|
|
@@ -47,7 +47,7 @@ describe('angular app generator', () => {
|
|
|
47
47
|
});
|
|
48
48
|
|
|
49
49
|
it ('can add multiple nginx proxy', async () => {
|
|
50
|
-
const host = createTreeWithEmptyWorkspace();
|
|
50
|
+
const host = createTreeWithEmptyWorkspace(2);
|
|
51
51
|
await angularApp(
|
|
52
52
|
host,
|
|
53
53
|
{
|
|
@@ -75,7 +75,7 @@ describe('angular app generator', () => {
|
|
|
75
75
|
});
|
|
76
76
|
|
|
77
77
|
it ('can add webpack dev server proxy', async () => {
|
|
78
|
-
const host = createTreeWithEmptyWorkspace();
|
|
78
|
+
const host = createTreeWithEmptyWorkspace(2);
|
|
79
79
|
await angularApp(
|
|
80
80
|
host,
|
|
81
81
|
{
|
|
@@ -6,24 +6,24 @@ const camelcase_1 = require("camelcase");
|
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const adsp_utils_1 = require("../../utils/adsp-utils");
|
|
8
8
|
function normalizeOptions(host, options) {
|
|
9
|
-
const projectName = devkit_1.names(options.name).fileName;
|
|
10
|
-
const projectRoot = `${devkit_1.getWorkspaceLayout(host).appsDir}/${projectName}`;
|
|
11
|
-
const adsp = adsp_utils_1.getAdspConfiguration(host, options);
|
|
9
|
+
const projectName = (0, devkit_1.names)(options.name).fileName;
|
|
10
|
+
const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
|
|
11
|
+
const adsp = (0, adsp_utils_1.getAdspConfiguration)(host, options);
|
|
12
12
|
return Object.assign(Object.assign({}, options), { projectName,
|
|
13
13
|
projectRoot,
|
|
14
|
-
adsp, namespace: camelcase_1.default(options.namespace || projectName, { pascalCase: true }) });
|
|
14
|
+
adsp, namespace: (0, camelcase_1.default)(options.namespace || projectName, { pascalCase: true }) });
|
|
15
15
|
}
|
|
16
16
|
function addFiles(host, options) {
|
|
17
17
|
const templateOptions = Object.assign(Object.assign(Object.assign({}, options), options.adsp), { tmpl: '' });
|
|
18
|
-
devkit_1.generateFiles(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
18
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
19
19
|
}
|
|
20
20
|
function default_1(host, options) {
|
|
21
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
22
22
|
const normalizedOptions = normalizeOptions(host, options);
|
|
23
|
-
devkit_1.addDependenciesToPackageJson(host, {}, {
|
|
23
|
+
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
24
24
|
'@abgov/nx-dotnet': '^1.0.0'
|
|
25
25
|
});
|
|
26
|
-
devkit_1.addProjectConfiguration(host, normalizedOptions.projectName, {
|
|
26
|
+
(0, devkit_1.addProjectConfiguration)(host, normalizedOptions.projectName, {
|
|
27
27
|
root: normalizedOptions.projectRoot,
|
|
28
28
|
projectType: 'application',
|
|
29
29
|
targets: {
|
|
@@ -47,17 +47,17 @@ function default_1(host, options) {
|
|
|
47
47
|
}
|
|
48
48
|
});
|
|
49
49
|
addFiles(host, normalizedOptions);
|
|
50
|
-
yield devkit_1.formatFiles(host);
|
|
51
|
-
if (adsp_utils_1.hasDependency(host, '@abgov/nx-dotnet')) {
|
|
50
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
51
|
+
if ((0, adsp_utils_1.hasDependency)(host, '@abgov/nx-dotnet')) {
|
|
52
52
|
const { workspaceGenerator } = yield Promise.resolve().then(() => require(`${'@abgov/nx-dotnet'}`));
|
|
53
53
|
yield workspaceGenerator(host, {});
|
|
54
54
|
}
|
|
55
|
-
if (adsp_utils_1.hasDependency(host, '@abgov/nx-oc')) {
|
|
55
|
+
if ((0, adsp_utils_1.hasDependency)(host, '@abgov/nx-oc')) {
|
|
56
56
|
const { deploymentGenerator } = yield Promise.resolve().then(() => require(`${'@abgov/nx-oc'}`));
|
|
57
57
|
yield deploymentGenerator(host, Object.assign(Object.assign({}, options), { project: normalizedOptions.projectName }));
|
|
58
58
|
}
|
|
59
|
-
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
60
|
-
devkit_1.installPackagesTask(host);
|
|
59
|
+
return () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
60
|
+
(0, devkit_1.installPackagesTask)(host);
|
|
61
61
|
});
|
|
62
62
|
});
|
|
63
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotnet-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/dotnet-service/dotnet-service.ts"],"names":[],"mappings":";;;AAAA,yCASsB;AACtB,yCAAkC;AAClC,6BAA6B;AAC7B,uDAA6E;AAG7E,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;IAEf,MAAM,WAAW,GAAG,cAAK,
|
|
1
|
+
{"version":3,"file":"dotnet-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/dotnet-service/dotnet-service.ts"],"names":[],"mappings":";;;AAAA,yCASsB;AACtB,yCAAkC;AAClC,6BAA6B;AAC7B,uDAA6E;AAG7E,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;IAEf,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IACjD,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;IAEzE,MAAM,IAAI,GAAG,IAAA,iCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjD,uCACK,OAAO,KACV,WAAW;QACX,WAAW;QACX,IAAI,EACJ,SAAS,EAAE,IAAA,mBAAS,EAClB,OAAO,CAAC,SAAS,IAAI,WAAW,EAChC,EAAE,UAAU,EAAE,IAAI,EAAE,CACrB,IACD;AACJ,CAAC;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;;QAExD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;YACE,kBAAkB,EAAE,QAAQ;SAC7B,CACF,CAAC;QAEF,IAAA,gCAAuB,EACrB,IAAI,EACJ,iBAAiB,CAAC,WAAW,EAC7B;YACE,IAAI,EAAE,iBAAiB,CAAC,WAAW;YACnC,WAAW,EAAE,aAAa;YAC1B,OAAO,EAAE;gBACP,IAAI,EAAE;oBACJ,QAAQ,EAAE,uBAAuB;iBAClC;gBACD,KAAK,EAAE;oBACL,QAAQ,EAAE,wBAAwB;oBAClC,OAAO,EAAE;wBACP,aAAa,EAAE,OAAO;qBACvB;oBACD,cAAc,EAAE;wBACd,UAAU,EAAE;4BACV,aAAa,EAAE,SAAS;yBACzB;qBACF;iBACF;gBACD,KAAK,EAAE;oBACL,QAAQ,EAAE,wBAAwB;iBACnC;aACF;SACF,CACF,CAAA;QAED,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAClC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,IAAA,0BAAa,EAAC,IAAI,EAAE,kBAAkB,CAAC,EAAE;YAC3C,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAAa,GAAG,kBAAkB,EAAE,EAAC,CAAC;YACrE,MAAM,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;SACpC;QAED,IAAI,IAAA,0BAAa,EAAC,IAAI,EAAE,cAAc,CAAC,EAAE;YACvC,MAAM,EAAE,mBAAmB,EAAE,GAAG,2CAAa,GAAG,cAAc,EAAE,EAAC,CAAC;YAClE,MAAM,mBAAmB,CACvB,IAAI,kCAEC,OAAO,KACV,OAAO,EAAE,iBAAiB,CAAC,WAAW,IAEzC,CAAC;SACH;QAED,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA,CAAA;IACH,CAAC;CAAA;AA9DD,4BA8DC"}
|
|
@@ -6,23 +6,23 @@ const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const adsp_utils_1 = require("../../utils/adsp-utils");
|
|
8
8
|
function normalizeOptions(host, options) {
|
|
9
|
-
const projectName = devkit_1.names(options.name).fileName;
|
|
10
|
-
const projectRoot = `${devkit_1.getWorkspaceLayout(host).appsDir}/${projectName}`;
|
|
11
|
-
const adsp = adsp_utils_1.getAdspConfiguration(host, options);
|
|
9
|
+
const projectName = (0, devkit_1.names)(options.name).fileName;
|
|
10
|
+
const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
|
|
11
|
+
const adsp = (0, adsp_utils_1.getAdspConfiguration)(host, options);
|
|
12
12
|
return Object.assign(Object.assign({}, options), { projectName,
|
|
13
13
|
projectRoot,
|
|
14
14
|
adsp });
|
|
15
15
|
}
|
|
16
16
|
function addFiles(host, options) {
|
|
17
17
|
const templateOptions = Object.assign(Object.assign(Object.assign({}, options), options.adsp), { tmpl: '' });
|
|
18
|
-
devkit_1.generateFiles(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
18
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
19
19
|
}
|
|
20
20
|
function default_1(host, options) {
|
|
21
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
22
22
|
const normalizedOptions = normalizeOptions(host, options);
|
|
23
|
-
const initExpress = ngcli_adapter_1.wrapAngularDevkitSchematic('@nrwl/express', 'application');
|
|
23
|
+
const initExpress = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@nrwl/express', 'application');
|
|
24
24
|
yield initExpress(host, options);
|
|
25
|
-
devkit_1.addDependenciesToPackageJson(host, {
|
|
25
|
+
(0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
26
26
|
'jwks-rsa': '^2.0.2',
|
|
27
27
|
'passport': '^0.4.1',
|
|
28
28
|
"passport-anonymous": "^1.0.1",
|
|
@@ -33,13 +33,13 @@ function default_1(host, options) {
|
|
|
33
33
|
'@types/passport-jwt': '^3.0.5',
|
|
34
34
|
});
|
|
35
35
|
addFiles(host, normalizedOptions);
|
|
36
|
-
yield devkit_1.formatFiles(host);
|
|
37
|
-
if (adsp_utils_1.hasDependency(host, '@abgov/nx-oc')) {
|
|
36
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
37
|
+
if ((0, adsp_utils_1.hasDependency)(host, '@abgov/nx-oc')) {
|
|
38
38
|
const { deploymentGenerator } = yield Promise.resolve().then(() => require(`${'@abgov/nx-oc'}`));
|
|
39
39
|
yield deploymentGenerator(host, Object.assign(Object.assign({}, options), { project: normalizedOptions.projectName }));
|
|
40
40
|
}
|
|
41
41
|
return () => {
|
|
42
|
-
devkit_1.installPackagesTask(host);
|
|
42
|
+
(0, devkit_1.installPackagesTask)(host);
|
|
43
43
|
};
|
|
44
44
|
});
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/express-service/express-service.ts"],"names":[],"mappings":";;;AAAA,yCAQsB;AACtB,8DAAwE;AACxE,6BAA6B;AAC7B,uDAA6E;AAG7E,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;IAEf,MAAM,WAAW,GAAG,cAAK,
|
|
1
|
+
{"version":3,"file":"express-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/express-service/express-service.ts"],"names":[],"mappings":";;;AAAA,yCAQsB;AACtB,8DAAwE;AACxE,6BAA6B;AAC7B,uDAA6E;AAG7E,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;IAEf,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IACjD,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;IAEzE,MAAM,IAAI,GAAG,IAAA,iCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjD,uCACK,OAAO,KACV,WAAW;QACX,WAAW;QACX,IAAI,IACJ;AACJ,CAAC;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;;QAExD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,WAAW,GAAG,IAAA,0CAA0B,EAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QAC/E,MAAM,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEjC,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,UAAU,EAAE,QAAQ;YACpB,UAAU,EAAE,QAAQ;YACpB,oBAAoB,EAAE,QAAQ;YAC9B,cAAc,EAAE,QAAQ;SACzB,EACD;YACE,iBAAiB,EAAE,QAAQ;YAC3B,2BAA2B,EAAE,QAAQ;YACrC,qBAAqB,EAAE,QAAQ;SAChC,CACF,CAAC;QAEF,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAClC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,IAAA,0BAAa,EAAC,IAAI,EAAE,cAAc,CAAC,EAAE;YACvC,MAAM,EAAE,mBAAmB,EAAE,GAAG,2CAAa,GAAG,cAAc,EAAE,EAAC,CAAC;YAClE,MAAM,mBAAmB,CACvB,IAAI,kCAEC,OAAO,KACV,OAAO,EAAE,iBAAiB,CAAC,WAAW,IAEzC,CAAC;SACH;QAED,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA;IACH,CAAC;CAAA;AAvCD,4BAuCC"}
|
|
@@ -7,12 +7,12 @@ const adsp_utils_1 = require("../../utils/adsp-utils");
|
|
|
7
7
|
const express_service_1 = require("../express-service/express-service");
|
|
8
8
|
const react_app_1 = require("../react-app/react-app");
|
|
9
9
|
function normalizeOptions(host, options) {
|
|
10
|
-
const name = devkit_1.names(options.name).fileName;
|
|
10
|
+
const name = (0, devkit_1.names)(options.name).fileName;
|
|
11
11
|
const projectDirectory = name;
|
|
12
12
|
const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
|
|
13
|
-
const projectRoot = `${devkit_1.getWorkspaceLayout(host).appsDir}/${projectDirectory}`;
|
|
14
|
-
const openshiftDirectory = `${path.dirname(devkit_1.getWorkspacePath(host))}/.openshift/${projectDirectory}`;
|
|
15
|
-
const adsp = adsp_utils_1.getAdspConfiguration(host, options);
|
|
13
|
+
const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectDirectory}`;
|
|
14
|
+
const openshiftDirectory = `${path.dirname((0, devkit_1.getWorkspacePath)(host))}/.openshift/${projectDirectory}`;
|
|
15
|
+
const adsp = (0, adsp_utils_1.getAdspConfiguration)(host, options);
|
|
16
16
|
return Object.assign(Object.assign({}, options), { projectName,
|
|
17
17
|
projectRoot,
|
|
18
18
|
projectDirectory,
|
|
@@ -20,23 +20,23 @@ function normalizeOptions(host, options) {
|
|
|
20
20
|
adsp });
|
|
21
21
|
}
|
|
22
22
|
function addFiles(host, options) {
|
|
23
|
-
const templateOptions = Object.assign(Object.assign(Object.assign({}, options), devkit_1.names(options.name)), { offsetFromRoot: devkit_1.offsetFromRoot(options.projectRoot), template: '' });
|
|
24
|
-
devkit_1.generateFiles(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
25
|
-
devkit_1.generateFiles(host, path.join(__dirname, 'openshift'), `${options.openshiftDirectory}`, templateOptions);
|
|
23
|
+
const templateOptions = Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.name)), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), template: '' });
|
|
24
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
25
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'openshift'), `${options.openshiftDirectory}`, templateOptions);
|
|
26
26
|
}
|
|
27
27
|
function default_1(host, options) {
|
|
28
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
29
29
|
const normalizedOptions = normalizeOptions(host, options);
|
|
30
|
-
yield express_service_1.default(host, Object.assign(Object.assign({}, options), { name: `${options.name}-service` }));
|
|
31
|
-
yield react_app_1.default(host, Object.assign(Object.assign({}, options), { name: `${options.name}-app`, proxy: {
|
|
30
|
+
yield (0, express_service_1.default)(host, Object.assign(Object.assign({}, options), { name: `${options.name}-service` }));
|
|
31
|
+
yield (0, react_app_1.default)(host, Object.assign(Object.assign({}, options), { name: `${options.name}-app`, proxy: {
|
|
32
32
|
location: '/api/',
|
|
33
33
|
proxyPass: `http://${options.name}-service:3333/${options.name}-service/`
|
|
34
34
|
} }));
|
|
35
35
|
// Currently no files specific to MERN generator.
|
|
36
36
|
// addFiles(host, normalizedOptions);
|
|
37
|
-
yield devkit_1.formatFiles(host);
|
|
37
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
38
38
|
return () => {
|
|
39
|
-
devkit_1.installPackagesTask(host);
|
|
39
|
+
(0, devkit_1.installPackagesTask)(host);
|
|
40
40
|
};
|
|
41
41
|
});
|
|
42
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mern/mern.ts"],"names":[],"mappings":";;;AAAA,yCASsB;AACtB,6BAA6B;AAC7B,uDAA8D;AAC9D,wEAAoE;AACpE,sDAAkD;AAGlD,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;IAEf,MAAM,IAAI,GAAG,cAAK,
|
|
1
|
+
{"version":3,"file":"mern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mern/mern.ts"],"names":[],"mappings":";;;AAAA,yCASsB;AACtB,6BAA6B;AAC7B,uDAA8D;AAC9D,wEAAoE;AACpE,sDAAkD;AAGlD,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;IAEf,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC;IAC9B,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,gBAAgB,EAAE,CAAC;IAE9E,MAAM,kBAAkB,GACtB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC,eAAe,gBAAgB,EAAE,CAAA;IAE1E,MAAM,IAAI,GAAG,IAAA,iCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjD,uCACK,OAAO,KACV,WAAW;QACX,WAAW;QACX,gBAAgB;QAChB,kBAAkB;QAClB,IAAI,IACJ;AACJ,CAAC;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,mBAA+B,IAAU,EAAE,OAAe;;QAExD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,IAAA,yBAAkB,EACtB,IAAI,kCAEC,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,UAAU,IAElC,CAAC;QAEF,MAAM,IAAA,mBAAY,EAChB,IAAI,kCAEC,OAAO,KACV,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,IAEJ,CAAC;QAEF,iDAAiD;QACjD,qCAAqC;QACrC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA;IACH,CAAC;CAAA;AA/BD,4BA+BC"}
|
|
@@ -11,7 +11,7 @@ describe('React App Generator', () => {
|
|
|
11
11
|
}
|
|
12
12
|
|
|
13
13
|
it ('can run', async () => {
|
|
14
|
-
const host = createTreeWithEmptyWorkspace();
|
|
14
|
+
const host = createTreeWithEmptyWorkspace(2);
|
|
15
15
|
await generator(host, options);
|
|
16
16
|
|
|
17
17
|
const appConfig = readProjectConfiguration(host, 'test-app');
|
|
@@ -2,12 +2,12 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
|
|
|
2
2
|
|
|
3
3
|
module.exports = (configuration) => {
|
|
4
4
|
configuration.entry['renew'] = [
|
|
5
|
-
'./renew.ts'
|
|
5
|
+
'./src/renew.ts'
|
|
6
6
|
]
|
|
7
7
|
|
|
8
8
|
configuration.plugins.push(
|
|
9
9
|
new HtmlWebpackPlugin({
|
|
10
|
-
template: './renew.html',
|
|
10
|
+
template: './src/renew.html',
|
|
11
11
|
chunks: ['renew'],
|
|
12
12
|
filename: 'renew.html'
|
|
13
13
|
})
|
|
@@ -6,10 +6,10 @@ const linter_1 = require("@nrwl/linter");
|
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const adsp_utils_1 = require("../../utils/adsp-utils");
|
|
8
8
|
function normalizeOptions(host, options) {
|
|
9
|
-
const projectName = devkit_1.names(options.name).fileName;
|
|
10
|
-
const projectRoot = `${devkit_1.getWorkspaceLayout(host).appsDir}/${projectName}`;
|
|
9
|
+
const projectName = (0, devkit_1.names)(options.name).fileName;
|
|
10
|
+
const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
|
|
11
11
|
const openshiftDirectory = `.openshift/${projectName}`;
|
|
12
|
-
const adsp = adsp_utils_1.getAdspConfiguration(host, options);
|
|
12
|
+
const adsp = (0, adsp_utils_1.getAdspConfiguration)(host, options);
|
|
13
13
|
const nginxProxies = Array.isArray(options.proxy) ?
|
|
14
14
|
[...options.proxy] :
|
|
15
15
|
(options.proxy ?
|
|
@@ -23,7 +23,7 @@ function normalizeOptions(host, options) {
|
|
|
23
23
|
}
|
|
24
24
|
function addFiles(host, options) {
|
|
25
25
|
const templateOptions = Object.assign(Object.assign(Object.assign({}, options), options.adsp), { tmpl: '' });
|
|
26
|
-
devkit_1.generateFiles(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
26
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
|
|
27
27
|
const addProxyConf = options.nginxProxies.length > 0;
|
|
28
28
|
if (addProxyConf) {
|
|
29
29
|
// Add a webpack dev server proxy configuration ...
|
|
@@ -44,7 +44,7 @@ function addFiles(host, options) {
|
|
|
44
44
|
}
|
|
45
45
|
return Object.assign(Object.assign({}, proxyConf), { [nginxProxy.location]: proxy });
|
|
46
46
|
}, {});
|
|
47
|
-
devkit_1.writeJson(host, `${options.projectRoot}/proxy.conf.json`, devProxyConf);
|
|
47
|
+
(0, devkit_1.writeJson)(host, `${options.projectRoot}/proxy.conf.json`, devProxyConf);
|
|
48
48
|
}
|
|
49
49
|
return addProxyConf;
|
|
50
50
|
}
|
|
@@ -53,14 +53,23 @@ function removeFiles(host, options) {
|
|
|
53
53
|
host.delete(`${options.projectRoot}/src/app/star.svg`);
|
|
54
54
|
}
|
|
55
55
|
function default_1(host, options) {
|
|
56
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
56
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
57
57
|
const normalizedOptions = normalizeOptions(host, options);
|
|
58
58
|
const { applicationGenerator: initReact } = yield Promise.resolve().then(() => require('@nrwl/react'));
|
|
59
59
|
const { reduxGenerator: initRedux } = yield Promise.resolve().then(() => require('@nrwl/react'));
|
|
60
60
|
// Setting strict to false because of: https://github.com/nrwl/nx/issues/8180
|
|
61
|
-
yield initReact(host,
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
yield initReact(host, {
|
|
62
|
+
name: options.name,
|
|
63
|
+
style: 'styled-components',
|
|
64
|
+
skipFormat: true,
|
|
65
|
+
unitTestRunner: 'jest',
|
|
66
|
+
babelJest: false,
|
|
67
|
+
e2eTestRunner: 'cypress',
|
|
68
|
+
linter: linter_1.Linter.EsLint,
|
|
69
|
+
strict: false,
|
|
70
|
+
});
|
|
71
|
+
yield initRedux(host, { name: 'intake', project: options.name });
|
|
72
|
+
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
64
73
|
'@abgov/core-css': '^0.7.56',
|
|
65
74
|
'@abgov/react-components': '^0.7.56',
|
|
66
75
|
'@types/react-router-dom': '~5.1.7',
|
|
@@ -73,8 +82,8 @@ function default_1(host, options) {
|
|
|
73
82
|
});
|
|
74
83
|
const addedProxy = addFiles(host, normalizedOptions);
|
|
75
84
|
removeFiles(host, normalizedOptions);
|
|
76
|
-
const layout = devkit_1.getWorkspaceLayout(host);
|
|
77
|
-
const config = devkit_1.readProjectConfiguration(host, options.name);
|
|
85
|
+
const layout = (0, devkit_1.getWorkspaceLayout)(host);
|
|
86
|
+
const config = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
78
87
|
config.targets.build.options = Object.assign(Object.assign({}, config.targets.build.options), { assets: [
|
|
79
88
|
...config.targets.build.options.assets,
|
|
80
89
|
{
|
|
@@ -87,14 +96,14 @@ function default_1(host, options) {
|
|
|
87
96
|
// Add the webpack dev server proxy if there is proxy configuration.
|
|
88
97
|
config.targets.serve.options = Object.assign(Object.assign({}, config.targets.serve.options), { proxyConfig: `${normalizedOptions.projectRoot}/proxy.conf.json` });
|
|
89
98
|
}
|
|
90
|
-
devkit_1.updateProjectConfiguration(host, options.name, config);
|
|
91
|
-
yield devkit_1.formatFiles(host);
|
|
92
|
-
if (adsp_utils_1.hasDependency(host, '@abgov/nx-oc')) {
|
|
99
|
+
(0, devkit_1.updateProjectConfiguration)(host, options.name, config);
|
|
100
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
101
|
+
if ((0, adsp_utils_1.hasDependency)(host, '@abgov/nx-oc')) {
|
|
93
102
|
const { deploymentGenerator } = yield Promise.resolve().then(() => require(`${'@abgov/nx-oc'}`));
|
|
94
103
|
yield deploymentGenerator(host, Object.assign(Object.assign({}, options), { project: normalizedOptions.projectName }));
|
|
95
104
|
}
|
|
96
105
|
return () => {
|
|
97
|
-
devkit_1.installPackagesTask(host);
|
|
106
|
+
(0, devkit_1.installPackagesTask)(host);
|
|
98
107
|
};
|
|
99
108
|
});
|
|
100
109
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-app/react-app.ts"],"names":[],"mappings":";;;AAAA,yCAWsB;AACtB,yCAAsC;AACtC,6BAA6B;AAC7B,uDAA6E;AAG7E,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;IAEf,MAAM,WAAW,GAAG,cAAK,
|
|
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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"}
|
|
@@ -5,14 +5,14 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const dotnet_service_1 = require("../dotnet-service/dotnet-service");
|
|
6
6
|
const react_app_1 = require("../react-app/react-app");
|
|
7
7
|
function default_1(host, options) {
|
|
8
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
yield dotnet_service_1.default(host, Object.assign(Object.assign({}, options), { name: `${options.name}-service`, namespace: options.name }));
|
|
10
|
-
yield react_app_1.default(host, Object.assign(Object.assign({}, options), { name: `${options.name}-app`, proxy: {
|
|
8
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
9
|
+
yield (0, dotnet_service_1.default)(host, Object.assign(Object.assign({}, options), { name: `${options.name}-service`, namespace: options.name }));
|
|
10
|
+
yield (0, react_app_1.default)(host, Object.assign(Object.assign({}, options), { name: `${options.name}-app`, proxy: {
|
|
11
11
|
location: '/api/',
|
|
12
12
|
proxyPass: `http://${options.name}-service:5000/${options.name}-service/`
|
|
13
13
|
} }));
|
|
14
14
|
return () => {
|
|
15
|
-
devkit_1.installPackagesTask(host);
|
|
15
|
+
(0, devkit_1.installPackagesTask)(host);
|
|
16
16
|
};
|
|
17
17
|
});
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-dotnet.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-dotnet/react-dotnet.ts"],"names":[],"mappings":";;;AAAA,yCAGsB;AACtB,qEAAiE;AACjE,sDAAkD;AAGlD,mBAA+B,IAAU,EAAE,OAAe;;QAExD,MAAM,wBAAiB,
|
|
1
|
+
{"version":3,"file":"react-dotnet.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-dotnet/react-dotnet.ts"],"names":[],"mappings":";;;AAAA,yCAGsB;AACtB,qEAAiE;AACjE,sDAAkD;AAGlD,mBAA+B,IAAU,EAAE,OAAe;;QAExD,MAAM,IAAA,wBAAiB,EACrB,IAAI,kCAEC,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,UAAU,EAC/B,SAAS,EAAE,OAAO,CAAC,IAAI,IAE1B,CAAC;QAEF,MAAM,IAAA,mBAAY,EAChB,IAAI,kCAEC,OAAO,KACV,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,IAEJ,CAAC;QAEF,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA;IACH,CAAC;CAAA;AA1BD,4BA0BC"}
|
package/src/utils/adsp-utils.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getAdspConfiguration = exports.hasDependency = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function hasDependency(host, dependency) {
|
|
6
|
-
const { dependencies, devDependencies } = devkit_1.readJson(host, 'package.json');
|
|
6
|
+
const { dependencies, devDependencies } = (0, devkit_1.readJson)(host, 'package.json');
|
|
7
7
|
return !!dependencies[dependency] ||
|
|
8
8
|
!!devDependencies[dependency];
|
|
9
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adsp-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/adsp-utils.ts"],"names":[],"mappings":";;;AAAA,yCAGsB;AAOtB,SAAgB,aAAa,CAAC,IAAU,EAAE,UAAkB;IAC1D,MAAM,EACJ,YAAY,EACZ,eAAe,EAChB,GAAY,iBAAQ,
|
|
1
|
+
{"version":3,"file":"adsp-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/adsp-utils.ts"],"names":[],"mappings":";;;AAAA,yCAGsB;AAOtB,SAAgB,aAAa,CAAC,IAAU,EAAE,UAAkB;IAC1D,MAAM,EACJ,YAAY,EACZ,eAAe,EAChB,GAAY,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE5C,OAAO,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC;QAC/B,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;AAClC,CAAC;AARD,sCAQC;AAED,SAAgB,oBAAoB,CAClC,IAAU,EACV,EAAE,MAAM,EAAsB;IAE9B,OAAO;QACL,MAAM;QACN,WAAW,EAAE,MAAM;QACnB,gBAAgB,EAAE,iCAAiC;KACpD,CAAA;AACH,CAAC;AATD,oDASC"}
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
const HtmlWebpackPlugin = require('html-webpack-plugin');
|
|
2
|
-
|
|
3
|
-
module.exports = (configuration) => {
|
|
4
|
-
configuration.entry['renew'] = [
|
|
5
|
-
'./renew.ts'
|
|
6
|
-
]
|
|
7
|
-
|
|
8
|
-
configuration.plugins.push(
|
|
9
|
-
new HtmlWebpackPlugin({
|
|
10
|
-
template: './renew.html',
|
|
11
|
-
chunks: ['renew'],
|
|
12
|
-
filename: 'renew.html'
|
|
13
|
-
})
|
|
14
|
-
);
|
|
15
|
-
|
|
16
|
-
return configuration;
|
|
17
|
-
}
|