将present-es2015升级到preset-env

jdf2e · Jun 12, 2018 · 9aa1fd9 · 9aa1fd9
1 parent cce1279
commit 9aa1fd9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
-node_modules
-npm-debug.log
-.svn
-.idea
-.DS_Store
-.vscode
+node_modules
+npm-debug.log
+.svn
+.idea
+.DS_Store
+.vscode
 package-lock.json
diff --git a/lib/VFS/VirtualFileSystem.js b/lib/VFS/VirtualFileSystem.js
@@ -143,7 +143,8 @@ class VFS {
         let extmap = {
             scss: 'css',
             less: 'css',
-            babel: 'js'
+            babel: 'js',
+            es6: 'js'
         }
 
         let extname = path.extname(oPath).slice(1);

diff --git a/lib/buildES6.js b/lib/buildES6.js
@@ -11,7 +11,7 @@ const vfs = require('./VFS/VirtualFileSystem');
 const logger = require('jdf-log');
 
 module.exports.init = () => {
-    const files = vfs.queryFileByType('babel');
+    const files = vfs.queryFileByType(['babel', 'es6']);
     if(files.length > 0) {
         logger.profile('parse es6');
         const babel = require('babel-core');
@@ -24,6 +24,7 @@ module.exports.init = () => {
             });
             logger.verbose(`build ES6: ${item.originPath}`);
             var fileName = path.basename(item.originPath, '.babel');
+            fileName = path.basename(fileName, '.es6');
             const sourcemapFileName = `${fileName}.js.map`;
             item.targetContent = `${result.code}\n//# sourceMappingURL=./${sourcemapFileName}`;
             result.map.file = `${fileName}}.js`;

diff --git a/lib/config.js b/lib/config.js
@@ -81,11 +81,11 @@ module.exports = {
 	},
 
 	"babel": {
-		// 默认只启用基本转义 http://babeljs.io/docs/plugins/preset-es2015/
-		"defaultPresets": [path.resolve(__dirname, "../node_modules/babel-preset-es2015")],
-        "presets": [],
+		// 默认只启用基本转义 http://babeljs.io/docs/plugins/preset-env/
+		"defaultPresets": [path.resolve(__dirname, "../node_modules/babel-preset-env")],
+    "presets": [],
 		"defaultPlugins": [],
-        "plugins": []
+    "plugins": []
 	},
 
 	// 插件  "jdf-cms"

diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "autoprefixer": "^6.5.2",
     "axios": "^0.17.0",
     "babel-core": "^6.18.0",
-    "babel-preset-es2015": "^6.24.0",
+    "babel-preset-env": "^1.7.0",
     "browser-sync": "2.21.0",
     "bs-html-injector": "^3.0.3",
     "cheerio": "^0.22.0",