Skip to content

Commit 19b1268

Browse files
committed
Init webpack@3
1 parent 7956980 commit 19b1268

File tree

4 files changed

+4148
-24
lines changed

4 files changed

+4148
-24
lines changed

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ mkdir my-new-project && cd $_
9797
9898
> **Workaround**: Use ```import * as variable from "package" ``` instead of ```import variable from "package" ```
9999
100+
> * **Problem**: Webpack3: ExtractTextPlugin and file-loader do not work with the use syntax. [Link to the issue](https://github.com/webpack/extract-text-webpack-plugin/issues/275).
101+
100102
### Contribute
101103

102104
##### If you want to contribute:

generators/app/templates/_config/webpack/global.js

+32-23
Original file line numberDiff line numberDiff line change
@@ -41,41 +41,50 @@ module.exports = function (_path) {
4141

4242
// modules resolvers
4343
module: {
44-
loaders: [{
44+
rules: [{
4545
test: /\.html$/,
46-
loaders: [
47-
{
48-
loader: 'ngtemplate-loader',
49-
query: {
50-
relativeTo: path.join(_path, '/src')
51-
}
52-
}, {
53-
loader: 'html-loader',
54-
query: {
55-
attrs: ['img:src', 'img:data-src']
46+
use: [
47+
{
48+
loader: 'ngtemplate-loader',
49+
options: {
50+
relativeTo: path.join(_path, '/src')
51+
}
52+
},
53+
{
54+
loader: 'html-loader',
55+
options: {
56+
attrs: ['img:src', 'img:data-src']
57+
}
5658
}
57-
}
5859
]
5960
}, {
6061
test: /\.js$/,
6162
exclude: [
6263
path.resolve(_path, "node_modules")
6364
],
64-
loaders: [
65+
use: [
6566
{
6667
loader: 'babel-loader',
67-
query: {
68+
options: {
6869
cacheDirectory: false
6970
}
7071
},
71-
'baggage-loader?[file].html&[file].css'
72+
{
73+
loader: 'baggage-loader?[file].html&[file].css'
74+
}
7275
]
7376
}, {
7477
test: /\.css$/,
75-
loaders: [
76-
'style-loader',
77-
'css-loader?sourceMap',
78-
'postcss-loader'
78+
use: [
79+
{
80+
loader: 'style-loader'
81+
},
82+
{
83+
loader: 'css-loader?sourceMap'
84+
},
85+
{
86+
loader: 'postcss-loader'
87+
}
7988
]
8089
}, {
8190
test: /\.(scss|sass)$/,
@@ -85,20 +94,20 @@ module.exports = function (_path) {
8594
})
8695
}, {
8796
test: /\.(woff2|woff|ttf|eot|svg)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
88-
loaders: [
97+
use: [
8998
{
9099
loader: 'url-loader',
91-
query: {
100+
options: {
92101
name: 'assets/fonts/[name]_[hash].[ext]'
93102
}
94103
}
95104
]
96105
}, {
97106
test: /\.(jpe?g|png|gif)$/i,
98-
loaders: [
107+
use: [
99108
{
100109
loader: 'url-loader',
101-
query: {
110+
options: {
102111
name: 'assets/images/[name]_[hash].[ext]',
103112
limit: 10000
104113
}

generators/app/templates/_package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"style-loader": "^0.13.1",
4444
"url": "^0.11.0",
4545
"url-loader": "^0.5.7",
46-
"webpack": "^2.2.0",
46+
"webpack": "^3.5.0",
4747
"webpack-dev-server": "^2.2.0"
4848
},
4949
"engines": {

0 commit comments

Comments
 (0)