From 1c38ff6e9aced9c30e9231d55f237dc850702fb8 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Thu, 7 Dec 2017 22:04:43 +0100 Subject: [PATCH] [Webpack] Change images to not use relative path. (#423) * Change webpack config to not use relative path for images. Resolves #421. * Move popup images to popup/images. * Move images to popup/images. --- .../app/accounts/views/accountsLoginTwoFactor.html | 4 ++-- src/popup/app/global/home.html | 2 +- src/popup/app/global/splash.html | 2 +- src/popup/app/settings/about.component.html | 2 +- src/{ => popup}/images/loading.svg | 0 src/{ => popup}/images/logo.png | Bin src/{ => popup}/images/logo@2x.png | Bin src/{ => popup}/images/logo@3x.png | Bin src/{ => popup}/images/two-factor/u2fkey.jpg | Bin src/{ => popup}/images/two-factor/yubikey.jpg | Bin src/popup/less/components.less | 2 +- webpack.common.js | 6 ++++-- 12 files changed, 10 insertions(+), 8 deletions(-) rename src/{ => popup}/images/loading.svg (100%) rename src/{ => popup}/images/logo.png (100%) rename src/{ => popup}/images/logo@2x.png (100%) rename src/{ => popup}/images/logo@3x.png (100%) rename src/{ => popup}/images/two-factor/u2fkey.jpg (100%) rename src/{ => popup}/images/two-factor/yubikey.jpg (100%) diff --git a/src/popup/app/accounts/views/accountsLoginTwoFactor.html b/src/popup/app/accounts/views/accountsLoginTwoFactor.html index d2519011d86..fee1be6919f 100644 --- a/src/popup/app/accounts/views/accountsLoginTwoFactor.html +++ b/src/popup/app/accounts/views/accountsLoginTwoFactor.html @@ -86,7 +86,7 @@

{{i18n.insertYubiKey}}

- +
@@ -125,7 +125,7 @@

Loading...

{{i18n.insertU2f}}

- +
diff --git a/src/popup/app/global/home.html b/src/popup/app/global/home.html index fac40c5ffdc..5b451834bc1 100644 --- a/src/popup/app/global/home.html +++ b/src/popup/app/global/home.html @@ -2,7 +2,7 @@  Settings - bitwarden + bitwarden

{{i18n.loginOrCreateNewAccount}}

- bitwarden + bitwarden
diff --git a/src/popup/app/settings/about.component.html b/src/popup/app/settings/about.component.html index 1de6951dc21..3fcff756cbc 100644 --- a/src/popup/app/settings/about.component.html +++ b/src/popup/app/settings/about.component.html @@ -6,7 +6,7 @@
- bitwarden + bitwarden {{$ctrl.i18n.version}} {{$ctrl.version}}
© 8bit Solutions LLC 2015-{{$ctrl.year}}
diff --git a/src/images/loading.svg b/src/popup/images/loading.svg similarity index 100% rename from src/images/loading.svg rename to src/popup/images/loading.svg diff --git a/src/images/logo.png b/src/popup/images/logo.png similarity index 100% rename from src/images/logo.png rename to src/popup/images/logo.png diff --git a/src/images/logo@2x.png b/src/popup/images/logo@2x.png similarity index 100% rename from src/images/logo@2x.png rename to src/popup/images/logo@2x.png diff --git a/src/images/logo@3x.png b/src/popup/images/logo@3x.png similarity index 100% rename from src/images/logo@3x.png rename to src/popup/images/logo@3x.png diff --git a/src/images/two-factor/u2fkey.jpg b/src/popup/images/two-factor/u2fkey.jpg similarity index 100% rename from src/images/two-factor/u2fkey.jpg rename to src/popup/images/two-factor/u2fkey.jpg diff --git a/src/images/two-factor/yubikey.jpg b/src/popup/images/two-factor/yubikey.jpg similarity index 100% rename from src/images/two-factor/yubikey.jpg rename to src/popup/images/two-factor/yubikey.jpg diff --git a/src/popup/less/components.less b/src/popup/less/components.less index 058a1f73967..07504fa0ea7 100644 --- a/src/popup/less/components.less +++ b/src/popup/less/components.less @@ -588,7 +588,7 @@ } #duoFrameWrapper { - background: ~"url('../../images/loading.svg') 0 0 no-repeat"; + background: ~"url('../images/loading.svg') 0 0 no-repeat"; width: 100%; height: 470px; margin-bottom: -10px; diff --git a/webpack.common.js b/webpack.common.js index e7e10cb99c6..4e620aed530 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -48,11 +48,13 @@ module.exports = { }, { test: /\.(jpe?g|png|gif|svg)$/i, + exclude: /.*(fontawesome-webfont|glyphicons-halflings-regular)\.svg/, use: [{ loader: 'file-loader', options: { - name: '[name].[ext]', - useRelativePath: true + name: '[name].[hash].[ext]', + outputPath: 'popup/images/', + publicPath: '/' } }] }