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
4 changes: 2 additions & 2 deletions packages/react/transform/crates/swc_plugin_compat/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -557,11 +557,11 @@ where
});
}

n.src = Box::new(Str {
*n.src = Str {
span: DUMMY_SP,
raw: None,
value: format!("{}/legacy-react-runtime", self.opts.new_runtime_pkg.clone()).into(),
});
};

self.is_old_runtime_pkg = true;
}
Expand Down
7 changes: 4 additions & 3 deletions packages/react/transform/crates/swc_plugin_css_scope/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,13 @@ where
// Is CSS files
//
// Add cssId to the import
import_decl.src = Box::new(Str {
span: import_decl.src.span,
let span = import_decl.src.span;
*import_decl.src = Str {
span,
raw: None,
// TODO(wangqingyu): deal with src that already have query(`?`)
value: format!("{}?cssId={}", src_value.as_ref(), self.css_id).into(),
});
};
has_css_import = true;
}
}
Expand Down
4 changes: 1 addition & 3 deletions packages/react/transform/crates/swc_plugin_inject/napi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ impl napi::bindgen_prelude::FromNapiValue for InjectAs {
// }

let array_val = <Vec<String>>::from_napi_value(env, napi_val);
if array_val.is_ok() {
let v = array_val.unwrap();

if let Ok(v) = array_val {
return match v[0].as_str() {
"expr" => Ok(InjectAs::Expr(v[1].clone())),
"importDefault" => Ok(InjectAs::ImportDefault(v[1].clone())),
Expand Down
6 changes: 2 additions & 4 deletions packages/react/transform/crates/swc_plugin_snapshot/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -665,14 +665,12 @@ where
})) => {
let expr = &**expr;
if is_literal(expr) {
let s = get_string_inline_style_from_literal(expr, span);

if s.is_some() {
if let Some(s) = get_string_inline_style_from_literal(expr, span) {
// <view style={{backgroundColor: "red"}} />;
// <view style={`background-color: red;`} />;
let s = Lit::Str(Str {
span: *span,
value: s.unwrap().into(),
value: s.into(),
raw: None,
});
let stmt = quote!(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ impl Visit for BindingCollector {
node.visit_children_with(self);
}

if node.ident.is_some() {
self.add(node.ident.as_ref().unwrap());
if let Some(ident) = node.ident.as_ref() {
self.add(ident);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,15 @@ impl ExtractingIdentsCollector {
.into()
};

if prop.is_some() {
if path.len() == 1 {
*prop.unwrap() = new_prop;
match prop {
Some(prop) => {
if path.len() == 1 {
*prop = new_prop;
}
}
None => {
props.push(new_prop);
}
} else {
props.push(new_prop);
}

if path.len() > 1 {
Expand Down
78 changes: 39 additions & 39 deletions packages/web-platform/web-core-wasm/binary/client/client.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,63 +180,63 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl

export interface InitOutput {
readonly memory: WebAssembly.Memory;
readonly mainthreadwasmcontext___GetComponentID: (a: number, b: number) => [number, number, number, number];
readonly mainthreadwasmcontext___GetElementConfig: (a: number, b: number) => [number, number, number];
readonly mainthreadwasmcontext___SetConfig: (a: number, b: number, c: any) => [number, number];
readonly mainthreadwasmcontext___GetConfig: (a: number, b: number) => [number, number, number];
readonly mainthreadwasmcontext___UpdateComponentID: (a: number, b: number, c: number, d: number) => [number, number];
readonly mainthreadwasmcontext___SetDataset: (a: number, b: number, c: any, d: any) => [number, number];
readonly mainthreadwasmcontext___AddDataset: (a: number, b: number, c: any, d: any) => [number, number];
readonly mainthreadwasmcontext___GetDataset: (a: number, b: number) => [number, number, number];
readonly mainthreadwasmcontext___GetDataByKey: (a: number, b: number, c: number, d: number) => [number, number, number];
readonly mainthreadwasmcontext__wasm_elementFromBinary: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => [number, number, number];
readonly __wbg_decodedstyledata_free: (a: number, b: number) => void;
readonly __wbg_elementtemplatesection_free: (a: number, b: number) => void;
readonly __wbg_eventinfo_free: (a: number, b: number) => void;
readonly __wbg_get_eventinfo_function: (a: number) => any;
readonly __wbg_get_eventinfo_name: (a: number) => [number, number];
readonly __wbg_set_eventinfo_name: (a: number, b: number, c: number) => void;
readonly __wbg_get_eventinfo_type: (a: number) => [number, number];
readonly __wbg_set_eventinfo_type: (a: number, b: number, c: number) => void;
readonly __wbg_get_eventinfo_function: (a: number) => any;
readonly __wbg_mainthreadwasmcontext_free: (a: number, b: number) => void;
readonly __wbg_rawstyleinfo_free: (a: number, b: number) => void;
readonly __wbg_rule_free: (a: number, b: number) => void;
readonly __wbg_ruleprelude_free: (a: number, b: number) => void;
readonly __wbg_selector_free: (a: number, b: number) => void;
readonly __wbg_set_eventinfo_function: (a: number, b: any) => void;
readonly mainthreadwasmcontext___wasm_add_event_bts: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => void;
readonly mainthreadwasmcontext___wasm_add_event_run_worklet: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
readonly __wbg_set_eventinfo_name: (a: number, b: number, c: number) => void;
readonly __wbg_set_eventinfo_type: (a: number, b: number, c: number) => void;
readonly decodedstyledata_decode_into: (a: any, b: number, c: number, d: number) => [number, number, number];
readonly decodedstyledata_encode_from_raw_style_info: (a: number, b: number, c: number, d: number) => [number, number, number];
readonly decodedstyledata_font_face_content: (a: number) => [number, number];
readonly decodedstyledata_new: (a: any) => [number, number, number];
readonly decodedstyledata_query_css_og_declarations_by_css_id: (a: number, b: number, c: number, d: number) => [number, number];
readonly decodedstyledata_style_content: (a: number) => [number, number];
readonly elementtemplatesection_from_encoded: (a: any) => [number, number, number];
readonly mainthreadwasmcontext___AddDataset: (a: number, b: number, c: any, d: any) => [number, number];
readonly mainthreadwasmcontext___CreateElementCommon: (a: number, b: number, c: any, d: number, e: number, f: number) => number;
readonly mainthreadwasmcontext___GetComponentID: (a: number, b: number) => [number, number, number, number];
readonly mainthreadwasmcontext___GetConfig: (a: number, b: number) => [number, number, number];
readonly mainthreadwasmcontext___GetDataByKey: (a: number, b: number, c: number, d: number) => [number, number, number];
readonly mainthreadwasmcontext___GetDataset: (a: number, b: number) => [number, number, number];
readonly mainthreadwasmcontext___GetElementConfig: (a: number, b: number) => [number, number, number];
readonly mainthreadwasmcontext___GetEvent: (a: number, b: number, c: number, d: number, e: number, f: number) => any;
readonly mainthreadwasmcontext___GetEvents: (a: number, b: number) => [number, number];
readonly mainthreadwasmcontext_dispatch_event_by_path: (a: number, b: number, c: number, d: number, e: number, f: number, g: any) => number;
readonly mainthreadwasmcontext___wasm_commonEventHandler: (a: number, b: any, c: number, d: number, e: number, f: number) => void;
readonly mainthreadwasmcontext___wasm_set_css_id: (a: number, b: number, c: number, d: number) => void;
readonly mainthreadwasmcontext___wasm_AddInlineStyle_str_key: (a: number, b: any, c: number, d: number, e: number, f: number) => void;
readonly mainthreadwasmcontext___SetConfig: (a: number, b: number, c: any) => [number, number];
readonly mainthreadwasmcontext___SetDataset: (a: number, b: number, c: any, d: any) => [number, number];
readonly mainthreadwasmcontext___UpdateComponentID: (a: number, b: number, c: number, d: number) => [number, number];
readonly mainthreadwasmcontext___wasm_AddInlineStyle_number_key: (a: number, b: any, c: number, d: number, e: number) => void;
readonly mainthreadwasmcontext___wasm_AddInlineStyle_str_key: (a: number, b: any, c: number, d: number, e: number, f: number) => void;
readonly mainthreadwasmcontext___wasm_SetInlineStyles: (a: number, b: any, c: number, d: number) => number;
readonly __wbg_mainthreadwasmcontext_free: (a: number, b: number) => void;
readonly mainthreadwasmcontext_new: (a: any, b: any, c: any, d: any, e: number) => number;
readonly mainthreadwasmcontext___wasm_add_event_bts: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => void;
readonly mainthreadwasmcontext___wasm_add_event_run_worklet: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
readonly mainthreadwasmcontext___wasm_commonEventHandler: (a: number, b: any, c: number, d: number, e: number, f: number) => void;
readonly mainthreadwasmcontext___wasm_get_css_id_by_unique_id: (a: number, b: number) => number;
readonly mainthreadwasmcontext___wasm_get_unique_id_by_component_id: (a: number, b: number, c: number) => number;
readonly mainthreadwasmcontext___wasm_set_css_id: (a: number, b: number, c: number, d: number) => void;
readonly mainthreadwasmcontext___wasm_set_page_element_unique_id: (a: number, b: number) => void;
readonly mainthreadwasmcontext___CreateElementCommon: (a: number, b: number, c: any, d: number, e: number, f: number) => number;
readonly mainthreadwasmcontext___wasm_take_timing_flags: (a: number) => [number, number];
readonly mainthreadwasmcontext___wasm_get_unique_id_by_component_id: (a: number, b: number, c: number) => number;
readonly mainthreadwasmcontext___wasm_get_css_id_by_unique_id: (a: number, b: number) => number;
readonly __wbg_elementtemplatesection_free: (a: number, b: number) => void;
readonly elementtemplatesection_from_encoded: (a: any) => [number, number, number];
readonly __wbg_rawstyleinfo_free: (a: number, b: number) => void;
readonly __wbg_rule_free: (a: number, b: number) => void;
readonly __wbg_ruleprelude_free: (a: number, b: number) => void;
readonly __wbg_selector_free: (a: number, b: number) => void;
readonly rawstyleinfo_new: () => number;
readonly mainthreadwasmcontext__wasm_elementFromBinary: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => [number, number, number];
readonly mainthreadwasmcontext_dispatch_event_by_path: (a: number, b: number, c: number, d: number, e: number, f: number, g: any) => number;
readonly mainthreadwasmcontext_new: (a: any, b: any, c: any, d: any, e: number) => number;
readonly rawstyleinfo_append_import: (a: number, b: number, c: number) => void;
readonly rawstyleinfo_new: () => number;
readonly rawstyleinfo_push_rule: (a: number, b: number, c: number) => void;
readonly rule_new: (a: number, b: number) => [number, number, number];
readonly rule_set_prelude: (a: number, b: number) => void;
readonly rule_push_declaration: (a: number, b: number, c: number, d: number, e: number) => void;
readonly rule_push_rule_children: (a: number, b: number) => void;
readonly rule_set_prelude: (a: number, b: number) => void;
readonly ruleprelude_new: () => number;
readonly ruleprelude_push_selector: (a: number, b: number) => void;
readonly selector_push_one_selector_section: (a: number, b: number, c: number, d: number, e: number) => [number, number];
readonly __wbg_decodedstyledata_free: (a: number, b: number) => void;
readonly decodedstyledata_new: (a: any) => [number, number, number];
readonly decodedstyledata_style_content: (a: number) => [number, number];
readonly decodedstyledata_font_face_content: (a: number) => [number, number];
readonly decodedstyledata_query_css_og_declarations_by_css_id: (a: number, b: number, c: number, d: number) => [number, number];
readonly decodedstyledata_decode_into: (a: any, b: number, c: number, d: number) => [number, number, number];
readonly decodedstyledata_encode_from_raw_style_info: (a: number, b: number, c: number, d: number) => [number, number, number];
readonly selector_new: () => number;
readonly __wbindgen_malloc: (a: number, b: number) => number;
readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
Expand Down
Loading
Loading