parent
1cc44cba81
commit
b1daa71da5
|
@ -27,7 +27,7 @@ function formatPublicPath(host = '', path = '') {
|
||||||
|
|
||||||
const output = {
|
const output = {
|
||||||
path: resolve('public', settings.public_output_path),
|
path: resolve('public', settings.public_output_path),
|
||||||
publicPath: formatPublicPath(env.ASSET_HOST || env.WEB_DOMAIN || env.LOCAL_DOMAIN, settings.public_output_path),
|
publicPath: formatPublicPath(env.ASSET_HOST, settings.public_output_path),
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
|
|
@ -2,16 +2,21 @@
|
||||||
|
|
||||||
module PremailerWebpackStrategy
|
module PremailerWebpackStrategy
|
||||||
def load(url)
|
def load(url)
|
||||||
public_path_host = ENV['ASSET_HOST'] || ENV['LOCAL_DOMAIN']
|
asset_host = ENV['ASSET_HOST'] || ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN']
|
||||||
url = url.gsub(/\A\/\/#{public_path_host}/, '')
|
|
||||||
|
|
||||||
if Webpacker.dev_server.running?
|
if Webpacker.dev_server.running?
|
||||||
url = File.join("#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}", url)
|
asset_host = "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}"
|
||||||
|
url = File.join(asset_host, url)
|
||||||
|
end
|
||||||
|
|
||||||
|
css = if url.start_with?('http')
|
||||||
HTTP.get(url).to_s
|
HTTP.get(url).to_s
|
||||||
else
|
else
|
||||||
url = url[1..-1] if url.start_with?('/')
|
url = url[1..-1] if url.start_with?('/')
|
||||||
File.read(Rails.root.join('public', url))
|
File.read(Rails.root.join('public', url))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
css.gsub(/url\(\//, "url(#{asset_host}/")
|
||||||
end
|
end
|
||||||
|
|
||||||
module_function :load
|
module_function :load
|
||||||
|
|
Reference in New Issue