@rspack/cli 0.1.1 → 0.1.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.
- package/dist/commands/build.d.ts.map +1 -1
- package/dist/commands/build.js +10 -4
- package/dist/commands/build.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/rspack-cli.d.ts +4 -2
- package/dist/rspack-cli.d.ts.map +1 -1
- package/dist/rspack-cli.js +22 -29
- package/dist/rspack-cli.js.map +1 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/loadConfig.d.ts +1 -1
- package/dist/utils/loadConfig.d.ts.map +1 -1
- package/dist/utils/loadConfig.js +13 -5
- package/dist/utils/loadConfig.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMzC,qBAAa,YAAa,YAAW,aAAa;IAC3C,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMzC,qBAAa,YAAa,YAAW,aAAa;IAC3C,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAkG1C"}
|
package/dist/commands/build.js
CHANGED
|
@@ -41,7 +41,7 @@ class BuildCommand {
|
|
|
41
41
|
const logger = cli.getLogger();
|
|
42
42
|
let createJsonStringifyStream;
|
|
43
43
|
if (options.json) {
|
|
44
|
-
const jsonExt = await
|
|
44
|
+
const jsonExt = await import("@discoveryjs/json-ext");
|
|
45
45
|
createJsonStringifyStream = jsonExt.stringifyStream;
|
|
46
46
|
}
|
|
47
47
|
const callback = (error, stats) => {
|
|
@@ -95,11 +95,17 @@ class BuildCommand {
|
|
|
95
95
|
};
|
|
96
96
|
console.time("build");
|
|
97
97
|
let rspackOptions = { ...options, argv: { ...options } };
|
|
98
|
-
const
|
|
99
|
-
compiler.run((err, Stats) => {
|
|
98
|
+
const errorHandler = (err, Stats) => {
|
|
100
99
|
callback(err, Stats);
|
|
101
100
|
console.timeEnd("build");
|
|
102
|
-
}
|
|
101
|
+
};
|
|
102
|
+
const compiler = await cli.createCompiler(rspackOptions, "production", errorHandler);
|
|
103
|
+
if (cli.isWatch(compiler)) {
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
compiler.run(errorHandler);
|
|
108
|
+
}
|
|
103
109
|
});
|
|
104
110
|
}
|
|
105
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AAGzB,8CAAiD;AAKjD,MAAa,YAAY;IACxB,KAAK,CAAC,KAAK,CAAC,GAAc;QACzB,GAAG,CAAC,OAAO,CAAC,OAAO,CAClB,CAAC,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,EACxC,sBAAsB,EACtB,KAAK,CAAC,EAAE,CACP,IAAA,uBAAa,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC;YAC5B,OAAO,EAAE;gBACR,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK;gBACd,QAAQ,EAAE,SAAS;aACnB;YACD,IAAI,EAAE;gBACL,QAAQ,EAAE,iBAAiB;aAC3B;SACD,CAAC,EACH,KAAK,EAAC,OAAO,EAAC,EAAE;YACf,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,IAAI,yBAAyB,CAAC;YAC9B,IAAI,OAAO,CAAC,IAAI,EAAE;gBACjB,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AAGzB,8CAAiD;AAKjD,MAAa,YAAY;IACxB,KAAK,CAAC,KAAK,CAAC,GAAc;QACzB,GAAG,CAAC,OAAO,CAAC,OAAO,CAClB,CAAC,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,EACxC,sBAAsB,EACtB,KAAK,CAAC,EAAE,CACP,IAAA,uBAAa,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC;YAC5B,OAAO,EAAE;gBACR,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK;gBACd,QAAQ,EAAE,SAAS;aACnB;YACD,IAAI,EAAE;gBACL,QAAQ,EAAE,iBAAiB;aAC3B;SACD,CAAC,EACH,KAAK,EAAC,OAAO,EAAC,EAAE;YACf,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,IAAI,yBAAyB,CAAC;YAC9B,IAAI,OAAO,CAAC,IAAI,EAAE;gBACjB,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC;gBACtD,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC;aACpD;YAED,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,KAAyB,EAAE,EAAE;gBACrD,IAAI,KAAK,EAAE;oBACV,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBAChB;gBACD,IAAI,KAAK,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE;oBAC/B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;iBACrB;gBACD,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,EAAE;oBACxB,OAAO;iBACP;gBACD,MAAM,YAAY,GAAG,GAAG,CAAC,kBAAkB,CAAC,QAAQ,CAAC;oBACpD,CAAC,CAAC;wBACA,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAC3C,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CACrD;qBACA;oBACH,CAAC,CAAC,QAAQ,CAAC,OAAO;wBAClB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK;wBACxB,CAAC,CAAC,SAAS,CAAC;gBACb,IAAI,OAAO,CAAC,IAAI,IAAI,yBAAyB,EAAE;oBAC9C,MAAM,gBAAgB,GAAG,KAAK,CAAC,EAAE;wBAChC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACjB,CAAC,CAAC;oBACF,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE;wBAC1B,yBAAyB,CAAC,KAAK,CAAC,MAAM,CAAC,YAAmB,CAAC,CAAC;6BAC1D,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC;6BAC7B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;6BACpB,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC;6BAC7B,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;qBAChD;yBAAM,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;wBAC5C,yBAAyB,CAAC,KAAK,CAAC,MAAM,CAAC,YAAmB,CAAC,CAAC;6BAC1D,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC;6BAC7B,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;6BACxC,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC;4BAC9B,wBAAwB;6BACvB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;4BACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CACnB,gBAAgB,GAAG,CAAC,MAAM,CAAC,KAAK,CAC/B,4CAA4C,OAAO,CAAC,IAAI,EAAE,CAC1D,IAAI,CACL,CAAC;wBACH,CAAC,CAAC,CAAC;qBACJ;iBACD;qBAAM;oBACN,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;oBAClD,8CAA8C;oBAC9C,IAAI,YAAY,EAAE;wBACjB,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;qBACzB;iBACD;YACF,CAAC,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtB,IAAI,aAAa,GAAG,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,EAAE,CAAC;YAEzD,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACnC,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACrB,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC1B,CAAC,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,cAAc,CACxC,aAAa,EACb,YAAY,EACZ,YAAY,CACZ,CAAC;YAEF,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAC1B,OAAO;aACP;iBAAM;gBACN,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;aAC3B;QACF,CAAC,CACD,CAAC;IACH,CAAC;CACD;AAnGD,oCAmGC"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -14,8 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.RspackCLI = void 0;
|
|
17
|
+
exports.defineConfig = exports.RspackCLI = void 0;
|
|
18
18
|
__exportStar(require("./types"), exports);
|
|
19
19
|
var rspack_cli_1 = require("./rspack-cli");
|
|
20
20
|
Object.defineProperty(exports, "RspackCLI", { enumerable: true, get: function () { return rspack_cli_1.RspackCLI; } });
|
|
21
|
+
Object.defineProperty(exports, "defineConfig", { enumerable: true, get: function () { return rspack_cli_1.defineConfig; } });
|
|
21
22
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,2CAAuD;AAA9C,uGAAA,SAAS,OAAA;AAAE,0GAAA,YAAY,OAAA"}
|
package/dist/rspack-cli.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import yargs from "yargs";
|
|
2
2
|
import { RspackCLIColors, RspackCLILogger, RspackCLIOptions } from "./types";
|
|
3
|
-
import { RspackOptions, MultiCompiler, Compiler, MultiRspackOptions } from "@rspack/core";
|
|
3
|
+
import { RspackOptions, MultiCompiler, Compiler, MultiRspackOptions, Stats, MultiStats } from "@rspack/core";
|
|
4
4
|
type RspackEnv = "development" | "production";
|
|
5
5
|
export declare class RspackCLI {
|
|
6
6
|
colors: RspackCLIColors;
|
|
7
7
|
program: yargs.Argv<{}>;
|
|
8
8
|
constructor();
|
|
9
|
-
createCompiler(options: RspackCLIOptions, rspackEnv: RspackEnv): Promise<Compiler | MultiCompiler>;
|
|
9
|
+
createCompiler(options: RspackCLIOptions, rspackEnv: RspackEnv, callback?: (e: Error, res?: Stats | MultiStats) => void): Promise<Compiler | MultiCompiler>;
|
|
10
10
|
createColors(useColor?: boolean): RspackCLIColors;
|
|
11
11
|
getLogger(): RspackCLILogger;
|
|
12
12
|
run(argv: string[]): Promise<void>;
|
|
@@ -14,6 +14,8 @@ export declare class RspackCLI {
|
|
|
14
14
|
buildConfig(item: RspackOptions | MultiRspackOptions, options: RspackCLIOptions, rspackEnv: RspackEnv): Promise<RspackOptions | MultiRspackOptions>;
|
|
15
15
|
loadConfig(options: RspackCLIOptions): Promise<RspackOptions | MultiRspackOptions>;
|
|
16
16
|
isMultipleCompiler(compiler: Compiler | MultiCompiler): compiler is MultiCompiler;
|
|
17
|
+
isWatch(compiler: Compiler | MultiCompiler): boolean;
|
|
17
18
|
}
|
|
19
|
+
export declare function defineConfig(config: RspackOptions): RspackOptions;
|
|
18
20
|
export {};
|
|
19
21
|
//# sourceMappingURL=rspack-cli.d.ts.map
|
package/dist/rspack-cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rspack-cli.d.ts","sourceRoot":"","sources":["../src/rspack-cli.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAG7E,OAAO,EACN,aAAa,EACb,aAAa,EACb,QAAQ,EAER,kBAAkB,EAClB,MAAM,cAAc,CAAC;AAKtB,KAAK,SAAS,GAAG,aAAa,GAAG,YAAY,CAAC;AAC9C,qBAAa,SAAS;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;;IAKlB,cAAc,CACnB,OAAO,EAAE,gBAAgB,EACzB,SAAS,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"rspack-cli.d.ts","sourceRoot":"","sources":["../src/rspack-cli.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAG7E,OAAO,EACN,aAAa,EACb,aAAa,EACb,QAAQ,EAER,kBAAkB,EAClB,KAAK,EACL,UAAU,EACV,MAAM,cAAc,CAAC;AAKtB,KAAK,SAAS,GAAG,aAAa,GAAG,YAAY,CAAC;AAC9C,qBAAa,SAAS;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;;IAKlB,cAAc,CACnB,OAAO,EAAE,gBAAgB,EACzB,SAAS,EAAE,SAAS,EACpB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,KAAK,GAAG,UAAU,KAAK,IAAI,GACrD,OAAO,CAAC,QAAQ,GAAG,aAAa,CAAC;IAmBpC,YAAY,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,eAAe;IAgBjD,SAAS,IAAI,eAAe;IAWtB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE;IAOlB,gBAAgB;IAMhB,WAAW,CAChB,IAAI,EAAE,aAAa,GAAG,kBAAkB,EACxC,OAAO,EAAE,gBAAgB,EACzB,SAAS,EAAE,SAAS,GAClB,OAAO,CAAC,aAAa,GAAG,kBAAkB,CAAC;IA2FxC,UAAU,CACf,OAAO,EAAE,gBAAgB,GACvB,OAAO,CAAC,aAAa,GAAG,kBAAkB,CAAC;IAkD9C,kBAAkB,CACjB,QAAQ,EAAE,QAAQ,GAAG,aAAa,GAChC,QAAQ,IAAI,aAAa;IAG5B,OAAO,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa,GAAG,OAAO;CAOpD;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa,CAEjE"}
|
package/dist/rspack-cli.js
CHANGED
|
@@ -1,32 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
4
|
};
|
|
28
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.RspackCLI = void 0;
|
|
6
|
+
exports.defineConfig = exports.RspackCLI = void 0;
|
|
30
7
|
const helpers_1 = require("yargs/helpers");
|
|
31
8
|
const yargs_1 = __importDefault(require("yargs"));
|
|
32
9
|
const util_1 = __importDefault(require("util"));
|
|
@@ -40,7 +17,7 @@ class RspackCLI {
|
|
|
40
17
|
this.colors = this.createColors();
|
|
41
18
|
this.program = (0, yargs_1.default)();
|
|
42
19
|
}
|
|
43
|
-
async createCompiler(options, rspackEnv) {
|
|
20
|
+
async createCompiler(options, rspackEnv, callback) {
|
|
44
21
|
var _a;
|
|
45
22
|
process.env.RSPACK_CONFIG_VALIDATE = "loose";
|
|
46
23
|
let nodeEnv = (_a = process === null || process === void 0 ? void 0 : process.env) === null || _a === void 0 ? void 0 : _a.NODE_ENV;
|
|
@@ -52,8 +29,11 @@ class RspackCLI {
|
|
|
52
29
|
}
|
|
53
30
|
let config = await this.loadConfig(options);
|
|
54
31
|
config = await this.buildConfig(config, options, rspackEnv);
|
|
32
|
+
const isWatch = Array.isArray(config)
|
|
33
|
+
? config.some(i => i.watch)
|
|
34
|
+
: config.watch;
|
|
55
35
|
// @ts-ignore
|
|
56
|
-
const compiler = (0, core_1.rspack)(config);
|
|
36
|
+
const compiler = (0, core_1.rspack)(config, isWatch ? callback : undefined);
|
|
57
37
|
return compiler;
|
|
58
38
|
}
|
|
59
39
|
createColors(useColor) {
|
|
@@ -99,7 +79,7 @@ class RspackCLI {
|
|
|
99
79
|
const isEnvProduction = rspackEnv === "production";
|
|
100
80
|
const isEnvDevelopment = rspackEnv === "development";
|
|
101
81
|
if (options.analyze) {
|
|
102
|
-
const { BundleAnalyzerPlugin } = await
|
|
82
|
+
const { BundleAnalyzerPlugin } = await import("webpack-bundle-analyzer");
|
|
103
83
|
((_a = item.plugins) !== null && _a !== void 0 ? _a : (item.plugins = [])).push({
|
|
104
84
|
name: "rspack-bundle-analyzer",
|
|
105
85
|
apply(compiler) {
|
|
@@ -109,6 +89,10 @@ class RspackCLI {
|
|
|
109
89
|
}
|
|
110
90
|
});
|
|
111
91
|
}
|
|
92
|
+
// cli --watch overrides the watch config
|
|
93
|
+
if (options.watch) {
|
|
94
|
+
item.watch = options.watch;
|
|
95
|
+
}
|
|
112
96
|
// auto set default mode if user config don't set it
|
|
113
97
|
if (!item.mode) {
|
|
114
98
|
item.mode = rspackEnv !== null && rspackEnv !== void 0 ? rspackEnv : "none";
|
|
@@ -145,7 +129,7 @@ class RspackCLI {
|
|
|
145
129
|
};
|
|
146
130
|
}
|
|
147
131
|
if (typeof item.stats === "undefined") {
|
|
148
|
-
item.stats = { preset: "
|
|
132
|
+
item.stats = { preset: "errors-warnings" };
|
|
149
133
|
}
|
|
150
134
|
else if (typeof item.stats === "boolean") {
|
|
151
135
|
item.stats = item.stats ? { preset: "normal" } : { preset: "none" };
|
|
@@ -170,7 +154,7 @@ class RspackCLI {
|
|
|
170
154
|
}
|
|
171
155
|
async loadConfig(options) {
|
|
172
156
|
var _a;
|
|
173
|
-
let loadedConfig = (0, loadConfig_1.loadRspackConfig)(options);
|
|
157
|
+
let loadedConfig = await (0, loadConfig_1.loadRspackConfig)(options);
|
|
174
158
|
if (options.configName) {
|
|
175
159
|
const notFoundConfigNames = [];
|
|
176
160
|
// @ts-ignore
|
|
@@ -209,6 +193,15 @@ class RspackCLI {
|
|
|
209
193
|
isMultipleCompiler(compiler) {
|
|
210
194
|
return Boolean(compiler.compilers);
|
|
211
195
|
}
|
|
196
|
+
isWatch(compiler) {
|
|
197
|
+
return Boolean(this.isMultipleCompiler(compiler)
|
|
198
|
+
? compiler.compilers.some(compiler => compiler.options.watch)
|
|
199
|
+
: compiler.options.watch);
|
|
200
|
+
}
|
|
212
201
|
}
|
|
213
202
|
exports.RspackCLI = RspackCLI;
|
|
203
|
+
function defineConfig(config) {
|
|
204
|
+
return config;
|
|
205
|
+
}
|
|
206
|
+
exports.defineConfig = defineConfig;
|
|
214
207
|
//# sourceMappingURL=rspack-cli.js.map
|
package/dist/rspack-cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rspack-cli.js","sourceRoot":"","sources":["../src/rspack-cli.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rspack-cli.js","sourceRoot":"","sources":["../src/rspack-cli.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,MAAM,WAAW,UAAU;IAC1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AACD,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;AAC9C,MAAM,WAAW,eAAgB,SAAQ,SAAS;IACjD,gBAAgB,EAAE,OAAO,CAAC;CAC1B;AACD,MAAM,WAAW,eAAe;IAC/B,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,UAAU,CAAC;IACpB,GAAG,EAAE,UAAU,CAAC;IAChB,GAAG,EAAE,UAAU,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAChC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC7B,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AACD,MAAM,MAAM,sBAAsB,GAAG,SAAS,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { RspackCLIOptions } from "../types";
|
|
2
2
|
import { RspackOptions, MultiRspackOptions } from "@rspack/core";
|
|
3
3
|
export type LoadedRspackConfig = undefined | RspackOptions | MultiRspackOptions | ((env: Record<string, any>, argv: Record<string, any>) => RspackOptions | MultiRspackOptions);
|
|
4
|
-
export declare function loadRspackConfig(options: RspackCLIOptions): LoadedRspackConfig
|
|
4
|
+
export declare function loadRspackConfig(options: RspackCLIOptions): Promise<LoadedRspackConfig>;
|
|
5
5
|
//# sourceMappingURL=loadConfig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadConfig.d.ts","sourceRoot":"","sources":["../../src/utils/loadConfig.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAMjE,MAAM,MAAM,kBAAkB,GAC3B,SAAS,GACT,aAAa,GACb,kBAAkB,GAClB,CAAC,CACD,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACpB,aAAa,GAAG,kBAAkB,CAAC,CAAC;AAE5C,
|
|
1
|
+
{"version":3,"file":"loadConfig.d.ts","sourceRoot":"","sources":["../../src/utils/loadConfig.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAMjE,MAAM,MAAM,kBAAkB,GAC3B,SAAS,GACT,aAAa,GACb,kBAAkB,GAClB,CAAC,CACD,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACpB,aAAa,GAAG,kBAAkB,CAAC,CAAC;AAE5C,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,gBAAgB,GACvB,OAAO,CAAC,kBAAkB,CAAC,CAoC7B"}
|
package/dist/utils/loadConfig.js
CHANGED
|
@@ -9,7 +9,7 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
9
9
|
const supportedExtensions = [".js", ".ts"];
|
|
10
10
|
const defaultConfig = "rspack.config";
|
|
11
11
|
const defaultEntry = "src/index";
|
|
12
|
-
function loadRspackConfig(options) {
|
|
12
|
+
async function loadRspackConfig(options) {
|
|
13
13
|
let loadedConfig;
|
|
14
14
|
// if we pass config paras
|
|
15
15
|
if (options.config) {
|
|
@@ -17,12 +17,12 @@ function loadRspackConfig(options) {
|
|
|
17
17
|
if (!fs_1.default.existsSync(resolvedConfigPath)) {
|
|
18
18
|
throw new Error(`config file "${resolvedConfigPath}" not exists`);
|
|
19
19
|
}
|
|
20
|
-
loadedConfig = requireWithAdditionalExtension(resolvedConfigPath);
|
|
20
|
+
loadedConfig = await requireWithAdditionalExtension(resolvedConfigPath);
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
23
23
|
let defaultConfigPath = findFileWithSupportedExtensions(path_1.default.resolve(process.cwd(), defaultConfig));
|
|
24
24
|
if (defaultConfigPath != null) {
|
|
25
|
-
loadedConfig = requireWithAdditionalExtension(defaultConfigPath);
|
|
25
|
+
loadedConfig = await requireWithAdditionalExtension(defaultConfigPath);
|
|
26
26
|
}
|
|
27
27
|
else {
|
|
28
28
|
let entry = {};
|
|
@@ -58,7 +58,7 @@ function findFileWithSupportedExtensions(basePath) {
|
|
|
58
58
|
return null;
|
|
59
59
|
}
|
|
60
60
|
let hasRegisteredTS = false;
|
|
61
|
-
function requireWithAdditionalExtension(resolvedPath) {
|
|
61
|
+
async function requireWithAdditionalExtension(resolvedPath) {
|
|
62
62
|
if (resolvedPath.endsWith("ts") && !hasRegisteredTS) {
|
|
63
63
|
hasRegisteredTS = true;
|
|
64
64
|
let tsNode;
|
|
@@ -70,6 +70,14 @@ function requireWithAdditionalExtension(resolvedPath) {
|
|
|
70
70
|
}
|
|
71
71
|
tsNode.register({ transpileOnly: true });
|
|
72
72
|
}
|
|
73
|
-
|
|
73
|
+
let loadedConfig;
|
|
74
|
+
if (resolvedPath.endsWith("ts")) {
|
|
75
|
+
loadedConfig = require(resolvedPath);
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
// dynamic import can handle both cjs & mjs
|
|
79
|
+
loadedConfig = (await import(resolvedPath)).default;
|
|
80
|
+
}
|
|
81
|
+
return loadedConfig;
|
|
74
82
|
}
|
|
75
83
|
//# sourceMappingURL=loadConfig.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadConfig.js","sourceRoot":"","sources":["../../src/utils/loadConfig.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,4CAAoB;AAIpB,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAC3C,MAAM,aAAa,GAAG,eAAe,CAAC;AACtC,MAAM,YAAY,GAAG,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"loadConfig.js","sourceRoot":"","sources":["../../src/utils/loadConfig.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,4CAAoB;AAIpB,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAC3C,MAAM,aAAa,GAAG,eAAe,CAAC;AACtC,MAAM,YAAY,GAAG,WAAW,CAAC;AAW1B,KAAK,UAAU,gBAAgB,CACrC,OAAyB;IAEzB,IAAI,YAAgC,CAAC;IACrC,0BAA0B;IAC1B,IAAI,OAAO,CAAC,MAAM,EAAE;QACnB,MAAM,kBAAkB,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACvE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;YACvC,MAAM,IAAI,KAAK,CAAC,gBAAgB,kBAAkB,cAAc,CAAC,CAAC;SAClE;QACD,YAAY,GAAG,MAAM,8BAA8B,CAAC,kBAAkB,CAAC,CAAC;KACxE;SAAM;QACN,IAAI,iBAAiB,GAAG,+BAA+B,CACtD,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAC1C,CAAC;QACF,IAAI,iBAAiB,IAAI,IAAI,EAAE;YAC9B,YAAY,GAAG,MAAM,8BAA8B,CAAC,iBAAiB,CAAC,CAAC;SACvE;aAAM;YACN,IAAI,KAAK,GAA2B,EAAE,CAAC;YACvC,IAAI,OAAO,CAAC,KAAK,EAAE;gBAClB,KAAK,GAAG;oBACP,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mCAAmC;iBACnG,CAAC;aACF;iBAAM;gBACN,MAAM,gBAAgB,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;gBACnE,MAAM,gBAAgB,GACrB,+BAA+B,CAAC,gBAAgB,CAAC;oBACjD,gBAAgB,GAAG,KAAK,CAAC,CAAC,sBAAsB;gBACjD,KAAK,GAAG;oBACP,IAAI,EAAE,gBAAgB;iBACtB,CAAC;aACF;YACD,YAAY,GAAG;gBACd,KAAK;aACL,CAAC;SACF;KACD;IACD,OAAO,YAAY,CAAC;AACrB,CAAC;AAtCD,4CAsCC;AAED,6EAA6E;AAC7E,8CAA8C;AAC9C,SAAS,+BAA+B,CAAC,QAAgB;IACxD,KAAK,MAAM,SAAS,IAAI,mBAAmB,EAAE;QAC5C,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,GAAG,SAAS,CAAC,EAAE;YACxC,OAAO,QAAQ,GAAG,SAAS,CAAC;SAC5B;KACD;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,IAAI,eAAe,GAAG,KAAK,CAAC;AAC5B,KAAK,UAAU,8BAA8B,CAAC,YAAoB;IACjE,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;QACpD,eAAe,GAAG,IAAI,CAAC;QACvB,IAAI,MAAW,CAAC;QAChB,IAAI;YACH,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;SAC5B;QAAC,OAAO,CAAC,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;SAC1E;QACD,MAAM,CAAC,QAAQ,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;KACzC;IACD,IAAI,YAAY,CAAC;IACjB,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KACrC;SAAM;QACN,2CAA2C;QAC3C,YAAY,GAAG,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;KACpD;IACD,OAAO,YAAY,CAAC;AACrB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rspack/cli",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.2",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "CLI for rspack",
|
|
6
6
|
"bin": {
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
"colorette": "2.0.19",
|
|
37
37
|
"webpack-bundle-analyzer": "4.6.1",
|
|
38
38
|
"yargs": "17.6.2",
|
|
39
|
-
"@rspack/core": "0.1.
|
|
40
|
-
"@rspack/dev-server": "0.1.
|
|
39
|
+
"@rspack/core": "0.1.2",
|
|
40
|
+
"@rspack/dev-server": "0.1.2"
|
|
41
41
|
},
|
|
42
42
|
"scripts": {
|
|
43
43
|
"build": "rimraf dist/ && tsc -b --force",
|