Skip to content

Commit

Permalink
Update dependencies and fix security vulnerability (#3217)
Browse files Browse the repository at this point in the history
* Update dependencies and fix security vulnerability

* Fix new type errors
  • Loading branch information
lukastaegert committed Nov 8, 2019
1 parent f9b9a7c commit b8ecf3d
Show file tree
Hide file tree
Showing 5 changed files with 144 additions and 87 deletions.
79 changes: 53 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Expand Up @@ -80,7 +80,7 @@
"chokidar": "^2.1.8",
"codecov": "^3.6.1",
"console-group": "^0.3.3",
"core-js": "^3.3.4",
"core-js": "^3.4.0",
"cross-os": "^1.3.0",
"date-time": "^3.1.0",
"es5-shim": "^4.5.13",
Expand All @@ -105,7 +105,7 @@
"pretty-ms": "^5.0.0",
"require-relative": "^0.8.7",
"requirejs": "^2.3.6",
"rollup": "^1.25.2",
"rollup": "^1.26.3",
"rollup-plugin-alias": "^2.2.0",
"rollup-plugin-buble": "^0.19.8",
"rollup-plugin-commonjs": "^10.1.0",
Expand All @@ -121,14 +121,14 @@
"shx": "^0.3.2",
"signal-exit": "^3.0.2",
"source-map": "^0.6.1",
"source-map-support": "^0.5.13",
"source-map-support": "^0.5.16",
"sourcemap-codec": "^1.4.6",
"systemjs": "^6.1.4",
"terser": "^4.3.9",
"tslib": "^1.10.0",
"tslint": "^5.20.0",
"tslint": "^5.20.1",
"turbocolor": "^2.6.1",
"typescript": "^3.6.4",
"typescript": "^3.7.2",
"url-parse": "^1.4.7"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion src/rollup/index.ts
Expand Up @@ -435,7 +435,7 @@ function normalizeOutputOptions(
}
const mergedOptions = mergeOptions({
config: {
output: { ...rawOutputOptions, ...rawOutputOptions.output, ...inputOptions.output }
output: { ...rawOutputOptions, ...(inputOptions.output as Object) }
}
});

Expand Down
2 changes: 1 addition & 1 deletion src/utils/mergeOptions.ts
Expand Up @@ -258,7 +258,7 @@ function getOutputOptions(
}

return {
amd: { ...config.amd, ...command.amd } as any,
amd: { ...(config.amd as object), ...(command.amd as object) } as any,
assetFileNames: getOption('assetFileNames'),
banner: getOption('banner'),
chunkFileNames: getOption('chunkFileNames'),
Expand Down

0 comments on commit b8ecf3d

Please sign in to comment.