Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/rspack/src/builder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3728,7 +3728,7 @@ impl ExperimentsBuilder {
// Builder specific
let future_defaults = w!(self.future_defaults, false);
w!(self.css, *future_defaults);
w!(self.async_web_assembly, *future_defaults);
w!(self.async_web_assembly, true);
w!(self.output_module, false);

Ok(Experiments {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ expression: builder_context
---
BuilderContext {
plugins: [
AsyncWebAssemblyModulesPlugin,
ArrayPushCallbackChunkFormatPlugin,
EnableChunkLoadingPlugin(
Jsonp,
Expand Down
213 changes: 213 additions & 0 deletions crates/rspack/tests/snapshots/defaults__default_options.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1190,6 +1190,219 @@ CompilerOptions {
},
extract_source_map: None,
},
ModuleRule {
rspack_resource: None,
test: Some(
"Func(...)",
),
include: None,
exclude: None,
resource: None,
resource_query: None,
resource_fragment: None,
dependency: None,
issuer: None,
issuer_layer: None,
scheme: None,
mimetype: None,
description_data: None,
with: None,
one_of: None,
rules: Some(
[
ModuleRule {
rspack_resource: None,
test: None,
include: None,
exclude: None,
resource: None,
resource_query: None,
resource_fragment: None,
dependency: None,
issuer: None,
issuer_layer: None,
scheme: None,
mimetype: None,
description_data: Some(
{
"type": RuleSetConditionWithEmpty {
condition: "module",
match_when_empty: OnceCell {
value: None,
},
},
},
),
with: None,
one_of: None,
rules: None,
effect: ModuleRuleEffect {
side_effects: None,
type: None,
layer: None,
use: ,
parser: None,
generator: None,
resolve: Some(
Resolve {
extensions: None,
alias: None,
prefer_relative: None,
prefer_absolute: None,
symlinks: None,
main_files: None,
main_fields: None,
condition_names: None,
tsconfig: None,
modules: None,
fallback: None,
fully_specified: Some(
true,
),
exports_fields: None,
extension_alias: None,
alias_fields: None,
roots: None,
restrictions: None,
imports_fields: None,
by_dependency: None,
description_files: None,
enforce_extension: None,
pnp: None,
builtin_modules: false,
},
),
enforce: Normal,
extract_source_map: None,
},
extract_source_map: None,
},
],
),
effect: ModuleRuleEffect {
side_effects: None,
type: Some(
WasmAsync,
),
layer: None,
use: ,
parser: None,
generator: None,
resolve: None,
enforce: Normal,
extract_source_map: None,
},
extract_source_map: None,
},
ModuleRule {
rspack_resource: None,
test: None,
include: None,
exclude: None,
resource: None,
resource_query: None,
resource_fragment: None,
dependency: None,
issuer: None,
issuer_layer: None,
scheme: None,
mimetype: Some(
RuleSetConditionWithEmpty {
condition: "application/wasm",
match_when_empty: OnceCell {
value: None,
},
},
),
description_data: None,
with: None,
one_of: None,
rules: Some(
[
ModuleRule {
rspack_resource: None,
test: None,
include: None,
exclude: None,
resource: None,
resource_query: None,
resource_fragment: None,
dependency: None,
issuer: None,
issuer_layer: None,
scheme: None,
mimetype: None,
description_data: Some(
{
"type": RuleSetConditionWithEmpty {
condition: "module",
match_when_empty: OnceCell {
value: None,
},
},
},
),
with: None,
one_of: None,
rules: None,
effect: ModuleRuleEffect {
side_effects: None,
type: None,
layer: None,
use: ,
parser: None,
generator: None,
resolve: Some(
Resolve {
extensions: None,
alias: None,
prefer_relative: None,
prefer_absolute: None,
symlinks: None,
main_files: None,
main_fields: None,
condition_names: None,
tsconfig: None,
modules: None,
fallback: None,
fully_specified: Some(
true,
),
exports_fields: None,
extension_alias: None,
alias_fields: None,
roots: None,
restrictions: None,
imports_fields: None,
by_dependency: None,
description_files: None,
enforce_extension: None,
pnp: None,
builtin_modules: false,
},
),
enforce: Normal,
extract_source_map: None,
},
extract_source_map: None,
},
],
),
effect: ModuleRuleEffect {
side_effects: None,
type: Some(
WasmAsync,
),
layer: None,
use: ,
parser: None,
generator: None,
resolve: None,
enforce: Normal,
extract_source_map: None,
},
extract_source_map: None,
},
ModuleRule {
rspack_resource: None,
test: None,
Expand Down
3 changes: 2 additions & 1 deletion packages/rspack/src/config/defaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ const applyInfrastructureLoggingDefaults = (

const applyExperimentsDefaults = (experiments: ExperimentsNormalized) => {
D(experiments, 'futureDefaults', false);
D(experiments, 'asyncWebAssembly', experiments.futureDefaults);
// IGNORE(experiments.asyncWebAssembly): Rspack enable async WebAssembly by default
D(experiments, 'asyncWebAssembly', true);
D(experiments, 'css', experiments.futureDefaults ? true : undefined);
D(experiments, 'deferImport', false);

Expand Down
2 changes: 1 addition & 1 deletion packages/rspack/src/config/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2741,7 +2741,7 @@ export type Experiments = {
/**
* Enable async WebAssembly.
* Support the new WebAssembly according to the [updated specification](https://github.com/WebAssembly/esm-integration), it makes a WebAssembly module an async module.
* @default false
* @default true
*/
asyncWebAssembly?: boolean;
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
/** @type {import("@rspack/core").Configuration} */
module.exports = {};
module.exports = {
experiments: {
asyncWebAssembly: false,
},
};
30 changes: 29 additions & 1 deletion tests/rspack-test/defaultsCases/default/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = {
},
},
experiments: Object {
asyncWebAssembly: false,
asyncWebAssembly: true,
buildHttp: undefined,
css: undefined,
deferImport: false,
Expand Down Expand Up @@ -147,6 +147,34 @@ module.exports = {
},
type: javascript/esm,
},
Object {
rules: Array [
Object {
descriptionData: Object {
type: module,
},
resolve: Object {
fullySpecified: true,
},
},
],
test: /\\\\\\.wasm\\$/i,
type: webassembly/async,
},
Object {
mimetype: application/wasm,
rules: Array [
Object {
descriptionData: Object {
type: module,
},
resolve: Object {
fullySpecified: true,
},
},
],
type: webassembly/async,
},
Object {
dependency: url,
oneOf: Array [
Expand Down
38 changes: 1 addition & 37 deletions tests/rspack-test/defaultsCases/experiments/async-wasm.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,5 @@ module.exports = {
description: "async wasm",
options: () => ({ experiments: { asyncWebAssembly: true } }),
diff: e =>
e.toMatchInlineSnapshot(`
- Expected
+ Received

@@ ... @@
- "asyncWebAssembly": false,
+ "asyncWebAssembly": true,
@@ ... @@
+ },
+ Object {
+ "rules": Array [
+ Object {
+ "descriptionData": Object {
+ "type": "module",
+ },
+ "resolve": Object {
+ "fullySpecified": true,
+ },
+ },
+ ],
+ "test": /\\.wasm$/i,
+ "type": "webassembly/async",
+ },
+ Object {
+ "mimetype": "application/wasm",
+ "rules": Array [
+ Object {
+ "descriptionData": Object {
+ "type": "module",
+ },
+ "resolve": Object {
+ "fullySpecified": true,
+ },
+ },
+ ],
+ "type": "webassembly/async",
`)
e.toMatchInlineSnapshot(`Compared values have no visual difference.`)
};
42 changes: 5 additions & 37 deletions tests/rspack-test/defaultsCases/experiments/both-wasm.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,10 @@ module.exports = {
}),
diff: e =>
e.toMatchInlineSnapshot(`
- Expected
+ Received
- Expected
+ Received

@@ ... @@
- "asyncWebAssembly": false,
+ "asyncWebAssembly": true,
@@ ... @@
+ "syncWebAssembly": true,
@@ ... @@
+ },
+ Object {
+ "rules": Array [
+ Object {
+ "descriptionData": Object {
+ "type": "module",
+ },
+ "resolve": Object {
+ "fullySpecified": true,
+ },
+ },
+ ],
+ "test": /\\.wasm$/i,
+ "type": "webassembly/async",
+ },
+ Object {
+ "mimetype": "application/wasm",
+ "rules": Array [
+ Object {
+ "descriptionData": Object {
+ "type": "module",
+ },
+ "resolve": Object {
+ "fullySpecified": true,
+ },
+ },
+ ],
+ "type": "webassembly/async",
`)
@@ ... @@
+ "syncWebAssembly": true,
`)
};
Loading
Loading