archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit 8eb8034236.

# Conflicts:
#	server/build/webpack.js
This commit is contained in:
Tim Neutkens 2018-01-08 16:44:52 +01:00 committed by GitHub
parent 9263ad13f7
commit e179c98aa8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/build/babel/preset.js
View file

@ -1,4 +1,3 @@
const babelRuntimePath = require.resolve('babel-runtime/package').replace(/[\\/]package\.json$/, '')
const relativeResolve = require('../root-module-relative-path').default(require)
// Resolve styled-jsx plugins
@ -58,7 +57,7 @@ module.exports = (context, opts = {}) => ({
require.resolve('babel-plugin-module-resolver'),
{
alias: {
'babel-runtime': babelRuntimePath,
'babel-runtime': relativeResolve('babel-runtime/package'),
'next/link': relativeResolve('../../../lib/link'),
'next/prefetch': relativeResolve('../../../lib/prefetch'),
'next/css': relativeResolve('../../../lib/css'),

3
server/build/webpack.js
View file

@ -303,7 +303,6 @@ export default async function createCompiler (dir, { buildId, dev = false, quiet
return { content, sourceMap }
}
const babelRuntimePath = require.resolve('babel-runtime/package').replace(/[\\/]package\.json$/, '')
const transpiled = babelCore.transform(content, {
babelrc: false,
sourceMaps: dev ? 'both' : false,
@ -319,7 +318,7 @@ export default async function createCompiler (dir, { buildId, dev = false, quiet
require.resolve('babel-plugin-module-resolver'),
{
alias: {
'babel-runtime': babelRuntimePath,
'babel-runtime': relativeResolve('babel-runtime/package'),
'next/link': relativeResolve('../../lib/link'),
'next/prefetch': relativeResolve('../../lib/prefetch'),
'next/css': relativeResolve('../../lib/css'),