Skip to content
This repository was archived by the owner on Feb 6, 2023. It is now read-only.

Commit 0131e1d

Browse files
mrkevfacebook-github-bot
authored andcommitted
Update webpack deps (#2310)
Summary: **Summary** This diff update build-related deps. We were creating more than one instance of `webpack-stream`, which is an error on the latest one, so I fix that too. **Test Plan** build && playground example Pull Request resolved: #2310 Differential Revision: D19598315 Pulled By: mrkev fbshipit-source-id: 5430f96576cadbd4f16b5a597dc77b9cc026d002
1 parent 963e312 commit 0131e1d

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

gulpfile.js

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,26 @@
77

88
'use strict';
99

10-
var babel = require('gulp-babel');
10+
var packageData = require('./package.json');
11+
var moduleMap = require('./scripts/module-map');
12+
var fbjsConfigurePreset = require('babel-preset-fbjs/configure');
1113
var del = require('del');
14+
var gulpCheckDependencies = require('fbjs-scripts/gulp/check-dependencies');
15+
var gulp = require('gulp');
16+
var babel = require('gulp-babel');
1217
var cleanCSS = require('gulp-clean-css');
1318
var concatCSS = require('gulp-concat-css');
1419
var derequire = require('gulp-derequire');
1520
var flatten = require('gulp-flatten');
16-
var gulp = require('gulp');
17-
var gulpif = require('gulp-if');
18-
var gulpUtil = require('gulp-util');
1921
var header = require('gulp-header');
20-
var packageData = require('./package.json');
22+
var gulpif = require('gulp-if');
2123
var rename = require('gulp-rename');
24+
var gulpUtil = require('gulp-util');
2225
var StatsPlugin = require('stats-webpack-plugin');
2326
var through = require('through2');
2427
var UglifyJsPlugin = require('uglifyjs-webpack-plugin');
2528
var webpackStream = require('webpack-stream');
2629

27-
var fbjsConfigurePreset = require('babel-preset-fbjs/configure');
28-
var gulpCheckDependencies = require('fbjs-scripts/gulp/check-dependencies');
29-
30-
var moduleMap = require('./scripts/module-map');
31-
3230
var paths = {
3331
dist: 'dist',
3432
lib: 'lib',
@@ -70,7 +68,12 @@ var COPYRIGHT_HEADER = `/**
7068
*/
7169
`;
7270

71+
var wpStream = null;
72+
7373
var buildDist = function(opts) {
74+
if (wpStream !== null) {
75+
return wpStream;
76+
}
7477
var webpackOpts = {
7578
externals: {
7679
immutable: {
@@ -114,14 +117,15 @@ var buildDist = function(opts) {
114117
if (!opts.debug) {
115118
webpackOpts.plugins.push(new UglifyJsPlugin());
116119
}
117-
return webpackStream(webpackOpts, null, function(err, stats) {
120+
wpStream = webpackStream(webpackOpts, null, function(err, stats) {
118121
if (err) {
119122
throw new gulpUtil.PluginError('webpack', err);
120123
}
121124
if (stats.compilation.errors.length) {
122125
gulpUtil.log('webpack', '\n' + stats.toString({colors: true}));
123126
}
124127
});
128+
return wpStream;
125129
};
126130

127131
gulp.task(

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"gulp-flatten": "^0.4.0",
7272
"gulp-header": "^2.0.9",
7373
"gulp-if": "^3.0.0",
74-
"gulp-rename": "^1.4.0",
74+
"gulp-rename": "2",
7575
"gulp-util": "^3.0.6",
7676
"jest": "^24.9.0",
7777
"prettier": "1.19.1",
@@ -80,8 +80,8 @@
8080
"react-test-renderer": "^16.0.0",
8181
"stats-webpack-plugin": "^0.6.2",
8282
"through2": "^3.0.1",
83-
"uglifyjs-webpack-plugin": "^1.1.6",
84-
"webpack-stream": "^4.0.0"
83+
"uglifyjs-webpack-plugin": "2",
84+
"webpack-stream": "5.2.1"
8585
},
8686
"devEngines": {
8787
"node": "10.x || 12.x || 13.x",

0 commit comments

Comments
 (0)