Merge babel config and add jscript fixes

TheGamerdk · Jan 13, 2016 · e9ccc6c · e9ccc6c
1 parent f40f4ed
commit e9ccc6c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/tgui/.babelrc b/tgui/.babelrc
@@ -0,0 +1,9 @@
+{
+  "presets": [
+    "es2015"
+  ],
+  "plugins": [
+    "transform-jscript",
+    "external-helpers-2"
+  ]
+}
diff --git a/tgui/assets/tgui.js b/tgui/assets/tgui.js
diff --git a/tgui/gulp/tasks/js.coffee b/tgui/gulp/tasks/js.coffee
@@ -14,10 +14,11 @@ through      = require "through2"
 
 
 b.componentify.compilers["text/javascript"] = (source, file) ->
-  compiled = babel.transform source,
+  fs = require "fs"
+  config =
     sourceMaps: true
-    presets: ["es2015"]
-    plugins: ["external-helpers-2"]
+  Object.assign config, JSON.parse fs.readFileSync(".babelrc", "utf8")
+  compiled = babel.transform source, config
 
   output =
     source: compiled.code
@@ -45,9 +46,7 @@ bundle = ->
     browserify file.path,
       extensions: [".js", ".coffee", ".ract"]
       debug: f.debug
-    .transform b.babelify,
-      presets: ["es2015"]
-      plugins: ["external-helpers-2"]
+    .transform b.babelify
     .plugin b.helpers
     .transform b.coffeeify
     .transform b.componentify

diff --git a/tgui/package.json b/tgui/package.json
@@ -4,6 +4,7 @@
   "dependencies": {
     "autoprefixer": "~6.2.3",
     "babel-plugin-external-helpers-2": "~6.3.13",
+    "babel-plugin-transform-jscript": "~6.4.0",
     "babel-preset-es2015": "~6.3.13",
     "babelify": "~7.2.0",
     "babelify-external-helpers": "~1.0.0",