Node 0.12 compatibility (#13)

tomdale · web-flow · commit daf5aa5fecc4 · 2016-07-28T18:04:27.000-04:00
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 node_modules
+dist/
+tmp/
diff --git a/.npmignore b/.npmignore
@@ -1,4 +1,5 @@
 .gitignore
 .jshintrc
 .travis.yml
-test
+test/
+tmp/
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ node_js:
   - "stable"
   - "5"
   - "4"
+  - "0.12"
 
 env:
   - CXX=g++-4.8 WORKER_COUNT=2
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -0,0 +1,7 @@
+var alchemist = require('broccoli-module-alchemist');
+
+module.exports = function() {
+  return alchemist({
+    entry: 'fastboot-app-server.js'
+  });
+};
diff --git a/package.json b/package.json
@@ -2,9 +2,10 @@
   "name": "fastboot-app-server",
   "version": "1.0.0-beta.2",
   "description": "A production-ready app server for running Ember FastBoot apps",
-  "main": "lib/fastboot-app-server.js",
+  "main": "src/fastboot-app-server.js",
   "scripts": {
-    "test": "NODE_ENV=test mocha"
+    "prepublish": "ember build",
+    "test": "ember build && NODE_ENV=test mocha"
   },
   "repository": {
     "type": "git",
@@ -26,12 +27,16 @@
     "basic-auth": "^1.0.3",
     "chalk": "^1.1.3",
     "express": "^4.13.3",
-    "fastboot": "^1.0.0-beta.1",
-    "fastboot-express-middleware": "^1.0.0-beta.3",
+    "fastboot": "^1.0.0-rc.0",
+    "fastboot-express-middleware": "^1.0.0-rc.3",
     "fs-promise": "^0.3.1"
   },
   "devDependencies": {
+    "babel-core": "^6.10.4",
+    "babel-preset-es2015": "^6.9.0",
+    "broccoli-module-alchemist": "^0.2.1",
     "chai": "^3.5.0",
+    "ember-cli": "^2.6.2",
     "mocha": "^2.4.5",
     "request-promise": "^3.0.0"
   }
diff --git a/src/basic-auth.js b/src/basic-auth.js
diff --git a/src/express-http-server.js b/src/express-http-server.js
@@ -1,6 +1,7 @@
 "use strict";
 
-const express = require('express');
+import * as express from 'express';
+//const express = require('express');
 const basicAuth = require('./basic-auth');
 
 class ExpressHTTPServer {
diff --git a/src/fastboot-app-server.js b/src/fastboot-app-server.js
diff --git a/src/ui.js b/src/ui.js
diff --git a/src/worker.js b/src/worker.js
diff --git a/test/app-server-test.js b/test/app-server-test.js
@@ -3,7 +3,8 @@
 const path              = require('path');
 const fork              = require('child_process').fork;
 const expect            = require('chai').expect;
-const FastBootAppServer = require('../lib/fastboot-app-server');
+const alchemistRequire  = require('broccoli-module-alchemist/require');
+const FastBootAppServer = alchemistRequire('fastboot-app-server');
 const request           = require('request-promise').defaults({ simple: false, resolveWithFullResponse: true });
 
 let server;
diff --git a/test/fixtures/basic-app-server.js b/test/fixtures/basic-app-server.js
@@ -1,9 +1,10 @@
 'use strict';
 
-const path = require('path');
-const FastBootAppServer = require('../../lib/fastboot-app-server.js');
+var path = require('path');
+var alchemistRequire = require('broccoli-module-alchemist/require');
+var FastBootAppServer = alchemistRequire('fastboot-app-server');
 
-let server = new FastBootAppServer({
+var server = new FastBootAppServer({
   distPath: path.resolve(__dirname, './basic-app')
 });
 
diff --git a/test/fixtures/not-found-server.js b/test/fixtures/not-found-server.js
@@ -1,10 +1,11 @@
 'use strict';
 
-const FastBootAppServer = require('../../lib/fastboot-app-server.js');
+var alchemistRequire = require('broccoli-module-alchemist/require');
+var FastBootAppServer = alchemistRequire('fastboot-app-server.js');
 
-let server = new FastBootAppServer({
+var server = new FastBootAppServer({
   downloader: {
-    download() {
+    download: function() {
       return Promise.resolve();
     }
   }
diff --git a/test/mocha.opts b/test/mocha.opts
@@ -0,0 +1,2 @@
+--compilers js:babel-core/register
+
