Skip to content

Commit db2d91f

Browse files
committed
Upgrade babel and jest
1 parent c590c69 commit db2d91f

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["es2015", "stage-0"]
3+
}

config/env.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import regeneratorRuntime from 'babel-runtime/regenerator';
2-
global.regeneratorRuntime = regeneratorRuntime;
1+
import "babel-polyfill";
32

43
global.knex = require('../connection').knex;

config/helpers.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function clean() {
1+
export function clean() {
22
return [
33
'students',
44
'classrooms',
@@ -8,8 +8,4 @@ function clean() {
88
].reduce((promise, table) =>
99
promise.then(knex(table).delete('*'))
1010
, Promise.resolve());
11-
}
12-
13-
export default {
14-
clean
15-
}
11+
}

models/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ import Homework from './Homework'
33
import Student from './Student'
44
import Subject from './Subject'
55

6-
export default { Classroom, Homework, Student, Subject }
6+
7+
module.exports = { Classroom, Homework, Student, Subject }

package.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Some help defining schema around bookshelfjs models.",
55
"main": "index.js",
66
"scripts": {
7-
"test": "./node_modules/.bin/jest -b",
7+
"test": "./node_modules/.bin/jest -b --runInBand",
88
"build": "./node_modules/.bin/babel src/index.js > index.js",
99
"pretest": "npm run-script build",
1010
"prepublish": "npm run-script build"
@@ -27,22 +27,26 @@
2727
},
2828
"homepage": "https://github.com/brysgo/graphql-bookshelf#readme",
2929
"devDependencies": {
30-
"babel": "^5.8.21",
31-
"babel-jest": "^5.3.0",
32-
"babel-runtime": "^5.8.20",
30+
"babel-cli": "^6.6.5",
31+
"babel-jest": "^9.0.3",
32+
"babel-polyfill": "^6.7.4",
33+
"babel-preset-es2015": "^6.6.0",
34+
"babel-preset-stage-0": "^6.5.0",
3335
"bookshelf": "^0.8.1",
3436
"co": "^4.6.0",
3537
"graphql": "^0.4.9",
36-
"jest-cli": "facebook/jest",
38+
"jest-cli": "^0.9.2",
3739
"knex": "^0.8.6",
3840
"sqlite3": "^3.0.10"
3941
},
4042
"jest": {
41-
"scriptPreprocessor": "<rootDir>/node_modules/babel-jest",
4243
"unmockedModulePathPatterns": [
4344
".*"
4445
],
4546
"testDirectoryName": "specs",
47+
"testPathDirs": [
48+
"<rootDir>/specs"
49+
],
4650
"setupEnvScriptFile": "<rootDir>/config/env.js",
4751
"setupTestFrameworkScriptFile": "<rootDir>/config/setup.js"
4852
},

0 commit comments

Comments
 (0)