Skip to content

Commit

Permalink
Merge pull request ember-fastboot#74 from ember-fastboot/0.12-support
Browse files Browse the repository at this point in the history
0.12 support
  • Loading branch information
tomdale authored Jul 28, 2016
2 parents abcd1ed + b62e795 commit 3dbc026
Show file tree
Hide file tree
Showing 25 changed files with 50 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["es2015"]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/node_modules
npm-debug.log
tmp*
dist/
1 change: 1 addition & 0 deletions .jshintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
test/fixtures/**
node_modules/**
dist/**
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ language: node_js
node_js:
- "stable"
- "4"
- "0.12"

env:
- CXX=g++-4.8 WORKER_COUNT=2
Expand Down
5 changes: 5 additions & 0 deletions Brocfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
var alchemist = require('broccoli-module-alchemist');

module.exports = alchemist({
targets: ['cjs']
});
10 changes: 10 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
"name": "fastboot",
"version": "1.0.0-beta.5",
"description": "Library for rendering Ember apps in node.js",
"main": "src/index.js",
"scripts": {
"test": "mocha",
"build": "rm -rf dist && broccoli build dist",
"preversion": "npm test",
"prepublish": "npm run build",
"postinstall": "broccoli-module-alchemist-install",
"postversion": "git push origin master --tags"
},
"repository": {
Expand All @@ -22,6 +26,7 @@
},
"homepage": "https://github.com/ember-fastboot/fastboot#readme",
"dependencies": {
"broccoli-module-alchemist-install": "^0.1.1",
"chalk": "^0.5.1",
"cookie": "^0.2.3",
"debug": "^2.1.0",
Expand All @@ -36,6 +41,11 @@
"source-map-support": "^0.4.0"
},
"devDependencies": {
"babel-core": "^6.10.4",
"babel-preset-es2015": "^6.9.0",
"broccoli": "^0.16.9",
"broccoli-cli": "^1.0.0",
"broccoli-module-alchemist": "^0.2.0",
"chai": "^3.5.0",
"chai-as-promised": "^5.2.0",
"fs-promise": "^0.5.0",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion index.js → src/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const EmberApp = require('./lib/ember-app');
const EmberApp = require('./ember-app');

/**
* FastBoot renders your Ember.js applications in Node.js. Start by
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 2 additions & 1 deletion test/fastboot-headers-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

var expect = require('chai').expect;
var path = require('path');
var FastBootHeaders = require('../lib/fastboot-headers.js');
var alchemistRequire = require('broccoli-module-alchemist/require');
var FastBootHeaders = alchemistRequire('fastboot-headers.js');

describe('FastBootHeaders', function() {
it('returns an array of header values from getAll, regardless of header name casing', function() {
Expand Down
7 changes: 4 additions & 3 deletions test/fastboot-info-test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
var expect = require('chai').expect;
var path = require('path');
var FastBootInfo = require('../lib/fastboot-info.js');
var FastBootResponse = require('../lib/fastboot-response.js');
var FastBootRequest = require('../lib/fastboot-request.js');
var alchemistRequire = require('broccoli-module-alchemist/require');
var FastBootInfo = alchemistRequire('fastboot-info.js');
var FastBootResponse = alchemistRequire('fastboot-response.js');
var FastBootRequest = alchemistRequire('fastboot-request.js');

describe("FastBootInfo", function() {
var response;
Expand Down
3 changes: 2 additions & 1 deletion test/fastboot-request-test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var expect = require('chai').expect;
var path = require('path');
var FastBootRequest = require('../lib/fastboot-request.js');
var alchemistRequire = require('broccoli-module-alchemist/require');
var FastBootRequest = alchemistRequire('fastboot-request.js');

describe("FastBootRequest", function() {
it("throws an exception if no hostWhitelist is provided", function() {
Expand Down
5 changes: 3 additions & 2 deletions test/fastboot-response-test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var expect = require('chai').expect;
var FastBootHeaders = require('../lib/fastboot-headers.js');
var FastBootResponse = require('../lib/fastboot-response.js');
var alchemistRequire = require('broccoli-module-alchemist/require');
var FastBootHeaders = alchemistRequire('fastboot-headers.js');
var FastBootResponse = alchemistRequire('fastboot-response.js');

describe("FastBootResponse", function() {
var fastBootResponse;
Expand Down
3 changes: 2 additions & 1 deletion test/fastboot-shoebox-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ const expect = require('chai').expect;
const fs = require('fs');
const path = require('path');
const request = require('request-promise');
const FastBoot = require('../index');
const TestHTTPServer = require('./helpers/test-http-server');
const alchemistRequire = require('broccoli-module-alchemist/require');
const FastBoot = alchemistRequire('index');

describe("FastBootShoebox", function() {

Expand Down
13 changes: 7 additions & 6 deletions test/fastboot-test.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
'use strict';

const expect = require('chai').expect;
const fs = require('fs');
const path = require('path');
const request = require('request-promise');
const FastBoot = require('../index');
const TestHTTPServer = require('./helpers/test-http-server');
const expect = require('chai').expect;
const fs = require('fs');
const path = require('path');
const request = require('request-promise');
const TestHTTPServer = require('./helpers/test-http-server');
const alchemistRequire = require('broccoli-module-alchemist/require');
const FastBoot = alchemistRequire('index');

describe("FastBoot", function() {
it("throws an exception if no distPath is provided", function() {
Expand Down
3 changes: 2 additions & 1 deletion test/helpers/test-http-server.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var express = require('express');
var RSVP = require('rsvp');
var FastBoot = require('../../index');
var alchemistRequire = require('broccoli-module-alchemist/require');
var FastBoot = alchemistRequire('index');

function TestHTTPServer(options) {
options = options || {};
Expand Down
2 changes: 2 additions & 0 deletions test/mocha.opts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
--require test/support/common
--compilers js:babel-core/register
--timeout 10000
7 changes: 4 additions & 3 deletions test/result-test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
var expect = require('chai').expect;
var Result = require('../lib/result.js');
var FastBootInfo = require('../lib/fastboot-info.js');
var alchemistRequire = require('broccoli-module-alchemist/require');
var Result = alchemistRequire('result.js');
var FastBootInfo = alchemistRequire('fastboot-info.js');
var SimpleDOM = require('simple-dom');

describe('Result', function() {
var doc, result;
var doc, result, html;

beforeEach(function () {
var req = { headers: {}, get() {} };
Expand Down

0 comments on commit 3dbc026

Please sign in to comment.