Skip to content
This repository was archived by the owner on Jun 25, 2019. It is now read-only.

Commit 20ca734

Browse files
author
Felix Gladisch
committed
feat: css loader for angular modules
1 parent 562a516 commit 20ca734

File tree

3 files changed

+143
-115
lines changed

3 files changed

+143
-115
lines changed

config/webpack.common.js

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,36 +34,42 @@ module.exports = () => {
3434
// Compiles all .ts files
3535
{
3636
test: /\.ts$/,
37-
loaders: isProd ? ['@ngtools/webpack'] : ['awesome-typescript-loader?silent=true', 'angular2-template-loader'],
37+
use: isProd ? ['@ngtools/webpack'] : ['awesome-typescript-loader?silent=true', 'angular2-template-loader'],
3838
exclude: /\.spec\.ts$/
3939
},
4040
// Injects all html templates into their components and loads referenced assets
4141
{
4242
test: /\.html$/,
43-
loader: 'html-loader',
43+
use: 'html-loader',
4444
exclude: helpers.root('src', 'index.html')
4545
},
4646
// Copies all images and fonts into dist/assets
4747
{
4848
test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot)$/,
49-
loader: 'file-loader?name=assets/[name].[ext]'
49+
use: 'file-loader?name=assets/[name].[ext]'
5050
},
5151
// Puts all styles from assets/styles/main.scss in a separate file
5252
{
5353
test: /\.scss$/,
54-
exclude: helpers.root('src', 'app'),
55-
loader: ExtractTextPlugin.extract(['css-loader', 'sass-loader'])
54+
use: ExtractTextPlugin.extract(['css-loader', 'sass-loader']),
55+
exclude: helpers.root('src', 'app')
5656
},
5757
// Injects all angular styles into their components
5858
{
5959
test: /\.scss$/,
60-
include: helpers.root('src', 'app'),
61-
loaders: ['raw-loader', 'sass-loader']
60+
use: ['raw-loader', 'sass-loader'],
61+
include: helpers.root('src', 'app')
62+
},
63+
// To string and css loader support for *.css files (from Angular components)
64+
{
65+
test: /\.css$/,
66+
use: ['to-string-loader', 'css-loader'],
67+
include: helpers.root('node_modules')
6268
},
6369
// Loads all "required" json files into their components
6470
{
6571
test: /\.json$/,
66-
loader: 'json-loader'
72+
use: 'json-loader'
6773
}
6874
]
6975
},

package.json

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
{
22
"name": "angular2-webpack-seed",
3-
"version": "1.1.2",
3+
"version": "1.1.3",
44
"scripts": {
55
"start": "webpack-dev-server --inline --progress --port 3000",
66
"build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail",
77
"test": "karma start",
8-
"lint": "tslint 'src/**/*.ts' --type-check --project tsconfig.json",
8+
"lint": "tslint 'src/**/*.ts' --type-check --project tsconfig.json -e src/main-aot.ts",
99
"aot": "rimraf aot && ngc -p tsconfig-aot.json"
1010
},
1111
"keywords": [
12-
"angular2",
13-
"webpack",
14-
"typescript"
12+
"angular",
13+
"typescript",
14+
"bootstrap",
15+
"karma",
16+
"jasmine",
17+
"webpack"
1518
],
1619
"author": "Felix Gladisch <felix@felixgladisch.de>",
1720
"homepage": "https://github.com/fgladisch/angular2-webpack-seed",
@@ -24,52 +27,53 @@
2427
"url": "https://github.com/fgladisch/angular2-webpack-seed/issues"
2528
},
2629
"dependencies": {
27-
"@angular/common": "4.3.5",
28-
"@angular/compiler": "4.3.5",
29-
"@angular/core": "4.3.5",
30-
"@angular/forms": "4.3.5",
31-
"@angular/http": "4.3.5",
32-
"@angular/platform-browser": "4.3.5",
33-
"@angular/platform-browser-dynamic": "4.3.5",
34-
"@angular/router": "4.3.5",
35-
"@ng-bootstrap/ng-bootstrap": "1.0.0-beta.1",
30+
"@angular/common": "4.3.6",
31+
"@angular/compiler": "4.3.6",
32+
"@angular/core": "4.3.6",
33+
"@angular/forms": "4.3.6",
34+
"@angular/http": "4.3.6",
35+
"@angular/platform-browser": "4.3.6",
36+
"@angular/platform-browser-dynamic": "4.3.6",
37+
"@angular/router": "4.3.6",
38+
"@ng-bootstrap/ng-bootstrap": "1.0.0-beta.3",
3639
"@ngx-translate/core": "7.2.0",
3740
"@ngx-translate/http-loader": "1.0.2",
3841
"bootstrap": "4.0.0-beta",
3942
"core-js": "2.5.0",
4043
"rxjs": "5.4.3",
41-
"zone.js": "0.8.16"
44+
"zone.js": "0.8.17"
4245
},
4346
"devDependencies": {
44-
"@angular/compiler-cli": "4.3.5",
45-
"@ngtools/webpack": "1.6.1",
47+
"@angular/compiler-cli": "4.3.6",
48+
"@ngtools/webpack": "1.6.2",
4649
"@types/core-js": "0.9.43",
4750
"@types/jasmine": "2.5.54",
48-
"@types/node": "8.0.24",
51+
"@types/node": "8.0.26",
4952
"angular2-template-loader": "0.6.2",
5053
"awesome-typescript-loader": "3.2.3",
5154
"codelyzer": "3.1.2",
5255
"compression-webpack-plugin": "1.0.0",
5356
"copy-webpack-plugin": "4.0.1",
54-
"css-loader": "0.28.5",
57+
"css-loader": "0.28.7",
5558
"extract-text-webpack-plugin": "3.0.0",
5659
"file-loader": "0.11.2",
5760
"html-loader": "0.5.1",
5861
"html-webpack-plugin": "2.30.1",
59-
"jasmine-core": "2.7.0",
62+
"jasmine-core": "2.8.0",
6063
"json-loader": "0.5.7",
61-
"karma": "1.7.0",
64+
"karma": "1.7.1",
6265
"karma-jasmine": "1.1.0",
63-
"karma-mocha-reporter": "2.2.3",
66+
"karma-mocha-reporter": "2.2.4",
6467
"karma-phantomjs-launcher": "1.0.4",
6568
"karma-sourcemap-loader": "0.3.7",
6669
"karma-webpack": "2.0.4",
6770
"node-sass": "4.5.3",
6871
"raw-loader": "0.5.1",
6972
"rimraf": "2.6.1",
7073
"sass-loader": "6.0.6",
74+
"to-string-loader": "1.1.5",
7175
"ts-helpers": "1.1.2",
72-
"tslint": "5.6.0",
76+
"tslint": "5.7.0",
7377
"typescript": "2.4.2",
7478
"webpack": "3.5.5",
7579
"webpack-dev-server": "2.7.1",

0 commit comments

Comments
 (0)