Merge pull request #351 from ParsePlatform/babelfix

Upgrading Babel, Jest, fixing RN compat

Author: andrewimm

babel-jest.js

@@ -0,0 +1,6 @@
+const babelJest = require('babel-jest');
+
+module.exports = babelJest.createTransformer({
+  presets: ['es2015', 'react', 'stage-2'],
+  plugins: [],
+});

gulpfile.js

@@ -12,6 +12,17 @@ var uglify     = require('gulp-uglify');
 var BUILD = process.env.PARSE_BUILD || 'browser';
 var VERSION = require('./package.json').version;
 
+var PRESETS = {
+  'browser': ['es2015', 'react', 'stage-2'],
+  'node': ['es2015', 'react', 'stage-2'],
+  'react-native': ['react'],
+};
+var PLUGINS = {
+  'browser': ['inline-package-json', 'transform-inline-environment-variables', 'transform-runtime'],
+  'node': ['inline-package-json', 'transform-inline-environment-variables', 'transform-runtime'],
+  'react-native': ['inline-package-json', 'transform-inline-environment-variables'],
+};
+
 var DEV_HEADER = (
   '/**\n' +
   ' * Parse JavaScript SDK v' + VERSION + '\n' +
@@ -42,15 +53,12 @@ gulp.task('compile', function() {
   };
   return gulp.src('src/*.js')
     .pipe(babel({
-      experimental: true,
-      optional: [
-        'runtime',
-        'utility.inlineEnvironmentVariables'
-      ],
-      plugins: [
-        'inline-package-json',
-        require('./vendor/babel-plugin-dead-code-elimination')
-      ],
+      presets: PRESETS[BUILD],
+      plugins: PLUGINS[BUILD],
+    }))
+    // Second pass to kill BUILD-switched code
+    .pipe(babel({
+      plugins: ['minify-dead-code-elimination'],
     }))
     .pipe(gulp.dest(path.join('lib', BUILD)));
 });

integration/package.json

@@ -3,7 +3,7 @@
   "dependencies": {
     "express": "^4.13.4",
     "mocha": "^2.4.5",
-    "parse-server": "^2.1.1"
+    "parse-server": "2.2.17"
   },
   "scripts": {
     "test": "mocha --reporter dot -t 5000"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "parse",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "The Parse JavaScript SDK",
   "homepage": "https://www.parse.com",
   "keywords": [
@@ -28,25 +28,31 @@
     "react-native": false
   },
   "dependencies": {
-    "babel-runtime": "^5.8.20",
+    "babel-runtime": "^6.11.6",
     "ws": "^1.0.1",
     "xmlhttprequest": "^1.7.0"
   },
   "devDependencies": {
-    "babel-jest": "~5.3.0",
+    "babel-jest": "^15.0.0",
     "babel-plugin-flow-comments": "^1.0.9",
-    "babel-plugin-inline-package-json": "~1.0.1",
+    "babel-plugin-inline-package-json": "~2.0.0",
+    "babel-plugin-minify-dead-code-elimination": "0.0.2",
+    "babel-plugin-transform-inline-environment-variables": "^6.8.0",
+    "babel-plugin-transform-runtime": "^6.15.0",
+    "babel-preset-es2015": "^6.14.0",
+    "babel-preset-react": "^6.11.1",
+    "babel-preset-stage-2": "^6.13.0",
     "browserify": "^11.0.1",
     "codecov.io": "^0.1.6",
     "gulp": "^3.9.0",
-    "gulp-babel": "^5.2.0",
+    "gulp-babel": "^6.1.2",
     "gulp-derequire": "^2.1.0",
     "gulp-insert": "^0.5.0",
     "gulp-rename": "^1.2.2",
     "gulp-replace": "^0.5.4",
     "gulp-uglify": "^1.4.0",
     "jasmine-reporters": "~1.0.0",
-    "jest-cli": "~0.5.0",
+    "jest-cli": "^15.1.1",
     "vinyl-source-stream": "^1.1.0"
   },
   "scripts": {
@@ -55,6 +61,7 @@
     "test": "PARSE_BUILD=node jest"
   },
   "jest": {
+    "automock": true,
     "collectCoverage": true,
     "testPathDirs": [
       "src/"
@@ -63,7 +70,7 @@
       "/node_modules/",
       "/test_helpers/"
     ],
-    "scriptPreprocessor": "node_modules/babel-jest",
+    "scriptPreprocessor": "babel-jest.js",
     "setupTestFrameworkScriptFile": "setup-jest.js"
   }
 }

src/LiveQueryClient.js

