framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

publicPath is ../ for styles, and optionally uses envar for everything else

Browse Source
This commit is contained in:
QWp6t
2017-01-09 13:32:38 -08:00
parent bfb3ef7873
commit ce6024cde4
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/build/config.js
View File

@@ -40,3 +40,6 @@ module.exports = mergeWithConcat(config, {
manifest: {}, manifest: {},
}); });
if (config.enabled.watcher && !process.env.WEBPACK_PUBLIC_PATH) {
process.env.WEBPACK_PUBLIC_PATH = config.publicPath;
}

6
assets/build/webpack.config.js
View File

@@ -49,6 +49,7 @@ let webpackConfig = {
include: config.paths.assets, include: config.paths.assets,
loader: ExtractTextPlugin.extract({ loader: ExtractTextPlugin.extract({
fallbackLoader: 'style', fallbackLoader: 'style',
publicPath: '../',
loader: [ loader: [
`css?${sourceMapQueryStr}`, `css?${sourceMapQueryStr}`,
'postcss', 'postcss',
@@ -60,6 +61,7 @@ let webpackConfig = {
include: config.paths.assets, include: config.paths.assets,
loader: ExtractTextPlugin.extract({ loader: ExtractTextPlugin.extract({
fallbackLoader: 'style', fallbackLoader: 'style',
publicPath: '../',
loader: [ loader: [
`css?${sourceMapQueryStr}`, `css?${sourceMapQueryStr}`,
'postcss', 'postcss',
@@ -140,8 +142,8 @@ let webpackConfig = {
'window.Tether': 'tether', 'window.Tether': 'tether',
}), }),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
WEBPACK_PUBLIC_PATH: (config.enabled.watcher) WEBPACK_PUBLIC_PATH: (process.env.WEBPACK_PUBLIC_PATH)
? JSON.stringify(config.publicPath) ? JSON.stringify(process.env.WEBPACK_PUBLIC_PATH)
: false, : false,
}), }),
new webpack.LoaderOptionsPlugin({ new webpack.LoaderOptionsPlugin({