@webiny/cli-core 6.3.0-beta.1 → 6.3.0-beta.2
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.
|
@@ -54,10 +54,7 @@ export class UpgradeCommandHandlerImpl {
|
|
|
54
54
|
if (!line || !line.trim()) {
|
|
55
55
|
continue;
|
|
56
56
|
}
|
|
57
|
-
this.output(line
|
|
58
|
-
debug,
|
|
59
|
-
logLevel
|
|
60
|
-
});
|
|
57
|
+
this.output(line);
|
|
61
58
|
}
|
|
62
59
|
});
|
|
63
60
|
npx.stderr.on("data", data => {
|
|
@@ -69,35 +66,28 @@ export class UpgradeCommandHandlerImpl {
|
|
|
69
66
|
this.ui.error(`Upgrade process failed: ${ex.message}`);
|
|
70
67
|
}
|
|
71
68
|
}
|
|
72
|
-
output(line
|
|
73
|
-
const {
|
|
74
|
-
debug,
|
|
75
|
-
logLevel
|
|
76
|
-
} = options;
|
|
69
|
+
output(line) {
|
|
77
70
|
try {
|
|
78
71
|
const json = JSON.parse(line);
|
|
79
72
|
switch (json.type) {
|
|
80
73
|
case "debug":
|
|
81
|
-
if (!debug && logLevel !== "debug") {
|
|
82
|
-
return;
|
|
83
|
-
}
|
|
84
74
|
this.ui.debug(json.message);
|
|
85
75
|
if (!json.data?.stack) {
|
|
86
76
|
return;
|
|
87
77
|
}
|
|
88
78
|
this.ui.debug(json.data?.stack);
|
|
89
|
-
|
|
79
|
+
return;
|
|
90
80
|
case "info":
|
|
91
81
|
this.ui.info(json.message);
|
|
92
|
-
|
|
82
|
+
return;
|
|
93
83
|
case "success":
|
|
94
84
|
case "done":
|
|
95
85
|
this.ui.success(json.message);
|
|
96
|
-
|
|
86
|
+
return;
|
|
97
87
|
case "warning":
|
|
98
88
|
case "warn":
|
|
99
89
|
this.ui.warning(json.message);
|
|
100
|
-
|
|
90
|
+
return;
|
|
101
91
|
case "error":
|
|
102
92
|
case "fatal":
|
|
103
93
|
this.ui.error(json.message);
|
|
@@ -105,15 +95,11 @@ export class UpgradeCommandHandlerImpl {
|
|
|
105
95
|
return;
|
|
106
96
|
}
|
|
107
97
|
this.ui.debug(json.data?.stack);
|
|
108
|
-
|
|
98
|
+
return;
|
|
109
99
|
default:
|
|
110
100
|
console.log(json);
|
|
111
101
|
}
|
|
112
102
|
} catch {
|
|
113
|
-
// Not JSON, let's just print the line then, if its debug mode on.
|
|
114
|
-
if (!debug && logLevel !== "debug") {
|
|
115
|
-
return;
|
|
116
|
-
}
|
|
117
103
|
console.log(line);
|
|
118
104
|
}
|
|
119
105
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["UpgradeCommandHandler","UpgradeCommandHandlerAbstraction","chalk","execa","UiService","GITHUB_REPOSITORY_URL","UpgradeCommandHandlerImpl","constructor","ui","handle","params","version","skipChecks","debug","logLevel","showLogs","showStackTrace","installVersion","gitStatus","stdout","sync","trim","error","red","split","map","line","matched","match","join","process","exit","command","undefined","filter","Boolean","npx","env","FORCE_COLOR","stdin","on","data","lines","toString","replace","output","stderr","ex","message","
|
|
1
|
+
{"version":3,"names":["UpgradeCommandHandler","UpgradeCommandHandlerAbstraction","chalk","execa","UiService","GITHUB_REPOSITORY_URL","UpgradeCommandHandlerImpl","constructor","ui","handle","params","version","skipChecks","debug","logLevel","showLogs","showStackTrace","installVersion","gitStatus","stdout","sync","trim","error","red","split","map","line","matched","match","join","process","exit","command","undefined","filter","Boolean","npx","env","FORCE_COLOR","stdin","on","data","lines","toString","replace","output","stderr","ex","message","json","JSON","parse","type","stack","info","success","warning","console","log","createImplementation","implementation","dependencies"],"sources":["UpgradeCommandHandler.ts"],"sourcesContent":["import { UpgradeCommandHandler as UpgradeCommandHandlerAbstraction } from \"./abstraction.js\";\nimport chalk from \"chalk\";\nimport execa from \"execa\";\nimport { UiService } from \"~/abstractions/index.js\";\n\nconst GITHUB_REPOSITORY_URL = \"https://github.com/webiny/webiny-upgrades-v6\";\n\ntype LogType = \"debug\" | \"success\" | \"warning\" | \"warn\" | \"error\" | \"fatal\" | \"done\" | \"info\";\n\ninterface IUpgradeLine {\n type: LogType;\n message: string;\n data?: {\n stack?: string;\n [key: string]: any;\n };\n}\n\nexport class UpgradeCommandHandlerImpl implements UpgradeCommandHandlerAbstraction.Interface {\n public constructor(private ui: UiService.Interface) {}\n\n public async handle(params: UpgradeCommandHandlerAbstraction.Params): Promise<void> {\n const { version, skipChecks, debug, logLevel, showLogs, showStackTrace, installVersion } =\n params;\n\n if (!skipChecks) {\n /**\n * Before doing any upgrading, there must not be any active changes in the current branch.\n */\n let gitStatus = \"\";\n try {\n const { stdout } = execa.sync(\"git\", [\"status\", \"--porcelain\"]);\n gitStatus = stdout.trim();\n } catch {}\n\n if (gitStatus) {\n this.ui.error(\n chalk.red(\"This git repository has untracked files or uncommitted changes:\") +\n \"\\n\\n\" +\n gitStatus\n .split(\"\\n\")\n .map(line => {\n const matched = line.match(/ .*/g);\n if (!matched || !matched[0]) {\n return \"\";\n }\n return matched[0].trim();\n })\n .join(\"\\n\") +\n \"\\n\\n\" +\n chalk.red(\n \"Remove untracked files, stash or commit any changes, and try again.\"\n )\n );\n process.exit(1);\n }\n }\n\n const command = [\n GITHUB_REPOSITORY_URL,\n version || undefined,\n debug ? \"--debug\" : \"\",\n showLogs ? `--showLogs=${showLogs}` : \"\",\n showStackTrace ? `--showStackTrace=${showStackTrace}` : \"\",\n logLevel ? `--logLevel=${logLevel}` : \"\",\n installVersion ? `--installVersion=${installVersion}` : \"\",\n \"--json\"\n ].filter(Boolean);\n\n const npx = execa(\"npx\", command, {\n env: {\n // TODO determine if this actually works\n // @ts-expect-error\n FORCE_COLOR: true\n },\n stdin: process.stdin\n });\n\n npx.stdout!.on(\"data\", data => {\n const lines = data.toString().replace(/\\n$/, \"\").split(\"\\n\") as string[];\n for (const line of lines) {\n if (!line || !line.trim()) {\n continue;\n }\n this.output(line);\n }\n });\n\n npx.stderr!.on(\"data\", data => {\n this.ui.error(data.toString());\n });\n\n try {\n await npx;\n } catch (ex) {\n this.ui.error(`Upgrade process failed: ${ex.message}`);\n }\n }\n\n private output(line: string): void {\n try {\n const json = JSON.parse(line) as IUpgradeLine;\n switch (json.type) {\n case \"debug\":\n this.ui.debug(json.message);\n if (!json.data?.stack) {\n return;\n }\n this.ui.debug(json.data?.stack);\n return;\n case \"info\":\n this.ui.info(json.message);\n return;\n case \"success\":\n case \"done\":\n this.ui.success(json.message);\n return;\n case \"warning\":\n case \"warn\":\n this.ui.warning(json.message);\n return;\n case \"error\":\n case \"fatal\":\n this.ui.error(json.message);\n if (!json.data?.stack) {\n return;\n }\n this.ui.debug(json.data?.stack);\n return;\n default:\n console.log(json);\n }\n } catch {\n console.log(line);\n }\n }\n}\n\nexport const UpgradeCommandHandler = UpgradeCommandHandlerAbstraction.createImplementation({\n implementation: UpgradeCommandHandlerImpl,\n dependencies: [UiService]\n});\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webiny/cli-core",
|
|
3
|
-
"version": "6.3.0-beta.
|
|
3
|
+
"version": "6.3.0-beta.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"repository": {
|
|
@@ -11,10 +11,10 @@
|
|
|
11
11
|
"license": "MIT",
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@webiny/di": "0.2.3",
|
|
14
|
-
"@webiny/feature": "6.3.0-beta.
|
|
15
|
-
"@webiny/project": "6.3.0-beta.
|
|
16
|
-
"@webiny/pulumi-sdk": "6.3.0-beta.
|
|
17
|
-
"@webiny/telemetry": "6.3.0-beta.
|
|
14
|
+
"@webiny/feature": "6.3.0-beta.2",
|
|
15
|
+
"@webiny/project": "6.3.0-beta.2",
|
|
16
|
+
"@webiny/pulumi-sdk": "6.3.0-beta.2",
|
|
17
|
+
"@webiny/telemetry": "6.3.0-beta.2",
|
|
18
18
|
"chalk": "5.6.2",
|
|
19
19
|
"ci-info": "4.4.0",
|
|
20
20
|
"execa": "5.1.1",
|
|
@@ -22,10 +22,10 @@
|
|
|
22
22
|
"find-up": "8.0.0",
|
|
23
23
|
"get-yarn-workspaces": "1.0.2",
|
|
24
24
|
"humanize-duration": "3.33.2",
|
|
25
|
-
"inquirer": "13.4.
|
|
25
|
+
"inquirer": "13.4.2",
|
|
26
26
|
"load-json-file": "7.0.1",
|
|
27
27
|
"open": "11.0.0",
|
|
28
|
-
"ora": "9.
|
|
28
|
+
"ora": "9.4.0",
|
|
29
29
|
"pino": "10.3.1",
|
|
30
30
|
"pino-pretty": "13.1.3",
|
|
31
31
|
"semver": "7.7.4",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@types/lodash": "4.17.24",
|
|
39
|
-
"@webiny/build-tools": "6.3.0-beta.
|
|
39
|
+
"@webiny/build-tools": "6.3.0-beta.2",
|
|
40
40
|
"rimraf": "6.1.3",
|
|
41
41
|
"typescript": "6.0.3"
|
|
42
42
|
},
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"access": "public",
|
|
45
45
|
"directory": "dist"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "c5ae1dbcb99bf7457449ef67aef19c5b4b1ffc4c"
|
|
48
48
|
}
|