Skip to content

Commit ebe2e35

Browse files
committed
fix(build): Use static files for styles.
Close angular#2148
1 parent 2225027 commit ebe2e35

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-6
lines changed

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"exit": "^0.1.2",
6666
"exports-loader": "^0.6.3",
6767
"expose-loader": "^0.7.1",
68+
"extract-loader": "^0.0.2",
6869
"file-loader": "^0.8.5",
6970
"fs-extra": "^0.30.0",
7071
"fs.realpath": "^1.0.0",

packages/angular-cli/models/webpack-build-common.ts

+29-6
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,46 @@ export function getWebpackCommonConfig(
7171
loaders: ['raw-loader', 'postcss-loader', 'sass-loader']
7272
},
7373

74-
// outside of main, load it via style-loader
74+
// outside of main, extract static css files using extract and file loaders.
7575
       {
7676
include: styles,
7777
test: /\.css$/,
78-
loaders: ['style-loader', 'css-loader', 'postcss-loader']
78+
loaders: [
79+
'file-loader?name=[name].css',
80+
'extract-loader',
81+
'css-loader',
82+
'postcss-loader'
83+
]
7984
}, {
8085
include: styles,
8186
test: /\.styl$/,
82-
loaders: ['style-loader', 'css-loader', 'postcss-loader', 'stylus-loader']
87+
loaders: [
88+
'file-loader?name=[name].css',
89+
'extract-loader',
90+
'css-loader',
91+
'postcss-loader',
92+
'stylus-loader'
93+
]
8394
}, {
8495
include: styles,
8596
test: /\.less$/,
86-
loaders: ['style-loader', 'css-loader', 'postcss-loader', 'less-loader']
97+
loaders: [
98+
'file-loader?name=[name].css',
99+
'extract-loader',
100+
'css-loader',
101+
'postcss-loader',
102+
'less-loader'
103+
]
87104
}, {
88105
include: styles,
89106
test: /\.scss$|\.sass$/,
90-
loaders: ['style-loader', 'css-loader', 'postcss-loader', 'sass-loader']
107+
loaders: [
108+
'file-loader?name=[name].css',
109+
'extract-loader',
110+
'css-loader',
111+
'postcss-loader',
112+
'sass-loader'
113+
]
91114
},
92115

93116
// load global scripts using script-loader
@@ -120,7 +143,7 @@ export function getWebpackCommonConfig(
120143
),
121144
new webpack.optimize.CommonsChunkPlugin({
122145
// Optimizing ensures loading order in index.html
123-
name: ['styles', 'scripts', 'main'].reverse()
146+
name: ['scripts', 'main'].reverse()
124147
}),
125148
new webpack.optimize.CommonsChunkPlugin({
126149
minChunks: Infinity,

packages/angular-cli/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"exit": "^0.1.2",
4949
"exports-loader": "^0.6.3",
5050
"expose-loader": "^0.7.1",
51+
"extract-loader": "^0.0.2",
5152
"file-loader": "^0.8.5",
5253
"fs-extra": "^0.30.0",
5354
"fs.realpath": "^1.0.0",

0 commit comments

Comments
 (0)