opensourcemirror
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8359 from webpack/types/bump-ts 

Update TypeScript and fix raised errors
This commit is contained in:
Tobias Koppers 2018-11-11 12:10:14 +01:00 committed by GitHub
parent 8b6df2df8a 792cc90470
commit 63e15dac11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/webpack.js
View File

@ -1,7 +1,5 @@
#!/usr/bin/env node
process.exitCode = 0;
/**
* @param {string} command process to run
* @param {string[]} args commandline arguments

2
lib/Compilation.js
View File

@ -482,6 +482,8 @@ class Compilation {
this.builtModules = new WeakSet();
/** @private @type {Map<Module, Callback[]>} */
this._rebuildingModules = new Map();
/** @type {WeakSet<Source>} */
this.emittedAssets = new WeakSet();
}
getStats() {

4
lib/Compiler.js
View File

@ -279,7 +279,7 @@ class Compiler {
targetFile
);
if (source.existsAt === targetPath) {
source.emitted = false;
compilation.emittedAssets.delete(source);
return callback();
}
let content = source.source();
@ -289,7 +289,7 @@ class Compiler {
}
source.existsAt = targetPath;
source.emitted = true;
compilation.emittedAssets.add(source);
this.outputFileSystem.writeFile(targetPath, content, callback);
};

9
lib/Stats.js
View File

@ -445,18 +445,17 @@ class Stats {
obj.assetsByChunkName = {};
obj.assets = compilationAssets
.map(asset => {
const source = compilation.assets[asset];
const obj = {
name: asset,
size: compilation.assets[asset].size(),
size: source.size(),
chunks: [],
chunkNames: [],
emitted: compilation.assets[asset].emitted
emitted: compilation.emittedAssets.has(source)
};
if (showPerformance) {
obj.isOverSizeLimit = SizeLimitsPlugin.isOverSizeLimit(
compilation.assets[asset]
);
obj.isOverSizeLimit = SizeLimitsPlugin.isOverSizeLimit(source);
}
assetsByFile[asset] = obj;

4
package.json
View File

@ -32,7 +32,7 @@
"webpack-sources": "^1.3.0"
},
"devDependencies": {
"@types/node": "^9.6.4",
"@types/node": "^10.12.3",
"@types/tapable": "^1.0.1",
"@types/webpack-sources": "^0.1.4",
"benchmark": "^2.1.1",
@ -70,7 +70,7 @@
"script-loader": "~0.7.0",
"simple-git": "^1.65.0",
"style-loader": "^0.19.1",
"typescript": "^3.0.0-rc",
"typescript": "^3.1.6",
"url-loader": "^0.6.2",
"vm-browserify": "~0.0.0",
"wast-loader": "^1.5.5",

18
yarn.lock
View File

@ -69,16 +69,16 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.1.tgz#d578446f4abff5c0b49ade9b4e5274f6badaadfc"
integrity sha512-AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ==
"@types/node@^10.12.3":
version "10.12.3"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.3.tgz#3918b73ceed484e58367be5acb79d1775239e393"
integrity sha512-sfGmOtSMSbQ/AKG8V9xD1gmjquC9awIIZ/Kj309pHb2n3bcRAcGMQv5nJ6gCXZVsneGE4+ve8DXKRCsrg3TFzg==
"@types/node@^10.9.4":
version "10.10.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.10.1.tgz#d5c96ca246a418404914d180b7fdd625ad18eca6"
integrity sha512-nzsx28VwfaIykfzMAG9TB3jxF5Nn+1/WMKnmVZc8TsB+LMIVvwUscVn7PAq+LFaY5ng5u4jp5mRROSswo76PPA==
"@types/node@^9.6.4":
version "9.6.30"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.30.tgz#1ecf83eaf7ac2d0dada7a9d61a1e4e7a6183ac06"
integrity sha512-mFkVM9yFexPPKm0sidVyEzM8F0O06W3vZ8QnjHYa3AB1uvtPOayGKLrXlXIKOdJ7LOE+zilhxYbGPy/34QTgrw==
"@types/prettier@^1.13.2":
version "1.13.2"
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.13.2.tgz#ffe96278e712a8d4e467e367a338b05e22872646"
@ -7585,10 +7585,10 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
typescript@^3.0.0-rc:
version "3.0.0-rc"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.0-rc.tgz#13553808426d393d3f92c054f4fa6f24589549c1"
integrity sha512-//6ivFupDRi+rtsivXnYNfXK7URxdvO18hhxgNpbiIVBE611+1NCiiEfgjjx53TU7fjxlhWPuv3RRj5hJF62/w==
typescript@^3.1.6:
version "3.1.6"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
ua-parser-js@^0.7.9:
version "0.7.18"