@lenne.tech/cli 0.0.80 → 0.0.84
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/build/commands/angular/create.js +169 -44
- package/build/commands/deployment/create.js +91 -9
- package/build/commands/server/module.js +67 -5
- package/build/extensions/server.js +234 -0
- package/build/extensions/tools.js +137 -0
- package/build/interfaces/ServerProps.interface.js +3 -0
- package/build/templates/deployment/.gitlab-ci.yml.ejs +6 -12
- package/build/templates/deployment/Dockerfile.app.ejs +2 -2
- package/build/templates/deployment/docker-compose.develop.yml.ejs +1 -1
- package/build/templates/deployment/docker-compose.prod.yml.ejs +1 -1
- package/build/templates/deployment/docker-compose.test.yml.ejs +1 -1
- package/build/templates/nest-server-module/inputs/template-create.input.ts.ejs +5 -8
- package/build/templates/nest-server-module/inputs/template.input.ts.ejs +3 -9
- package/build/templates/nest-server-module/template.model.ts.ejs +4 -21
- package/build/templates/nest-server-module/template.resolver.ts.ejs +2 -1
- package/package.json +5 -5
|
@@ -18,8 +18,9 @@ const NewCommand = {
|
|
|
18
18
|
description: 'Creates a new angular (fullstack) workspace',
|
|
19
19
|
hidden: false,
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
+
var _a, _b, _c;
|
|
21
22
|
// Retrieve the tools we need
|
|
22
|
-
const { filesystem, git, helper, parameters, print: { error, info, spin, success }, prompt: { confirm }, strings: { kebabCase }, system, } = toolbox;
|
|
23
|
+
const { filesystem, git, helper, parameters, patching, print: { error, info, spin, success }, prompt: { confirm }, strings: { kebabCase }, system, tools, } = toolbox;
|
|
23
24
|
// Start timer
|
|
24
25
|
const timer = system.startTimer();
|
|
25
26
|
// Info
|
|
@@ -44,28 +45,20 @@ const NewCommand = {
|
|
|
44
45
|
error(`There's already a folder named "${projectDir}" here.`);
|
|
45
46
|
return undefined;
|
|
46
47
|
}
|
|
47
|
-
//
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
showError: true,
|
|
62
|
-
});
|
|
63
|
-
if (!gitLink) {
|
|
64
|
-
addToGit = false;
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
const workspaceSpinner = spin(`Create ${preset} workspace ${projectDir} with ${name} app`);
|
|
48
|
+
// Localize
|
|
49
|
+
const localize = ((_a = parameters.second) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes('localize')) ||
|
|
50
|
+
(!parameters.second && (yield confirm(`Init localize for Angular?`, true)));
|
|
51
|
+
// Angular Universal
|
|
52
|
+
const angularUniversal = ((_b = parameters.second) === null || _b === void 0 ? void 0 : _b.toLowerCase().includes('universal')) ||
|
|
53
|
+
(!parameters.second && (yield confirm(`Add Angular Universal (SSR)?`, true)));
|
|
54
|
+
// Nest-Server
|
|
55
|
+
const nestServer = ((_c = parameters.second) === null || _c === void 0 ? void 0 : _c.toLowerCase().includes('nest')) ||
|
|
56
|
+
(!parameters.second && (yield confirm(`Add API (Nest-Server)?`, true)));
|
|
57
|
+
const gitLink = (yield helper.getInput(null, {
|
|
58
|
+
name: 'link to an empty repository (e.g. git@gitlab.lenne.tech:group/project.git or leave empty for no linking)',
|
|
59
|
+
showError: false,
|
|
60
|
+
})).trim();
|
|
61
|
+
const workspaceSpinner = spin(`Create workspace ${projectDir} with ${name} app`);
|
|
69
62
|
// Clone monorepo
|
|
70
63
|
yield system.run(`git clone https://github.com/lenneTech/lt-monorepo.git ${projectDir}`);
|
|
71
64
|
// Check for directory
|
|
@@ -73,36 +66,154 @@ const NewCommand = {
|
|
|
73
66
|
error(`The directory "${projectDir}" could not be created.`);
|
|
74
67
|
return undefined;
|
|
75
68
|
}
|
|
76
|
-
workspaceSpinner.succeed(`Create ${preset} workspace ${projectDir} for ${name} created`);
|
|
77
|
-
// Include example app
|
|
78
|
-
const ngBaseSpinner = spin('Integrate example for Angular');
|
|
79
69
|
// Remove git folder after clone
|
|
80
70
|
yield system.run(`cd ${projectDir} && rm -rf .git`);
|
|
71
|
+
// Set project name
|
|
72
|
+
yield filesystem.write(`${projectDir}/lt.json`, JSON.stringify({ name }));
|
|
73
|
+
yield patching.update(`${projectDir}/package.json`, (data) => {
|
|
74
|
+
data.name = kebabCase(name);
|
|
75
|
+
data.version = '0.0.0';
|
|
76
|
+
return data;
|
|
77
|
+
});
|
|
78
|
+
// Install packages
|
|
79
|
+
yield system.run(`cd ${projectDir} && npm i`);
|
|
81
80
|
// Check if git init is active
|
|
82
|
-
|
|
83
|
-
|
|
81
|
+
yield system.run(`cd ${projectDir} && git init --initial-branch=main`);
|
|
82
|
+
if (gitLink) {
|
|
84
83
|
yield system.run(`cd ${projectDir} && git remote add origin ${gitLink}`);
|
|
85
84
|
yield system.run(`cd ${projectDir} && git add .`);
|
|
86
85
|
yield system.run(`cd ${projectDir} && git commit -m "Initial commit"`);
|
|
87
86
|
yield system.run(`cd ${projectDir} && git push -u origin main`);
|
|
88
87
|
}
|
|
89
|
-
|
|
90
|
-
|
|
88
|
+
workspaceSpinner.succeed(`Create workspace ${projectDir} for ${name} created`);
|
|
89
|
+
// Include example app
|
|
90
|
+
const ngBaseSpinner = spin('Integrate example for Angular');
|
|
91
91
|
// Remove gitkeep file
|
|
92
92
|
yield system.run(`cd ${projectDir}/projects && rm .gitkeep`);
|
|
93
|
-
//
|
|
94
|
-
yield system.run(`cd ${projectDir}/projects
|
|
95
|
-
//
|
|
93
|
+
// Clone ng-base-starter
|
|
94
|
+
yield system.run(`cd ${projectDir}/projects && git clone https://github.com/lenneTech/ng-base-starter.git app`);
|
|
95
|
+
// Main version of angular
|
|
96
|
+
let angularVersion = '';
|
|
96
97
|
if (filesystem.isDirectory(`./${projectDir}/projects/app`)) {
|
|
98
|
+
// Get main verion of angular
|
|
99
|
+
yield patching.update(`${projectDir}/projects/app/package.json`, (data) => {
|
|
100
|
+
const version = parseInt(data.dependencies['@angular/core'].split('.')[0]);
|
|
101
|
+
if (version && version > 0) {
|
|
102
|
+
angularVersion = '@' + version;
|
|
103
|
+
}
|
|
104
|
+
return data;
|
|
105
|
+
});
|
|
106
|
+
// Remove git folder after clone
|
|
107
|
+
yield system.run(`cd ${projectDir}/projects/app && rm -rf .git`);
|
|
108
|
+
// Remove husky from app project
|
|
109
|
+
yield system.run(`rm -rf ${projectDir}/projects/app/.husky`);
|
|
110
|
+
yield patching.update(`${projectDir}/projects/app/package.json`, (data) => {
|
|
111
|
+
delete data.scripts.prepare;
|
|
112
|
+
delete data.devDependencies.husky;
|
|
113
|
+
return data;
|
|
114
|
+
});
|
|
115
|
+
if (localize) {
|
|
116
|
+
yield system.run(`cd ${projectDir}/projects/app && ng add @angular/localize --skip-confirmation`);
|
|
117
|
+
}
|
|
118
|
+
// Commit changes
|
|
119
|
+
yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Angular example integrated"`);
|
|
97
120
|
// Check if git init is active
|
|
98
|
-
if (
|
|
99
|
-
|
|
100
|
-
yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Angular example integrated" && git push`);
|
|
121
|
+
if (gitLink) {
|
|
122
|
+
`cd ${projectDir} && git push`;
|
|
101
123
|
}
|
|
102
124
|
// Angular example integration done
|
|
103
125
|
ngBaseSpinner.succeed('Example for Angular integrated');
|
|
126
|
+
if (angularUniversal) {
|
|
127
|
+
// Include example app
|
|
128
|
+
const ngUniversalSpinner = spin('Integrate example for Angular');
|
|
129
|
+
yield system.run(`cd ${projectDir}/projects/app && ng add @nguniversal/express-engine${angularVersion} --skip-confirmation`);
|
|
130
|
+
yield system.run(`cd ${projectDir}/projects/app && npm i localstorage-polyfill`);
|
|
131
|
+
yield system.run(`cd ${projectDir}/projects/app && npm i compression`);
|
|
132
|
+
yield system.run(`cd ${projectDir}/projects/app && npm i --save-dev @types/compression`);
|
|
133
|
+
// Add scripts and clean up dependencies
|
|
134
|
+
yield patching.update(`${projectDir}/projects/app/package.json`, (data) => {
|
|
135
|
+
// Add / extend scripts
|
|
136
|
+
data.scripts.build = 'ng build --configuration production && ng run app:server';
|
|
137
|
+
data.scripts['build:test'] = 'ng build --configuration test && ng run app:server';
|
|
138
|
+
// Clean up
|
|
139
|
+
const dependencies = ['dependencies', 'devDependencies'];
|
|
140
|
+
for (const deps of dependencies) {
|
|
141
|
+
for (const dep of Object.keys(data[deps])) {
|
|
142
|
+
data[deps][dep] = data[deps][dep].replace('^', '');
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
return data;
|
|
146
|
+
});
|
|
147
|
+
// Set allowSyntheticDefaultImports
|
|
148
|
+
tools.stripAndSaveJsonFile(`${projectDir}/projects/app/tsconfig.json`);
|
|
149
|
+
yield patching.update(`${projectDir}/projects/app/tsconfig.json`, (data) => {
|
|
150
|
+
data.compilerOptions.allowSyntheticDefaultImports = true;
|
|
151
|
+
return data;
|
|
152
|
+
});
|
|
153
|
+
// Pimp server.ts
|
|
154
|
+
let localizeString = '';
|
|
155
|
+
if (localize) {
|
|
156
|
+
localizeString = `\nimport '@angular/localize/init';`;
|
|
157
|
+
}
|
|
158
|
+
const windowAndCo = `
|
|
159
|
+
// ----------------------------------------------
|
|
160
|
+
// window for image lazy loading
|
|
161
|
+
// ----------------------------------------------
|
|
162
|
+
/* eslint-disable */${localizeString}
|
|
163
|
+
import 'reflect-metadata';
|
|
164
|
+
import 'localstorage-polyfill';
|
|
165
|
+
import compression from 'compression';
|
|
166
|
+
import domino from 'domino';
|
|
167
|
+
import { readFileSync } from 'fs';
|
|
168
|
+
const template = readFileSync(join(process.cwd(), 'dist/app/browser/index.html')).toString();
|
|
169
|
+
const win: any = domino.createWindow(template);
|
|
170
|
+
// @ts-ignore
|
|
171
|
+
global['window'] = win;
|
|
172
|
+
global['Node'] = win.Node;
|
|
173
|
+
global['navigator'] = win.navigator;
|
|
174
|
+
global['Event'] = win.Event;
|
|
175
|
+
global['KeyboardEvent'] = win.Event;
|
|
176
|
+
global['MouseEvent'] = win.Event;
|
|
177
|
+
global['Event']['prototype'] = win.Event.prototype;
|
|
178
|
+
global['document'] = win.document;
|
|
179
|
+
global['localStorage'] = localStorage;
|
|
180
|
+
global['WebSocket'] = require('ws');
|
|
181
|
+
/* eslint-enable */
|
|
182
|
+
`;
|
|
183
|
+
yield patching.update(`${projectDir}/projects/app/server.ts`, (str) => {
|
|
184
|
+
const lines = str.split('\n');
|
|
185
|
+
const rest = str.split('\n');
|
|
186
|
+
let back = '';
|
|
187
|
+
for (let i = 0; i < lines.length; i++) {
|
|
188
|
+
// Stop if the line is not empty and does not start with an import
|
|
189
|
+
if (!!lines[i].trim() && !lines[i].trim().startsWith('import')) {
|
|
190
|
+
break;
|
|
191
|
+
}
|
|
192
|
+
back += lines[i] + '\n';
|
|
193
|
+
rest.shift();
|
|
194
|
+
}
|
|
195
|
+
back += windowAndCo + rest.join('\n');
|
|
196
|
+
return back;
|
|
197
|
+
});
|
|
198
|
+
yield patching.replace(`${projectDir}/projects/app/server.ts`, 'const server = express();', `const server = express();\n server.use(compression());`);
|
|
199
|
+
// Commit changes
|
|
200
|
+
yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Angular Universal integrated"`);
|
|
201
|
+
// Check if git init is active
|
|
202
|
+
if (gitLink) {
|
|
203
|
+
`cd ${projectDir} && git push`;
|
|
204
|
+
}
|
|
205
|
+
// Angular universal integration done
|
|
206
|
+
ngUniversalSpinner.succeed('Angular Universal integrated');
|
|
207
|
+
}
|
|
208
|
+
else {
|
|
209
|
+
yield patching.update(`${projectDir}/projects/app/package.json`, (data) => {
|
|
210
|
+
data.scripts.build = 'ng build --configuration production';
|
|
211
|
+
data.scripts['build:test'] = 'ng build --configuration test';
|
|
212
|
+
return data;
|
|
213
|
+
});
|
|
214
|
+
}
|
|
104
215
|
// Include files from https://github.com/lenneTech/nest-server-starter
|
|
105
|
-
if (
|
|
216
|
+
if (nestServer) {
|
|
106
217
|
// Init
|
|
107
218
|
const serverSpinner = spin(`Integrate Nest Server Starter`);
|
|
108
219
|
// Clone api
|
|
@@ -111,16 +222,24 @@ const NewCommand = {
|
|
|
111
222
|
if (filesystem.isDirectory(`./${projectDir}/projects/api`)) {
|
|
112
223
|
// Remove git folder from clone
|
|
113
224
|
yield system.run(`cd ${projectDir}/projects/api && rm -rf .git`);
|
|
225
|
+
// Remove husky from api project
|
|
226
|
+
yield system.run(`rm -rf ${projectDir}/projects/api/.husky`);
|
|
227
|
+
yield patching.update(`${projectDir}/projects/api/package.json`, (data) => {
|
|
228
|
+
delete data.scripts.prepare;
|
|
229
|
+
delete data.devDependencies.husky;
|
|
230
|
+
return data;
|
|
231
|
+
});
|
|
114
232
|
// Prepare meta.json in api
|
|
115
233
|
filesystem.write(`./${projectDir}/projects/api/src/meta.json`, {
|
|
116
234
|
name: `${name}-api-server`,
|
|
117
235
|
description: `API for ${name} app`,
|
|
118
236
|
version: '0.0.0',
|
|
119
237
|
});
|
|
238
|
+
// Commit changes
|
|
239
|
+
yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Nest Server Starter integrated"`);
|
|
120
240
|
// Check if git init is active
|
|
121
|
-
if (
|
|
122
|
-
|
|
123
|
-
yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Nest Server Starter integrated" && git push`);
|
|
241
|
+
if (gitLink) {
|
|
242
|
+
`cd ${projectDir} && git push`;
|
|
124
243
|
}
|
|
125
244
|
// Done
|
|
126
245
|
serverSpinner.succeed('Nest Server Starter integrated');
|
|
@@ -131,11 +250,17 @@ const NewCommand = {
|
|
|
131
250
|
}
|
|
132
251
|
// Install all packages
|
|
133
252
|
const installSpinner = spin('Install all packages');
|
|
134
|
-
yield system.run(`cd ${projectDir} && npm
|
|
135
|
-
|
|
253
|
+
yield system.run(`cd ${projectDir} && npm run init`);
|
|
254
|
+
// Commit changes
|
|
255
|
+
yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Initialization of workspace done"`);
|
|
256
|
+
// Check if git init is active
|
|
257
|
+
if (gitLink) {
|
|
258
|
+
`cd ${projectDir} && git push`;
|
|
259
|
+
}
|
|
260
|
+
installSpinner.succeed('Successfully installed all packages');
|
|
136
261
|
// We're done, so show what to do next
|
|
137
262
|
info(``);
|
|
138
|
-
success(`Generated
|
|
263
|
+
success(`Generated workspace ${projectDir} with ${name} app in ${helper.msToMinutesAndSeconds(timer())}m.`);
|
|
139
264
|
info(``);
|
|
140
265
|
info(`Next:`);
|
|
141
266
|
info(` Run ${name}`);
|
|
@@ -151,4 +276,4 @@ const NewCommand = {
|
|
|
151
276
|
}),
|
|
152
277
|
};
|
|
153
278
|
exports.default = NewCommand;
|
|
154
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2FuZ3VsYXIvY3JlYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBR0E7O0dBRUc7QUFDSCxNQUFNLFVBQVUsR0FBbUI7SUFDakMsSUFBSSxFQUFFLFFBQVE7SUFDZCxLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUsNkNBQTZDO0lBQzFELE1BQU0sRUFBRSxLQUFLO0lBQ2IsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osVUFBVSxFQUNWLEdBQUcsRUFDSCxNQUFNLEVBQ04sVUFBVSxFQUNWLEtBQUssRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNyQyxNQUFNLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFDbkIsT0FBTyxFQUFFLEVBQUUsU0FBUyxFQUFFLEVBQ3RCLE1BQU0sR0FDUCxHQUFHLE9BQU8sQ0FBQztRQUVaLGNBQWM7UUFDZCxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7UUFFbEMsT0FBTztRQUNQLElBQUksQ0FBQyw0Q0FBNEMsQ0FBQyxDQUFDO1FBRW5ELFlBQVk7UUFDWixJQUFJLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxFQUFFO1lBQy9CLE9BQU87U0FDUjtRQUVELDRCQUE0QjtRQUM1QixNQUFNLElBQUksR0FBRyxNQUFNLE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRTtZQUNuRCxJQUFJLEVBQUUsZ0JBQWdCO1lBQ3RCLFNBQVMsRUFBRSxJQUFJO1NBQ2hCLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDVCxPQUFPO1NBQ1I7UUFFRCx3QkFBd0I7UUFDeEIsTUFBTSxVQUFV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
|
|
279
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/angular/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,27 +20,63 @@ const NewCommand = {
|
|
|
20
20
|
hidden: false,
|
|
21
21
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
22
|
// Retrieve the tools we need
|
|
23
|
-
const { filesystem, helper, parameters, print: { info, spin, success }, strings: { kebabCase, pascalCase, camelCase }, prompt: { confirm }, system, template, } = toolbox;
|
|
23
|
+
const { filesystem, helper, parameters, patching, print: { info, spin, success }, strings: { kebabCase, pascalCase, camelCase }, prompt: { confirm }, system, template, } = toolbox;
|
|
24
24
|
// Start timer
|
|
25
25
|
const timer = system.startTimer();
|
|
26
26
|
// Info
|
|
27
27
|
info('Create a new deployment');
|
|
28
|
+
// Get default project name
|
|
29
|
+
let projectName = '';
|
|
30
|
+
const config = yield filesystem.exists('lt.json');
|
|
31
|
+
if (config) {
|
|
32
|
+
yield patching.update(`lt.json`, (data) => {
|
|
33
|
+
projectName = data.name;
|
|
34
|
+
return data;
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
if (!projectName) {
|
|
38
|
+
yield patching.update(`package.json`, (data) => {
|
|
39
|
+
projectName = pascalCase(data.name);
|
|
40
|
+
return data;
|
|
41
|
+
});
|
|
42
|
+
}
|
|
28
43
|
// Get name
|
|
29
44
|
const name = yield helper.getInput(parameters.first, {
|
|
30
|
-
|
|
45
|
+
initial: projectName,
|
|
46
|
+
name: 'project name (e.g. ' + (projectName ? projectName : 'My new project') + ')',
|
|
31
47
|
});
|
|
32
48
|
if (!name) {
|
|
33
49
|
return;
|
|
34
50
|
}
|
|
35
|
-
// Get
|
|
36
|
-
const
|
|
37
|
-
|
|
51
|
+
// Get domain
|
|
52
|
+
const domain = yield helper.getInput(parameters.second, {
|
|
53
|
+
initial: kebabCase(name) + '.lenne.tech',
|
|
54
|
+
name: 'main domain of the project (e.g. ' + kebabCase(name) + '.lenne.tech)',
|
|
38
55
|
});
|
|
39
56
|
if (!name) {
|
|
40
57
|
return;
|
|
41
58
|
}
|
|
42
59
|
const gitHub = yield confirm(`Add GitHub pipeline?`);
|
|
43
60
|
const gitLab = yield confirm(`Add GitLab pipeline?`);
|
|
61
|
+
// GitLab test runner
|
|
62
|
+
let testRunner;
|
|
63
|
+
let prodRunner;
|
|
64
|
+
if (gitLab) {
|
|
65
|
+
testRunner = yield helper.getInput('', {
|
|
66
|
+
initial: 'docker-swarm',
|
|
67
|
+
name: 'runner for test (tag in .gitlab-ci.yml, e.g. docker-swarm)',
|
|
68
|
+
});
|
|
69
|
+
if (!testRunner) {
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
prodRunner = yield helper.getInput('', {
|
|
73
|
+
initial: 'docker-landing',
|
|
74
|
+
name: 'runner for production (tag in .gitlab-ci.yml, e.g. docker-landing)',
|
|
75
|
+
});
|
|
76
|
+
if (!prodRunner) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
44
80
|
// Set up initial props (to pass into templates)
|
|
45
81
|
const nameCamel = camelCase(name);
|
|
46
82
|
const nameKebab = kebabCase(name);
|
|
@@ -87,26 +123,72 @@ const NewCommand = {
|
|
|
87
123
|
yield template.generate({
|
|
88
124
|
template: 'deployment/.github/workflows/pre-release.yml.ejs',
|
|
89
125
|
target: (0, path_1.join)(cwd, '.github', 'workflows', 'pre-release.yml'),
|
|
90
|
-
props: { nameCamel, nameKebab, namePascal, url },
|
|
126
|
+
props: { nameCamel, nameKebab, namePascal, url: domain },
|
|
91
127
|
});
|
|
92
128
|
yield template.generate({
|
|
93
129
|
template: 'deployment/.github/workflows/release.yml.ejs',
|
|
94
130
|
target: (0, path_1.join)(cwd, '.github', 'workflows', 'release.yml'),
|
|
95
|
-
props: { nameCamel, nameKebab, namePascal, url },
|
|
131
|
+
props: { nameCamel, nameKebab, namePascal, url: domain },
|
|
96
132
|
});
|
|
97
133
|
}
|
|
98
134
|
if (gitLab) {
|
|
99
135
|
yield template.generate({
|
|
100
136
|
template: 'deployment/.gitlab-ci.yml.ejs',
|
|
101
137
|
target: (0, path_1.join)(cwd, '.gitlab-ci.yml'),
|
|
102
|
-
props: { nameCamel, nameKebab, namePascal, url },
|
|
138
|
+
props: { nameCamel, nameKebab, namePascal, url: domain, testRunner, prodRunner },
|
|
103
139
|
});
|
|
104
140
|
}
|
|
105
141
|
generateSpinner.succeed('Files generated');
|
|
142
|
+
const environmentsSpinner = spin('Update app environment files');
|
|
143
|
+
const prodEnv = yield filesystem.exists('projects/app/src/environments/environment.prod.ts');
|
|
144
|
+
if (prodEnv) {
|
|
145
|
+
yield patching.patch('projects/app/src/environments/environment.prod.ts', {
|
|
146
|
+
replace: new RegExp('http://127.0.0.1:3000', 'g'),
|
|
147
|
+
insert: 'https://api.' + domain,
|
|
148
|
+
});
|
|
149
|
+
yield patching.patch('projects/app/src/environments/environment.prod.ts', {
|
|
150
|
+
replace: new RegExp('ws://127.0.0.1:3000', 'g'),
|
|
151
|
+
insert: 'wss://api.' + domain,
|
|
152
|
+
});
|
|
153
|
+
yield patching.patch('projects/app/src/environments/environment.prod.ts', {
|
|
154
|
+
replace: new RegExp('http://127.0.0.1:4200', 'g'),
|
|
155
|
+
insert: 'https://' + domain,
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
info('Missing projects/app/src/environments/environment.prod.ts');
|
|
160
|
+
}
|
|
161
|
+
const testEnv = yield filesystem.exists('projects/app/src/environments/environment.test.ts');
|
|
162
|
+
if (testEnv) {
|
|
163
|
+
yield patching.patch('projects/app/src/environments/environment.test.ts', {
|
|
164
|
+
replace: new RegExp('http://127.0.0.1:3000', 'g'),
|
|
165
|
+
insert: 'https://api.test.' + domain,
|
|
166
|
+
});
|
|
167
|
+
yield patching.patch('projects/app/src/environments/environment.test.ts', {
|
|
168
|
+
replace: new RegExp('ws://127.0.0.1:3000', 'g'),
|
|
169
|
+
insert: 'wss://api.test.' + domain,
|
|
170
|
+
});
|
|
171
|
+
yield patching.patch('projects/app/src/environments/environment.test.ts', {
|
|
172
|
+
replace: new RegExp('http://127.0.0.1:4200', 'g'),
|
|
173
|
+
insert: 'https://test.' + domain,
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
else {
|
|
177
|
+
info('Missing projects/app/src/environments/environment.test.ts');
|
|
178
|
+
}
|
|
179
|
+
environmentsSpinner.succeed('App environment files updated');
|
|
106
180
|
// We're done, so show what to do next
|
|
107
181
|
info(``);
|
|
108
182
|
success(`Generated deployment for ${namePascal} in ${helper.msToMinutesAndSeconds(timer())}m.`);
|
|
109
183
|
info(``);
|
|
184
|
+
// Hint for CI/CD
|
|
185
|
+
const subDomains = ['www', 'api', 'test', 'www.test', 'api.test'];
|
|
186
|
+
let urlStr = '\n- ' + domain;
|
|
187
|
+
for (const sub of subDomains) {
|
|
188
|
+
urlStr += '\n- ' + sub + '.' + domain;
|
|
189
|
+
}
|
|
190
|
+
success(`HINT: please initialize following Domains before running the CI/CD pipeline:${urlStr}`);
|
|
191
|
+
info(``);
|
|
110
192
|
if (!toolbox.parameters.options.fromGluegunMenu) {
|
|
111
193
|
process.exit();
|
|
112
194
|
}
|
|
@@ -115,4 +197,4 @@ const NewCommand = {
|
|
|
115
197
|
}),
|
|
116
198
|
};
|
|
117
199
|
exports.default = NewCommand;
|
|
118
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
200
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/deployment/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ const NewCommand = {
|
|
|
20
20
|
hidden: false,
|
|
21
21
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
22
|
// Retrieve the tools we need
|
|
23
|
-
const { filesystem, helper, parameters, patching, print: { error, info, spin, success }, strings: { kebabCase, pascalCase, camelCase }, system, template, } = toolbox;
|
|
23
|
+
const { filesystem, helper, parameters, patching, print: { error, info, spin, success }, prompt: { ask, confirm }, server, strings: { kebabCase, pascalCase, camelCase }, system, template, } = toolbox;
|
|
24
24
|
// Start timer
|
|
25
25
|
const timer = system.startTimer();
|
|
26
26
|
// Info
|
|
@@ -50,18 +50,69 @@ const NewCommand = {
|
|
|
50
50
|
error(`Module directory "${moduleDir}" already exists.`);
|
|
51
51
|
return undefined;
|
|
52
52
|
}
|
|
53
|
+
// Set props
|
|
54
|
+
const props = {};
|
|
55
|
+
const setProps = true;
|
|
56
|
+
let refsSet = false;
|
|
57
|
+
while (setProps) {
|
|
58
|
+
const name = (yield ask({
|
|
59
|
+
type: 'input',
|
|
60
|
+
name: 'input',
|
|
61
|
+
message: `Enter property name (e.g. myProperty) to create new property or leave empty (ENTER)`,
|
|
62
|
+
})).input;
|
|
63
|
+
if (!name.trim()) {
|
|
64
|
+
break;
|
|
65
|
+
}
|
|
66
|
+
let type = (yield ask([
|
|
67
|
+
{
|
|
68
|
+
type: 'select',
|
|
69
|
+
name: 'input',
|
|
70
|
+
message: 'Choose property type',
|
|
71
|
+
choices: ['boolean', 'string', 'number', 'ObjectId / Reference', 'Date', 'Use own'],
|
|
72
|
+
},
|
|
73
|
+
])).input;
|
|
74
|
+
if (type === 'ObjectId / Reference') {
|
|
75
|
+
type = 'ObjectId';
|
|
76
|
+
}
|
|
77
|
+
if (type === 'Use own')
|
|
78
|
+
type = (yield ask({
|
|
79
|
+
type: 'input',
|
|
80
|
+
name: 'input',
|
|
81
|
+
message: `Enter property type (e.g. MyClass or MyClass[])`,
|
|
82
|
+
})).input;
|
|
83
|
+
let reference;
|
|
84
|
+
if (type === 'ObjectId') {
|
|
85
|
+
reference = (yield ask({
|
|
86
|
+
type: 'input',
|
|
87
|
+
name: 'input',
|
|
88
|
+
initial: pascalCase(name),
|
|
89
|
+
message: `Enter reference for ObjectId`,
|
|
90
|
+
})).input;
|
|
91
|
+
if (reference) {
|
|
92
|
+
refsSet = true;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
const arrayEnding = type.endsWith('[]');
|
|
96
|
+
type = type.replace('[]', '');
|
|
97
|
+
const isArray = arrayEnding || (yield confirm(`Array?`));
|
|
98
|
+
const nullable = yield confirm(`Nullable?`, true);
|
|
99
|
+
props[name] = { name, nullable, isArray, type, reference };
|
|
100
|
+
}
|
|
53
101
|
const generateSpinner = spin('Generate files');
|
|
102
|
+
const inputTemplate = server.propsForInput(props, { modelName: name, nullable: true });
|
|
103
|
+
const createTemplate = server.propsForInput(props, { modelName: name, nullable: false });
|
|
104
|
+
const modelTemplate = server.propsForModel(props, { modelName: name });
|
|
54
105
|
// nest-server-module/inputs/xxx.input.ts
|
|
55
106
|
yield template.generate({
|
|
56
107
|
template: 'nest-server-module/inputs/template.input.ts.ejs',
|
|
57
108
|
target: (0, path_1.join)(moduleDir, 'inputs', nameKebab + '.input.ts'),
|
|
58
|
-
props: { nameCamel, nameKebab, namePascal },
|
|
109
|
+
props: { nameCamel, nameKebab, namePascal, props: inputTemplate.props, imports: inputTemplate.imports },
|
|
59
110
|
});
|
|
60
111
|
// nest-server-module/inputs/xxx-create.input.ts
|
|
61
112
|
yield template.generate({
|
|
62
113
|
template: 'nest-server-module/inputs/template-create.input.ts.ejs',
|
|
63
114
|
target: (0, path_1.join)(moduleDir, 'inputs', nameKebab + '-create.input.ts'),
|
|
64
|
-
props: { nameCamel, nameKebab, namePascal },
|
|
115
|
+
props: { nameCamel, nameKebab, namePascal, props: createTemplate.props, imports: createTemplate.imports },
|
|
65
116
|
});
|
|
66
117
|
// nest-server-module/output/find-and-count-xxxs-result.output.ts
|
|
67
118
|
yield template.generate({
|
|
@@ -73,7 +124,14 @@ const NewCommand = {
|
|
|
73
124
|
yield template.generate({
|
|
74
125
|
template: 'nest-server-module/template.model.ts.ejs',
|
|
75
126
|
target: (0, path_1.join)(moduleDir, nameKebab + '.model.ts'),
|
|
76
|
-
props: {
|
|
127
|
+
props: {
|
|
128
|
+
nameCamel,
|
|
129
|
+
nameKebab,
|
|
130
|
+
namePascal,
|
|
131
|
+
props: modelTemplate.props,
|
|
132
|
+
imports: modelTemplate.imports,
|
|
133
|
+
mappings: modelTemplate.mappings,
|
|
134
|
+
},
|
|
77
135
|
});
|
|
78
136
|
// nest-server-module/xxx.module.ts
|
|
79
137
|
yield template.generate({
|
|
@@ -128,6 +186,10 @@ const NewCommand = {
|
|
|
128
186
|
info(``);
|
|
129
187
|
success(`Generated ${namePascal}Module in ${helper.msToMinutesAndSeconds(timer())}m.`);
|
|
130
188
|
info(``);
|
|
189
|
+
// We're done, so show what to do next
|
|
190
|
+
if (refsSet) {
|
|
191
|
+
success(`HINT: References have been added, so it is necessary to add the corresponding imports!`);
|
|
192
|
+
}
|
|
131
193
|
if (!toolbox.parameters.options.fromGluegunMenu) {
|
|
132
194
|
process.exit();
|
|
133
195
|
}
|
|
@@ -136,4 +198,4 @@ const NewCommand = {
|
|
|
136
198
|
}),
|
|
137
199
|
};
|
|
138
200
|
exports.default = NewCommand;
|
|
139
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
201
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/commands/server/module.ts"],"names":[],"mappings":"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"}
|