@rspack/cli 0.5.0 → 0.5.1-canary-ee0ef69-20240117010243
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/dist/commands/build.js +8 -0
- package/dist/commands/serve.js +1 -0
- package/dist/utils/options.d.ts +14 -0
- package/dist/utils/options.js +41 -5
- package/package.json +4 -3
package/dist/commands/build.js
CHANGED
|
@@ -38,6 +38,14 @@ class BuildCommand {
|
|
|
38
38
|
describe: "emit stats json"
|
|
39
39
|
}
|
|
40
40
|
}), async (options) => {
|
|
41
|
+
const env = (0, options_1.ensureEnvObject)(options);
|
|
42
|
+
if (options.watch) {
|
|
43
|
+
(0, options_1.setBuiltinEnvArg)(env, "WATCH", true);
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
(0, options_1.setBuiltinEnvArg)(env, "BUNDLE", true);
|
|
47
|
+
(0, options_1.setBuiltinEnvArg)(env, "BUILD", true);
|
|
48
|
+
}
|
|
41
49
|
const logger = cli.getLogger();
|
|
42
50
|
let createJsonStringifyStream;
|
|
43
51
|
if (options.json) {
|
package/dist/commands/serve.js
CHANGED
|
@@ -8,6 +8,7 @@ class ServeCommand {
|
|
|
8
8
|
cli.program.command(["serve", "server", "s", "dev"], "run the rspack dev server.", options_1.commonOptions, async (options) => {
|
|
9
9
|
var _a, _b, _c, _d;
|
|
10
10
|
var _e, _f;
|
|
11
|
+
(0, options_1.setBuiltinEnvArg)((0, options_1.ensureEnvObject)(options), "SERVE", true);
|
|
11
12
|
const rspackOptions = {
|
|
12
13
|
...options,
|
|
13
14
|
argv: {
|
package/dist/utils/options.d.ts
CHANGED
|
@@ -18,11 +18,13 @@ export declare const commonOptions: (yargs: yargs.Argv<{}>) => yargs.Argv<yargs.
|
|
|
18
18
|
mode: {
|
|
19
19
|
type: "string";
|
|
20
20
|
describe: string;
|
|
21
|
+
alias: string;
|
|
21
22
|
};
|
|
22
23
|
watch: {
|
|
23
24
|
type: "boolean";
|
|
24
25
|
default: boolean;
|
|
25
26
|
describe: string;
|
|
27
|
+
alias: string;
|
|
26
28
|
};
|
|
27
29
|
env: {
|
|
28
30
|
type: "array";
|
|
@@ -80,3 +82,15 @@ export declare const previewOptions: (yargs: yargs.Argv<{}>) => yargs.Argv<yargs
|
|
|
80
82
|
};
|
|
81
83
|
}>>;
|
|
82
84
|
export declare function normalizeEnv(argv: yargs.Arguments): void;
|
|
85
|
+
/**
|
|
86
|
+
* set builtin env from cli - like `WEBPACK_BUNDLE=true`. also for `RSPACK_` prefixed.
|
|
87
|
+
* @param env the `argv.env` object
|
|
88
|
+
* @param envNameSuffix the added env will be `WEBPACK_${envNameSuffix}` and `RSPACK_${envNameSuffix}`
|
|
89
|
+
* @param value
|
|
90
|
+
*/
|
|
91
|
+
export declare function setBuiltinEnvArg(env: Record<string, any>, envNameSuffix: string, value: any): void;
|
|
92
|
+
/**
|
|
93
|
+
* infer `argv.env` as an object for it was transformed from array to object after `normalizeEnv` middleware
|
|
94
|
+
* @returns the reference of `argv.env` object
|
|
95
|
+
*/
|
|
96
|
+
export declare function ensureEnvObject<T extends Record<string, unknown>>(options: yargs.Arguments): T;
|
package/dist/utils/options.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.normalizeEnv = exports.previewOptions = exports.commonOptions = void 0;
|
|
3
|
+
exports.ensureEnvObject = exports.setBuiltinEnvArg = exports.normalizeEnv = exports.previewOptions = exports.commonOptions = void 0;
|
|
4
4
|
const commonOptions = (yargs) => {
|
|
5
|
-
return yargs
|
|
5
|
+
return yargs
|
|
6
|
+
.options({
|
|
6
7
|
config: {
|
|
7
8
|
g: true,
|
|
8
9
|
type: "string",
|
|
@@ -18,11 +19,12 @@ const commonOptions = (yargs) => {
|
|
|
18
19
|
type: "string",
|
|
19
20
|
describe: "output path dir"
|
|
20
21
|
},
|
|
21
|
-
mode: { type: "string", describe: "mode" },
|
|
22
|
+
mode: { type: "string", describe: "mode", alias: "m" },
|
|
22
23
|
watch: {
|
|
23
24
|
type: "boolean",
|
|
24
25
|
default: false,
|
|
25
|
-
describe: "watch"
|
|
26
|
+
describe: "watch",
|
|
27
|
+
alias: "w"
|
|
26
28
|
},
|
|
27
29
|
env: {
|
|
28
30
|
type: "array",
|
|
@@ -43,7 +45,8 @@ const commonOptions = (yargs) => {
|
|
|
43
45
|
string: true,
|
|
44
46
|
describe: "Name of the configuration to use."
|
|
45
47
|
}
|
|
46
|
-
})
|
|
48
|
+
})
|
|
49
|
+
.alias({ v: "version", h: "help" });
|
|
47
50
|
};
|
|
48
51
|
exports.commonOptions = commonOptions;
|
|
49
52
|
const previewOptions = (yargs) => {
|
|
@@ -124,3 +127,36 @@ function normalizeEnv(argv) {
|
|
|
124
127
|
argv.env = envObj;
|
|
125
128
|
}
|
|
126
129
|
exports.normalizeEnv = normalizeEnv;
|
|
130
|
+
/**
|
|
131
|
+
* set builtin env from cli - like `WEBPACK_BUNDLE=true`. also for `RSPACK_` prefixed.
|
|
132
|
+
* @param env the `argv.env` object
|
|
133
|
+
* @param envNameSuffix the added env will be `WEBPACK_${envNameSuffix}` and `RSPACK_${envNameSuffix}`
|
|
134
|
+
* @param value
|
|
135
|
+
*/
|
|
136
|
+
function setBuiltinEnvArg(env, envNameSuffix, value) {
|
|
137
|
+
const envNames = [
|
|
138
|
+
// TODO: breaking change
|
|
139
|
+
// `WEBPACK_${envNameSuffix}`,
|
|
140
|
+
`RSPACK_${envNameSuffix}`
|
|
141
|
+
];
|
|
142
|
+
for (const envName of envNames) {
|
|
143
|
+
if (envName in env) {
|
|
144
|
+
continue;
|
|
145
|
+
}
|
|
146
|
+
env[envName] = value;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
exports.setBuiltinEnvArg = setBuiltinEnvArg;
|
|
150
|
+
/**
|
|
151
|
+
* infer `argv.env` as an object for it was transformed from array to object after `normalizeEnv` middleware
|
|
152
|
+
* @returns the reference of `argv.env` object
|
|
153
|
+
*/
|
|
154
|
+
function ensureEnvObject(options) {
|
|
155
|
+
if (Array.isArray(options.env)) {
|
|
156
|
+
// in case that cli haven't got `normalizeEnv` middleware applied
|
|
157
|
+
normalizeEnv(options);
|
|
158
|
+
}
|
|
159
|
+
options.env = options.env || {};
|
|
160
|
+
return options.env;
|
|
161
|
+
}
|
|
162
|
+
exports.ensureEnvObject = ensureEnvObject;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rspack/cli",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.1-canary-ee0ef69-20240117010243",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "CLI for rspack",
|
|
6
6
|
"bin": {
|
|
@@ -24,6 +24,7 @@
|
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@types/rechoir": "^0.6.1",
|
|
27
|
+
"@types/semver": "^7.5.6",
|
|
27
28
|
"@types/webpack-bundle-analyzer": "^4.6.0",
|
|
28
29
|
"concat-stream": "^2.0.0",
|
|
29
30
|
"cross-env": "^7.0.3",
|
|
@@ -31,7 +32,7 @@
|
|
|
31
32
|
"internal-ip": "6.2.0",
|
|
32
33
|
"source-map-support": "^0.5.19",
|
|
33
34
|
"ts-node": "10.9.1",
|
|
34
|
-
"@rspack/core": "0.5.
|
|
35
|
+
"@rspack/core": "0.5.1-canary-ee0ef69-20240117010243"
|
|
35
36
|
},
|
|
36
37
|
"dependencies": {
|
|
37
38
|
"@discoveryjs/json-ext": "^0.5.7",
|
|
@@ -42,7 +43,7 @@
|
|
|
42
43
|
"semver": "6.3.1",
|
|
43
44
|
"webpack-bundle-analyzer": "4.6.1",
|
|
44
45
|
"yargs": "17.6.2",
|
|
45
|
-
"@rspack/dev-server": "0.5.
|
|
46
|
+
"@rspack/dev-server": "0.5.1-canary-ee0ef69-20240117010243"
|
|
46
47
|
},
|
|
47
48
|
"scripts": {
|
|
48
49
|
"build": "tsc -b ./tsconfig.build.json",
|