@lenne.tech/cli 0.0.106 → 0.0.108
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/bin/lt +5 -5
- package/build/cli.js +3 -2
- package/build/commands/angular/angular.js +2 -2
- package/build/commands/angular/create.js +20 -20
- package/build/commands/cli/cli.js +3 -3
- package/build/commands/cli/create.js +10 -10
- package/build/commands/cli/rename.js +3 -3
- package/build/commands/components/add.js +41 -41
- package/build/commands/components/components.js +2 -2
- package/build/commands/deployment/create.js +41 -41
- package/build/commands/deployment/deployment.js +2 -2
- package/build/commands/docs/docs.js +3 -3
- package/build/commands/docs/open.js +9 -9
- package/build/commands/fullstack/fullstack.js +2 -2
- package/build/commands/fullstack/init.js +17 -15
- package/build/commands/git/clean.js +6 -6
- package/build/commands/git/clear.js +4 -4
- package/build/commands/git/create.js +7 -7
- package/build/commands/git/force-pull.js +4 -4
- package/build/commands/git/get.js +10 -10
- package/build/commands/git/git.js +3 -3
- package/build/commands/git/rebase.js +2 -2
- package/build/commands/git/rename.js +5 -5
- package/build/commands/git/reset.js +12 -16
- package/build/commands/git/squash.js +28 -21
- package/build/commands/git/undo.js +3 -3
- package/build/commands/git/update.js +4 -4
- package/build/commands/lt.js +4 -4
- package/build/commands/npm/npm.js +3 -3
- package/build/commands/npm/reinit.js +7 -7
- package/build/commands/npm/update.js +6 -6
- package/build/commands/server/add-property.js +131 -0
- package/build/commands/server/create-secret.js +3 -3
- package/build/commands/server/create.js +15 -20
- package/build/commands/server/module.js +64 -108
- package/build/commands/server/object.js +51 -95
- package/build/commands/server/server.js +3 -3
- package/build/commands/server/test.js +9 -9
- package/build/commands/starter/chrome-extension.js +11 -11
- package/build/commands/starter/starter.js +3 -3
- package/build/commands/tools/crypt.js +4 -4
- package/build/commands/tools/jwt-read.js +6 -6
- package/build/commands/tools/regex.js +3 -3
- package/build/commands/tools/sha256.js +4 -4
- package/build/commands/tools/tools.js +3 -3
- package/build/commands/typescript/create.js +14 -14
- package/build/commands/typescript/playground.js +9 -9
- package/build/commands/typescript/typescript.js +3 -3
- package/build/commands/update.js +4 -4
- package/build/extensions/git.js +19 -19
- package/build/extensions/server.js +241 -37
- package/build/extensions/tools.js +6 -6
- package/build/extensions/typescript.js +10 -10
- package/build/interfaces/extended-gluegun-command.js +3 -0
- package/package.json +18 -18
|
@@ -14,26 +14,26 @@ const open = require("open");
|
|
|
14
14
|
* Open documentations
|
|
15
15
|
*/
|
|
16
16
|
const NewCommand = {
|
|
17
|
-
name: 'open',
|
|
18
17
|
alias: ['o'],
|
|
19
18
|
description: 'Open documentation',
|
|
20
19
|
hidden: false,
|
|
20
|
+
name: 'open',
|
|
21
21
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
22
|
// Retrieve the tools we need
|
|
23
|
-
const { helper, parameters, print: { error }, prompt: { ask } } = toolbox;
|
|
23
|
+
const { helper, parameters, print: { error }, prompt: { ask }, } = toolbox;
|
|
24
24
|
const choices = ['lenne.Tech', 'NestJS', 'GlueGun'];
|
|
25
25
|
// Get input
|
|
26
26
|
let input = yield helper.getInput(parameters.first, {
|
|
27
27
|
name: 'doc',
|
|
28
|
-
showError: true
|
|
28
|
+
showError: true,
|
|
29
29
|
});
|
|
30
30
|
if (!input || !choices.includes(input)) {
|
|
31
31
|
// Select type
|
|
32
32
|
const { type } = yield ask({
|
|
33
|
-
|
|
34
|
-
name: 'type',
|
|
33
|
+
choices: choices.slice(0),
|
|
35
34
|
message: 'Select',
|
|
36
|
-
|
|
35
|
+
name: 'type',
|
|
36
|
+
type: 'select',
|
|
37
37
|
});
|
|
38
38
|
input = type;
|
|
39
39
|
}
|
|
@@ -56,8 +56,8 @@ const NewCommand = {
|
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
// For tests
|
|
59
|
-
return
|
|
60
|
-
})
|
|
59
|
+
return 'docs open';
|
|
60
|
+
}),
|
|
61
61
|
};
|
|
62
62
|
exports.default = NewCommand;
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3Blbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9kb2NzL29wZW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFDQSw2QkFBNkI7QUFJN0I7O0dBRUc7QUFDSCxNQUFNLFVBQVUsR0FBbUI7SUFDakMsS0FBSyxFQUFFLENBQUMsR0FBRyxDQUFDO0lBQ1osV0FBVyxFQUFFLG9CQUFvQjtJQUNqQyxNQUFNLEVBQUUsS0FBSztJQUNiLElBQUksRUFBRSxNQUFNO0lBQ1osR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osTUFBTSxFQUNOLFVBQVUsRUFDVixLQUFLLEVBQUUsRUFBRSxLQUFLLEVBQUUsRUFDaEIsTUFBTSxFQUFFLEVBQUUsR0FBRyxFQUFFLEdBQ2hCLEdBQUcsT0FBTyxDQUFDO1FBRVosTUFBTSxPQUFPLEdBQUcsQ0FBQyxZQUFZLEVBQUUsUUFBUSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBRXBELFlBQVk7UUFDWixJQUFJLEtBQUssR0FBRyxNQUFNLE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRTtZQUNsRCxJQUFJLEVBQUUsS0FBSztZQUNYLFNBQVMsRUFBRSxJQUFJO1NBQ2hCLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxLQUFLLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDdkMsY0FBYztZQUNkLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxNQUFNLEdBQUcsQ0FBQztnQkFDekIsT0FBTyxFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO2dCQUN6QixPQUFPLEVBQUUsUUFBUTtnQkFDakIsSUFBSSxFQUFFLE1BQU07Z0JBQ1osSUFBSSxFQUFFLFFBQVE7YUFDZixDQUFDLENBQUM7WUFDSCxLQUFLLEdBQUcsSUFBSSxDQUFDO1FBQ2YsQ0FBQztRQUVELFFBQVEsS0FBSyxFQUFFLENBQUM7WUFDZCxLQUFLLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ2hCLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLENBQUM7Z0JBQ2hDLE1BQU07WUFDUixDQUFDO1lBQ0QsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUNoQixNQUFNLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO2dCQUN2QyxNQUFNO1lBQ1IsQ0FBQztZQUNELEtBQUssT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDaEIsTUFBTSxJQUFJLENBQUMseURBQXlELENBQUMsQ0FBQztnQkFDdEUsTUFBTTtZQUNSLENBQUM7WUFDRCxPQUFPLENBQUMsQ0FBQyxDQUFDO2dCQUNSLEtBQUssQ0FBQyxHQUFHLEtBQUssYUFBYSxDQUFDLENBQUM7Z0JBQzdCLE9BQU87WUFDVCxDQUFDO1FBQ0gsQ0FBQztRQUVELFlBQVk7UUFDWixPQUFPLFdBQVcsQ0FBQztJQUNyQixDQUFDLENBQUE7Q0FDRixDQUFDO0FBRUYsa0JBQWUsVUFBVSxDQUFDIn0=
|
|
@@ -13,13 +13,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
* Fullstack commands
|
|
14
14
|
*/
|
|
15
15
|
module.exports = {
|
|
16
|
-
name: 'fullstack',
|
|
17
16
|
alias: ['full'],
|
|
18
17
|
description: 'Fullstack commands',
|
|
19
18
|
hidden: true,
|
|
19
|
+
name: 'fullstack',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
yield toolbox.helper.showMenu('fullstack');
|
|
22
22
|
return 'fullstack';
|
|
23
23
|
}),
|
|
24
24
|
};
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVsbHN0YWNrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2Z1bGxzdGFjay9mdWxsc3RhY2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFFQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxPQUFPLEdBQUc7SUFDZixLQUFLLEVBQUUsQ0FBQyxNQUFNLENBQUM7SUFDZixXQUFXLEVBQUUsb0JBQW9CO0lBQ2pDLE1BQU0sRUFBRSxJQUFJO0lBQ1osSUFBSSxFQUFFLFdBQVc7SUFDakIsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLE1BQU0sT0FBTyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDM0MsT0FBTyxXQUFXLENBQUM7SUFDckIsQ0FBQyxDQUFBO0NBQ0YsQ0FBQyJ9
|
|
@@ -9,17 +9,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const gluegun_1 = require("gluegun");
|
|
12
13
|
/**
|
|
13
14
|
* Create a new server
|
|
14
15
|
*/
|
|
15
16
|
const NewCommand = {
|
|
16
|
-
name: 'init',
|
|
17
17
|
alias: ['init'],
|
|
18
18
|
description: 'Creates a new fullstack workspace',
|
|
19
19
|
hidden: false,
|
|
20
|
+
name: 'init',
|
|
20
21
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
22
|
// Retrieve the tools we need
|
|
22
|
-
const { filesystem, git, helper, parameters, print: { error, info, spin, success }, prompt: {
|
|
23
|
+
const { filesystem, git, helper, parameters, print: { error, info, spin, success }, prompt: { ask, confirm }, server, strings: { kebabCase }, system, } = toolbox;
|
|
23
24
|
// Start timer
|
|
24
25
|
const timer = system.startTimer();
|
|
25
26
|
// Info
|
|
@@ -40,14 +41,14 @@ const NewCommand = {
|
|
|
40
41
|
const projectDir = kebabCase(name);
|
|
41
42
|
// Check if directory already exists
|
|
42
43
|
if (filesystem.exists(projectDir)) {
|
|
43
|
-
info(
|
|
44
|
+
info('');
|
|
44
45
|
error(`There's already a folder named "${projectDir}" here.`);
|
|
45
46
|
return undefined;
|
|
46
47
|
}
|
|
47
48
|
let frontend = (yield ask({
|
|
48
|
-
type: 'input',
|
|
49
|
-
name: 'frontend',
|
|
50
49
|
message: 'Angular (a) or Nuxt 3 (n)',
|
|
50
|
+
name: 'frontend',
|
|
51
|
+
type: 'input',
|
|
51
52
|
})).frontend;
|
|
52
53
|
if (frontend === 'a') {
|
|
53
54
|
frontend = 'angular';
|
|
@@ -61,7 +62,7 @@ const NewCommand = {
|
|
|
61
62
|
let addToGit = false;
|
|
62
63
|
let gitLink;
|
|
63
64
|
if (parameters.third !== 'false') {
|
|
64
|
-
addToGit = parameters.third === 'true' || (yield confirm(
|
|
65
|
+
addToGit = parameters.third === 'true' || (yield confirm('Add workspace to a new git repository?'));
|
|
65
66
|
// Check if git init is active
|
|
66
67
|
if (addToGit) {
|
|
67
68
|
// Get name of the app
|
|
@@ -100,7 +101,7 @@ const NewCommand = {
|
|
|
100
101
|
yield system.run(`cd ${projectDir}/projects && git clone https://github.com/lenneTech/ng-base-starter.git app`);
|
|
101
102
|
}
|
|
102
103
|
else {
|
|
103
|
-
yield system.run(
|
|
104
|
+
yield system.run('npm i -g create-nuxt-base');
|
|
104
105
|
yield system.run(`cd ${projectDir}/projects && create-nuxt-base app`);
|
|
105
106
|
}
|
|
106
107
|
// Remove gitkeep file
|
|
@@ -118,7 +119,7 @@ const NewCommand = {
|
|
|
118
119
|
ngBaseSpinner.succeed(`Example for ${frontend} integrated`);
|
|
119
120
|
// Include files from https://github.com/lenneTech/nest-server-starter
|
|
120
121
|
// Init
|
|
121
|
-
const serverSpinner = spin(
|
|
122
|
+
const serverSpinner = spin('Integrate Nest Server Starter');
|
|
122
123
|
// Clone api
|
|
123
124
|
yield system.run(`cd ${projectDir}/projects && git clone https://github.com/lenneTech/nest-server-starter api`);
|
|
124
125
|
// Integrate files
|
|
@@ -127,10 +128,11 @@ const NewCommand = {
|
|
|
127
128
|
yield system.run(`cd ${projectDir}/projects/api && rm -rf .git`);
|
|
128
129
|
// Prepare meta.json in api
|
|
129
130
|
filesystem.write(`./${projectDir}/projects/api/src/meta.json`, {
|
|
130
|
-
name: `${name}-api-server`,
|
|
131
131
|
description: `API for ${name} app`,
|
|
132
|
+
name: `${name}-api-server`,
|
|
132
133
|
version: '0.0.0',
|
|
133
134
|
});
|
|
135
|
+
yield gluegun_1.patching.update(`./${projectDir}/projects/api/src/config.env.ts`, server.replaceSecretOrPrivateKeys);
|
|
134
136
|
// Check if git init is active
|
|
135
137
|
if (addToGit) {
|
|
136
138
|
// Commit changes
|
|
@@ -147,14 +149,14 @@ const NewCommand = {
|
|
|
147
149
|
yield system.run(`cd ${projectDir} && npm i && npm run init`);
|
|
148
150
|
installSpinner.succeed('Successfull installed all packages');
|
|
149
151
|
// We're done, so show what to do next
|
|
150
|
-
info(
|
|
152
|
+
info('');
|
|
151
153
|
success(`Generated fullstack workspace with ${frontend} in ${projectDir} with ${name} app in ${helper.msToMinutesAndSeconds(timer())}m.`);
|
|
152
|
-
info(
|
|
153
|
-
info(
|
|
154
|
+
info('');
|
|
155
|
+
info('Next:');
|
|
154
156
|
info(` Run ${name}`);
|
|
155
157
|
info(` $ cd ${projectDir}`);
|
|
156
|
-
info(
|
|
157
|
-
info(
|
|
158
|
+
info(' $ npm run start');
|
|
159
|
+
info('');
|
|
158
160
|
if (!toolbox.parameters.options.fromGluegunMenu) {
|
|
159
161
|
process.exit();
|
|
160
162
|
}
|
|
@@ -164,4 +166,4 @@ const NewCommand = {
|
|
|
164
166
|
}),
|
|
165
167
|
};
|
|
166
168
|
exports.default = NewCommand;
|
|
167
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
169
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9mdWxsc3RhY2svaW5pdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBLHFDQUFtRDtBQUtuRDs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxLQUFLLEVBQUUsQ0FBQyxNQUFNLENBQUM7SUFDZixXQUFXLEVBQUUsbUNBQW1DO0lBQ2hELE1BQU0sRUFBRSxLQUFLO0lBQ2IsSUFBSSxFQUFFLE1BQU07SUFDWixHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7UUFDN0MsNkJBQTZCO1FBQzdCLE1BQU0sRUFDSixVQUFVLEVBQ1YsR0FBRyxFQUNILE1BQU0sRUFDTixVQUFVLEVBQ1YsS0FBSyxFQUFFLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEVBQ3JDLE1BQU0sRUFBRSxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsRUFDeEIsTUFBTSxFQUNOLE9BQU8sRUFBRSxFQUFFLFNBQVMsRUFBRSxFQUN0QixNQUFNLEdBQ1AsR0FBRyxPQUFPLENBQUM7UUFFWixjQUFjO1FBQ2QsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBRWxDLE9BQU87UUFDUCxJQUFJLENBQUMsa0NBQWtDLENBQUMsQ0FBQztRQUV6QyxZQUFZO1FBQ1osSUFBSSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsWUFBWSxFQUFFLENBQUMsRUFBRSxDQUFDO1lBQ2hDLE9BQU87UUFDVCxDQUFDO1FBRUQsNEJBQTRCO1FBQzVCLE1BQU0sSUFBSSxHQUFHLE1BQU0sTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFO1lBQ25ELElBQUksRUFBRSxnQkFBZ0I7WUFDdEIsU0FBUyxFQUFFLElBQUk7U0FDaEIsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLElBQUksRUFBRSxD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
|
|
@@ -13,10 +13,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
* Removed local merged branches
|
|
14
14
|
*/
|
|
15
15
|
const NewCommand = {
|
|
16
|
-
name: 'clean',
|
|
17
16
|
alias: ['rm'],
|
|
18
17
|
description: 'Removed local merged branches',
|
|
19
18
|
hidden: false,
|
|
19
|
+
name: 'clean',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
// Retrieve the tools we need
|
|
22
22
|
const { git, helper, print: { info, spin, success }, system: { run, startTimer }, } = toolbox;
|
|
@@ -44,25 +44,25 @@ const NewCommand = {
|
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
46
|
yield run(`git checkout ${branch}`);
|
|
47
|
-
info(
|
|
47
|
+
info(`Changed Branch to ${branch}`);
|
|
48
48
|
}
|
|
49
49
|
// Start timer
|
|
50
50
|
const timer = startTimer();
|
|
51
51
|
// Reset soft
|
|
52
|
-
const undoSpinner = spin(
|
|
52
|
+
const undoSpinner = spin('Start cleaning');
|
|
53
53
|
const resultFetch = yield run('git fetch -p');
|
|
54
54
|
info(resultFetch);
|
|
55
55
|
const resultpull = yield run('git pull');
|
|
56
56
|
info(resultpull);
|
|
57
|
-
const resultDelete = yield run(
|
|
57
|
+
const resultDelete = yield run('git branch --merged | egrep -v "(^\\*|main|dev|develop|beta|intern|release)" | xargs git branch -d');
|
|
58
58
|
info(resultDelete);
|
|
59
59
|
undoSpinner.succeed();
|
|
60
60
|
// Success
|
|
61
61
|
success(`Successfull cleaned in ${helper.msToMinutesAndSeconds(timer())}m.`);
|
|
62
62
|
info('');
|
|
63
63
|
// For tests
|
|
64
|
-
return
|
|
64
|
+
return 'cleaned local';
|
|
65
65
|
}),
|
|
66
66
|
};
|
|
67
67
|
exports.default = NewCommand;
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvZ2l0L2NsZWFuLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBSUE7O0dBRUc7QUFDSCxNQUFNLFVBQVUsR0FBbUI7SUFDakMsS0FBSyxFQUFFLENBQUMsSUFBSSxDQUFDO0lBQ2IsV0FBVyxFQUFFLCtCQUErQjtJQUM1QyxNQUFNLEVBQUUsS0FBSztJQUNiLElBQUksRUFBRSxPQUFPO0lBQ2IsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osR0FBRyxFQUNILE1BQU0sRUFDTixLQUFLLEVBQUUsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUM5QixNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFLEdBQzVCLEdBQUcsT0FBTyxDQUFDO1FBRVosWUFBWTtRQUNaLElBQUksQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLFlBQVksRUFBRSxDQUFDLEVBQUUsQ0FBQztZQUNoQyxPQUFPO1FBQ1QsQ0FBQztRQUVELHFCQUFxQjtRQUNyQixNQUFNLGFBQWEsR0FBRyxNQUFNLEdBQUcsQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUVoRCxJQUFJLE1BQU0sQ0FBQztRQUNYLElBQUksYUFBYSxLQUFLLEtBQUssSUFBSSxhQUFhLEtBQUssTUFBTSxFQUFFLENBQUM7WUFDeEQsZ0RBQWdEO1lBQ2hELE1BQU0sR0FBRyxNQUFNLEdBQUcsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFO2dCQUNsQyxLQUFLLEVBQUUsS0FBSztnQkFDWixLQUFLLEVBQUUsS0FBSztnQkFDWixNQUFNLEVBQUUsS0FBSztnQkFDYixJQUFJLEVBQUUsSUFBSTthQUNYLENBQUMsQ0FBQztZQUVILElBQUksTUFBTSxLQUFLLEtBQUssRUFBRSxDQUFDO2dCQUNyQixNQUFNLEdBQUcsTUFBTSxHQUFHLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRTtvQkFDbkMsS0FBSyxFQUFFLElBQUk7b0JBQ1gsS0FBSyxFQUFFLEtBQUs7b0JBQ1osTUFBTSxFQUFFLEtBQUs7b0JBQ2IsSUFBSSxFQUFFLElBQUk7aUJBQ1gsQ0FBQyxDQUFDO1lBQ0wsQ0FBQztZQUVELE1BQU0sR0FBRyxDQUFDLGdCQUFnQixNQUFNLEVBQUUsQ0FBQyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxxQkFBcUIsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUN0QyxDQUFDO1FBRUQsY0FBYztRQUNkLE1BQU0sS0FBSyxHQUFHLFVBQVUsRUFBRSxDQUFDO1FBRTNCLGFBQWE7UUFDYixNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUUzQyxNQUFNLFdBQVcsR0FBRyxNQUFNLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUM5QyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7UUFFbEIsTUFBTSxVQUFVLEdBQUcsTUFBTSxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDekMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBRWpCLE1BQU0sWUFBWSxHQUFHLE1BQU0sR0FBRyxDQUM1QixvR0FBb0csQ0FDckcsQ0FBQztRQUNGLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUVuQixXQUFXLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFdEIsVUFBVTtRQUNWLE9BQU8sQ0FBQywwQkFBMEIsTUFBTSxDQUFDLHFCQUFxQixDQUFDLEtBQUssRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzdFLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUVULFlBQVk7UUFDWixPQUFPLGVBQWUsQ0FBQztJQUN6QixDQUFDLENBQUE7Q0FDRixDQUFDO0FBRUYsa0JBQWUsVUFBVSxDQUFDIn0=
|
|
@@ -13,13 +13,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
* Undo current changes
|
|
14
14
|
*/
|
|
15
15
|
const NewCommand = {
|
|
16
|
-
name: 'clear',
|
|
17
16
|
alias: ['cl'],
|
|
18
17
|
description: 'Undo current changes',
|
|
19
18
|
hidden: false,
|
|
19
|
+
name: 'clear',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
// Retrieve the tools we need
|
|
22
|
-
const { git, helper, parameters,
|
|
22
|
+
const { git, helper, parameters, print: { info, spin, success }, prompt: { confirm }, system: { run, startTimer }, } = toolbox;
|
|
23
23
|
// Check git
|
|
24
24
|
if (!(yield git.gitInstalled())) {
|
|
25
25
|
return;
|
|
@@ -41,7 +41,7 @@ const NewCommand = {
|
|
|
41
41
|
info('');
|
|
42
42
|
// For tests
|
|
43
43
|
return `clear branch ${branch}`;
|
|
44
|
-
})
|
|
44
|
+
}),
|
|
45
45
|
};
|
|
46
46
|
exports.default = NewCommand;
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvZ2l0L2NsZWFyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBSUE7O0dBRUc7QUFDSCxNQUFNLFVBQVUsR0FBbUI7SUFDakMsS0FBSyxFQUFFLENBQUMsSUFBSSxDQUFDO0lBQ2IsV0FBVyxFQUFFLHNCQUFzQjtJQUNuQyxNQUFNLEVBQUUsS0FBSztJQUNiLElBQUksRUFBRSxPQUFPO0lBQ2IsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osR0FBRyxFQUNILE1BQU0sRUFDTixVQUFVLEVBQ1YsS0FBSyxFQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsRUFDOUIsTUFBTSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQ25CLE1BQU0sRUFBRSxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUUsR0FDNUIsR0FBRyxPQUFPLENBQUM7UUFFWixZQUFZO1FBQ1osSUFBSSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsWUFBWSxFQUFFLENBQUMsRUFBRSxDQUFDO1lBQ2hDLE9BQU87UUFDVCxDQUFDO1FBRUQscUJBQXFCO1FBQ3JCLE1BQU0sTUFBTSxHQUFHLE1BQU0sR0FBRyxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBRXpDLDJCQUEyQjtRQUMzQixJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxTQUFTLElBQUksQ0FBQyxDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsTUFBTSxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUM7WUFDNUUsT0FBTztRQUNULENBQUM7UUFFRCxjQUFjO1FBQ2QsTUFBTSxLQUFLLEdBQUcsVUFBVSxFQUFFLENBQUM7UUFFM0IsYUFBYTtRQUNiLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxTQUFTLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDNUMsTUFBTSxHQUFHLENBQUMsbUNBQW1DLENBQUMsQ0FBQztRQUMvQyxXQUFXLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFdEIsVUFBVTtRQUNWLE9BQU8sQ0FBQyxTQUFTLE1BQU0sT0FBTyxNQUFNLENBQUMscUJBQXFCLENBQUMsS0FBSyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDekUsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRVQsWUFBWTtRQUNaLE9BQU8sZ0JBQWdCLE1BQU0sRUFBRSxDQUFDO0lBQ2xDLENBQUMsQ0FBQTtDQUNGLENBQUM7QUFFRixrQkFBZSxVQUFVLENBQUMifQ==
|
|
@@ -13,13 +13,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
* Create a new branch
|
|
14
14
|
*/
|
|
15
15
|
const NewCommand = {
|
|
16
|
-
name: 'create',
|
|
17
16
|
alias: ['c'],
|
|
18
17
|
description: 'Create a new branch',
|
|
19
18
|
hidden: false,
|
|
19
|
+
name: 'create',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
// Retrieve the tools we need
|
|
22
|
-
const { git, helper, npm, parameters, print: { error, info, spin, success }, system } = toolbox;
|
|
22
|
+
const { git, helper, npm, parameters, print: { error, info, spin, success }, system, } = toolbox;
|
|
23
23
|
// Check git
|
|
24
24
|
if (!(yield git.gitInstalled())) {
|
|
25
25
|
return;
|
|
@@ -29,7 +29,7 @@ const NewCommand = {
|
|
|
29
29
|
// Get branch
|
|
30
30
|
const branch = yield helper.getInput(parameters.first, {
|
|
31
31
|
name: 'branch name',
|
|
32
|
-
showError: true
|
|
32
|
+
showError: true,
|
|
33
33
|
});
|
|
34
34
|
if (!branch) {
|
|
35
35
|
return;
|
|
@@ -46,8 +46,8 @@ const NewCommand = {
|
|
|
46
46
|
// Start timer
|
|
47
47
|
const timer = system.startTimer();
|
|
48
48
|
// Checkout
|
|
49
|
-
const createSpin = spin(
|
|
50
|
-
yield system.run(
|
|
49
|
+
const createSpin = spin(`Create ${branch}`);
|
|
50
|
+
yield system.run('git fetch &&' + `git checkout ${baseBranch} &&` + 'git pull && ' + `git checkout -b ${branch}`);
|
|
51
51
|
createSpin.succeed();
|
|
52
52
|
// Install npm packages
|
|
53
53
|
yield npm.install();
|
|
@@ -56,7 +56,7 @@ const NewCommand = {
|
|
|
56
56
|
info('');
|
|
57
57
|
// For tests
|
|
58
58
|
return `created branch ${branch}`;
|
|
59
|
-
})
|
|
59
|
+
}),
|
|
60
60
|
};
|
|
61
61
|
exports.default = NewCommand;
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2dpdC9jcmVhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFJQTs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUscUJBQXFCO0lBQ2xDLE1BQU0sRUFBRSxLQUFLO0lBQ2IsSUFBSSxFQUFFLFFBQVE7SUFDZCxHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7UUFDN0MsNkJBQTZCO1FBQzdCLE1BQU0sRUFDSixHQUFHLEVBQ0gsTUFBTSxFQUNOLEdBQUcsRUFDSCxVQUFVLEVBQ1YsS0FBSyxFQUFFLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEVBQ3JDLE1BQU0sR0FDUCxHQUFHLE9BQU8sQ0FBQztRQUVaLFlBQVk7UUFDWixJQUFJLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxFQUFFLENBQUM7WUFDaEMsT0FBTztRQUNULENBQUM7UUFFRCxtREFBbUQ7UUFDbkQsTUFBTSxHQUFHLENBQUMsV0FBVyxFQUFFLENBQUM7UUFFeEIsYUFBYTtRQUNiLE1BQU0sTUFBTSxHQUFHLE1BQU0sTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFO1lBQ3JELElBQUksRUFBRSxhQUFhO1lBQ25CLFNBQVMsRUFBRSxJQUFJO1NBQ2hCLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNaLE9BQU87UUFDVCxDQUFDO1FBRUQsaUNBQWlDO1FBQ2pDLElBQUksTUFBTSxHQUFHLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7WUFDaEMsS0FBSyxDQUFDLFVBQVUsTUFBTSxrQkFBa0IsQ0FBQyxDQUFDO1FBQzVDLENBQUM7UUFFRCxxQkFBcUI7UUFDckIsSUFBSSxVQUFVLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQztRQUNuQyxJQUFJLENBQUMsVUFBVSxJQUFJLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUMsRUFBRSxDQUFDO1lBQ3RELFVBQVUsR0FBRyxNQUFNLEdBQUcsQ0FBQyxZQUFZLENBQUMsRUFBRSxJQUFJLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQyxDQUFDO1FBQ3RFLENBQUM7UUFFRCxjQUFjO1FBQ2QsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBRWxDLFdBQVc7UUFDWCxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsVUFBVSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQzVDLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyxjQUFjLEdBQUcsZ0JBQWdCLFVBQVUsS0FBSyxHQUFHLGNBQWMsR0FBRyxtQkFBbUIsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUNsSCxVQUFVLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFckIsdUJBQXVCO1FBQ3ZCLE1BQU0sR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBRXBCLGVBQWU7UUFDZixPQUFPLENBQUMsVUFBVSxNQUFNLG1CQUFtQixNQUFNLENBQUMscUJBQXFCLENBQUMsS0FBSyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdEYsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRVQsWUFBWTtRQUNaLE9BQU8sa0JBQWtCLE1BQU0sRUFBRSxDQUFDO0lBQ3BDLENBQUMsQ0FBQTtDQUNGLENBQUM7QUFFRixrQkFBZSxVQUFVLENBQUMifQ==
|
|
@@ -13,13 +13,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
* Pull branch with loosing changes
|
|
14
14
|
*/
|
|
15
15
|
const NewCommand = {
|
|
16
|
-
name: 'force-pull',
|
|
17
16
|
alias: ['pf', 'pull-force'],
|
|
18
17
|
description: 'Pull branch with loosing changes',
|
|
19
18
|
hidden: false,
|
|
19
|
+
name: 'force-pull',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
// Retrieve the tools we need
|
|
22
|
-
const { git, helper, parameters,
|
|
22
|
+
const { git, helper, parameters, print: { info, spin, success }, prompt, system: { run, startTimer }, } = toolbox;
|
|
23
23
|
// Check git
|
|
24
24
|
if (!(yield git.gitInstalled())) {
|
|
25
25
|
return;
|
|
@@ -27,7 +27,7 @@ const NewCommand = {
|
|
|
27
27
|
// Get current branch
|
|
28
28
|
const branch = yield git.currentBranch();
|
|
29
29
|
// Ask for reset
|
|
30
|
-
if (!parameters.options.noConfirm && !(yield prompt.confirm(
|
|
30
|
+
if (!parameters.options.noConfirm && !(yield prompt.confirm('You will lose your changes, are you sure?'))) {
|
|
31
31
|
return;
|
|
32
32
|
}
|
|
33
33
|
// Start timer
|
|
@@ -44,4 +44,4 @@ const NewCommand = {
|
|
|
44
44
|
}),
|
|
45
45
|
};
|
|
46
46
|
exports.default = NewCommand;
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9yY2UtcHVsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9naXQvZm9yY2UtcHVsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUlBOztHQUVHO0FBQ0gsTUFBTSxVQUFVLEdBQW1CO0lBQ2pDLEtBQUssRUFBRSxDQUFDLElBQUksRUFBRSxZQUFZLENBQUM7SUFDM0IsV0FBVyxFQUFFLGtDQUFrQztJQUMvQyxNQUFNLEVBQUUsS0FBSztJQUNiLElBQUksRUFBRSxZQUFZO0lBQ2xCLEdBQUcsRUFBRSxDQUFPLE9BQStCLEVBQUUsRUFBRTtRQUM3Qyw2QkFBNkI7UUFDN0IsTUFBTSxFQUNKLEdBQUcsRUFDSCxNQUFNLEVBQ04sVUFBVSxFQUNWLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEVBQzlCLE1BQU0sRUFDTixNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFLEdBQzVCLEdBQUcsT0FBTyxDQUFDO1FBRVosWUFBWTtRQUNaLElBQUksQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLFlBQVksRUFBRSxDQUFDLEVBQUUsQ0FBQztZQUNoQyxPQUFPO1FBQ1QsQ0FBQztRQUVELHFCQUFxQjtRQUNyQixNQUFNLE1BQU0sR0FBRyxNQUFNLEdBQUcsQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUV6QyxnQkFBZ0I7UUFDaEIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsU0FBUyxJQUFJLENBQUMsQ0FBQyxNQUFNLE1BQU0sQ0FBQyxPQUFPLENBQUMsMkNBQTJDLENBQUMsQ0FBQyxFQUFFLENBQUM7WUFDMUcsT0FBTztRQUNULENBQUM7UUFFRCxjQUFjO1FBQ2QsTUFBTSxLQUFLLEdBQUcsVUFBVSxFQUFFLENBQUM7UUFFM0IsYUFBYTtRQUNiLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxrQkFBa0IsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUNyRCxNQUFNLEdBQUcsQ0FBQyxpQ0FBaUMsTUFBTSxTQUFTLENBQUMsQ0FBQztRQUM1RCxXQUFXLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFdEIsVUFBVTtRQUNWLE9BQU8sQ0FBQyxRQUFRLE1BQU0sT0FBTyxNQUFNLENBQUMscUJBQXFCLENBQUMsS0FBSyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDeEUsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRVQsWUFBWTtRQUNaLE9BQU8sZUFBZSxNQUFNLEVBQUUsQ0FBQztJQUNqQyxDQUFDLENBQUE7Q0FDRixDQUFDO0FBRUYsa0JBQWUsVUFBVSxDQUFDIn0=
|
|
@@ -13,10 +13,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
* Checkout git branch
|
|
14
14
|
*/
|
|
15
15
|
const NewCommand = {
|
|
16
|
-
name: 'get',
|
|
17
16
|
alias: ['g'],
|
|
18
17
|
description: 'Checkout git branch',
|
|
19
18
|
hidden: false,
|
|
19
|
+
name: 'get',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
// Retrieve the tools we need
|
|
22
22
|
const { filesystem, git, helper, npm, parameters, print: { error, info, spin, success }, prompt, system, } = toolbox;
|
|
@@ -52,13 +52,13 @@ const NewCommand = {
|
|
|
52
52
|
const remoteBranch = yield git.getBranch(branch, { remote: true });
|
|
53
53
|
// Ask for checkout branch
|
|
54
54
|
if (branchName !== branch) {
|
|
55
|
-
if (!parameters.options.noConfirm
|
|
56
|
-
!(yield prompt.confirm(
|
|
55
|
+
if (!parameters.options.noConfirm
|
|
56
|
+
&& !(yield prompt.confirm(`Checkout ${remoteBranch ? 'remote' : 'local'} branch ${branch}`))) {
|
|
57
57
|
return;
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
// Checkout branch
|
|
61
|
-
yield system.run(
|
|
61
|
+
yield system.run(`git checkout ${(yield git.getDefaultBranch()) || 'main'}`);
|
|
62
62
|
let checkoutSpin;
|
|
63
63
|
// Handling for remote
|
|
64
64
|
if (remoteBranch) {
|
|
@@ -74,7 +74,7 @@ const NewCommand = {
|
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
76
|
if (mode === 'hard') {
|
|
77
|
-
const prepareSpin = spin(
|
|
77
|
+
const prepareSpin = spin(`Refresh ${branch}`);
|
|
78
78
|
yield system.run(`git branch -D ${branch}`);
|
|
79
79
|
removed = true;
|
|
80
80
|
prepareSpin.succeed();
|
|
@@ -84,7 +84,7 @@ const NewCommand = {
|
|
|
84
84
|
checkSpin.succeed();
|
|
85
85
|
}
|
|
86
86
|
// Start spin
|
|
87
|
-
checkoutSpin = spin(
|
|
87
|
+
checkoutSpin = spin(`Checkout ${branch}`);
|
|
88
88
|
// Checkout remote if local branch not exists
|
|
89
89
|
if (removed || !(yield git.getBranch(branch, { local: true }))) {
|
|
90
90
|
yield system.run(`git fetch && git checkout --track origin/${branch} && git reset --hard && git clean -fd && git pull`);
|
|
@@ -96,7 +96,7 @@ const NewCommand = {
|
|
|
96
96
|
// Handling for local only
|
|
97
97
|
}
|
|
98
98
|
else if (branch) {
|
|
99
|
-
checkoutSpin = spin(
|
|
99
|
+
checkoutSpin = spin(`Checkout ${branch}`);
|
|
100
100
|
yield system.run(`git fetch && git checkout ${branch} && git reset --hard && git clean -fd`);
|
|
101
101
|
// No branch found
|
|
102
102
|
}
|
|
@@ -109,9 +109,9 @@ const NewCommand = {
|
|
|
109
109
|
// Install npm packages
|
|
110
110
|
yield npm.install();
|
|
111
111
|
// Init lerna projects
|
|
112
|
-
if (filesystem.isFile(
|
|
112
|
+
if (filesystem.isFile('./lerna.json')) {
|
|
113
113
|
const initProjectsSpin = spin('Init projects');
|
|
114
|
-
yield system.run(
|
|
114
|
+
yield system.run('npm run init --if-present');
|
|
115
115
|
initProjectsSpin.succeed();
|
|
116
116
|
}
|
|
117
117
|
// Success info
|
|
@@ -125,4 +125,4 @@ const NewCommand = {
|
|
|
125
125
|
}),
|
|
126
126
|
};
|
|
127
127
|
exports.default = NewCommand;
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2dpdC9nZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFJQTs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUscUJBQXFCO0lBQ2xDLE1BQU0sRUFBRSxLQUFLO0lBQ2IsSUFBSSxFQUFFLEtBQUs7SUFDWCxHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7UUFDN0MsNkJBQTZCO1FBQzdCLE1BQU0sRUFDSixVQUFVLEVBQ1YsR0FBRyxFQUNILE1BQU0sRUFDTixHQUFHLEVBQ0gsVUFBVSxFQUNWLEtBQUssRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNyQyxNQUFNLEVBQ04sTUFBTSxHQUNQLEdBQUcsT0FBTyxDQUFDO1FBRVosY0FBYztRQUNkLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUVsQyxZQUFZO1FBQ1osSUFBSSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsWUFBWSxFQUFFLENBQUMsRUFBRSxDQUFDO1lBQ2hDLE9BQU87UUFDVCxDQUFDO1FBRUQsNEJBQTRCO1FBQzVCLE1BQU0sVUFBVSxHQUFHLE1BQU0sTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFO1lBQ3pELElBQUksRUFBRSxhQUFhO1lBQ25CLFNBQVMsRUFBRSxJQUFJO1NBQ2hCLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNoQixPQUFPO1FBQ1QsQ0FBQztRQUVELG9EQUFvRDtRQUNwRCxJQUFJLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxXQUFXLENBQUMsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUM7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
|
|
@@ -13,13 +13,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
* Git commands
|
|
14
14
|
*/
|
|
15
15
|
module.exports = {
|
|
16
|
-
name: 'git',
|
|
17
16
|
alias: ['g'],
|
|
18
17
|
description: 'Git commands',
|
|
19
18
|
hidden: true,
|
|
19
|
+
name: 'git',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
yield toolbox.helper.showMenu('git');
|
|
22
22
|
return 'git';
|
|
23
|
-
})
|
|
23
|
+
}),
|
|
24
24
|
};
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2dpdC9naXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFFQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxPQUFPLEdBQUc7SUFDZixLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUsY0FBYztJQUMzQixNQUFNLEVBQUUsSUFBSTtJQUNaLElBQUksRUFBRSxLQUFLO0lBQ1gsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLE1BQU0sT0FBTyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDckMsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDLENBQUE7Q0FDRixDQUFDIn0=
|
|
@@ -13,10 +13,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
* Rebase branch
|
|
14
14
|
*/
|
|
15
15
|
const NewCommand = {
|
|
16
|
-
name: 'rebase',
|
|
17
16
|
alias: ['rb'],
|
|
18
17
|
description: 'Rebase branch',
|
|
19
18
|
hidden: false,
|
|
19
|
+
name: 'rebase',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
// Retrieve the tools we need
|
|
22
22
|
const { git, helper, parameters, print: { error, info, spin, success }, prompt: { confirm }, system: { run, startTimer }, } = toolbox;
|
|
@@ -54,4 +54,4 @@ const NewCommand = {
|
|
|
54
54
|
}),
|
|
55
55
|
};
|
|
56
56
|
exports.default = NewCommand;
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmViYXNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2dpdC9yZWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFJQTs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxLQUFLLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDYixXQUFXLEVBQUUsZUFBZTtJQUM1QixNQUFNLEVBQUUsS0FBSztJQUNiLElBQUksRUFBRSxRQUFRO0lBQ2QsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osR0FBRyxFQUNILE1BQU0sRUFDTixVQUFVLEVBQ1YsS0FBSyxFQUFFLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEVBQ3JDLE1BQU0sRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUNuQixNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFLEdBQzVCLEdBQUcsT0FBTyxDQUFDO1FBRVosWUFBWTtRQUNaLElBQUksQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLFlBQVksRUFBRSxDQUFDLEVBQUUsQ0FBQztZQUNoQyxPQUFPO1FBQ1QsQ0FBQztRQUVELHFCQUFxQjtRQUNyQixNQUFNLE1BQU0sR0FBRyxNQUFNLEdBQUcsQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUV6QyxlQUFlO1FBQ2YsSUFBSSxNQUFNLEtBQUssTUFBTSxJQUFJLE1BQU0sS0FBSyxTQUFTLElBQUksTUFBTSxLQUFLLEtBQUssRUFBRSxDQUFDO1lBQ2xFLEtBQUssQ0FBQyxvQkFBb0IsTUFBTSxrQkFBa0IsQ0FBQyxDQUFDO1lBQ3BELE9BQU87UUFDVCxDQUFDO1FBRUQsMkJBQTJCO1FBQzNCLElBQUksQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLFNBQVMsSUFBSSxDQUFDLENBQUMsTUFBTSxPQUFPLENBQUMsaUJBQWlCLE1BQU0sR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDO1lBQ2xGLE9BQU87UUFDVCxDQUFDO1FBRUQscUJBQXFCO1FBQ3JCLElBQUksVUFBVSxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUM7UUFDbEMsSUFBSSxDQUFDLFVBQVUsSUFBSSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUN0RCxVQUFVLEdBQUcsTUFBTSxHQUFHLENBQUMsWUFBWSxDQUFDLEVBQUUsSUFBSSxFQUFFLG9CQUFvQixFQUFFLENBQUMsQ0FBQztRQUN0RSxDQUFDO1FBRUQsY0FBYztRQUNkLE1BQU0sS0FBSyxHQUFHLFVBQVUsRUFBRSxDQUFDO1FBRTNCLFNBQVM7UUFDVCxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsT0FBTyxVQUFVLGVBQWUsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUNsRSxNQUFNLEdBQUcsQ0FDUCw2QkFBNkIsVUFBVSxnQ0FBZ0MsTUFBTSxrQkFBa0IsVUFBVSxFQUFFLENBQzVHLENBQUM7UUFDRixVQUFVLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFckIsVUFBVTtRQUNWLE9BQU8sQ0FBQyxXQUFXLE1BQU0sT0FBTyxNQUFNLENBQUMscUJBQXFCLENBQUMsS0FBSyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDM0UsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRVQsWUFBWTtRQUNaLE9BQU8sV0FBVyxNQUFNLEVBQUUsQ0FBQztJQUM3QixDQUFDLENBQUE7Q0FDRixDQUFDO0FBRUYsa0JBQWUsVUFBVSxDQUFDIn0=
|
|
@@ -13,10 +13,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
* Rename branch
|
|
14
14
|
*/
|
|
15
15
|
const NewCommand = {
|
|
16
|
-
name: 'rename',
|
|
17
16
|
alias: ['rn'],
|
|
18
17
|
description: 'Rename branch',
|
|
19
18
|
hidden: false,
|
|
19
|
+
name: 'rename',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
// Retrieve the tools we need
|
|
22
22
|
const { git, helper, parameters, print: { error, info, spin, success }, prompt: { confirm }, system: { run, startTimer }, } = toolbox;
|
|
@@ -63,9 +63,9 @@ const NewCommand = {
|
|
|
63
63
|
// Save time
|
|
64
64
|
let time = timer();
|
|
65
65
|
// Ask to delete remote branch
|
|
66
|
-
if (remote
|
|
67
|
-
(parameters.options.deleteRemote
|
|
68
|
-
(!parameters.options.noConfirm && (yield confirm(`Delete remote branch ${branch}?`))))) {
|
|
66
|
+
if (remote
|
|
67
|
+
&& (parameters.options.deleteRemote
|
|
68
|
+
|| (!parameters.options.noConfirm && (yield confirm(`Delete remote branch ${branch}?`))))) {
|
|
69
69
|
timer = startTimer();
|
|
70
70
|
const deleteSpin = spin(`Delete remote branch ${branch}`);
|
|
71
71
|
yield run(`git push origin :${branch}`);
|
|
@@ -80,4 +80,4 @@ const NewCommand = {
|
|
|
80
80
|
}),
|
|
81
81
|
};
|
|
82
82
|
exports.default = NewCommand;
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVuYW1lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2dpdC9yZW5hbWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFJQTs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxLQUFLLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDYixXQUFXLEVBQUUsZUFBZTtJQUM1QixNQUFNLEVBQUUsS0FBSztJQUNiLElBQUksRUFBRSxRQUFRO0lBQ2QsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osR0FBRyxFQUNILE1BQU0sRUFDTixVQUFVLEVBQ1YsS0FBSyxFQUFFLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEVBQ3JDLE1BQU0sRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUNuQixNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFLEdBQzVCLEdBQUcsT0FBTyxDQUFDO1FBRVosWUFBWTtRQUNaLElBQUksQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLFlBQVksRUFBRSxDQUFDLEVBQUUsQ0FBQztZQUNoQyxPQUFPO1FBQ1QsQ0FBQztRQUVELHFCQUFxQjtRQUNyQixNQUFNLE1BQU0sR0FBRyxNQUFNLEdBQUcsQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUV6QyxlQUFlO1FBQ2YsTUFBTSxJQUFJLEdBQUcsTUFBTSxNQUFNLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUU7WUFDbkQsSUFBSSxFQUFFLFVBQVU7WUFDaEIsU0FBUyxFQUFFLElBQUk7U0FDaEIsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ1osT0FBTztRQUNULENBQUM7UUFFRCxlQUFlO1FBQ2YsSUFBSSxNQUFNLEtBQUssTUFBTSxJQUFJLE1BQU0sS0FBSyxTQUFTLElBQUksTUFB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
|
|
@@ -13,10 +13,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
* Reset current branch
|
|
14
14
|
*/
|
|
15
15
|
const NewCommand = {
|
|
16
|
-
name: 'reset',
|
|
17
16
|
alias: ['rs'],
|
|
18
17
|
description: 'Reset current branch',
|
|
19
18
|
hidden: false,
|
|
19
|
+
name: 'reset',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
// Retrieve the tools we need
|
|
22
22
|
const { git, helper, npm, parameters, print: { error, info, spin, success }, prompt, system, } = toolbox;
|
|
@@ -29,7 +29,7 @@ const NewCommand = {
|
|
|
29
29
|
// Current branch
|
|
30
30
|
const branch = yield git.currentBranch();
|
|
31
31
|
if (!branch) {
|
|
32
|
-
error(
|
|
32
|
+
error('No current branch!');
|
|
33
33
|
return;
|
|
34
34
|
}
|
|
35
35
|
// Check remote
|
|
@@ -43,19 +43,15 @@ const NewCommand = {
|
|
|
43
43
|
return;
|
|
44
44
|
}
|
|
45
45
|
// Reset
|
|
46
|
-
const resetSpin = spin(
|
|
47
|
-
yield system.run('git clean -fd && '
|
|
48
|
-
'git reset HEAD --hard && '
|
|
49
|
-
'git checkout main && '
|
|
50
|
-
'git fetch && '
|
|
51
|
-
'git pull && '
|
|
52
|
-
|
|
53
|
-
branch
|
|
54
|
-
'
|
|
55
|
-
'git checkout ' +
|
|
56
|
-
branch +
|
|
57
|
-
' && ' +
|
|
58
|
-
'git pull');
|
|
46
|
+
const resetSpin = spin(`Reset ${branch}`);
|
|
47
|
+
yield system.run('git clean -fd && '
|
|
48
|
+
+ 'git reset HEAD --hard && '
|
|
49
|
+
+ 'git checkout main && '
|
|
50
|
+
+ 'git fetch && '
|
|
51
|
+
+ 'git pull && '
|
|
52
|
+
+ `git branch -D ${branch} && `
|
|
53
|
+
+ `git checkout ${branch} && `
|
|
54
|
+
+ 'git pull');
|
|
59
55
|
resetSpin.succeed();
|
|
60
56
|
// Install npm packages
|
|
61
57
|
yield npm.install();
|
|
@@ -67,4 +63,4 @@ const NewCommand = {
|
|
|
67
63
|
}),
|
|
68
64
|
};
|
|
69
65
|
exports.default = NewCommand;
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvZ2l0L3Jlc2V0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBSUE7O0dBRUc7QUFDSCxNQUFNLFVBQVUsR0FBbUI7SUFDakMsS0FBSyxFQUFFLENBQUMsSUFBSSxDQUFDO0lBQ2IsV0FBVyxFQUFFLHNCQUFzQjtJQUNuQyxNQUFNLEVBQUUsS0FBSztJQUNiLElBQUksRUFBRSxPQUFPO0lBQ2IsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osR0FBRyxFQUNILE1BQU0sRUFDTixHQUFHLEVBQ0gsVUFBVSxFQUNWLEtBQUssRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNyQyxNQUFNLEVBQ04sTUFBTSxHQUNQLEdBQUcsT0FBTyxDQUFDO1FBRVosY0FBYztRQUNkLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUVsQyxZQUFZO1FBQ1osSUFBSSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsWUFBWSxFQUFFLENBQUMsRUFBRSxDQUFDO1lBQ2hDLE9BQU87UUFDVCxDQUFDO1FBRUQsaUJBQWlCO1FBQ2pCLE1BQU0sTUFBTSxHQUFHLE1BQU0sR0FBRyxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBQ3pDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNaLEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1lBQzVCLE9BQU87UUFDVCxDQUFDO1FBRUQsZUFBZTtRQUNmLE1BQU0sWUFBWSxHQUFHLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyxnQ0FBZ0MsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUNoRixJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7WUFDbEIsS0FBSyxDQUFDLG9CQUFvQixNQUFNLFNBQVMsQ0FBQyxDQUFDO1lBQzNDLE9BQU87UUFDVCxDQUFDO1FBRUQsZ0JBQWdCO1FBQ2hCLElBQUksQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLFNBQVMsSUFBSSxDQUFDLENBQUMsTUFBTSxNQUFNLENBQUMsT0FBTyxDQUFDLGdCQUFnQixNQUFNLHNCQUFzQixDQUFDLENBQUMsRUFBRSxDQUFDO1lBQzNHLE9BQU87UUFDVCxDQUFDO1FBRUQsUUFBUTtRQUNSLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDMUMsTUFBTSxNQUFNLENBQUMsR0FBRyxDQUNkLG1CQUFtQjtjQUNmLDJCQUEyQjtjQUMzQix1QkFBdUI7Y0FDdkIsZUFBZTtjQUNmLGNBQWM7Y0FDZCxpQkFDRixNQUNBLE1BQU07Y0FDSixnQkFDRixNQUNBLE1BQU07Y0FDSixVQUFVLENBQ2YsQ0FBQztRQUNGLFNBQVMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUVwQix1QkFBdUI7UUFDdkIsTUFBTSxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFcEIsZUFBZTtRQUNmLE9BQU8sQ0FBQyxVQUFVLE1BQU0sb0JBQW9CLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN2RixJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFVCxZQUFZO1FBQ1osT0FBTyxnQkFBZ0IsTUFBTSxFQUFFLENBQUM7SUFDbEMsQ0FBQyxDQUFBO0NBQ0YsQ0FBQztBQUVGLGtCQUFlLFVBQVUsQ0FBQyJ9
|