Skip to content

fix: update yield codegen (update swc) #965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2022
Merged

fix: update yield codegen (update swc) #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
174 changes: 90 additions & 84 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions packages/qwik/src/optimizer/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ categories = ["development-tools", "development-tools::cargo-plugins"]
crate-type = ["rlib"]

[dependencies]
swc_ecmascript = { version = "0.156.0", features = ["parser", "transforms", "module", "typescript", "optimization", "minifier", "react", "utils", "visit", "codegen", "utils"] }
swc_common = { version = "0.18.1", features = ["sourcemap"] }
swc_atoms = "0.2.11"
serde = "1.0.137"
serde_bytes = "0.11.6"
serde_json = "1.0.81"
swc_ecmascript = { version = "0.188.0", features = ["parser", "transforms", "module", "typescript", "optimization", "minifier", "react", "utils", "visit", "codegen", "utils"] }
swc_common = { version = "0.27.0", features = ["sourcemap"] }
swc_atoms = "0.4.0"
serde = "1.0.142"
serde_bytes = "0.11.7"
serde_json = "1.0.83"
simple-error = "0.2.3"
base64 = "0.13.0"
pathdiff = "0.2.1"
relative-path = "1.7.0"
relative-path = "1.7.2"
lazy_static = "1.4.0"
anyhow = "1.0.57"
anyhow = "1.0.60"
derivative = "2.2.0"
rayon = "1.5.1"
path-slash="0.1.4"
rayon = "1.5.3"
path-slash="0.2.1"

[dev-dependencies]
insta = "1.14.0"
Expand Down
20 changes: 11 additions & 9 deletions packages/qwik/src/optimizer/core/src/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,14 +351,12 @@ pub fn transform_code(config: TransformCodeOptions) -> Result<TransformOutput, a
config.source_maps,
)?;

let path = path_data
.rel_dir
.join(if did_transform {
[&path_data.file_stem, ".", &extension].concat()
} else {
path_data.file_name
})
.to_slash_lossy();
let a = if did_transform {
[&path_data.file_stem, ".", &extension].concat()
} else {
path_data.file_name
};
let path = path_data.rel_dir.join(a).to_string_lossy().to_string();

