From df99f5c0a5254e3e8f0d49e991eb3d6301675ccb Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Wed, 23 Mar 2016 09:41:08 +0100 Subject: [PATCH] Revert "Merge pull request #265 from vatesfr/revert-babel-6" This reverts commit 8907290d2702e09a6e2eb4f24ae6489950910171, reversing changes made to eb55cba34ac640fab14b2b99521fee95505c7882. --- .babelrc | 17 +++++++---------- index.js | 2 +- package.json | 10 +++++++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.babelrc b/.babelrc index 5e9978a41..fa056be0d 100644 --- a/.babelrc +++ b/.babelrc @@ -1,15 +1,12 @@ { "comments": false, "compact": true, - "optional": [ - // Experimental features. - // "minification.constantFolding", - // "minification.deadCodeElimination", - - "es7.asyncFunctions", - "es7.decorators", - "es7.exportExtensions", - "es7.functionBind", - "runtime" + "plugins": [ + "transform-decorators-legacy", + "transform-runtime" + ], + "presets": [ + "stage-0", + "es2015" ] } diff --git a/index.js b/index.js index f6dd4e320..40fbfef2a 100644 --- a/index.js +++ b/index.js @@ -8,4 +8,4 @@ if (process.env.DEBUG === undefined) { } // Import the real main module. -module.exports = require('./dist') +module.exports = require('./dist').default diff --git a/package.json b/package.json index 70e34eddd..a210b38a3 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "dependencies": { "@marsaud/smb2-promise": "^0.2.0", "app-conf": "^0.4.0", - "babel-runtime": "^5", + "babel-runtime": "^6.5.0", "base64url": "^1.0.5", "blocked": "^1.1.0", "bluebird": "^3.1.1", @@ -131,12 +131,16 @@ "xo-remote-parser": "^0.1.0" }, "devDependencies": { - "babel-eslint": "^4.0.10", + "babel-eslint": "^5.0.0", + "babel-plugin-transform-decorators-legacy": "^1.3.4", + "babel-plugin-transform-runtime": "^6.5.2", + "babel-preset-es2015": "^6.5.0", + "babel-preset-stage-0": "^6.5.0", "chai": "^3.0.0", "dependency-check": "^2.4.0", "ghooks": "^1.0.3", "gulp": "git://github.com/gulpjs/gulp#4.0", - "gulp-babel": "^5", + "gulp-babel": "^6", "gulp-coffee": "^2.3.1", "gulp-plumber": "^1.0.0", "gulp-sourcemaps": "^1.5.1",