Resolve styled-jsx/style when transpiling ES2015 modules. (vercel#953)

arunoda · timneutkens · commit 24edfbdea728 · 2017-02-02T06:56:21.000+01:00
diff --git a/server/build/babel/preset.js b/server/build/babel/preset.js
@@ -26,8 +26,7 @@ module.exports = {
           'next/css': require.resolve('../../../lib/css'),
           'next/head': require.resolve('../../../lib/head'),
           'next/document': require.resolve('../../../server/document'),
-          'next/router': require.resolve('../../../lib/router'),
-          'styled-jsx/style': require.resolve('styled-jsx/style')
+          'next/router': require.resolve('../../../lib/router')
         }
       }
     ]
diff --git a/server/build/webpack.js b/server/build/webpack.js
@@ -158,6 +158,21 @@ export default async function createCompiler (dir, { dev = false, quiet = false
         const transpiled = babelCore.transform(content, {
           presets: [require.resolve('babel-preset-es2015')],
           sourceMaps: dev ? 'both' : false,
+          // Here we need to resolve styled-jsx/style to the absolute paths.
+          // Earlier we did it with the babel-preset.
+          // But since we don't transpile ES2015 in the preset this is not resolving.
+          // That's why we need to do it here.
+          // See more: https://github.com/zeit/next.js/issues/951
+          plugins: [
+            [
+              require.resolve('babel-plugin-module-resolver'),
+              {
+                alias: {
+                  'styled-jsx/style': require.resolve('styled-jsx/style')
+                }
+              }
+            ]
+          ],
           inputSourceMap: sourceMap
         })
 

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ module.exports = {`
`26`	`26`	`'next/css': require.resolve('../../../lib/css'),`
`27`	`27`	`'next/head': require.resolve('../../../lib/head'),`
`28`	`28`	`'next/document': require.resolve('../../../server/document'),`
`29`		`- 'next/router': require.resolve('../../../lib/router'),`
`30`		`- 'styled-jsx/style': require.resolve('styled-jsx/style')`
	`29`	`+ 'next/router': require.resolve('../../../lib/router')`
`31`	`30`	`}`
`32`	`31`	`}`
`33`	`32`	`]`