Skip to content

Commit 69b2e73

Browse files
greenkeeper[bot]peril-parse-community[bot]
authored and
peril-parse-community[bot]
committed
Update jsdoc-babel to the latest version 🚀 (#653)
* chore(package): update jsdoc-babel to version 0.5.0 * wip * Bumps babel versions * Transform runtime in browser only * ensures that tests use properly static things * Fixes for babel-jest * Comment flow types to preserve them
1 parent b3f1137 commit 69b2e73

File tree

8 files changed

+8639
-6981
lines changed

8 files changed

+8639
-6981
lines changed

‎babel-jest.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
const babelJest = require('babel-jest');
22

33
module.exports = babelJest.createTransformer({
4-
presets: [["env", {
5-
"targets": {
6-
"node": "8"
7-
}
8-
}], 'react'],
9-
plugins: [],
4+
presets: [["@babel/preset-env", {
5+
"targets": {
6+
"node": "8"
7+
}
8+
}]],
9+
plugins: ['@babel/plugin-transform-flow-comments'],
1010
});

‎gulpfile.js

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,33 @@ var gulp = require('gulp');
55
var insert = require('gulp-insert');
66
var path = require('path');
77
var rename = require('gulp-rename');
8-
var replace = require('gulp-replace');
98
var source = require('vinyl-source-stream');
109
var uglify = require('gulp-uglify');
1110
var watch = require('gulp-watch');
1211

1312
var BUILD = process.env.PARSE_BUILD || 'browser';
1413
var VERSION = require('./package.json').version;
1514

15+
var transformRuntime = ["@babel/plugin-transform-runtime", {
16+
"corejs": false,
17+
"helpers": true,
18+
"regenerator": false,
19+
"useESModules": false
20+
}];
21+
1622
var PRESETS = {
17-
'browser': ['es2015', 'react', 'stage-2'],
18-
'node': ['es2015', 'react', 'stage-2'],
19-
'react-native': ['react'],
23+
'browser': [["@babel/preset-env", {
24+
"targets": "> 0.25%, not dead"
25+
}], '@babel/preset-react'],
26+
'node': [["@babel/preset-env", {
27+
"targets": { "node": "8" }
28+
}]],
29+
'react-native': ['@babel/preset-react'],
2030
};
2131
var PLUGINS = {
22-
'browser': ['inline-package-json', 'transform-inline-environment-variables', 'transform-runtime'],
23-
'node': ['inline-package-json', 'transform-inline-environment-variables', 'transform-runtime'],
24-
'react-native': ['inline-package-json', 'transform-inline-environment-variables'],
32+
'browser': [transformRuntime, '@babel/plugin-transform-flow-comments', '@babel/plugin-proposal-class-properties', 'inline-package-json', 'transform-inline-environment-variables'],
33+
'node': ['@babel/plugin-transform-flow-comments', 'inline-package-json', 'transform-inline-environment-variables'],
34+
'react-native': ['@babel/plugin-transform-flow-comments', 'inline-package-json', 'transform-inline-environment-variables'],
2535
};
2636

2737
var DEV_HEADER = (
@@ -49,9 +59,6 @@ var FULL_HEADER = (
4959
);
5060

5161
gulp.task('compile', function() {
52-
var packageJSON = {
53-
version: VERSION
54-
};
5562
return gulp.src('src/*.js')
5663
.pipe(babel({
5764
presets: PRESETS[BUILD],
@@ -64,16 +71,18 @@ gulp.task('compile', function() {
6471
.pipe(gulp.dest(path.join('lib', BUILD)));
6572
});
6673

67-
gulp.task('browserify', function() {
74+
gulp.task('browserify', function(cb) {
6875
var stream = browserify({
6976
builtins: ['_process', 'events'],
7077
entries: 'lib/browser/Parse.js',
7178
standalone: 'Parse'
7279
})
73-
.exclude('xmlhttprequest')
74-
.ignore('_process')
75-
.bundle();
76-
80+
.exclude('xmlhttprequest')
81+
.ignore('_process')
82+
.bundle();
83+
stream.on('end', () => {
84+
cb();
85+
});
7786
return stream.pipe(source('parse.js'))
7887
.pipe(derequire())
7988
.pipe(insert.prepend(DEV_HEADER))

‎integration/test/ParseObjectTest.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -486,12 +486,12 @@ describe('Parse Object', () => {
486486
assert(!object.has('cat'));
487487
assert(object.op('cat') instanceof Parse.Op.Unset);
488488

489-
const Related = new Parse.Object.extend('RelatedObject');
489+
const Related = Parse.Object.extend('RelatedObject');
490490
const relatedObjects = [];
491491
for (let i = 0; i < 5; i++) {
492492
relatedObjects.push(new Related({ i: i }));
493493
}
494-
Parse.Object.saveAll(relatedObjects).then(() => {
494+
return Parse.Object.saveAll(relatedObjects).then(() => {
495495
object.set({
496496
relation: {
497497
__op: 'Batch',
@@ -520,9 +520,8 @@ describe('Parse Object', () => {
520520
assert.equal(relation.relationsToAdd.length, 3);
521521
assert.equal(relation.relationsToRemove.length, 2);
522522

523-
done();
524-
});
525-
});
523+
}).then(done).catch(done.fail);
524+
}).catch(done.fail);
526525
});
527526

528527
it('can repeatedly unset old attributes', (done) => {

‎integration/test/ParseQueryTest.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,12 +1392,12 @@ describe('Parse Query', () => {
13921392
const q2 = new Parse.Query('Parent');
13931393
q2.equalTo('complexor', true);
13941394
q2.lessThan('y', 2);
1395-
const orQuery = new Parse.Query.or(q1, q2);
1395+
const orQuery = Parse.Query.or(q1, q2);
13961396
return orQuery.find();
13971397
}).then((results) => {
13981398
assert.equal(results.length, 3);
13991399
done();
1400-
});
1400+
}).catch(done.fail);
14011401
});
14021402

14031403
it('can build AND queries', (done) => {
@@ -1446,12 +1446,12 @@ describe('Parse Query', () => {
14461446
const q2 = new Parse.Query('Parent');
14471447
q2.equalTo('and', true);
14481448
q2.equalTo('y', 4);
1449-
const andQuery = new Parse.Query.and(q1, q2);
1449+
const andQuery = Parse.Query.and(q1, q2);
14501450
return andQuery.find();
14511451
}).then((results) => {
14521452
assert.equal(results.length, 1);
14531453
done();
1454-
}).catch(e => console.log(e));
1454+
}).catch(done.fail);
14551455
});
14561456

14571457
it('can build NOR queries', async () => {
@@ -1494,7 +1494,7 @@ describe('Parse Query', () => {
14941494
q1.matchesQuery('child', subQuery);
14951495
const q2 = new Parse.Query('Parent');
14961496
q2.equalTo('y', 5);
1497-
const norQuery = new Parse.Query.nor(q1, q2);
1497+
const norQuery = Parse.Query.nor(q1, q2);
14981498
const results = await norQuery.find();
14991499

15001500
assert.equal(results.length, 8);

‎integration/test/ParseUserTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ describe('Parse User', () => {
416416
});
417417

418418
it('handles user subclassing', (done) => {
419-
const SuperUser = new Parse.Object.extend('User');
419+
const SuperUser = Parse.Object.extend('User');
420420
const user = new SuperUser();
421421
user.set('username', 'bob');
422422
user.set('password', 'welcome');

‎jsdoc-conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"plugins": ["node_modules/jsdoc-babel", "plugins/markdown"],
33
"babel": {
4-
"plugins": ["transform-flow-strip-types"]
4+
"plugins": ["@babel/plugin-transform-flow-comments"]
55
},
66
"source": {
77
"include": ["./README.md"],

0 commit comments

Comments
 (0)