Skip to content

Commit 73522a1

Browse files
committed
Merge branch 'feature/resolve' into devel
2 parents 620dfea + e667408 commit 73522a1

File tree

5 files changed

+15
-2
lines changed

5 files changed

+15
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ When your assets are ready, you have to make sure following files are added to y
252252
* **entry** object syntax entry points [Webpack entry documentation](https://webpack.js.org/concepts/entry-points/#object-syntax)
253253
* **commonBundles** explicit vendor chunk [Webpack CommonChunkPlugin documentation](https://webpack.js.org/plugins/commons-chunk-plugin/#explicit-vendor-chunk)
254254
* **externals** object syntax externals [Webpack externals documentation](https://webpack.js.org/configuration/externals/#object)
255+
* **alias** object syntax resolve.alias [Webpack resolve.alias documentation](https://webpack.js.org/configuration/resolve/#resolve-alias)
255256

256257

257258
Contributing

sample-app/webpack-yii2.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
],
99
"externals": {
1010

11+
},
12+
"alias": {
13+
1114
},
1215
"subDirectories": {
1316
"sources": "src",

sample-app/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ const AssetsPlugin = require('assets-webpack-plugin');
1717
const CleanWebpackPlugin = require('clean-webpack-plugin');
1818
const CompressionPlugin = require('compression-webpack-plugin');
1919
const ExtractTextPlugin = require('extract-text-webpack-plugin');
20+
2021
const prodFlag = process.argv.indexOf('-p') !== -1;
22+
2123
module.exports = {
2224
entry: config.entry,
2325
context: path.resolve(__dirname, config.sourceDir, config.subDirectories.sources),
@@ -126,7 +128,8 @@ module.exports = {
126128
]
127129
},
128130
resolve: {
129-
extensions: ['.tsx', '.ts', '.js']
131+
alias: config.alias,
132+
extensions: ['.tsx', '.ts', '.jsx', '.js']
130133
},
131134
devtool: 'source-map',
132135
target: 'web'

src/templates/webpack-yii2.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
],
99
"externals": {
1010

11+
},
12+
"alias": {
13+
1114
},
1215
"subDirectories": {
1316
"sources": "src",

src/templates/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ const AssetsPlugin = require('assets-webpack-plugin');
1717
const CleanWebpackPlugin = require('clean-webpack-plugin');
1818
const CompressionPlugin = require('compression-webpack-plugin');
1919
const ExtractTextPlugin = require('extract-text-webpack-plugin');
20+
2021
const prodFlag = process.argv.indexOf('-p') !== -1;
22+
2123
module.exports = {
2224
entry: config.entry,
2325
context: path.resolve(__dirname, config.sourceDir, config.subDirectories.sources),
@@ -126,7 +128,8 @@ module.exports = {
126128
]
127129
},
128130
resolve: {
129-
extensions: ['.tsx', '.ts', '.js']
131+
alias: config.alias,
132+
extensions: ['.tsx', '.ts', '.jsx', '.js']
130133
},
131134
devtool: 'source-map',
132135
target: 'web'

0 commit comments

Comments
 (0)