Skip to content

fix(@ngtools/webpack): Bump loader-utils and use getOptions #5001

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

Merged
filipesilva merged 2 commits into from
Mar 1, 2017
Merged

fix(@ngtools/webpack): Bump loader-utils and use getOptions #5001

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b3e1f3
fix(@ngtools/webpack): Bump loader-utils and use getOptions
ryantd Feb 25, 2017
7917145
Merge branch 'master' into fix-deprecated-warning
ryantd Mar 1, 2017
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
Next Next commit
fix(@ngtools/webpack): Bump loader-utils and use getOptions
  • Loading branch information
@ryantd
ryantd committed Feb 25, 2017
commit 8b3e1f3bd3d3d5aa09ab9792aa4d677f0a2cf252
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"karma-webpack": "^2.0.0",
"less": "^2.7.2",
"less-loader": "^2.2.3",
"loader-utils": "^0.2.16",
"loader-utils": "^1.0.2",
"lodash": "^4.11.1",
"magic-string": "^0.19.0",
"minimatch": "^3.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ngtools/webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"dependencies": {
"enhanced-resolve": "^3.1.0",
"loader-utils": "^0.2.16",
"loader-utils": "^1.0.2",
"magic-string": "^0.19.0",
"source-map": "^0.5.6"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@ngtools/webpack/src/loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ export function ngcLoader(this: LoaderContext & { _compilation: any }) {
})
.catch(err => cb(err));
} else {
const options = loaderUtils.parseQuery(this.query);
const options = loaderUtils.getOptions(this) || {};
const tsConfigPath = options.tsConfigPath;
const tsConfig = ts.readConfigFile(tsConfigPath, ts.sys.readFile);

Expand Down