Skip to content

Commit

Permalink
Upgrade libs (oppia#9823)
Browse files Browse the repository at this point in the history
  • Loading branch information
vojtechjelinek authored Jul 8, 2020
1 parent 862858a commit 3d0bad3
Show file tree
Hide file tree
Showing 5 changed files with 497 additions and 582 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"postcss-syntax": "^0.36.2",
"protractor": "^7.0.0",
"protractor-jasmine2-screenshot-reporter": "^0.5.0",
"puppeteer": "^4.0.1",
"puppeteer": "^5.0.0",
"reflect-metadata": "^0.1.12",
"rxjs": "^6.4.0",
"sourcemapped-stacktrace": "^1.1.11",
Expand All @@ -95,7 +95,7 @@
"webdriver-manager": "^12.1.7",
"webpack": "^4.30.0",
"webpack-cli": "^3.3.1",
"webpack-merge": "^4.2.1",
"webpack-merge": "^5.0.8",
"yargs": "^15.3.1",
"zone.js": "^0.10.3"
},
Expand All @@ -120,7 +120,7 @@
"d3-color": "^1.4.1",
"d3-hexbin": "^0.2.2",
"d3-scale": "^3.2.1",
"default-passive-events": "^1.0.10",
"default-passive-events": "^2.0.0",
"fabric": "^3.6.3",
"gif-frames": "^1.0.1",
"gifshot": "^0.4.5",
Expand Down
2 changes: 1 addition & 1 deletion webpack.dev.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @fileoverview Development environment config file for Webpack.
*/

const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const common = require('./webpack.common.config.ts');
const path = require('path');

Expand Down
2 changes: 1 addition & 1 deletion webpack.prod.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @fileoverview Production environment config file for Webpack.
*/

const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const common = require('./webpack.common.config.ts');
const path = require('path');

Expand Down
2 changes: 1 addition & 1 deletion webpack.terser.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @fileoverview Disable parallelism on terser webpack plugin.
*/

const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const prod = require('./webpack.prod.config.ts');
const TerserPlugin = require('terser-webpack-plugin');

Expand Down
Loading

0 comments on commit 3d0bad3

Please sign in to comment.