Merge branch 'main' into node-api

web-infra-dev · Apr 1, 2024 · fef60d0 · fef60d0
2 parents 35fd25e + 48aa3b9
commit fef60d0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 21 deletions.
diff --git a/packages/rspack-dev-server/src/server.ts b/packages/rspack-dev-server/src/server.ts
@@ -230,14 +230,18 @@ export class RspackDevServer extends WebpackDevServer {
 						if (req.url.indexOf("/lazy-compilation-web/") > -1) {
 							const path = req.url.replace("/lazy-compilation-web/", "");
 							if (fs.existsSync(path)) {
-								compiler.rebuild(new Set([path]), new Set(), error => {
-									if (error) {
-										throw error;
+								compiler.__internal__rebuild(
+									new Set([path]),
+									new Set(),
+									error => {
+										if (error) {
+											throw error;
+										}
+										res.write("");
+										res.end();
+										console.log("lazy compiler success");
 									}
-									res.write("");
-									res.end();
-									console.log("lazy compiler success");
-								});
+								);
 							}
 						}
 					}

diff --git a/packages/rspack-test-tools/tests/statsAPICases/cache-disabled.js b/packages/rspack-test-tools/tests/statsAPICases/cache-disabled.js
@@ -18,7 +18,7 @@ module.exports = {
 			});
 		});
 		await new Promise((resolve, reject) => {
-			compiler.rebuild(
+			compiler.__internal__rebuild(
 				new Set([context.getSource("./fixtures/a")]),
 				new Set(),
 				err => {

diff --git a/packages/rspack-test-tools/tests/statsAPICases/cache-enabled.js b/packages/rspack-test-tools/tests/statsAPICases/cache-enabled.js
@@ -19,7 +19,7 @@ module.exports = {
 			});
 		});
 		await new Promise((resolve, reject) => {
-			compiler.rebuild(
+			compiler.__internal__rebuild(
 				new Set([context.getSource("./fixtures/a")]),
 				new Set(),
 				err => {

diff --git a/packages/rspack/src/Compiler.ts b/packages/rspack/src/Compiler.ts
@@ -70,7 +70,7 @@ class Compiler {
 	compilation?: Compilation;
 	compilationParams?: CompilationParams;
 	// TODO: remove this after remove rebuild on the rust side.
-	first: boolean = true;
+	#initial: boolean = true;
 	builtinPlugins: binding.BuiltinPlugin[];
 	root: Compiler;
 	running: boolean;
@@ -945,15 +945,12 @@ class Compiler {
 			doRun();
 		}
 	}
-	/**
-	 * Safety: This method is only valid to call if the previous rebuild task is finished, or there will be data races.
-	 */
-	build(callback?: (error: Error | null) => void) {
+	#build(callback?: (error: Error | null) => void) {
 		this.#getInstance((error, instance) => {
 			if (error) {
 				return callback?.(error);
 			}
-			if (!this.first) {
+			if (!this.#initial) {
 				instance!.rebuild(
 					Array.from(this.modifiedFiles || []),
 					Array.from(this.removedFiles || []),
@@ -966,7 +963,7 @@ class Compiler {
 				);
 				return;
 			}
-			this.first = false;
+			this.#initial = false;
 			instance!.build(error => {
 				if (error) {
 					return callback?.(error);
@@ -977,10 +974,10 @@ class Compiler {
 	}
 
 	/**
-	 * Safety: This method is only valid to call if the previous rebuild task is finished, or there will be data races.
-	 * @deprecated This is a low-level incremental rebuild API, which shouldn't be used intentionally. Use `compiler.build` instead.
+	 * * Note: This is not a webpack public API, maybe removed in future.
+	 * @internal
 	 */
-	rebuild(
+	__internal__rebuild(
 		modifiedFiles?: ReadonlySet<string>,
 		removedFiles?: ReadonlySet<string>,
 		callback?: (error: Error | null) => void
@@ -1041,7 +1038,7 @@ class Compiler {
 			this.hooks.compile.call(params);
 			this.#resetThisCompilation();
 
-			this.build(err => {
+			this.#build(err => {
 				if (err) {
 					return callback(err);
 				}
@@ -1077,7 +1074,7 @@ class Compiler {
 
 	close(callback: (error?: Error | null) => void) {
 		if (this.watching) {
-			// When there is still an active watching, close this first
+			// When there is still an active watching, close this #initial
 			this.watching.close(() => {
 				this.close(callback);
 			});