let mut hasher = DefaultHasher::new();
hasher.write(path.as_bytes());
Expand Down Expand Up @@ -468,7 +466,11 @@ pub fn emit_source_code(
None
},
));
let config = swc_ecmascript::codegen::Config { minify: false };
let config = swc_ecmascript::codegen::Config {
minify: false,
target: ast::EsVersion::latest(),
ascii_only: false,
};
let mut emitter = swc_ecmascript::codegen::Emitter {
cfg: config,
comments: Some(&comments),
Expand Down
12 changes: 4 additions & 8 deletions packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_1.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ const renderHeader = component($(() => {

import { qrl } from "@builder.io/qwik";
export const renderHeader_zBbHWn4e8Cg = ()=>{
return <div onClick={qrl(()=>import("./renderheader_div_onclick_fv2uzal99u4")
, "renderHeader_div_onClick_fV2uzAL99u4")}/>;
return <div onClick={qrl(()=>import("./renderheader_div_onclick_fv2uzal99u4"), "renderHeader_div_onClick_fV2uzAL99u4")}/>;
};
export { _hW } from "@builder.io/qwik";

Expand Down Expand Up @@ -76,15 +75,12 @@ export { _hW } from "@builder.io/qwik";

import { qrl } from "@builder.io/qwik";
import { component } from '@builder.io/qwik';
export const renderHeader = qrl(()=>import("./renderheader_zbbhwn4e8cg")
, "renderHeader_zBbHWn4e8Cg");
component(qrl(()=>import("./renderheader_component_u6kkv07sbpq")
, "renderHeader_component_U6Kkv07sbpQ"));
export const renderHeader = qrl(()=>import("./renderheader_zbbhwn4e8cg"), "renderHeader_zBbHWn4e8Cg");
component(qrl(()=>import("./renderheader_component_u6kkv07sbpq"), "renderHeader_component_U6Kkv07sbpQ"));

============================= renderheader_div_onclick_fv2uzal99u4.tsx (ENTRY POINT)==

export const renderHeader_div_onClick_fV2uzAL99u4 = (ctx)=>console.log(ctx)
;
export const renderHeader_div_onClick_fV2uzAL99u4 = (ctx)=>console.log(ctx);
export { _hW } from "@builder.io/qwik";

/*
Expand Down
6 changes: 2 additions & 4 deletions packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_10.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ export const Header_WlR3xnI6u38 = (decl1, { decl2 }, [decl3])=>{
return ident10;
}
}
return <div onClick={(ident11)=>ident11 + ident12
} required={false}/>;
return <div onClick={(ident11)=>ident11 + ident12} required={false}/>;
};
export { _hW } from "@builder.io/qwik";

Expand All @@ -72,8 +71,7 @@ export { _hW } from "@builder.io/qwik";
============================= project/test.tsx ==

import { qrl } from "@builder.io/qwik";
qrl(()=>import("../header_wlr3xni6u38")
, "Header_WlR3xnI6u38");
qrl(()=>import("../header_wlr3xni6u38"), "Header_WlR3xnI6u38");

== DIAGNOSTICS ==

Expand Down
12 changes: 4 additions & 8 deletions packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_11.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ export const App = component$(() => {
============================= header_component_header_onclick_kjd9tcnknxy.tsx ==

import dep3 from "dep3/something";
export const Header_component_Header_onClick_KjD9TCNkNxY = (ev)=>dep3(ev)
;
export const Header_component_Header_onClick_KjD9TCNkNxY = (ev)=>dep3(ev);

/*
{
Expand Down Expand Up @@ -56,8 +55,7 @@ import { bar as bbar } from "./state";
import * as dep2 from "dep2";
import { qrl } from "@builder.io/qwik";
export const Header_component_UVBJuFYfvDo = ()=>{
return <Header onClick={qrl(()=>import("./entry_hooks")
, "Header_component_Header_onClick_KjD9TCNkNxY")}>
return <Header onClick={qrl(()=>import("./entry_hooks"), "Header_component_Header_onClick_KjD9TCNkNxY")}>

{dep2.stuff()}{bbar()}

Expand Down Expand Up @@ -114,10 +112,8 @@ export const App_component_wGkRHWXaqjs = ()=>{

import { componentQrl } from "@builder.io/qwik";
import { qrl } from "@builder.io/qwik";
export const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("../entry_hooks")
, "Header_component_UVBJuFYfvDo"));
export const App = /*#__PURE__*/ componentQrl(qrl(()=>import("../entry_hooks")
, "App_component_wGkRHWXaqjs"));
export const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("../entry_hooks"), "Header_component_UVBJuFYfvDo"));
export const App = /*#__PURE__*/ componentQrl(qrl(()=>import("../entry_hooks"), "App_component_wGkRHWXaqjs"));

============================= entry_hooks.js (ENTRY POINT)==

Expand Down
9 changes: 3 additions & 6 deletions packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ export const Header = component$(() => {
import { qrl } from "@builder.io/qwik";
export const Header_component_J4uyIhaBNR4 = ()=>{
console.log("mount");
return <div onClick={qrl(()=>import("./header_component_div_onclick_i7ekvwh3674")
, "Header_component_div_onClick_i7ekvWH3674")}/>;
return <div onClick={qrl(()=>import("./header_component_div_onclick_i7ekvwh3674"), "Header_component_div_onClick_i7ekvWH3674")}/>;
};

/*
Expand All @@ -45,13 +44,11 @@ export const Header_component_J4uyIhaBNR4 = ()=>{

import { componentQrl } from "@builder.io/qwik";
import { qrl } from "@builder.io/qwik";
export const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("./header_component_j4uyihabnr4")
, "Header_component_J4uyIhaBNR4"));
export const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("./header_component_j4uyihabnr4"), "Header_component_J4uyIhaBNR4"));

============================= header_component_div_onclick_i7ekvwh3674.tsx (ENTRY POINT)==

export const Header_component_div_onClick_i7ekvWH3674 = (ctx)=>console.log(ctx)
;
export const Header_component_div_onClick_i7ekvWH3674 = (ctx)=>console.log(ctx);
export { _hW } from "@builder.io/qwik";

/*
Expand Down
9 changes: 3 additions & 6 deletions packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_3.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ export const App = () => {
import { qrl } from "@builder.io/qwik";
export const App_Header_component_B9F3YeqcO1w = ()=>{
console.log("mount");
return <div onClick={qrl(()=>import("./app_header_component_div_onclick_ao7ui7iw6oq")
, "App_Header_component_div_onClick_aO7uI7Iw6oQ")}/>;
return <div onClick={qrl(()=>import("./app_header_component_div_onclick_ao7ui7iw6oq"), "App_Header_component_div_onClick_aO7uI7Iw6oQ")}/>;
};

/*
Expand All @@ -46,8 +45,7 @@ export const App_Header_component_B9F3YeqcO1w = ()=>{
*/
============================= app_header_component_div_onclick_ao7ui7iw6oq.tsx (ENTRY POINT)==

export const App_Header_component_div_onClick_aO7uI7Iw6oQ = (ctx)=>console.log(ctx)
;
export const App_Header_component_div_onClick_aO7uI7Iw6oQ = (ctx)=>console.log(ctx);
export { _hW } from "@builder.io/qwik";

/*
Expand All @@ -74,8 +72,7 @@ export { _hW } from "@builder.io/qwik";
import { componentQrl } from "@builder.io/qwik";
import { qrl } from "@builder.io/qwik";
export const App = ()=>{
const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("./app_header_component_b9f3yeqco1w")
, "App_Header_component_B9F3YeqcO1w"));
const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("./app_header_component_b9f3yeqco1w"), "App_Header_component_B9F3YeqcO1w"));
return Header;
};

Expand Down
9 changes: 3 additions & 6 deletions packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_4.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ export function App() {
import { qrl } from "@builder.io/qwik";
export const App_Header_component_B9F3YeqcO1w = ()=>{
console.log("mount");
return <div onClick={qrl(()=>import("./app_header_component_div_onclick_ao7ui7iw6oq")
, "App_Header_component_div_onClick_aO7uI7Iw6oQ")}/>;
return <div onClick={qrl(()=>import("./app_header_component_div_onclick_ao7ui7iw6oq"), "App_Header_component_div_onClick_aO7uI7Iw6oQ")}/>;
};

/*
Expand All @@ -46,8 +45,7 @@ export const App_Header_component_B9F3YeqcO1w = ()=>{
*/
============================= app_header_component_div_onclick_ao7ui7iw6oq.tsx (ENTRY POINT)==

export const App_Header_component_div_onClick_aO7uI7Iw6oQ = (ctx)=>console.log(ctx)
;
export const App_Header_component_div_onClick_aO7uI7Iw6oQ = (ctx)=>console.log(ctx);
export { _hW } from "@builder.io/qwik";

/*
Expand All @@ -74,8 +72,7 @@ export { _hW } from "@builder.io/qwik";
import { componentQrl } from "@builder.io/qwik";
import { qrl } from "@builder.io/qwik";
export function App() {
const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("./app_header_component_b9f3yeqco1w")
, "App_Header_component_B9F3YeqcO1w"));
const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("./app_header_component_b9f3yeqco1w"), "App_Header_component_B9F3YeqcO1w"));
return Header;
}

Expand Down
12 changes: 4 additions & 8 deletions packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_5.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@ import { qrl } from "@builder.io/qwik";
export const Header_component_J4uyIhaBNR4 = ()=>{
return <>

<div onClick={(ctx)=>console.log("1")
}/>
<div onClick={(ctx)=>console.log("1")}/>

<div onClick={qrl(()=>import("./header_component_div_onclick_i7ekvwh3674")
, "Header_component_div_onClick_i7ekvWH3674")}/>
<div onClick={qrl(()=>import("./header_component_div_onclick_i7ekvwh3674"), "Header_component_div_onClick_i7ekvWH3674")}/>

</>;
};
Expand Down Expand Up @@ -53,13 +51,11 @@ export const Header_component_J4uyIhaBNR4 = ()=>{

import { componentQrl } from "@builder.io/qwik";
import { qrl } from "@builder.io/qwik";
export const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("./header_component_j4uyihabnr4")
, "Header_component_J4uyIhaBNR4"));
export const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("./header_component_j4uyihabnr4"), "Header_component_J4uyIhaBNR4"));

============================= header_component_div_onclick_i7ekvwh3674.tsx (ENTRY POINT)==

export const Header_component_div_onClick_i7ekvWH3674 = (ctx)=>console.log("2")
;
export const Header_component_div_onClick_i7ekvWH3674 = (ctx)=>console.log("2");
export { _hW } from "@builder.io/qwik";

/*
Expand Down
6 changes: 2 additions & 4 deletions packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_6.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ export const sym1 = $((ctx) => console.log("1"));

============================= sym1_axurpxx5lak.tsx (ENTRY POINT)==

export const sym1_aXUrPXX5Lak = (ctx)=>console.log("1")
;
export const sym1_aXUrPXX5Lak = (ctx)=>console.log("1");
export { _hW } from "@builder.io/qwik";

/*
Expand All @@ -36,8 +35,7 @@ export { _hW } from "@builder.io/qwik";
============================= test.tsx ==

import { qrl } from "@builder.io/qwik";
export const sym1 = qrl(()=>import("./sym1_axurpxx5lak")
, "sym1_aXUrPXX5Lak");
export const sym1 = qrl(()=>import("./sym1_axurpxx5lak"), "sym1_aXUrPXX5Lak");

== DIAGNOSTICS ==

Expand Down
12 changes: 4 additions & 8 deletions packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_7.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ const App = component$(() => {
import { qrl } from "@builder.io/qwik";
export const Header_component_J4uyIhaBNR4 = ()=>{
console.log("mount");
return <div onClick={qrl(()=>import("./header_component_div_onclick_i7ekvwh3674")
, "Header_component_div_onClick_i7ekvWH3674")}/>;
return <div onClick={qrl(()=>import("./header_component_div_onclick_i7ekvwh3674"), "Header_component_div_onClick_i7ekvWH3674")}/>;
};

/*
Expand All @@ -52,10 +51,8 @@ export const Header_component_J4uyIhaBNR4 = ()=>{

import { componentQrl } from "@builder.io/qwik";
import { qrl } from "@builder.io/qwik";
export const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("./header_component_j4uyihabnr4")
, "Header_component_J4uyIhaBNR4"));
/*#__PURE__*/ componentQrl(qrl(()=>import("./app_component_ckepmxzlub0")
, "App_component_ckEPmXZlub0"));
export const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("./header_component_j4uyihabnr4"), "Header_component_J4uyIhaBNR4"));
/*#__PURE__*/ componentQrl(qrl(()=>import("./app_component_ckepmxzlub0"), "App_component_ckEPmXZlub0"));

============================= app_component_ckepmxzlub0.tsx (ENTRY POINT)==

Expand Down Expand Up @@ -85,8 +82,7 @@ export const App_component_ckEPmXZlub0 = ()=>{
*/
============================= header_component_div_onclick_i7ekvwh3674.tsx (ENTRY POINT)==

export const Header_component_div_onClick_i7ekvWH3674 = (ctx)=>console.log(ctx)
;
export const Header_component_div_onClick_i7ekvWH3674 = (ctx)=>console.log(ctx);
export { _hW } from "@builder.io/qwik";

/*
Expand Down
6 changes: 2 additions & 4 deletions packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_8.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ export const Header = component$(() => {

import { qrl } from "@builder.io/qwik";
export const Header_component_J4uyIhaBNR4 = ()=>{
return qrl(()=>import("./header_component_1_2b8d0oh9zwc")
, "Header_component_1_2B8d0oH9ZWc");
return qrl(()=>import("./header_component_1_2b8d0oh9zwc"), "Header_component_1_2B8d0oH9ZWc");
};

/*
Expand Down Expand Up @@ -79,8 +78,7 @@ export { _hW } from "@builder.io/qwik";

import { componentQrl } from "@builder.io/qwik";
import { qrl } from "@builder.io/qwik";
export const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("./header_component_j4uyihabnr4")
, "Header_component_J4uyIhaBNR4"));
export const Header = /*#__PURE__*/ componentQrl(qrl(()=>import("./header_component_j4uyihabnr4"), "Header_component_J4uyIhaBNR4"));

== DIAGNOSTICS ==

Expand Down
3 changes: 1 addition & 2 deletions packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_9.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ export { _hW } from "@builder.io/qwik";
============================= test.tsx ==

import { qrl } from "@builder.io/qwik";
qrl(()=>import("./header_wjuauqn7oxg")
, "Header_WjUaUQN7Oxg");
qrl(()=>import("./header_wjuauqn7oxg"), "Header_WjUaUQN7Oxg");

== DIAGNOSTICS ==

Expand Down
9 changes: 3 additions & 6 deletions packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_capture_imports.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ export const App = component$(() => {

import { componentQrl } from "@builder.io/qwik";
import { qrl } from "@builder.io/qwik";
export const App = /*#__PURE__*/ componentQrl(qrl(()=>import("./app_component_ckepmxzlub0")
, "App_component_ckEPmXZlub0"));
export const App = /*#__PURE__*/ componentQrl(qrl(()=>import("./app_component_ckepmxzlub0"), "App_component_ckEPmXZlub0"));

============================= app_component_usestyles_t35nsa5uv7u.js (ENTRY POINT)==

Expand Down Expand Up @@ -52,10 +51,8 @@ export const App_component_useStyles_t35nSa5UV7U = `${css1}${css2}`;
import { qrl } from "@builder.io/qwik";
import { useStylesQrl } from "@builder.io/qwik";
export const App_component_ckEPmXZlub0 = ()=>{
useStylesQrl(qrl(()=>import("./app_component_usestyles_t35nsa5uv7u")
, "App_component_useStyles_t35nSa5UV7U"));
useStylesQrl(qrl(()=>import("./app_component_usestyles_1_xbk4w0zkwe8")
, "App_component_useStyles_1_xBK4W0ZKWe8"));
useStylesQrl(qrl(()=>import("./app_component_usestyles_t35nsa5uv7u"), "App_component_useStyles_t35nSa5UV7U"));
useStylesQrl(qrl(()=>import("./app_component_usestyles_1_xbk4w0zkwe8"), "App_component_useStyles_1_xBK4W0ZKWe8"));
};

/*
Expand Down
6 changes: 2 additions & 4 deletions ...es/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_capturing_fn_class.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ export const App = component$(() => {

import { componentQrl } from "@builder.io/qwik";
import { qrl } from "@builder.io/qwik";
export const App = /*#__PURE__*/ componentQrl(qrl(()=>import("./app_component_ckepmxzlub0")
, "App_component_ckEPmXZlub0"));
export const App = /*#__PURE__*/ componentQrl(qrl(()=>import("./app_component_ckepmxzlub0"), "App_component_ckEPmXZlub0"));

============================= app_component_ckepmxzlub0.js (ENTRY POINT)==

Expand All @@ -41,8 +40,7 @@ export const App_component_ckEPmXZlub0 = ()=>{
}
class Other {
}
return qrl(()=>import("./app_component_1_w0t0o3qmovu")
, "App_component_1_w0t0o3QMovU");
return qrl(()=>import("./app_component_1_w0t0o3qmovu"), "App_component_1_w0t0o3QMovU");
};

/*
Expand Down
Loading