Setup require hook in next-server for styled-jsx resolving

package.json

@@ -191,7 +191,6 @@
     "semver": "7.3.7",
     "shell-quote": "1.7.3",
     "styled-components": "5.3.3",
-    "styled-jsx": "link:packages/next/node_modules/styled-jsx",
     "styled-jsx-plugin-postcss": "3.0.2",
     "tailwindcss": "1.1.3",
     "taskr": "1.1.0",

packages/next-swc/crates/core/tests/loader/front/attr-1/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default function Foo() {
     return /*#__PURE__*/ React.createElement("div", {
         render: function(v) {

packages/next-swc/crates/styled_jsx/src/utils.rs

@@ -310,7 +310,7 @@ pub fn styled_jsx_import_decl(style_import_name: &str) -> ModuleItem {
         })],
         src: Str {
             span: DUMMY_SP,
-            value: "next/dist/shared/lib/styled-jsx".into(),
+            value: "next/dist/shared/lib/styled-jsx/style".into(),
             raw: None,
         },
     }))

packages/next-swc/crates/styled_jsx/tests/errors/nested-style-tags/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 const Component = ()=><>
     <header >
       <Comp >

packages/next-swc/crates/styled_jsx/tests/errors/no-child/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=><div >
 
     <style jsx>

packages/next-swc/crates/styled_jsx/tests/errors/ts-with-css-resolve/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default {
     styles: <_JSXStyle id={"71f03d42ea0ec6"}>{".container.jsx-71f03d42ea0ec6{background:#000;color:white;font-weight:700;height:100px}"}</_JSXStyle>,
     className: "jsx-71f03d42ea0ec6"

packages/next-swc/crates/styled_jsx/tests/errors/two-children/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=><div >
 
     <style jsx>

packages/next-swc/crates/styled_jsx/tests/errors/wrong-child-type/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=><div >
 
     <style jsx>

packages/next-swc/crates/styled_jsx/tests/errors/wrong-jsx-expression-type/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=><div >
 
     <style jsx>

packages/next-swc/crates/styled_jsx/tests/fixture/attribute-generation-classname-rewriting/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=>{
     const Element = 'div';
     return <div className={"jsx-abb4c2202db1a207"}>

packages/next-swc/crates/styled_jsx/tests/fixture/attribute-generation-modes/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 import styles from './styles';
 const styles2 = require('./styles2');
 // external only

packages/next-swc/crates/styled_jsx/tests/fixture/class/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default class {
     render() {
         return <div className={"jsx-b2b86d63f35d25ee"}>

packages/next-swc/crates/styled_jsx/tests/fixture/comments/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default class {
     render() {
         return <div className={"jsx-1952086b0a5ae64c"}>

packages/next-swc/crates/styled_jsx/tests/fixture/component-attribute/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 const Test = ()=><div className={"jsx-a9535d7d5f32c3c4"}>
 
     <span className={"jsx-a9535d7d5f32c3c4"}>test</span>

packages/next-swc/crates/styled_jsx/tests/fixture/css-selector-after-pseudo/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 function NavigationItem({ active , className ,  }) {
     return <span className={"jsx-2342aae4628612c6" + " " + (cn({
         active

packages/next-swc/crates/styled_jsx/tests/fixture/css-tag-same-file/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (({ children  })=><div className={`jsx-${styles.__hash}`}>
 
     <p className={`jsx-${styles.__hash}`}>{children}</p>

packages/next-swc/crates/styled_jsx/tests/fixture/different-jsx-ids/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 const color = 'red';
 const otherColor = 'green';
 const A = ()=><div className={"jsx-551210e97e875d0e"}>

packages/next-swc/crates/styled_jsx/tests/fixture/dynamic-element-class/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default class {
     render() {
         const Element = 'div';

packages/next-swc/crates/styled_jsx/tests/fixture/dynamic-element-external/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 import styles from './styles2';
 export default (({ level =1  })=>{
     const Element = `h${level}`;

packages/next-swc/crates/styled_jsx/tests/fixture/dynamic-element/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (({ level =1  })=>{
     const Element = `h${level}`;
     return <Element className={"jsx-fca64cc3f069b519" + " " + "root"}>

packages/next-swc/crates/styled_jsx/tests/fixture/expressions/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 const darken = (c)=>c;
 const color = 'red';
 const otherColor = 'green';

packages/next-swc/crates/styled_jsx/tests/fixture/external-nested-scope/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 function test() {
     ({
         styles: <_JSXStyle id={"abb4c2202db1a207"}>{"div.jsx-abb4c2202db1a207{color:red}"}</_JSXStyle>,

packages/next-swc/crates/styled_jsx/tests/fixture/external-stylesheet-global/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 import styles, { foo as styles3 } from './styles';
 const styles2 = require('./styles2');
 export default (()=><div >

packages/next-swc/crates/styled_jsx/tests/fixture/external-stylesheet-multi-line/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 import styles from './styles';
 export default (()=><div className={`jsx-${styles.__hash}`}>
 

packages/next-swc/crates/styled_jsx/tests/fixture/external-stylesheet/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 import styles from './styles';
 const styles2 = require('./styles2');
 import { foo as styles3 } from './styles';

packages/next-swc/crates/styled_jsx/tests/fixture/fragment/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 import React from 'react';
 export default (()=><>
 

packages/next-swc/crates/styled_jsx/tests/fixture/global-child-selector/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 const Test = ()=><div className={"jsx-5a206f122d1cb32e"}>
 
     <span className={"jsx-5a206f122d1cb32e"}>test</span>

packages/next-swc/crates/styled_jsx/tests/fixture/global-redundant/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default function IndexPage() {
     return <div className={"jsx-b6abd0684ba81871"}>
 

packages/next-swc/crates/styled_jsx/tests/fixture/global/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 const Test = ()=><div className={"jsx-d47d6adadf14e957"}>
 
     <_JSXStyle id={"d47d6adadf14e957"}>{"body{color:red}:hover{color:red;display:-webkit-box;display:-webkit-flex;display:-moz-box;display:-ms-flexbox;display:flex;-webkit-animation:foo 1s ease-out;-moz-animation:foo 1s ease-out;-o-animation:foo 1s ease-out;animation:foo 1s ease-out}div a{display:none}[data-test]>div{color:red}"}</_JSXStyle>

packages/next-swc/crates/styled_jsx/tests/fixture/issue-30480/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (({ breakPoint  })=><div className={_JSXStyle.dynamic([
         [
             "5d2a0e645566ce9c",

packages/next-swc/crates/styled_jsx/tests/fixture/issue-30570/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default function IndexPage() {
     return <div className={"jsx-bbdada4ef17d18ef"}>
 

packages/next-swc/crates/styled_jsx/tests/fixture/issue-31562-interpolation-in-mdea/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default class {
     render() {
         return <div className={_JSXStyle.dynamic([

packages/next-swc/crates/styled_jsx/tests/fixture/mixed-global-scoped/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 const Test = ()=><_JSXStyle id={"94239b6d6b42c9b5"}>{"p{color:red}"}</_JSXStyle>;
 export default (()=><div className={"jsx-3822e6e1fb9fa41a"}>
 

packages/next-swc/crates/styled_jsx/tests/fixture/multiple-jsx/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 const attrs = {
     id: 'test'
 };

packages/next-swc/crates/styled_jsx/tests/fixture/non-styled-jsx-style/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=><div className={"jsx-94239b6d6b42c9b5"}>
 
     <p className={"jsx-94239b6d6b42c9b5"}>woot</p>

packages/next-swc/crates/styled_jsx/tests/fixture/number-after-placeholder/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 import Link from "next/link";
 export default function IndexPage() {
     return <div className={"jsx-9a4b3442d519aae9"}>

packages/next-swc/crates/styled_jsx/tests/fixture/one-off-global-selectors/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=><div className={"jsx-c7c3a8e231c9215a"}>
 
     <p className={"jsx-c7c3a8e231c9215a"}>test</p>

packages/next-swc/crates/styled_jsx/tests/fixture/stateless/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=><div className={"jsx-94239b6d6b42c9b5"}>
 
     <p className={"jsx-94239b6d6b42c9b5"}>test</p>

packages/next-swc/crates/styled_jsx/tests/fixture/styles/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 import colors, { size } from './constants';
 const color = 'red';
 const bar = new String("div.jsx-aaed0341accea8f{font-size:3em}");

packages/next-swc/crates/styled_jsx/tests/fixture/too-many/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export const Red = ({ Component ='button' ,  })=>{
     return <Component className={_JSXStyle.dynamic([
         [

packages/next-swc/crates/styled_jsx/tests/fixture/tpl-escape-1/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default class {
     render() {
         return <div className={"jsx-1f6cef12199c3a8f"}>

packages/next-swc/crates/styled_jsx/tests/fixture/tpl-escape-2/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default function Home({ fontFamily  }) {
     return <div className={_JSXStyle.dynamic([
         [

packages/next-swc/crates/styled_jsx/tests/fixture/tpl-placeholder-1-as-property/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default class {
     render() {
         return <div className={_JSXStyle.dynamic([

packages/next-swc/crates/styled_jsx/tests/fixture/tpl-placeholder-2-as-part-of-value/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default class {
     render() {
         return <div className={_JSXStyle.dynamic([

packages/next-swc/crates/styled_jsx/tests/fixture/tpl-placeholder-3-as-value/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default class {
     render() {
         return <div className={_JSXStyle.dynamic([

packages/next-swc/crates/styled_jsx/tests/fixture/tpl-placeholder-4-as-part-of-value-in-multiple/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default class {
     render() {
         return <div className={_JSXStyle.dynamic([

packages/next-swc/crates/styled_jsx/tests/fixture/tpl-placeholder-5-values-of-multiple-properties/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default class {
     render() {
         return <div className={_JSXStyle.dynamic([

packages/next-swc/crates/styled_jsx/tests/fixture/transform-css-global/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=><div className={"jsx-53fd644ab080300c"}>
 
     <p className={"jsx-53fd644ab080300c"}>test</p>

packages/next-swc/crates/styled_jsx/tests/fixture/transform-css-media-query/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=><div className={"jsx-1f7963ae04c6466a"}>
 
     <p className={"jsx-1f7963ae04c6466a"}>test</p>

packages/next-swc/crates/styled_jsx/tests/fixture/transform-css-normal/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=><div className={"jsx-1a19bb4817c105dd"}>
 
     <p className={"jsx-1a19bb4817c105dd"}>test</p>

packages/next-swc/crates/styled_jsx/tests/fixture/transform-css-nth-1/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=><div className={"jsx-938ca197692ef624"}>
 
       <p className={"jsx-938ca197692ef624"}>test</p>

packages/next-swc/crates/styled_jsx/tests/fixture/whitespace/output.js

@@ -1,4 +1,4 @@
-import _JSXStyle from "next/dist/shared/lib/styled-jsx";
+import _JSXStyle from "next/dist/shared/lib/styled-jsx/style";
 export default (()=><div className={"jsx-94239b6d6b42c9b5"}>
 
     <p className={"jsx-94239b6d6b42c9b5"}>test</p>

packages/next/build/babel/preset.ts

@@ -16,7 +16,7 @@ type StyledJsxBabelOptions =
 // Resolve styled-jsx plugins
 function styledJsxOptions(options: StyledJsxBabelOptions) {
   options = options || {}
-  options.styleModule = 'next/dist/shared/lib/styled-jsx'
+  options.styleModule = 'next/dist/shared/lib/styled-jsx/style'
 
   if (!Array.isArray(options.plugins)) {
     return options

packages/next/build/webpack-config.ts

@@ -685,6 +685,8 @@ export default async function getBaseWebpackConfig(
       'react-dom/server$': `${reactDomDir}/server`,
       'react-dom/server.browser$': `${reactDomDir}/server.browser`,
       'react-dom/client$': `${reactDomDir}/client`,
+      'styled-jsx/style$': require.resolve(`styled-jsx/style`),
+      'styled-jsx$': require.resolve(`styled-jsx`),
 
       ...customAppAliases,
       ...customErrorAlias,
@@ -816,9 +818,13 @@ export default async function getBaseWebpackConfig(
       resolveRequest: string
     ) => Promise<[string | null, boolean]>
   ) {
+    // Rewrite back to internals to avoid bundled into chunks after overriding in require-hook
+    if (request === 'styled-jsx') {
+      request = 'next/dist/shared/lib/styled-jsx'
+    }
     // We need to externalize internal requests for files intended to
     // not be bundled.
-    const isLocal: boolean =
+    let isLocal: boolean =
       request.startsWith('.') ||
       // Always check for unix-style path, as webpack sometimes
       // normalizes as posix.

packages/next/build/webpack/require-hook.ts

@@ -126,6 +126,8 @@ const hookPropertyMap = new Map(
       'next/dist/compiled/@babel/runtime/package.json',
     ],
     ['node-fetch', 'next/dist/compiled/node-fetch'],
+    ['styled-jsx/style', 'styled-jsx/style'],
+    ['styled-jsx', 'styled-jsx'],
   ].map(([request, replacement]) => [request, require.resolve(replacement)])
 )
 

packages/next/pages/_error.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import Head from '../shared/lib/head'
-import { NextPageContext } from '../shared/lib/utils'
+import type { NextPageContext } from '../shared/lib/utils'
 
 const statusCodes: { [code: number]: string } = {
   400: 'Bad Request',
@@ -57,7 +57,7 @@ export default class Error<P = {}> extends React.Component<P & ErrorProps> {
                 .next-error-h1 {
                   border-right: 1px solid rgba(0, 0, 0, .3);
                 }
-                
+
                 ${
                   withDarkMode
                     ? `@media (prefers-color-scheme: dark) {

packages/next/shared/lib/styled-jsx/index.d.ts

@@ -0,0 +1 @@
+export * from 'next/dist/styled-jsx-types'

packages/next/shared/lib/styled-jsx/index.js

@@ -0,0 +1 @@
+module.exports = require('styled-jsx')