@@ -270,7 +270,6 @@ export default class LiveQueryClient extends EventEmitter {
     };
 
     this.socket.onerror = (error) => {
-      console.log("error on socket");
       this._handleWebSocketError(error);
     };
   }
@@ -440,8 +439,6 @@ export default class LiveQueryClient extends EventEmitter {
 
     if (this.reconnectHandle) {
       clearTimeout(this.reconnectHandle);
-    } else {
-      console.info('attempting to reconnect');
     }
 
     this.reconnectHandle = setTimeout((() => {

src/Parse.js

@@ -90,17 +90,17 @@ Object.defineProperty(Parse, 'liveQueryServerURL', {
 });
 /** End setters **/
 
-Parse.ACL = require('./ParseACL');
+Parse.ACL = require('./ParseACL').default;
 Parse.Analytics = require('./Analytics');
 Parse.Cloud = require('./Cloud');
 Parse.CoreManager = require('./CoreManager');
-Parse.Config = require('./ParseConfig');
-Parse.Error = require('./ParseError');
-Parse.FacebookUtils = require('./FacebookUtils');
-Parse.File = require('./ParseFile');
-Parse.GeoPoint = require('./ParseGeoPoint');
-Parse.Installation = require('./ParseInstallation');
-Parse.Object = require('./ParseObject');
+Parse.Config = require('./ParseConfig').default;
+Parse.Error = require('./ParseError').default;
+Parse.FacebookUtils = require('./FacebookUtils').default;
+Parse.File = require('./ParseFile').default;
+Parse.GeoPoint = require('./ParseGeoPoint').default;
+Parse.Installation = require('./ParseInstallation').default;
+Parse.Object = require('./ParseObject').default;
 Parse.Op = {
   Set: ParseOp.SetOp,
   Unset: ParseOp.UnsetOp,
@@ -110,16 +110,16 @@ Parse.Op = {
   AddUnique: ParseOp.AddUniqueOp,
   Relation: ParseOp.RelationOp
 };
-Parse.Promise = require('./ParsePromise');
+Parse.Promise = require('./ParsePromise').default;
 Parse.Push = require('./Push');
-Parse.Query = require('./ParseQuery');
-Parse.Relation = require('./ParseRelation');
-Parse.Role = require('./ParseRole');
-Parse.Session = require('./ParseSession');
+Parse.Query = require('./ParseQuery').default;
+Parse.Relation = require('./ParseRelation').default;
+Parse.Role = require('./ParseRole').default;
+Parse.Session = require('./ParseSession').default;
 Parse.Storage = require('./Storage');
-Parse.User = require('./ParseUser');
-Parse.LiveQuery = require('./ParseLiveQuery');
-Parse.LiveQueryClient = require('./LiveQueryClient');
+Parse.User = require('./ParseUser').default;
+Parse.LiveQuery = require('./ParseLiveQuery').default;
+Parse.LiveQueryClient = require('./LiveQueryClient').default;
 
 Parse._request = function(...args) {
   return CoreManager.getRESTController().request.apply(null, args);

src/ParseFile.js

@@ -100,7 +100,7 @@ export default class ParseFile {
           file: data,
           type: specifiedType
         };
-      } else if (data && typeof data.base64 !== 'undefined') {
+      } else if (data && typeof data.base64 === 'string') {
         const base64 = data.base64;
         var commaIndex = base64.indexOf(',');
 

src/ParsePromise.js

@@ -280,8 +280,8 @@ export default class ParsePromise {
    * @param {Function} continuation the callback.
    */
   _continueWith(continuation) {
-    return this.then(function() {
-      return continuation(arguments, null);
+    return this.then(function(...args) {
+      return continuation(args, null);
     }, function(error) {
       return continuation(null, error);
     });

src/ParseQuery.js

@@ -18,6 +18,8 @@ import ParsePromise from './ParsePromise';
 
 import type { RequestOptions, FullOptions } from './RESTController';
 
+type BatchOptions = FullOptions & { batchSize?: number };
+
 export type WhereClause = {
   [attr: string]: mixed;
 };
@@ -407,7 +409,7 @@ export default class ParseQuery {
    * @return {Parse.Promise} A promise that will be fulfilled once the
    *     iteration has completed.
    */
-  each(callback: (obj: ParseObject) => any, options?: FullOptions): ParsePromise {
+  each(callback: (obj: ParseObject) => any, options?: BatchOptions): ParsePromise {
     options = options || {};
 
     if (this._order || this._skip || (this._limit >= 0)) {

src/ParseUser.js

@@ -115,7 +115,7 @@ export default class ParseUser extends ParseObject {
           });
         },
         error: (provider, error) => {
-          if (options.error) {
+          if (typeof options.error === 'function') {
             options.error(this, error);
           }
           promise.reject(error);