refactor: use lux babel preset

postlight · Jun 12, 2016 · 53e257a · 53e257a
1 parent 2512e85
commit 53e257a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 70 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,17 +1,12 @@
 {
+  "presets": [
+    "lux"
+  ],
   "plugins": [
-    "external-helpers-2",
     "syntax-flow",
     "syntax-trailing-function-commas",
     "transform-decorators-legacy",
     "transform-flow-strip-types",
-    "transform-class-properties",
-    "transform-decorators",
-    "transform-es2015-destructuring",
-    "transform-es2015-parameters",
-    "transform-es2015-spread",
-    "transform-object-rest-spread",
-    "transform-async-to-generator",
-    "transform-exponentiation-operator"
+    "transform-decorators"
   ]
 }
diff --git a/package.json b/package.json
@@ -55,22 +55,14 @@
   },
   "devDependencies": {
     "babel-core": "6.9.1",
-    "babel-plugin-external-helpers-2": "6.3.13",
     "babel-plugin-syntax-flow": "6.8.0",
     "babel-plugin-syntax-trailing-function-commas": "6.8.0",
-    "babel-plugin-transform-async-to-generator": "6.8.0",
-    "babel-plugin-transform-class-properties": "6.9.1",
     "babel-plugin-transform-decorators": "6.8.0",
     "babel-eslint": "6.0.4",
     "babel-loader": "6.2.4",
     "babel-plugin-transform-decorators-legacy": "1.3.4",
-    "babel-plugin-transform-es2015-destructuring": "6.9.0",
-    "babel-plugin-transform-es2015-modules-commonjs": "6.8.0",
-    "babel-plugin-transform-es2015-parameters": "6.9.0",
-    "babel-plugin-transform-es2015-spread": "6.8.0",
-    "babel-plugin-transform-exponentiation-operator": "6.8.0",
     "babel-plugin-transform-flow-strip-types": "6.8.0",
-    "babel-plugin-transform-object-rest-spread": "6.8.0",
+    "babel-preset-lux": "1.0.0",
     "chai": "3.5.0",
     "documentation": "4.0.0-beta5",
     "flow-bin": "0.26.0",

diff --git a/src/packages/cli/templates/babel-rc.js b/src/packages/cli/templates/babel-rc.js
@@ -6,18 +6,6 @@ import template from '../../template';
  */
 export default (): string => template`
   {
-    "plugins": [
-      "external-helpers-2",
-      "syntax-trailing-function-commas",
-      "transform-decorators-legacy",
-      "transform-class-properties",
-      "transform-decorators",
-      "transform-es2015-destructuring",
-      "transform-es2015-parameters",
-      "transform-es2015-spread",
-      "transform-object-rest-spread",
-      "transform-async-to-generator",
-      "transform-exponentiation-operator"
-    ]
+    "presets": ["lux"]
   }
 `;
diff --git a/src/packages/cli/templates/package-json.js b/src/packages/cli/templates/package-json.js
@@ -1,9 +1,9 @@
 // @flow
-import { version } from '../../../../package.json';
-
+import { version, devDependencies } from '../../../../package.json';
 import template from '../../template';
 
-const VERSION: string = version;
+const LUX_VERSION: string = version;
+const BABEL_PRESET_VERSION: string = devDependencies['babel-preset-lux'];
 
 /**
  * @private
@@ -21,19 +21,9 @@ export default (name: string): string => template`
     "license": "MIT",
     "dependencies": {
       "babel-core": "6.9.1",
-      "babel-plugin-external-helpers-2": "6.3.13",
-      "babel-plugin-syntax-trailing-function-commas": "6.8.0",
-      "babel-plugin-transform-async-to-generator": "6.8.0",
-      "babel-plugin-transform-class-properties": "6.9.1",
-      "babel-plugin-transform-decorators": "6.8.0",
-      "babel-plugin-transform-decorators-legacy": "1.3.4",
-      "babel-plugin-transform-es2015-destructuring": "6.9.0",
-      "babel-plugin-transform-es2015-parameters": "6.9.0",
-      "babel-plugin-transform-es2015-spread": "6.8.0",
-      "babel-plugin-transform-exponentiation-operator": "6.8.0",
-      "babel-plugin-transform-object-rest-spread": "6.8.0",
+      "babel-preset-lux": "${BABEL_PRESET_VERSION}",
       "knex": "0.11.5",
-      "lux-framework": "${VERSION}"
+      "lux-framework": "${LUX_VERSION}"
     }
   }
 `;
diff --git a/test/test-app/.babelrc b/test/test-app/.babelrc
@@ -1,15 +1,3 @@
 {
-  "plugins": [
-    "external-helpers-2",
-    "syntax-trailing-function-commas",
-    "transform-decorators-legacy",
-    "transform-class-properties",
-    "transform-decorators",
-    "transform-es2015-destructuring",
-    "transform-es2015-parameters",
-    "transform-es2015-spread",
-    "transform-object-rest-spread",
-    "transform-async-to-generator",
-    "transform-exponentiation-operator"
-  ]
+  "presets": ["lux"]
 }
diff --git a/test/test-app/package.json b/test/test-app/package.json
@@ -12,17 +12,7 @@
   "dependencies": {
     "babel-core": "6.9.1",
     "babel-eslint": "6.0.4",
-    "babel-plugin-external-helpers-2": "6.3.13",
-    "babel-plugin-syntax-trailing-function-commas": "6.8.0",
-    "babel-plugin-transform-async-to-generator": "6.8.0",
-    "babel-plugin-transform-class-properties": "6.9.1",
-    "babel-plugin-transform-decorators": "6.8.0",
-    "babel-plugin-transform-decorators-legacy": "1.3.4",
-    "babel-plugin-transform-es2015-destructuring": "6.9.0",
-    "babel-plugin-transform-es2015-parameters": "6.9.0",
-    "babel-plugin-transform-es2015-spread": "6.8.0",
-    "babel-plugin-transform-exponentiation-operator": "6.8.0",
-    "babel-plugin-transform-object-rest-spread": "6.8.0",
+    "babel-preset-lux": "1.0.0",
     "knex": "0.11.5",
     "mysql2": "1.0.0-rc.2",
     "pg": "4.5.6",