Unverified Commit bc334396 authored by Kevin Moore's avatar Kevin Moore Committed by GitHub

[flutter_tools] enable wasm compile on beta channel (#143779)

Wasm compilation is now available on `master` and `beta` channels.
parent 6c78e36c
...@@ -149,7 +149,7 @@ class BuildWebCommand extends BuildSubCommand { ...@@ -149,7 +149,7 @@ class BuildWebCommand extends BuildSubCommand {
final List<WebCompilerConfig> compilerConfigs; final List<WebCompilerConfig> compilerConfigs;
if (boolArg('wasm')) { if (boolArg('wasm')) {
if (!featureFlags.isFlutterWebWasmEnabled) { if (!featureFlags.isFlutterWebWasmEnabled) {
throwToolExit('Compiling to WebAssembly (wasm) is only available on the master channel.'); throwToolExit('Compiling to WebAssembly (wasm) is only available on the beta and master channels.');
} }
if (stringArg(FlutterOptions.kWebRendererFlag) != argParser.defaultFor(FlutterOptions.kWebRendererFlag)) { if (stringArg(FlutterOptions.kWebRendererFlag) != argParser.defaultFor(FlutterOptions.kWebRendererFlag)) {
throwToolExit('"--${FlutterOptions.kWebRendererFlag}" cannot be combined with "--${FlutterOptions.kWebWasmFlag}"'); throwToolExit('"--${FlutterOptions.kWebRendererFlag}" cannot be combined with "--${FlutterOptions.kWebWasmFlag}"');
......
...@@ -150,6 +150,10 @@ const Feature flutterCustomDevicesFeature = Feature( ...@@ -150,6 +150,10 @@ const Feature flutterCustomDevicesFeature = Feature(
const Feature flutterWebWasm = Feature( const Feature flutterWebWasm = Feature(
name: 'WebAssembly compilation from flutter build web', name: 'WebAssembly compilation from flutter build web',
environmentOverride: 'FLUTTER_WEB_WASM', environmentOverride: 'FLUTTER_WEB_WASM',
beta: FeatureChannelSetting(
available: true,
enabledByDefault: true,
),
master: FeatureChannelSetting( master: FeatureChannelSetting(
available: true, available: true,
enabledByDefault: true, enabledByDefault: true,
......
...@@ -83,7 +83,7 @@ void main() { ...@@ -83,7 +83,7 @@ void main() {
testWithoutContext('Flutter web wasm only enable on master', () { testWithoutContext('Flutter web wasm only enable on master', () {
expect(flutterWebWasm.getSettingForChannel('master').enabledByDefault, isTrue); expect(flutterWebWasm.getSettingForChannel('master').enabledByDefault, isTrue);
expect(flutterWebWasm.getSettingForChannel('beta').enabledByDefault, isFalse); expect(flutterWebWasm.getSettingForChannel('beta').enabledByDefault, isTrue);
expect(flutterWebWasm.getSettingForChannel('stable').enabledByDefault, isFalse); expect(flutterWebWasm.getSettingForChannel('stable').enabledByDefault, isFalse);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment