Unverified Commit e179c98a authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Revert "remove relative path to babel-runtime (#3119)" (#3547)

This reverts commit 8eb80342.

# Conflicts:
#	server/build/webpack.js
parent 9263ad13
const babelRuntimePath = require.resolve('babel-runtime/package').replace(/[\\/]package\.json$/, '')
const relativeResolve = require('../root-module-relative-path').default(require) const relativeResolve = require('../root-module-relative-path').default(require)
// Resolve styled-jsx plugins // Resolve styled-jsx plugins
...@@ -58,7 +57,7 @@ module.exports = (context, opts = {}) => ({ ...@@ -58,7 +57,7 @@ module.exports = (context, opts = {}) => ({
require.resolve('babel-plugin-module-resolver'), require.resolve('babel-plugin-module-resolver'),
{ {
alias: { alias: {
'babel-runtime': babelRuntimePath, 'babel-runtime': relativeResolve('babel-runtime/package'),
'next/link': relativeResolve('../../../lib/link'), 'next/link': relativeResolve('../../../lib/link'),
'next/prefetch': relativeResolve('../../../lib/prefetch'), 'next/prefetch': relativeResolve('../../../lib/prefetch'),
'next/css': relativeResolve('../../../lib/css'), 'next/css': relativeResolve('../../../lib/css'),
......
...@@ -303,7 +303,6 @@ export default async function createCompiler (dir, { buildId, dev = false, quiet ...@@ -303,7 +303,6 @@ export default async function createCompiler (dir, { buildId, dev = false, quiet
return { content, sourceMap } return { content, sourceMap }
} }
const babelRuntimePath = require.resolve('babel-runtime/package').replace(/[\\/]package\.json$/, '')
const transpiled = babelCore.transform(content, { const transpiled = babelCore.transform(content, {
babelrc: false, babelrc: false,
sourceMaps: dev ? 'both' : false, sourceMaps: dev ? 'both' : false,
...@@ -319,7 +318,7 @@ export default async function createCompiler (dir, { buildId, dev = false, quiet ...@@ -319,7 +318,7 @@ export default async function createCompiler (dir, { buildId, dev = false, quiet
require.resolve('babel-plugin-module-resolver'), require.resolve('babel-plugin-module-resolver'),
{ {
alias: { alias: {
'babel-runtime': babelRuntimePath, 'babel-runtime': relativeResolve('babel-runtime/package'),
'next/link': relativeResolve('../../lib/link'), 'next/link': relativeResolve('../../lib/link'),
'next/prefetch': relativeResolve('../../lib/prefetch'), 'next/prefetch': relativeResolve('../../lib/prefetch'),
'next/css': relativeResolve('../../lib/css'), 'next/css': relativeResolve('../../lib/css'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment