Skip to content
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.

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

Update swc #32210

Merged
merged 45 commits into from Dec 8, 2021
Merged

Update swc #32210

merged 45 commits into from Dec 8, 2021

Conversation

kdy1
Copy link
Member

@kdy1 kdy1 commented Dec 7, 2021

Bug

  • Related issues linked using fixes #number
  • Integration tests added
  • Errors have helpful link attached, see contributing.md

Feature

  • Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
  • Related issues linked using fixes #number
  • Integration tests added
  • Documentation added
  • Telemetry added. In case of a feature if it's used or not.
  • Errors have helpful link attached, see contributing.md

Documentation / Examples

  • Make sure the linting passes by running yarn lint

This PR upgrades all crates related to swc.

};

pub(crate) fn contains_cjs(m: &Module) -> bool {
let mut v = CjsFinder::default();
m.visit_with(&Invalid { span: DUMMY_SP }, &mut v);
m.visit_with(&mut v);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a major difference.

@@ -19,6 +21,8 @@ pub fn transform_css(
is_global: bool,
class_name: &Option<String>,
) -> Result<Expr, Error> {
debug!("CSS: \n{}", style_info.css);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This expression (and corresponding expression statement) will be completely noop on release builds.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @padmaia
It was useful for debugging to me, but I'm not sure if it's good to have this line.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't quite understand what it does. Doesn't seem to be spamming the terminal by default so I think I'm okay with it, but it would help to understand how it works.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We enable release_max_level_off of tracing, which is a crate for logging.
The cargo feature release_max_level_off removes all logging for release build and all macro calls for logging become completely no-op.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This logging statement will print the input passed to the css parser while testing.
testing is a crate for testing swc crates and next-swc, and it configures logger by default.

Logging level is debug by default, but if you run it like RUST_LOG=trace cargo test, trace! calls will also print the messages.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a side note, tracing is used by swc and rustc.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

bail!("Failed to transform one off global selector");
}

trace!("Combinator: {:?}", combinator);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @padmaia
This line is also removable. I used it to debug styled-jsx, but I'm not sure if it's better to remove it.
Also completely noop on release builds.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same answer as the debug comment

@@ -162,88 +156,177 @@ struct Namespacer {

impl VisitMut for Namespacer {
fn visit_mut_complex_selector(&mut self, node: &mut ComplexSelector) {
#[cfg(debug_assertions)]
let _tracing = {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This block explictly uses #[cfg(debug_assertions)] because it does some operation which cannot removed by tracing.

<Element {...props} className={"jsx-abb4c2202db1a207" + " " + (props && props.className != null && props.className || "")}/>
<_JSXStyle id={"abb4c2202db1a207"}>{"div.jsx-abb4c2202db1a207 {color:red}"}</_JSXStyle>

<_JSXStyle id={"abb4c2202db1a207"}>{"div.jsx-abb4c2202db1a207{color:red}"}</_JSXStyle>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed a space between the selectors and the block.
Most css changes of this PR is due to removal of the space.

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@padmaia padmaia self-requested a review December 7, 2021 23:01
padmaia
padmaia previously approved these changes Dec 8, 2021
packages/next-swc/Cargo.lock Outdated Show resolved Hide resolved
@@ -19,6 +21,8 @@ pub fn transform_css(
is_global: bool,
class_name: &Option<String>,
) -> Result<Expr, Error> {
debug!("CSS: \n{}", style_info.css);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't quite understand what it does. Doesn't seem to be spamming the terminal by default so I think I'm okay with it, but it would help to understand how it works.

bail!("Failed to transform one off global selector");
}

trace!("Combinator: {:?}", combinator);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same answer as the debug comment

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk
Copy link
Member

ijjk commented Dec 8, 2021

Failing test suites

Commit: 34ad44b

test/integration/app-document-add-hmr/test/index.test.js

  • _app/_document add HMR > should HMR when _document is added
Expand output

● _app/_document add HMR › should HMR when _document is added

expect(received).toContain(expected) // indexOf

Expected substring: "index page"
Received string:    "<head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width\"><meta name=\"next-head-count\" content=\"2\"><noscript data-n-css=\"\"></noscript><script defer=\"\" nomodule=\"\" src=\"/_next/static/chunks/polyfills.js?ts=1638961696667\"></script><script src=\"/_next/static/chunks/fallback/webpack.js?ts=1638961696667\" defer=\"\"></script><script src=\"/_next/static/chunks/fallback/main.js?ts=1638961696667\" defer=\"\"></script><script src=\"/_next/static/chunks/fallback/pages/_app.js?ts=1638961696667\" defer=\"\"></script><script src=\"/_next/static/chunks/fallback/pages/_error.js?ts=1638961696667\" defer=\"\"></script><noscript id=\"__next_css__DO_NOT_USE__\"></noscript></head><body style=\"overflow: hidden;\"><div id=\"__next\" data-reactroot=\"\"></div><script src=\"/_next/static/chunks/fallback/react-refresh.js?ts=1638961696667\"></script><script id=\"__NEXT_DATA__\" type=\"application/json\">{\"props\":{\"pageProps\":{\"statusCode\":500}},\"page\":\"/_error\",\"query\":{},\"buildId\":\"development\",\"isFallback\":false,\"err\":{\"name\":\"ModuleBuildError\",\"message\":\"Module build failed (from ../../../packages/next/dist/build/webpack/loaders/next-swc-loader.js):\\nError: Failed to read source code from /home/runner/work/next.js/next.js/test/integration/app-document-add-hmr/pages/_app.js\\n\\nCaused by:\\n    No such file or directory (os error 2)\",\"stack\":\"ModuleBuildError: Module build failed (from ../../../packages/next/dist/build/webpack/loaders/next-swc-loader.js):\\nError: Failed to read source code from /home/runner/work/next.js/next.js/test/integration/app-document-add-hmr/pages/_app.js\\n\\nCaused by:\\n    No such file or directory (os error 2)\\n    at processResult (/home/runner/work/next.js/next.js/packages/next/dist/compiled/webpack/bundle5.js:54691:19)\\n    at /home/runner/work/next.js/next.js/packages/next/dist/compiled/webpack/bundle5.js:54793:5\\n    at /home/runner/work/next.js/next.js/packages/next/dist/compiled/webpack/bundle5.js:140664:11\\n    at /home/runner/work/next.js/next.js/packages/next/dist/compiled/webpack/bundle5.js:140460:20\\n    at context.callback (/home/runner/work/next.js/next.js/packages/next/dist/compiled/webpack/bundle5.js:140389:13)\"},\"gip\":true,\"scriptLoader\":[]}</script><div id=\"__next-build-watcher\" style=\"position: fixed; bottom: 10px; right: 20px; width: 0px; height: 0px; z-index: 99999;\"></div><next-route-announcer><p aria-live=\"assertive\" id=\"__next-route-announcer__\" role=\"alert\" style=\"border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap; overflow-wrap: normal;\"></p></next-route-announcer><nextjs-portal></nextjs-portal></body>"

  54 |       await fs.remove(appPage)
  55 |     }
> 56 |   })
     |     ^
  57 |
  58 |   it('should HMR when _document is added', async () => {
  59 |     let indexContent = await fs.readFile(indexPage)

  at Object.<anonymous> (integration/app-document-add-hmr/test/index.test.js:56:27)

test/integration/css-customization/test/index.test.js

  • CSS Customization custom loader > should've applied style
Expand output

● CSS Customization custom loader › should've applied style

expect(received).toMatch(expected)

Expected pattern: /\.my-text\.jsx-[0-9a-z]+ {color:red}/
Received string:  "(self.webpackChunk_N_E=self.webpackChunk_N_E||[]).push([[405],{3797:function(n,t,e){\"use strict\";t.default=c;var u,r=(u=e(1902))&&u.__esModule?u:{default:u},f=e(9684),a=e(2052);var i=r.default.useInsertionEffect||r.default.useLayoutEffect;function c(n){var t=(0,f.useStyleRegistry)();return t?\"undefined\"===typeof window?(t.add(n),null):(i((function(){return t.add(n),function(){t.remove(n)}}),[n.id,String(n.dynamic)]),null):null}c.dynamic=function(n){return n.map((function(n){var t=n[0],e=n[1];return(0,a.computeId)(t,e)})).join(\" \")}},9424:function(n,t,e){n.exports=e(3797)},9461:function(n,t,e){(window.__NEXT_P=window.__NEXT_P||[]).push([\"/\",function(){return e(6343)}])},6343:function(n,t,e){\"use strict\";e.r(t),e.d(t,{default:function(){return i}});var u=e(3704),r=e(9424),f=new String(\".my-text.jsx-ff6a1f25a3b55a1f{color:red}\");f.__hash=\"ff6a1f25a3b55a1f\";var a=f;function i(){return(0,u.jsxs)(u.Fragment,{children:[(0,u.jsx)(\"div\",{className:\"jsx-\".concat(a.__hash)+\" my-text\",children:\"This text should be red.\"}),(0,u.jsx)(r.default,{id:a.__hash,children:a})]})}}},function(n){n.O(0,[774,888,179],(function(){return t=9461,n(n.s=t);var t}));var t=n.O();_N_E=t}]);"

  148 |   beforeAll(async () => {
  149 |     await remove(join(appDir, '.next'))
> 150 |   })
      |     ^
  151 |
  152 |   it('should compile successfully', async () => {
  153 |     const { code, stdout, stderr } = await nextBuild(appDir, [], {

  at Object.<anonymous> (integration/css-customization/test/index.test.js:150:30)

@ijjk

This comment has been minimized.

@ijjk
Copy link
Member

ijjk commented Dec 8, 2021

Stats from current PR

Default Build (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary kdy1/next.js update-swc-min Change
buildDuration 18.4s 18.1s -218ms
buildDurationCached 3.4s 3.3s -143ms
nodeModulesSize 349 MB 349 MB ⚠️ +7 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary kdy1/next.js update-swc-min Change
/ failed reqs 0 0
/ total time (seconds) 2.953 2.973 ⚠️ +0.02
/ avg req/sec 846.73 840.92 ⚠️ -5.81
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.397 1.399 0
/error-in-render avg req/sec 1790.14 1786.69 ⚠️ -3.45
Client Bundles (main, webpack, commons)
vercel/next.js canary kdy1/next.js update-swc-min Change
450.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42.2 kB 42.2 kB
main-HASH.js gzip 28.8 kB 28.8 kB
webpack-HASH.js gzip 1.45 kB 1.45 kB
Overall change 72.7 kB 72.7 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary kdy1/next.js update-swc-min Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary kdy1/next.js update-swc-min Change
_app-HASH.js gzip 1.37 kB 1.37 kB
_error-HASH.js gzip 194 B 194 B
amp-HASH.js gzip 312 B 312 B
css-HASH.js gzip 326 B 326 B
dynamic-HASH.js gzip 2.39 kB 2.39 kB
head-HASH.js gzip 350 B 350 B
hooks-HASH.js gzip 919 B 919 B
image-HASH.js gzip 4.73 kB 4.73 kB
index-HASH.js gzip 263 B 263 B
link-HASH.js gzip 2.13 kB 2.13 kB
routerDirect..HASH.js gzip 321 B 321 B
script-HASH.js gzip 383 B 383 B
withRouter-HASH.js gzip 318 B 318 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 14.1 kB 14.1 kB
Client Build Manifests
vercel/next.js canary kdy1/next.js update-swc-min Change
_buildManifest.js gzip 459 B 459 B
Overall change 459 B 459 B
Rendered Page Sizes
vercel/next.js canary kdy1/next.js update-swc-min Change
index.html gzip 532 B 532 B
link.html gzip 546 B 546 B
withRouter.html gzip 527 B 527 B
Overall change 1.6 kB 1.6 kB

Default Build with SWC (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary kdy1/next.js update-swc-min Change
buildDuration 18.5s 18.8s ⚠️ +339ms
buildDurationCached 3.3s 3.3s ⚠️ +32ms
nodeModulesSize 349 MB 349 MB ⚠️ +7 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary kdy1/next.js update-swc-min Change
/ failed reqs 0 0
/ total time (seconds) 2.795 2.841 ⚠️ +0.05
/ avg req/sec 894.42 879.86 ⚠️ -14.56
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.347 1.373 ⚠️ +0.03
/error-in-render avg req/sec 1856.66 1820.77 ⚠️ -35.89
Client Bundles (main, webpack, commons)
vercel/next.js canary kdy1/next.js update-swc-min Change
450.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42.3 kB 42.3 kB
main-HASH.js gzip 29.1 kB 29.1 kB
webpack-HASH.js gzip 1.44 kB 1.44 kB
Overall change 73 kB 73 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary kdy1/next.js update-swc-min Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary kdy1/next.js update-swc-min Change
_app-HASH.js gzip 1.35 kB 1.35 kB
_error-HASH.js gzip 180 B 180 B
amp-HASH.js gzip 305 B 305 B
css-HASH.js gzip 321 B 321 B
dynamic-HASH.js gzip 2.39 kB 2.39 kB
head-HASH.js gzip 342 B 342 B
hooks-HASH.js gzip 906 B 906 B
image-HASH.js gzip 4.75 kB 4.75 kB
index-HASH.js gzip 256 B 256 B
link-HASH.js gzip 2.19 kB 2.19 kB
routerDirect..HASH.js gzip 314 B 314 B
script-HASH.js gzip 375 B 375 B
withRouter-HASH.js gzip 309 B 309 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 14.1 kB 14.1 kB
Client Build Manifests
vercel/next.js canary kdy1/next.js update-swc-min Change
_buildManifest.js gzip 458 B 458 B
Overall change 458 B 458 B
Rendered Page Sizes
vercel/next.js canary kdy1/next.js update-swc-min Change
index.html gzip 531 B 531 B
link.html gzip 545 B 545 B
withRouter.html gzip 525 B 525 B
Overall change 1.6 kB 1.6 kB
Commit: 5e3ef5b

@timneutkens timneutkens merged commit 4ce49b7 into vercel:canary Dec 8, 2021
@timneutkens timneutkens deleted the update-swc-min branch December 8, 2021 17:54
@vercel vercel locked as resolved and limited conversation to collaborators Jan 27, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants