Skip to content

Update to Babel 7.x - WIP #3428

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.

Sign up for GitHub

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

Closed
benedyktdryl wants to merge 2 commits into from
Closed

Update to Babel 7.x - WIP #3428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0ee8d2
Update to Babel 7.x - WIP
benedyktdryl Nov 30, 2017
c2f758f
Updated yarn.lock
bdryl-softserve Dec 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"presets": [
"env",
"react"
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"transform-object-rest-spread",
"transform-class-properties",
"transform-runtime"
"@babel/plugin-proposal-object-rest-spread",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-runtime"
],
"env": {
"test": {
"presets": [
"es2015",
"@babel/preset-es2015",
"./babel"
]
}
Expand Down
39 changes: 20 additions & 19 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,23 @@
"bin/*": "standard"
},
"dependencies": {
"@babel/core": "7.0.0-beta.32",
"@babel/generator": "7.0.0-beta.32",
"@babel/plugin-proposal-class-properties": "7.0.0-beta.32",
"@babel/plugin-proposal-object-rest-spread": "7.0.0-beta.32",
"@babel/plugin-syntax-dynamic-import": "7.0.0-beta.32",
"@babel/plugin-transform-modules-commonjs": "7.0.0-beta.32",
"@babel/plugin-transform-react-jsx-source": "7.0.0-beta.32",
"@babel/plugin-transform-runtime": "7.0.0-beta.32",
"@babel/preset-env": "7.0.0-beta.32",
"@babel/preset-react": "7.0.0-beta.32",
"@babel/runtime": "7.0.0-beta.32",
"@babel/template": "7.0.0-beta.32",
"ansi-html": "0.0.7",
"babel-core": "6.26.0",
Copy link
Copy Markdown

@haohcraft haohcraft Feb 26, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Looks like this is still using babel-core.

Copy link
Copy Markdown

@xtuc xtuc Feb 26, 2018

Choose a reason for hiding this comment

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

You will need to change it @babel/core, but in general you should rely on Babel's internals.

We already had a few discussions to expose the config to plugins authors babel/babel#7259.

Copy link
Copy Markdown
Contributor

@timneutkens timneutkens Feb 26, 2018

Choose a reason for hiding this comment

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

If that PR gets merged we'll change to it.

"babel-generator": "6.26.0",
"babel-loader": "7.1.2",
"babel-plugin-module-resolver": "2.7.1",
"babel-loader": "8.0.0-beta.0",
"babel-plugin-module-resolver": "3.0.0",
"babel-plugin-react-require": "3.0.0",
"babel-plugin-syntax-dynamic-import": "6.18.0",
"babel-plugin-transform-class-properties": "6.24.1",
"babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
"babel-plugin-transform-object-rest-spread": "6.26.0",
"babel-plugin-transform-react-jsx-source": "6.22.0",
"babel-plugin-transform-react-remove-prop-types": "0.4.8",
"babel-plugin-transform-runtime": "6.23.0",
"babel-preset-env": "1.6.0",
"babel-preset-react": "6.24.1",
"babel-runtime": "6.26.0",
"babel-template": "6.26.0",
"babel-plugin-transform-react-remove-prop-types": "0.4.10",
"case-sensitive-paths-webpack-plugin": "2.1.1",
"cross-spawn": "5.1.0",
"del": "3.0.0",
Expand Down Expand Up @@ -106,6 +106,7 @@
"xss-filters": "1.2.7"
},
"devDependencies": {
"@babel/preset-es2015": "7.0.0-beta.32",
"@taskr/babel": "1.1.0",
"@taskr/clear": "1.1.0",
"@taskr/esnext": "1.1.0",
Expand All @@ -114,7 +115,6 @@
"babel-jest": "21.2.0",
"babel-plugin-istanbul": "4.1.5",
"babel-plugin-transform-remove-strict-mode": "0.0.2",
"babel-preset-es2015": "6.24.1",
"benchmark": "2.1.4",
"cheerio": "0.22.0",
"chromedriver": "2.32.3",
Expand All @@ -123,11 +123,11 @@
"express": "4.15.5",
"fkill": "5.1.0",
"husky": "0.14.3",
"jest-cli": "21.2.0",
"jest-cli": "21.2.1",
"lint-staged": "4.2.3",
"node-fetch": "1.7.3",
"node-notifier": "5.1.2",
"nyc": "11.2.1",
"nyc": "11.3.0",
"portfinder": "1.0.13",
"react": "16.0.0",
"react-dom": "16.0.0",
Expand All @@ -138,7 +138,8 @@
},
"peerDependencies": {
"react": "^16.0.0",
"react-dom": "^16.0.0"
"react-dom": "^16.0.0",
"babel-core": "6.x | ^7.0.0-0"
},
"jest": {
"testEnvironment": "node",
Expand Down
16 changes: 8 additions & 8 deletions server/build/babel/preset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const babelRuntimePath = require.resolve('babel-runtime/package').replace(/[\\/]package\.json$/, '')
const babelRuntimePath = require.resolve('@babel/runtime/package').replace(/[\\/]package\.json$/, '')
const relativeResolve = require('../root-module-relative-path').default(require)

// Resolve styled-jsx plugins
Expand Down Expand Up @@ -28,7 +28,7 @@ function styledJsxOptions (opts) {

const envPlugins = {
'development': [
require.resolve('babel-plugin-transform-react-jsx-source')
require.resolve('@babel/plugin-transform-react-jsx-source')
],
'production': [
require.resolve('babel-plugin-transform-react-remove-prop-types')
Expand All @@ -39,26 +39,26 @@ const plugins = envPlugins[process.env.NODE_ENV] || envPlugins['development']

module.exports = (context, opts = {}) => ({
presets: [
[require.resolve('babel-preset-env'), {
[require.resolve('@babel/preset-env'), {
modules: false,
...opts['preset-env']
}],
require.resolve('babel-preset-react')
require.resolve('@babel/preset-react')
],
plugins: [
require.resolve('./plugins/remove-dotjsx-from-import'),
require.resolve('babel-plugin-react-require'),
require.resolve('./plugins/handle-import'),
require.resolve('babel-plugin-transform-object-rest-spread'),
require.resolve('babel-plugin-transform-class-properties'),
[require.resolve('babel-plugin-transform-runtime'), opts['transform-runtime'] || {}],
require.resolve('@babel/plugin-proposal-class-properties'),
require.resolve('@babel/plugin-proposal-object-rest-spread'),
[require.resolve('@babel/plugin-transform-runtime'), opts['transform-runtime'] || {}],
[require.resolve('styled-jsx/babel'), styledJsxOptions(opts['styled-jsx'])],
...plugins,
[
require.resolve('babel-plugin-module-resolver'),
{
alias: {
'babel-runtime': babelRuntimePath,
'@babel/runtime': babelRuntimePath,
'next/link': relativeResolve('../../../lib/link'),
'next/prefetch': relativeResolve('../../../lib/prefetch'),
'next/css': relativeResolve('../../../lib/css'),
Expand Down
7 changes: 4 additions & 3 deletions server/build/webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import PagesPlugin from './plugins/pages-plugin'
import DynamicChunksPlugin from './plugins/dynamic-chunks-plugin'
import CombineAssetsPlugin from './plugins/combine-assets-plugin'
import getConfig from '../config'
import * as babelCore from 'babel-core'
import * as babelCore from '@babel/core'
import findBabelConfig from './babel/find-config'
import rootModuleRelativePath from './root-module-relative-path'

Expand Down Expand Up @@ -242,7 +242,8 @@ export default async function createCompiler (dir, { buildId, dev = false, quiet
return { content, sourceMap }
}

const babelRuntimePath = require.resolve('babel-runtime/package').replace(/[\\/]package\.json$/, '')
const babelRuntimePath = require.resolve('@babel/runtime/package').replace(/[\\/]package\.json$/, '')

const transpiled = babelCore.transform(content, {
babelrc: false,
sourceMaps: dev ? 'both' : false,
Expand All @@ -253,7 +254,7 @@ export default async function createCompiler (dir, { buildId, dev = false, quiet
// See more: https://github.com/zeit/next.js/issues/951
plugins: [
require.resolve(join(__dirname, './babel/plugins/remove-dotjsx-from-import.js')),
[require.resolve('babel-plugin-transform-es2015-modules-commonjs')],
[require.resolve('@babel/plugin-transform-modules-commonjs')],
[
require.resolve('babel-plugin-module-resolver'),
{
Expand Down
Loading