use packages under @babel scope

poooi · Feb 19, 2018 · 730aa1c · 730aa1c
1 parent d13788d
commit 730aa1c
Show file tree

Hide file tree

Showing 10 changed files with 1,794 additions and 1,764 deletions.
diff --git a/assets/js/plugin-preload.js b/assets/js/plugin-preload.js
@@ -5,7 +5,7 @@ const APPDATA_PATH = remote.getGlobal('APPDATA_PATH')
 const config = remote.require('./lib/config')
 
 require('module').globalPaths.push(MODULE_PATH)
-require('babel-register')(require(`${ROOT}/babel.config`))
+require('@babel/register')(require(`${ROOT}/babel.config`))
 require('coffee-react/register')
 async function setPath() {
   require(`${ROOT}/lib/module-path`).setAllowedPath([ ROOT, APPDATA_PATH, await remote.getCurrentWebContents().executeJavaScript('__dirname') ])

diff --git a/babel.config.js b/babel.config.js
@@ -1,16 +1,16 @@
 module.exports = {
   presets: [
     [
-      "env",
+      "@babel/preset-env",
       {
         targets: {
           electron: "1.8",
         },
         loose: true,
       },
     ],
-    "stage-0",
-    "react",
+    "@babel/preset-stage-0",
+    "@babel/preset-react",
   ],
   plugins: [
     "transform-export-extensions",

diff --git a/build/compile-to-js.es b/build/compile-to-js.es
@@ -2,7 +2,7 @@ import fs from 'fs-extra'
 import path from 'path-extra'
 import Promise, { promisify } from 'bluebird'
 import { log } from '../lib/utils'
-import { transformFile } from 'babel-core'
+import { transformFile } from '@babel/core'
 import BabelConfig from '../babel.config'
 import walk from 'walk'
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -1,4 +1,4 @@
-require('babel-register')(require('./babel.config'))
+require('@babel/register')(require('./babel.config'))
 const gulp = require('gulp')
 const path = require('path')
 

diff --git a/index.html b/index.html
@@ -8,7 +8,7 @@
   <script>
     window.isMain = true
     require('coffee-script/register');
-    require('babel-register')(require('./babel.config'));
+    require('@babel/register')(require('./babel.config'));
     require('./views/env');
   </script>
 </head>

diff --git a/index.js b/index.js
@@ -1,4 +1,4 @@
 require('coffee-script/register')
-require('babel-register')(require('./babel.config'))
+require('@babel/register')(require('./babel.config'))
 require('./lib/cli')
 require('./app')