Babel-ify things during the build process

allejo · Jun 23, 2017 · ca85493 · ca85493
1 parent 6263197
commit ca85493
Show file tree

Hide file tree

Showing 8 changed files with 1,483 additions and 6 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,5 @@
+{
+    "presets": [
+        "env"
+    ]
+}
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ Gemfile.lock
 *.map
 CodeBuilder.js
 workspace/
-_events/
+_events/
+node_modules/
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 build:
-	npm install -g typescript; \
-	tsc --project lib/CodeBuilder; \
+	node_modules/.bin/tsc --project lib/CodeBuilder; \
+	node_modules/.bin/babel assets/js/ -d build; \
 	bash tools/fetchEvents.sh; \
 	bundle exec jekyll build;
diff --git a/_config.yml b/_config.yml
@@ -19,6 +19,7 @@ exclude:
   - LICENSE.md
   - tools/
   - Makefile
+  - node_modules
 
 # Development settings
 livereload: true
diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -7,5 +7,5 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/linq.js/2.2.0.2/linq.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.5.16/clipboard.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/1.3.3/FileSaver.min.js"></script>
-<script src="assets/js/CodeBuilder.js"></script>
-<script src="assets/js/main.js"></script>
+<script src="build/CodeBuilder.js"></script>
+<script src="build/main.js"></script>
diff --git a/lib/CodeBuilder/tsconfig.json b/lib/CodeBuilder/tsconfig.json
@@ -8,7 +8,7 @@
         "sourceMap": true,
         "declaration": false,
         "stripInternal": true,
-        "target": "ES5",
+        "target": "ES6",
         "noUnusedLocals": true,
         "noUnusedParameters": true
     },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -0,0 +1,7 @@
+{
+    "dependencies": {
+        "babel-cli": "^6.24.1",
+        "babel-preset-env": "^1.5.2",
+        "typescript": "^2.3.4"
+    }
+}