Skip to content

Commit f51adc5

Browse files
authored
Merge branch 'master' into greenkeeper/debug-4.1.0
2 parents ea3b8e7 + b79df75 commit f51adc5

6 files changed

Lines changed: 7 additions & 21 deletions

File tree

.babelrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.travis.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
language: node_js
22
node_js:
33
- "stable"
4-
- "4"
54
- "6"
6-
7-
env:
8-
- CXX=g++-4.8 WORKER_COUNT=2
9-
addons:
10-
apt:
11-
sources:
12-
- ubuntu-toolchain-r-test
13-
packages:
14-
- g++-4.8
5+
- "8"
6+
- "10"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Greenkeeper badge](https://badges.greenkeeper.io/ember-fastboot/fastboot.svg)](https://greenkeeper.io/)
44
[![npm version](https://badge.fury.io/js/fastboot.svg)](https://badge.fury.io/js/fastboot)
5-
[![Build Status](https://travis-ci.org/ember-fastboot/fastboot.svg?branch=master)](https://travis-ci.org/ember-fastboot/ember-fastboot-server)
5+
[![Build Status](https://travis-ci.org/ember-fastboot/fastboot.svg?branch=master)](https://travis-ci.org/ember-fastboot/fastboot)
66
![Ember Version](https://embadge.io/v1/badge.svg?start=2.3.0)
77

88
FastBoot is a library for rendering Ember.js applications in Node.js.
@@ -17,7 +17,7 @@ To serve server-rendered versions of your Ember app over HTTP, see the
1717
[FastBoot App
1818
Server](https://github.com/ember-fastboot/fastboot-app-server).
1919

20-
FastBoot requires Node.js v4 or later.
20+
FastBoot requires Node.js v6 or later.
2121

2222
## Usage
2323

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"url": "git+https://github.com/ember-fastboot/fastboot.git"
1414
},
1515
"engines": {
16-
"node": ">= 4.0.0"
16+
"node": ">= 6.0.0"
1717
},
1818
"keywords": [
1919
"ember",
@@ -22,7 +22,7 @@
2222
"author": "Tom Dale and FastBoot contributors",
2323
"license": "MIT",
2424
"bugs": {
25-
"url": "https://github.com/ember-fastboot/fastboot-fastboot-server/issues"
25+
"url": "https://github.com/ember-fastboot/fastboot/issues"
2626
},
2727
"homepage": "https://github.com/ember-fastboot/fastboot#readme",
2828
"dependencies": {

src/ember-app.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const chalk = require('chalk');
66

77
const najax = require('najax');
88
const SimpleDOM = require('simple-dom');
9-
const existsSync = require('exists-sync');
109
const debug = require('debug')('fastboot:ember-app');
1110

1211
const FastBootInfo = require('./fastboot-info');
@@ -123,7 +122,7 @@ class EmberApp {
123122
if (whitelist.indexOf(moduleName) > -1) {
124123
let nodeModulesPath = path.join(distPath, 'node_modules', moduleName);
125124

126-
if (existsSync(nodeModulesPath)) {
125+
if (fs.existsSync(nodeModulesPath)) {
127126
return require(nodeModulesPath);
128127
} else {
129128
// If it's not on disk, assume it's a built-in node package

test/fixtures/custom-sandbox/custom-sandbox.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
22

33
const vm = require('vm');
4-
const fs = require('fs');
5-
const existsSync = require('exists-sync');
64
const Sandbox = require('./../../../src/sandbox');
75

86
/**

0 commit comments

Comments
 (0)