Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

minor perf optimisation for loaderoptions #412

Merged
merged 9 commits into from
Dec 15, 2016
Merged

minor perf optimisation for loaderoptions #412

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift click to select a range
4a562a6
minor perf optimisation for loaderoptions
johnnyreilly Dec 11, 2016
b84e101
update object-assign definition
johnnyreilly Dec 12, 2016
2b3765c
regex perf tweaks - all precompiled and using test
johnnyreilly Dec 13, 2016
6298dd3
Update CHANGELOG.md
johnnyreilly Dec 14, 2016
ab80535
Update CHANGELOG.md
johnnyreilly Dec 14, 2016
e57b9f3
Switch from test back to match again
johnnyreilly Dec 14, 2016
4b83fba
renames, use readfile constently
johnnyreilly Dec 15, 2016
f05d713
Update package.json
johnnyreilly Dec 15, 2016
f0d0ad9
fix build
johnnyreilly Dec 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
renames, use readfile constently
  • Loading branch information
@johnnyreilly
johnnyreilly committed Dec 15, 2016
commit 4b83fbaee83a3661674ec6a5387644b397fe43c7
2 changes: 1 addition & 1 deletion src/after-compile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 52,8 @@ function provideCompilerOptionDiagnosticErrorsToWebpack(
instance: interfaces.TSInstance,
configFilePath: string
) {
const { languageService, loaderOptions, compiler } = instance;
if (getCompilerOptionDiagnostics) {
const { languageService, loaderOptions, compiler } = instance;
utils.registerWebpackErrors(
compilation.errors,
utils.formatErrors(
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 154,7 @@ function getEmit(

loader._module.meta.tsLoaderDefinitionFileVersions = allDefinitionFiles
.concat(additionalDependencies)
.map(fp => fp '@' (instance.files[fp] || { version: '?' }).version);
.map(filePath => filePath '@' (instance.files[filePath] || { version: '?' }).version);

const outputFile = output.outputFiles.filter(outputFile => !!outputFile.name.match(constants.jsJsx)).pop();
const outputText = (outputFile) ? outputFile.text : undefined;
Expand Down
7 changes: 3 additions & 4 deletions src/instances.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 1,4 @@
import path = require('path');
import fs = require('fs');
require('colors');

import afterCompile = require('./after-compile');
Expand Down Expand Up @@ -75,10 74,10 @@ export function getTypeScriptInstance(
let filePath: string;
try {
const filesToLoad = configParseResult.fileNames;
filesToLoad.forEach(fp => {
filePath = path.normalize(fp);
filesToLoad.forEach(filePath => {
filePath = path.normalize(filePath);
files[filePath] = {
text: fs.readFileSync(filePath, 'utf-8'),
text: utils.readFile(filePath),
version: 0
};
});
Expand Down
2 changes: 1 addition & 1 deletion src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 125,7 @@ export function collectAllDependencies(
directDependencies.forEach(dependencyFilePath => {
if (!collected[dependencyFilePath]) {
collectAllDependencies(dependencyGraph, dependencyFilePath, collected)
.forEach(fPath => result[fPath] = true);
.forEach(filePath => result[filePath] = true);
}
});
}
Expand Down