diff --git a/lib/install/config/webpack/configuration.js b/lib/install/config/webpack/configuration.js index 0f5e4437a..28a261dcc 100644 --- a/lib/install/config/webpack/configuration.js +++ b/lib/install/config/webpack/configuration.js @@ -15,12 +15,12 @@ function removeOuterSlashes(string) { } function formatPublicPath(host = '', path = '') { - host = removeOuterSlashes(host) - path = removeOuterSlashes(path) - if (host && !/^http/i.test(host)) { - host = `//${host}` + let formattedHost = removeOuterSlashes(host) + if (formattedHost && !/^http/i.test(formattedHost)) { + formattedHost = `//${formattedHost}` } - return `${host}/${path}/` + const formattedPath = removeOuterSlashes(path) + return `${formattedHost}/${formattedPath}/` } const output = { diff --git a/lib/install/config/webpack/development.server.js b/lib/install/config/webpack/development.server.js index 98506f72c..08dc44cec 100644 --- a/lib/install/config/webpack/development.server.js +++ b/lib/install/config/webpack/development.server.js @@ -1,6 +1,5 @@ // Note: You must restart bin/webpack-dev-server for changes to take effect -const { resolve } = require('path') const merge = require('webpack-merge') const ManifestPlugin = require('webpack-manifest-plugin') const devConfig = require('./development.js') diff --git a/lib/install/config/webpack/shared.js b/lib/install/config/webpack/shared.js index 1fa3fdcf9..53a0b5895 100644 --- a/lib/install/config/webpack/shared.js +++ b/lib/install/config/webpack/shared.js @@ -37,7 +37,11 @@ module.exports = { plugins: [ new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(env))), new ExtractTextPlugin(env.NODE_ENV === 'production' ? '[name]-[hash].css' : '[name].css'), - new ManifestPlugin({ fileName: paths.manifest, publicPath: output.publicPath, writeToFileEmit: true }) + new ManifestPlugin({ + fileName: paths.manifest, + publicPath: output.publicPath, + writeToFileEmit: true + }) ], resolve: { diff --git a/lib/webpacker/configuration.rb b/lib/webpacker/configuration.rb index 60bdc8716..ad330ef2f 100644 --- a/lib/webpacker/configuration.rb +++ b/lib/webpacker/configuration.rb @@ -16,7 +16,6 @@ def manifest_path output_path.join(fetch(:manifest)) end - def source_path Rails.root.join(source) end @@ -29,7 +28,6 @@ def config_path Rails.root.join(fetch(:config)) end - def file_path(root: Rails.root) root.join("config/webpack/paths.yml") end @@ -38,7 +36,6 @@ def default_file_path file_path(root: Pathname.new(__dir__).join("../install")) end - def source fetch(:source) end @@ -47,7 +44,6 @@ def fetch(key) paths.fetch(key, default_paths[key]) end - def paths load if Webpacker.env.development? raise Webpacker::FileLoader::FileLoaderError.new("Webpacker::Configuration.load must be called first") unless instance