@common-stack/generate-plugin 6.0.2-alpha.1 → 6.0.2-alpha.3
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/CHANGELOG.md +8 -0
- package/lib/generators/add-backend/files/package.json +114 -114
- package/lib/generators/add-browser-package/files/package.json +47 -47
- package/lib/generators/add-client-package/files/package.json +28 -28
- package/lib/generators/add-core-package/files/package.json +28 -28
- package/lib/generators/add-frontend/templates/package.json +2 -2
- package/lib/generators/add-fullstack/files/package.json +346 -358
- package/lib/generators/add-fullstack/generator.cjs +8 -11
- package/lib/generators/add-fullstack/generator.cjs.map +1 -1
- package/lib/generators/add-fullstack/generator.mjs +8 -11
- package/lib/generators/add-fullstack/generator.mjs.map +1 -1
- package/lib/generators/add-fullstack/schema.json +5 -0
- package/lib/generators/add-moleculer/files/package.json +5 -5
- package/lib/generators/add-server-package/files/package.json +3 -3
- package/package.json +3 -3
- package/src/generators/add-fullstack/files/package.json +5 -17
- package/src/generators/add-fullstack/generator.ts +12 -11
- package/src/generators/add-fullstack/schema.d.ts +2 -1
- package/src/generators/add-fullstack/schema.json +5 -0
- package/src/generators/add-moleculer/files/package.json +5 -5
- package/lib/generators/add-fullstack/files/tools/html-plugin-template.ejs +0 -28
- package/src/generators/add-fullstack/files/tools/html-plugin-template.ejs +0 -28
|
@@ -1,21 +1,18 @@
|
|
|
1
1
|
'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),fs=require('fs'),index=require('../../utils/index.cjs'),generator$2=require('../add-frontend/generator.cjs'),generator$1=require('../add-backend/generator.cjs'),generator=require('../add-moleculer/generator.cjs'),generator$5=require('../add-browser-package/generator.cjs'),generator$4=require('../add-client-package/generator.cjs'),generator$6=require('../add-core-package/generator.cjs'),generator$3=require('../add-server-package/generator.cjs');require('../../executors/update-deploy-version/executor.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);function addFullstackGenerator(tree, options) {
|
|
2
2
|
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
3
3
|
var _a;
|
|
4
|
-
|
|
5
|
-
//
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
// sourceRoot: `${projectRoot}/src`,
|
|
9
|
-
// targets: {},
|
|
10
|
-
// });
|
|
4
|
+
// If the provided path is relative, ensure it is treated as relative to the current working directory
|
|
5
|
+
const basePath = options.path || ''; // Use the provided path directly, no resolution to absolute path
|
|
6
|
+
const projectRoot = path__namespace.join(basePath, (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro');
|
|
7
|
+
console.log(`basePath: ${basePath}`);
|
|
11
8
|
devkit.generateFiles(tree, path__namespace.join(__dirname, 'files'), projectRoot, options);
|
|
12
9
|
devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
|
|
13
|
-
packageJson['name'] =
|
|
10
|
+
packageJson['name'] = index.getValid(options.name);
|
|
14
11
|
return packageJson;
|
|
15
12
|
});
|
|
16
13
|
yield devkit.formatFiles(tree);
|
|
17
14
|
if (index.isValid(options.config)) {
|
|
18
|
-
const configPath = index.getValid(options.config);
|
|
15
|
+
const configPath = path__namespace.resolve(basePath, index.getValid(options.config));
|
|
19
16
|
if (fs.existsSync(configPath)) {
|
|
20
17
|
try {
|
|
21
18
|
const content = String(fs.readFileSync(configPath));
|
|
@@ -42,7 +39,7 @@ const generateServers = (tree, parent, servers) => tslib.__awaiter(void 0, void
|
|
|
42
39
|
for (const [serverName, serverConfig] of Object.entries(servers)) {
|
|
43
40
|
const configs = serverConfig;
|
|
44
41
|
configs.name = serverName;
|
|
45
|
-
configs.directory =
|
|
42
|
+
configs.directory = path__namespace.join(parent, 'servers');
|
|
46
43
|
switch (configs === null || configs === void 0 ? void 0 : configs.type) {
|
|
47
44
|
case 'frontend':
|
|
48
45
|
yield generator$2.generateFrontend(tree, configs);
|
|
@@ -60,7 +57,7 @@ const generatePackages = (tree, parent, packages) => tslib.__awaiter(void 0, voi
|
|
|
60
57
|
for (const [packageName, packageConfig] of Object.entries(packages)) {
|
|
61
58
|
const configs = packageConfig;
|
|
62
59
|
configs.name = packageName;
|
|
63
|
-
configs.directory =
|
|
60
|
+
configs.directory = path__namespace.join(parent, 'packages');
|
|
64
61
|
switch (packageConfig === null || packageConfig === void 0 ? void 0 : packageConfig.type) {
|
|
65
62
|
case 'packages-core':
|
|
66
63
|
yield generator$6.generateCorePackage(tree, configs);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":["
|
|
1
|
+
{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":["path","getValid","generateFiles","updateJson","formatFiles","isValid","__awaiter","generateFrontend","generateBackend","generateMoleculer","generateCorePackage","generateBrowserPackage","generateClientPackage","generateServerPackage"],"mappings":"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"}
|
|
@@ -1,21 +1,18 @@
|
|
|
1
1
|
import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import fs from'fs';import {getValid,isValid}from'../../utils/index.mjs';import {generateFrontend}from'../add-frontend/generator.mjs';import {generateBackend}from'../add-backend/generator.mjs';import {generateMoleculer}from'../add-moleculer/generator.mjs';import {generateBrowserPackage}from'../add-browser-package/generator.mjs';import {generateClientPackage}from'../add-client-package/generator.mjs';import {generateCorePackage}from'../add-core-package/generator.mjs';import {generateServerPackage}from'../add-server-package/generator.mjs';import'../../executors/update-deploy-version/executor.mjs';function addFullstackGenerator(tree, options) {
|
|
2
2
|
return __awaiter(this, void 0, void 0, function* () {
|
|
3
3
|
var _a;
|
|
4
|
-
|
|
5
|
-
//
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
// sourceRoot: `${projectRoot}/src`,
|
|
9
|
-
// targets: {},
|
|
10
|
-
// });
|
|
4
|
+
// If the provided path is relative, ensure it is treated as relative to the current working directory
|
|
5
|
+
const basePath = options.path || ''; // Use the provided path directly, no resolution to absolute path
|
|
6
|
+
const projectRoot = path.join(basePath, (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro');
|
|
7
|
+
console.log(`basePath: ${basePath}`);
|
|
11
8
|
generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
|
|
12
9
|
updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
|
|
13
|
-
packageJson['name'] =
|
|
10
|
+
packageJson['name'] = getValid(options.name);
|
|
14
11
|
return packageJson;
|
|
15
12
|
});
|
|
16
13
|
yield formatFiles(tree);
|
|
17
14
|
if (isValid(options.config)) {
|
|
18
|
-
const configPath = getValid(options.config);
|
|
15
|
+
const configPath = path.resolve(basePath, getValid(options.config));
|
|
19
16
|
if (fs.existsSync(configPath)) {
|
|
20
17
|
try {
|
|
21
18
|
const content = String(fs.readFileSync(configPath));
|
|
@@ -42,7 +39,7 @@ const generateServers = (tree, parent, servers) => __awaiter(void 0, void 0, voi
|
|
|
42
39
|
for (const [serverName, serverConfig] of Object.entries(servers)) {
|
|
43
40
|
const configs = serverConfig;
|
|
44
41
|
configs.name = serverName;
|
|
45
|
-
configs.directory =
|
|
42
|
+
configs.directory = path.join(parent, 'servers');
|
|
46
43
|
switch (configs === null || configs === void 0 ? void 0 : configs.type) {
|
|
47
44
|
case 'frontend':
|
|
48
45
|
yield generateFrontend(tree, configs);
|
|
@@ -60,7 +57,7 @@ const generatePackages = (tree, parent, packages) => __awaiter(void 0, void 0, v
|
|
|
60
57
|
for (const [packageName, packageConfig] of Object.entries(packages)) {
|
|
61
58
|
const configs = packageConfig;
|
|
62
59
|
configs.name = packageName;
|
|
63
|
-
configs.directory =
|
|
60
|
+
configs.directory = path.join(parent, 'packages');
|
|
64
61
|
switch (packageConfig === null || packageConfig === void 0 ? void 0 : packageConfig.type) {
|
|
65
62
|
case 'packages-core':
|
|
66
63
|
yield generateCorePackage(tree, configs);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"8sBAesB,SAAA,qBAAqB,CAAC,IAAU,EAAE,OAAoC,EAAA
|
|
1
|
+
{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"8sBAesB,SAAA,qBAAqB,CAAC,IAAU,EAAE,OAAoC,EAAA;;;;QAExF,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;AACpC,QAAA,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,eAAe,CAAC,CAAC;AAEnF,QAAA,OAAO,CAAC,GAAG,CAAC,aAAa,QAAQ,CAAA,CAAE,CAAC,CAAC;AAErC,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAEzE,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;YAC5D,WAAW,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAC7C,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;AAEH,QAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;AAExB,QAAA,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;AACzB,YAAA,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AACpE,YAAA,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;AAC3B,gBAAA,IAAI;oBACA,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;oBACpD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACpC,oBAAA,OAAO,CAAC,MAAM,GAAG,WAAW,CAAC;AAE7B,oBAAA,MAAM,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;iBACvC;gBAAC,OAAM,KAAK,EAAE;AACX,oBAAA,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;iBACvD;aACJ;SACJ;KACJ,CAAA,CAAA;AAAA,CAAA;AAED,MAAM,cAAc,GAAG,CAAO,IAAU,EAAE,OAAY,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;AACtD,IAAA,IAAI,OAAO,CAAC,OAAO,EAAE;AACjB,QAAA,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;KAChE;IAED,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE;AAC9C,QAAA,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;KAC1E;AACL,CAAC,CAAA,CAAA;AAED,MAAM,eAAe,GAAG,CAAO,IAAU,EAAE,MAAc,EAAE,OAAY,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;AACvE,IAAA,KAAK,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC9D,MAAM,OAAO,GAAQ,YAAY,CAAC;AAClC,QAAA,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC;QAC1B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEjD,QAAO,OAAO,aAAP,OAAO,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAP,OAAO,CAAE,IAAI;AAChB,YAAA,KAAK,UAAU;AACX,gBAAA,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBACtC,MAAM;AACV,YAAA,KAAK,SAAS;AACV,gBAAA,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBACrC,MAAM;AACV,YAAA,KAAK,WAAW;AACZ,gBAAA,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBACvC,MAAM;SAGb;KACJ;AACL,CAAC,CAAA,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAO,IAAU,EAAE,MAAc,EAAE,QAAa,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;AACzE,IAAA,KAAK,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACjE,MAAM,OAAO,GAAQ,aAAa,CAAC;AACnC,QAAA,OAAO,CAAC,IAAI,GAAG,WAAW,CAAC;QAC3B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAElD,QAAQ,aAAqB,aAArB,aAAa,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAb,aAAa,CAAU,IAAI;AAC/B,YAAA,KAAK,eAAe;AAChB,gBAAA,MAAM,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBACzC,MAAM;AACV,YAAA,KAAK,kBAAkB;AACnB,gBAAA,MAAM,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC5C,MAAM;AACV,YAAA,KAAK,iBAAiB;AAClB,gBAAA,MAAM,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC3C,MAAM;AACV,YAAA,KAAK,iBAAiB;AAClB,gBAAA,MAAM,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC3C,MAAM;SAGb;KACJ;AACL,CAAC,CAAA"}
|
|
@@ -12,6 +12,11 @@
|
|
|
12
12
|
"config": {
|
|
13
13
|
"type": "string",
|
|
14
14
|
"description": "The absolute path of config file"
|
|
15
|
+
},
|
|
16
|
+
"path": {
|
|
17
|
+
"type": "string",
|
|
18
|
+
"description": "The base path where the project will be created or updated",
|
|
19
|
+
"x-prompt": "Where do you want to create or update the project? (Leave empty for the current directory)"
|
|
15
20
|
}
|
|
16
21
|
},
|
|
17
22
|
"required": ["name"]
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
"@casl/ability": "^4.1.5",
|
|
29
29
|
"@cdm-logger/client": "^9.0.3",
|
|
30
30
|
"@cdm-logger/server": "^9.0.3",
|
|
31
|
-
"@common-stack/client-core": "6.0.
|
|
32
|
-
"@common-stack/core": "6.0.
|
|
33
|
-
"@common-stack/server-core": "6.0.
|
|
34
|
-
"@common-stack/server-stack": "6.0.
|
|
35
|
-
"@common-stack/store-mongo": "6.0.
|
|
31
|
+
"@common-stack/client-core": "6.0.2-alpha.2",
|
|
32
|
+
"@common-stack/core": "6.0.2-alpha.2",
|
|
33
|
+
"@common-stack/server-core": "6.0.2-alpha.2",
|
|
34
|
+
"@common-stack/server-stack": "6.0.2-alpha.2",
|
|
35
|
+
"@common-stack/store-mongo": "6.0.2-alpha.2",
|
|
36
36
|
"@container-stack/mailing-api": "5.2.1-alpha.1",
|
|
37
37
|
"app-root-path": "^3.0.0",
|
|
38
38
|
"body-parser": "^1.19.0",
|
|
@@ -62,9 +62,9 @@
|
|
|
62
62
|
"peerDependencies": {
|
|
63
63
|
"@apollo/client": ">=3.0.0",
|
|
64
64
|
"@cdm-logger/server": ">=9.0.3",
|
|
65
|
-
"@common-stack/core": "6.0.
|
|
66
|
-
"@common-stack/server-core": "6.0.
|
|
67
|
-
"@common-stack/store-mongo": "6.0.
|
|
65
|
+
"@common-stack/core": "6.0.2-alpha.2",
|
|
66
|
+
"@common-stack/server-core": "6.0.2-alpha.2",
|
|
67
|
+
"@common-stack/store-mongo": "6.0.2-alpha.2",
|
|
68
68
|
"@container-stack/mailing-api": ">=0.0.35-alpha.1",
|
|
69
69
|
"@vscode-alt/monaco-editor": "^0.21.4",
|
|
70
70
|
"inversify": "^5.0.1",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@common-stack/generate-plugin",
|
|
3
|
-
"version": "6.0.2-alpha.
|
|
3
|
+
"version": "6.0.2-alpha.3",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./lib/index.mjs",
|
|
6
6
|
"typings": "./lib/index.d.ts",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"watch": "yarn build:lib:watch"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@common-stack/rollup-vite-utils": "6.0.2-alpha.
|
|
20
|
+
"@common-stack/rollup-vite-utils": "6.0.2-alpha.2",
|
|
21
21
|
"@nx/devkit": "19.5.1",
|
|
22
22
|
"tslib": "^2.3.0"
|
|
23
23
|
},
|
|
@@ -26,5 +26,5 @@
|
|
|
26
26
|
},
|
|
27
27
|
"executors": "./executors.json",
|
|
28
28
|
"generators": "./generators.json",
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "bd4059453b914a33e26bd860eef3cdac7824a819"
|
|
30
30
|
}
|
|
@@ -102,27 +102,15 @@
|
|
|
102
102
|
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
|
|
103
103
|
}
|
|
104
104
|
},
|
|
105
|
-
"lint-staged": {
|
|
106
|
-
"*.md": [
|
|
107
|
-
"yarn format:md",
|
|
108
|
-
"git add"
|
|
109
|
-
],
|
|
110
|
-
"*.{js,jsx,ts,tsx}": [
|
|
111
|
-
"eslint --fix",
|
|
112
|
-
"git add"
|
|
113
|
-
],
|
|
114
|
-
"package.json": "sort-package-json --check package.json */**/package.json "
|
|
115
|
-
},
|
|
116
105
|
"resolutions": {
|
|
117
106
|
"@apollo/client": "^3.9.0",
|
|
118
107
|
"@types/react": "^18.0.25",
|
|
119
108
|
"@types/react-dom": "^18.0.8",
|
|
120
|
-
"chokidar": "^3.5.3",
|
|
121
109
|
"html-to-text": "^8.0.0",
|
|
122
|
-
"react": "18.
|
|
123
|
-
"react-dom": "18.
|
|
124
|
-
"react-native": "0.
|
|
125
|
-
"react-native-gesture-handler": "~2.
|
|
110
|
+
"react": "18.3.0-canary-c3048aab4-20240326",
|
|
111
|
+
"react-dom": "18.3.0-canary-c3048aab4-20240326",
|
|
112
|
+
"react-native": "0.72.10",
|
|
113
|
+
"react-native-gesture-handler": "~2.12.0"
|
|
126
114
|
},
|
|
127
115
|
"dependencies": {
|
|
128
116
|
"dataloader": "^2.1.0",
|
|
@@ -159,7 +147,7 @@
|
|
|
159
147
|
"@babel/preset-typescript": "^7.18.6",
|
|
160
148
|
"@babel/register": "^7.18.9",
|
|
161
149
|
"@babel/runtime": "^7.20.1",
|
|
162
|
-
"@common-stack/env-list-loader": "6.0.
|
|
150
|
+
"@common-stack/env-list-loader": "6.0.2-alpha.2",
|
|
163
151
|
"@emotion/babel-plugin": "^11.11.0",
|
|
164
152
|
"@graphql-codegen/add": "^5.0.2",
|
|
165
153
|
"@graphql-codegen/cli": "^5.0.2",
|
|
@@ -14,22 +14,23 @@ import {
|
|
|
14
14
|
} from '../../index';
|
|
15
15
|
|
|
16
16
|
export async function addFullstackGenerator(tree: Tree, options: AddFullstackGeneratorSchema) {
|
|
17
|
-
|
|
18
|
-
//
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
// });
|
|
17
|
+
// If the provided path is relative, ensure it is treated as relative to the current working directory
|
|
18
|
+
const basePath = options.path || ''; // Use the provided path directly, no resolution to absolute path
|
|
19
|
+
const projectRoot = path.join(basePath, getValid(options.name) ?? 'fullstack-pro');
|
|
20
|
+
|
|
21
|
+
console.log(`basePath: ${basePath}`);
|
|
22
|
+
|
|
24
23
|
generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
|
|
24
|
+
|
|
25
25
|
updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
|
|
26
|
-
packageJson['name'] =
|
|
26
|
+
packageJson['name'] = getValid(options.name);
|
|
27
27
|
return packageJson;
|
|
28
28
|
});
|
|
29
|
+
|
|
29
30
|
await formatFiles(tree);
|
|
30
31
|
|
|
31
32
|
if (isValid(options.config)) {
|
|
32
|
-
const configPath = getValid(options.config);
|
|
33
|
+
const configPath = path.resolve(basePath, getValid(options.config));
|
|
33
34
|
if (fs.existsSync(configPath)) {
|
|
34
35
|
try {
|
|
35
36
|
const content = String(fs.readFileSync(configPath));
|
|
@@ -58,7 +59,7 @@ const generateServers = async (tree: Tree, parent: string, servers: any) => {
|
|
|
58
59
|
for (const [serverName, serverConfig] of Object.entries(servers)) {
|
|
59
60
|
const configs: any = serverConfig;
|
|
60
61
|
configs.name = serverName;
|
|
61
|
-
configs.directory =
|
|
62
|
+
configs.directory = path.join(parent, 'servers');
|
|
62
63
|
|
|
63
64
|
switch(configs?.type) {
|
|
64
65
|
case 'frontend':
|
|
@@ -80,7 +81,7 @@ const generatePackages = async (tree: Tree, parent: string, packages: any) => {
|
|
|
80
81
|
for (const [packageName, packageConfig] of Object.entries(packages)) {
|
|
81
82
|
const configs: any = packageConfig;
|
|
82
83
|
configs.name = packageName;
|
|
83
|
-
configs.directory =
|
|
84
|
+
configs.directory = path.join(parent, 'packages');
|
|
84
85
|
|
|
85
86
|
switch((packageConfig as any)?.type) {
|
|
86
87
|
case 'packages-core':
|
|
@@ -12,6 +12,11 @@
|
|
|
12
12
|
"config": {
|
|
13
13
|
"type": "string",
|
|
14
14
|
"description": "The absolute path of config file"
|
|
15
|
+
},
|
|
16
|
+
"path": {
|
|
17
|
+
"type": "string",
|
|
18
|
+
"description": "The base path where the project will be created or updated",
|
|
19
|
+
"x-prompt": "Where do you want to create or update the project? (Leave empty for the current directory)"
|
|
15
20
|
}
|
|
16
21
|
},
|
|
17
22
|
"required": ["name"]
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
"@casl/ability": "^4.1.5",
|
|
29
29
|
"@cdm-logger/client": "^9.0.3",
|
|
30
30
|
"@cdm-logger/server": "^9.0.3",
|
|
31
|
-
"@common-stack/client-core": "6.0.
|
|
32
|
-
"@common-stack/core": "6.0.
|
|
33
|
-
"@common-stack/server-core": "6.0.
|
|
34
|
-
"@common-stack/server-stack": "6.0.
|
|
35
|
-
"@common-stack/store-mongo": "6.0.
|
|
31
|
+
"@common-stack/client-core": "6.0.2-alpha.2",
|
|
32
|
+
"@common-stack/core": "6.0.2-alpha.2",
|
|
33
|
+
"@common-stack/server-core": "6.0.2-alpha.2",
|
|
34
|
+
"@common-stack/server-stack": "6.0.2-alpha.2",
|
|
35
|
+
"@common-stack/store-mongo": "6.0.2-alpha.2",
|
|
36
36
|
"@container-stack/mailing-api": "5.2.1-alpha.1",
|
|
37
37
|
"app-root-path": "^3.0.0",
|
|
38
38
|
"body-parser": "^1.19.0",
|
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
<!DOCTYPE html>
|
|
2
|
-
<html>
|
|
3
|
-
|
|
4
|
-
<head>
|
|
5
|
-
<base href="/">
|
|
6
|
-
<meta charset="utf-8">
|
|
7
|
-
<title>
|
|
8
|
-
<%= htmlWebpackPlugin.options.title %>
|
|
9
|
-
</title>
|
|
10
|
-
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
11
|
-
</head>
|
|
12
|
-
|
|
13
|
-
<body>
|
|
14
|
-
<div class="demo">
|
|
15
|
-
<div id="root">
|
|
16
|
-
Try building the demo:
|
|
17
|
-
<pre>
|
|
18
|
-
</pre> ...and refreshing this page!
|
|
19
|
-
</div>
|
|
20
|
-
</div>
|
|
21
|
-
<footer class="dark">
|
|
22
|
-
<section class="container copyright">
|
|
23
|
-
CDMBase LLC
|
|
24
|
-
</section>
|
|
25
|
-
</footer>
|
|
26
|
-
</body>
|
|
27
|
-
|
|
28
|
-
</html>
|
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
<!DOCTYPE html>
|
|
2
|
-
<html>
|
|
3
|
-
|
|
4
|
-
<head>
|
|
5
|
-
<base href="/">
|
|
6
|
-
<meta charset="utf-8">
|
|
7
|
-
<title>
|
|
8
|
-
<%= htmlWebpackPlugin.options.title %>
|
|
9
|
-
</title>
|
|
10
|
-
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
11
|
-
</head>
|
|
12
|
-
|
|
13
|
-
<body>
|
|
14
|
-
<div class="demo">
|
|
15
|
-
<div id="root">
|
|
16
|
-
Try building the demo:
|
|
17
|
-
<pre>
|
|
18
|
-
</pre> ...and refreshing this page!
|
|
19
|
-
</div>
|
|
20
|
-
</div>
|
|
21
|
-
<footer class="dark">
|
|
22
|
-
<section class="container copyright">
|
|
23
|
-
CDMBase LLC
|
|
24
|
-
</section>
|
|
25
|
-
</footer>
|
|
26
|
-
</body>
|
|
27
|
-
|
|
28
|
-
</html>
|