Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 63ad78c

Browse files
committed
changes for webpack
1 parent 168ecda commit 63ad78c

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

public/docs/_examples/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"@types/jasmine": "^2.2.33",
4848
"@types/node": "^4.0.30",
4949
"angular2-template-loader": "^0.4.0",
50+
"awesome-typescript-loader": "^2.2.4",
5051
"canonical-path": "0.0.2",
5152
"concurrently": "^2.2.0",
5253
"css-loader": "^0.23.1",
@@ -72,7 +73,6 @@
7273
"raw-loader": "^0.5.1",
7374
"rimraf": "^2.5.2",
7475
"style-loader": "^0.13.1",
75-
"ts-loader": "^0.8.2",
7676
"ts-node": "^1.3.0",
7777
"tslint": "^3.15.1",
7878
"typescript": "^2.0.2",

public/docs/_examples/webpack/ts/config/webpack.common.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = {
2424
loaders: [
2525
{
2626
test: /\.ts$/,
27-
loaders: ['ts', 'angular2-template-loader']
27+
loaders: ['awesome-typescript-loader', 'angular2-template-loader']
2828
},
2929
{
3030
test: /\.html$/,

public/docs/_examples/webpack/ts/config/webpack.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = {
1212
loaders: [
1313
{
1414
test: /\.ts$/,
15-
loaders: ['ts', 'angular2-template-loader']
15+
loaders: ['awesome-typescript-loader', 'angular2-template-loader']
1616
},
1717
{
1818
test: /\.html$/,

public/docs/_examples/webpack/ts/package.webpack.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
},
2424
"devDependencies": {
2525
"angular2-template-loader": "^0.4.0",
26+
"awesome-typescript-loader": "^2.2.4",
2627
"css-loader": "^0.23.1",
2728
"extract-text-webpack-plugin": "^1.0.1",
2829
"file-loader": "^0.8.5",
@@ -39,7 +40,6 @@
3940
"raw-loader": "^0.5.1",
4041
"rimraf": "^2.5.2",
4142
"style-loader": "^0.13.1",
42-
"ts-loader": "^0.8.2",
4343
"typescript": "^2.0.2",
4444
"webpack": "^1.13.0",
4545
"webpack-dev-server": "^1.14.1",

public/docs/ts/latest/guide/webpack.jade

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ a(id="loaders")
115115
:marked
116116
... it applies the `test` RegEx patterns. When a pattern matches the filename, Webpack processes the file with the associated loader.
117117

118-
The first `import` file matches the `.ts` pattern so Webpack processes it with the `ts` (TypeScript) loader.
118+
The first `import` file matches the `.ts` pattern so Webpack processes it with the `awesome-typescript-loader`.
119119
The imported file doesn't match the second pattern so its loader is ignored.
120120

121121
The second `import` matches the second `.css` pattern for which we have *two* loaders chained by the (!) character.
@@ -230,7 +230,7 @@ a(id="common-configuration")
230230
+makeExample('webpack/ts/config/webpack.common.js', 'loaders', 'config/webpack.common.js')(format=".")
231231

232232
:marked
233-
* ts - a loader to transpile our Typescript code to ES5, guided by the `tsconfig.json` file
233+
* awesome-typescript-loader - a loader to transpile our Typescript code to ES5, guided by the `tsconfig.json` file
234234
* angular2-template-loader - loads angular components' template and styles
235235
* html - for component templates
236236
* images/fonts - Images and fonts are bundled as well.

0 commit comments

Comments
 (0)