Use Babel 6

ctxhou · Dec 15, 2015 · b2d2224 · b2d2224
1 parent e44e1e4
commit b2d2224
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 24 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,4 @@
 {
-  "loose": "all",
-  "stage": 0
+  "presets": ["es2015-loose", "stage-0"],
+  "plugins": ["add-module-exports"]
 }
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -26,12 +26,20 @@ gulp.task('build:docs', ['clean'], () => {
 
 gulp.task('build:package', ['clean'], () => {
     let editor = require('gulp-json-editor');
+    let builders = [
+        'babel-plugin-add-module-exports',
+        'babel-preset-es2015-loose',
+        'babel-preset-stage-0',
+        'babel-core'
+    ];
     return gulp.src('./package.json')
-        .pipe(editor( (p) => {
-            p.main = 'lib/postcss';
-            p.devDependencies['babel-core'] = p.dependencies['babel-core'];
-            delete p.dependencies['babel-core'];
-            return p;
+        .pipe(editor( (json) => {
+            json.main = 'lib/postcss';
+            for ( let i of builders ) {
+                json.devDependencies[i] = json.dependencies[i];
+                delete json.dependencies[i];
+            }
+            return json;
         }))
         .pipe(gulp.dest('build'));
 });

diff --git a/lib/container.es6 b/lib/container.es6
@@ -156,7 +156,7 @@ export default class Container extends Node {
     }
 
     cleanRaws(keepBetween) {
-        super(keepBetween);
+        super.cleanRaws(keepBetween);
         if ( this.nodes ) {
             for ( let node of this.nodes ) node.cleanRaws(keepBetween);
         }

diff --git a/lib/css-syntax-error.es6 b/lib/css-syntax-error.es6
@@ -2,12 +2,11 @@ import supportsColor from 'supports-color';
 
 import warnOnce from './warn-once';
 
-export default class CssSyntaxError extends SyntaxError {
+export default class CssSyntaxError {
 
     name = 'CssSyntaxError';
 
     constructor(message, line, column, source, file, plugin) {
-        super(message);
         this.reason = message;
 
         if ( file )   this.file   = file;

diff --git a/lib/input.es6 b/lib/input.es6
@@ -31,20 +31,20 @@ export default class Input {
     }
 
     error(message, line, column, opts = { }) {
-        let error;
+        let result;
         let origin = this.origin(line, column);
         if ( origin ) {
-            error = new CssSyntaxError(message, origin.line, origin.column,
+            result = new CssSyntaxError(message, origin.line, origin.column,
                 origin.source, origin.file, opts.plugin);
         } else {
-            error = new CssSyntaxError(message, line, column,
+            result = new CssSyntaxError(message, line, column,
                 this.css, this.file, opts.plugin);
         }
 
-        error.input = { line, column, source: this.css };
-        if ( this.file ) error.input.file = this.file;
+        result.input = { line, column, source: this.css };
+        if ( this.file ) result.input.file = this.file;
 
-        return error;
+        return result;
     }
 
     origin(line, column) {

diff --git a/package.json b/package.json
@@ -20,26 +20,29 @@
   "license": "MIT",
   "repository": "postcss/postcss",
   "dependencies": {
-    "supports-color": "^3.1.2",
-    "source-map":     "^0.5.1",
-    "babel-core":     "5.8.25",
-    "js-base64":      "^2.1.9"
+    "babel-plugin-add-module-exports": "0.1.1",
+    "babel-preset-es2015-loose":       "6.1.3",
+    "babel-preset-stage-0":            "6.3.13",
+    "supports-color":                  "^3.1.2",
+    "source-map":                      "^0.5.1",
+    "babel-core":                      "6.3.17",
+    "js-base64":                       "^2.1.9"
   },
   "devDependencies": {
     "concat-with-sourcemaps": "1.0.4",
     "postcss-parser-tests":   "5.0.4",
     "gulp-json-editor":       "2.2.1",
     "gulp-istanbul":          "0.10.3",
     "run-sequence":           "1.1.5",
-    "babel-eslint":           "4.1.5",
+    "babel-eslint":           "5.0.0-beta6",
     "gulp-eslint":            "1.1.1",
     "gulp-mocha":             "2.2.0",
-    "gulp-babel":             "5.3.0",
+    "gulp-babel":             "6.1.1",
     "strip-ansi":             "3.0.0",
     "gulp-shell":             "0.5.1",
     "yaspeller":              "2.6.0",
     "fs-extra":               "0.26.2",
-    "isparta":                "3.5.3",
+    "isparta":                "4.0.0",
     "eslint":                 "1.10.3",
     "sinon":                  "1.17.2",
     "mocha":                  "2.3.4",

diff --git a/test/css-syntax-error.es6 b/test/css-syntax-error.es6
@@ -42,7 +42,7 @@ describe('CssSyntaxError', () => {
 
     it('has stack trace', () => {
         expect(parseError('a {\n  content: "\n}').stack)
-            .to.match(/test\/css-syntax-error\.es6/);
+            .to.match(/css-syntax-error\.es6/);
     });
 
     it('highlights broken line', () => {