Skip to content

Commit f2c33c0

Browse files
committed
Merge pull request #312 from ParsePlatform/nlutsenko.babel
Add Babel.js compiler support.
2 parents 123ac5f + 2750a4c commit f2c33c0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+76
-59
lines changed

.babelrc

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

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,7 @@ node_modules
3030
*~
3131

3232
# WebStorm/IntelliJ
33-
.idea
33+
.idea
34+
35+
# Babel.js
36+
lib/

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion

bin/parse-server

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env node
22
var express = require('express');
3-
var ParseServer = require("../index").ParseServer;
3+
var ParseServer = require("../lib/index").ParseServer;
44

55
var app = express();
66

package.json

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "parse-server",
33
"version": "2.0.7",
44
"description": "An express module providing a Parse-compatible API server",
5-
"main": "index.js",
5+
"main": "lib/index.js",
66
"repository": {
77
"type": "git",
88
"url": "https://github.com/ParsePlatform/parse-server"
@@ -11,6 +11,7 @@
1111
"dependencies": {
1212
"apn": "^1.7.5",
1313
"aws-sdk": "~2.2.33",
14+
"babel-runtime": "^6.5.0",
1415
"bcrypt-nodejs": "0.0.3",
1516
"body-parser": "^1.14.2",
1617
"deepcopy": "^0.6.1",
@@ -19,23 +20,29 @@
1920
"mime": "^1.3.4",
2021
"mongodb": "~2.1.0",
2122
"multer": "^1.1.0",
23+
"node-gcm": "^0.14.0",
2224
"parse": "^1.7.0",
2325
"randomstring": "^1.1.3",
24-
"node-gcm": "^0.14.0",
2526
"request": "^2.65.0"
2627
},
2728
"devDependencies": {
29+
"babel-cli": "^6.5.1",
30+
"babel-core": "^6.5.1",
31+
"babel-istanbul": "^0.6.0",
32+
"babel-preset-es2015": "^6.5.0",
33+
"babel-register": "^6.5.1",
2834
"codecov": "^1.0.1",
2935
"deep-diff": "^0.3.3",
30-
"istanbul": "^0.4.2",
3136
"jasmine": "^2.3.2",
3237
"mongodb-runner": "^3.1.15"
3338
},
3439
"scripts": {
40+
"build": "./node_modules/.bin/babel src/ -d lib/",
3541
"pretest": "MONGODB_VERSION=${MONGODB_VERSION:=3.0.8} mongodb-runner start",
36-
"test": "NODE_ENV=test TESTING=1 ./node_modules/.bin/istanbul cover --include-all-sources -x **/spec/** ./node_modules/.bin/jasmine",
42+
"test": "NODE_ENV=test TESTING=1 ./node_modules/.bin/babel-node ./node_modules/.bin/babel-istanbul cover -x **/spec/** ./node_modules/.bin/jasmine",
3743
"posttest": "mongodb-runner stop",
38-
"start": "./bin/parse-server"
44+
"start": "./bin/parse-server",
45+
"prepublish": "npm run build"
3946
},
4047
"engines": {
4148
"node": ">=4.1"

spec/APNS.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var APNS = require('../APNS');
1+
var APNS = require('../src/APNS');
22

33
describe('APNS', () => {
44
it('can generate APNS notification', (done) => {

spec/ExportAdapter.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var ExportAdapter = require('../ExportAdapter');
1+
var ExportAdapter = require('../src/ExportAdapter');
22

33
describe('ExportAdapter', () => {
44
it('can be constructed', (done) => {

spec/GCM.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var GCM = require('../GCM');
1+
var GCM = require('../src/GCM');
22

33
describe('GCM', () => {
44
it('can generate GCM Payload without expiration time', (done) => {

spec/ParseACL.spec.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,9 @@ describe('Parse.ACL', () => {
251251
equal(results.length, 1);
252252
var result = results[0];
253253
ok(result);
254+
if (!result) {
255+
return fail();
256+
}
254257
equal(result.id, object.id);
255258
equal(result.getACL().getReadAccess(user), true);
256259
equal(result.getACL().getWriteAccess(user), true);

spec/ParseAPI.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// A bunch of different tests are in here - it isn't very thematic.
22
// It would probably be better to refactor them into different files.
33

4-
var DatabaseAdapter = require('../DatabaseAdapter');
4+
var DatabaseAdapter = require('../src/DatabaseAdapter');
55
var request = require('request');
66

77
describe('miscellaneous', function() {

0 commit comments

Comments
 (0)