Browse Source

refactor(webpack): use portable scss include paths

Rather than using relative paths for css imports - which can break when
we move files around - add our styles path to the webpack sass-loader
loader using the `includePaths` setting.
renovate/lint-staged-8.x
Tom Kirkpatrick 6 years ago
parent
commit
aeb832d30a
No known key found for this signature in database GPG Key ID: 72203A8EC5967EA8
  1. 2
      app/components/Activity/Activity.scss
  2. 2
      app/components/Activity/ActivityModal/ActivityModal.scss
  3. 2
      app/components/Activity/Countdown/Countdown.scss
  4. 2
      app/components/Activity/InvoiceModal/InvoiceModal.scss
  5. 2
      app/components/Activity/PaymentModal/PaymentModal.scss
  6. 2
      app/components/Activity/Transaction/Transaction.scss
  7. 2
      app/components/Activity/TransactionModal/TransactionModal.scss
  8. 2
      app/components/App/App.scss
  9. 2
      app/components/Contacts/AddChannel/AddChannel.scss
  10. 2
      app/components/Contacts/ChannelForm/ChannelForm.scss
  11. 2
      app/components/Contacts/ConnectManually/ConnectManually.scss
  12. 2
      app/components/Contacts/ContactModal/ContactModal.scss
  13. 2
      app/components/Contacts/ContactsForm/ContactsForm.scss
  14. 2
      app/components/Contacts/Network/Network.scss
  15. 2
      app/components/Contacts/SubmitChannelForm/SubmitChannelForm.scss
  16. 2
      app/components/Contacts/SuggestedNodes/SuggestedNodes.scss
  17. 2
      app/components/Form/Form.scss
  18. 2
      app/components/Form/Pay/Pay.scss
  19. 2
      app/components/Form/Request/Request.scss
  20. 2
      app/components/GlobalError/GlobalError.scss
  21. 2
      app/components/LoadingBolt/LoadingBolt.scss
  22. 2
      app/components/Onboarding/Alias/Alias.scss
  23. 2
      app/components/Onboarding/Autopilot/Autopilot.scss
  24. 2
      app/components/Onboarding/BtcPayServer/BtcPayServer.scss
  25. 2
      app/components/Onboarding/ConnectionConfirm/ConnectionConfirm.scss
  26. 2
      app/components/Onboarding/ConnectionDetails/ConnectionDetails.scss
  27. 2
      app/components/Onboarding/ConnectionType/ConnectionType.scss
  28. 2
      app/components/Onboarding/FormContainer/FormContainer.scss
  29. 2
      app/components/Onboarding/InitWallet/InitWallet.scss
  30. 2
      app/components/Onboarding/Login/Login.scss
  31. 2
      app/components/Onboarding/NewWalletPassword/NewWalletPassword.scss
  32. 2
      app/components/Onboarding/NewWalletSeed/NewWalletSeed.scss
  33. 2
      app/components/Onboarding/ReEnterSeed/ReEnterSeed.scss
  34. 2
      app/components/Onboarding/RecoverForm/RecoverForm.scss
  35. 2
      app/components/Onboarding/Signup/Signup.scss
  36. 2
      app/components/Onboarding/Syncing/Syncing.scss
  37. 2
      app/components/Settings/Fiat/Fiat.scss
  38. 2
      app/components/Wallet/ReceiveModal/ReceiveModal.scss
  39. 2
      app/components/Wallet/Wallet.scss
  40. 10
      webpack.config.renderer.dev.dll.js
  41. 12
      webpack.config.renderer.dev.js
  42. 10
      webpack.config.renderer.prod.js

2
app/components/Activity/Activity.scss

@ -1,4 +1,4 @@
@import '../../styles/variables.scss';
@import 'styles/variables.scss';
.search {
height: 55px;

2
app/components/Activity/ActivityModal/ActivityModal.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
position: relative;

2
app/components/Activity/Countdown/Countdown.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
display: block;

2
app/components/Activity/InvoiceModal/InvoiceModal.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
color: $white;

2
app/components/Activity/PaymentModal/PaymentModal.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
color: $white;

2
app/components/Activity/Transaction/Transaction.scss

@ -1,4 +1,4 @@
@import '../../../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
display: flex;

2
app/components/Activity/TransactionModal/TransactionModal.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
color: $white;

2
app/components/App/App.scss

@ -1,4 +1,4 @@
@import '../../styles/variables.scss';
@import 'styles/variables.scss';
.content {
position: relative;

2
app/components/Contacts/AddChannel/AddChannel.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
position: relative;

2
app/components/Contacts/ChannelForm/ChannelForm.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
position: absolute;

2
app/components/Contacts/ConnectManually/ConnectManually.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
position: absolute;

2
app/components/Contacts/ContactModal/ContactModal.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.header {
display: flex;

2
app/components/Contacts/ContactsForm/ContactsForm.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.modal {
position: absolute;

2
app/components/Contacts/Network/Network.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.network {
position: relative;

2
app/components/Contacts/SubmitChannelForm/SubmitChannelForm.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.content {
padding: 0 40px;

2
app/components/Contacts/SuggestedNodes/SuggestedNodes.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
color: $white;

2
app/components/Form/Form.scss

@ -1,4 +1,4 @@
@import '../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
position: absolute;

2
app/components/Form/Pay/Pay.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
padding: 0 40px;

2
app/components/Form/Request/Request.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
padding: 0 40px;

2
app/components/GlobalError/GlobalError.scss

@ -1,4 +1,4 @@
@import '../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
position: absolute;

2
app/components/LoadingBolt/LoadingBolt.scss

@ -1,4 +1,4 @@
@import '../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
z-index: 1000;

2
app/components/Onboarding/Alias/Alias.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.alias {
background: transparent;

2
app/components/Onboarding/Autopilot/Autopilot.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
color: $white;

2
app/components/Onboarding/BtcPayServer/BtcPayServer.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
color: $white;

2
app/components/Onboarding/ConnectionConfirm/ConnectionConfirm.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
color: $white;

2
app/components/Onboarding/ConnectionDetails/ConnectionDetails.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
color: $white;

2
app/components/Onboarding/ConnectionType/ConnectionType.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
color: $white;

2
app/components/Onboarding/FormContainer/FormContainer.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
position: relative;

2
app/components/Onboarding/InitWallet/InitWallet.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
position: relative;

2
app/components/Onboarding/Login/Login.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
position: relative;

2
app/components/Onboarding/NewWalletPassword/NewWalletPassword.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.input:nth-child(2) {
margin-top: 30px;

2
app/components/Onboarding/NewWalletSeed/NewWalletSeed.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
font-size: 14px;

2
app/components/Onboarding/ReEnterSeed/ReEnterSeed.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.seedContainer {
display: flex;

2
app/components/Onboarding/RecoverForm/RecoverForm.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.seedContainer {
position: relative;

2
app/components/Onboarding/Signup/Signup.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
color: $white;

2
app/components/Onboarding/Syncing/Syncing.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
position: relative;

2
app/components/Settings/Fiat/Fiat.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.submenuHeader {
padding: 20px;

2
app/components/Wallet/ReceiveModal/ReceiveModal.scss

@ -1,4 +1,4 @@
@import '../../../styles/variables.scss';
@import 'styles/variables.scss';
.container {
position: relative;

2
app/components/Wallet/Wallet.scss

@ -1,4 +1,4 @@
@import '../../styles/variables.scss';
@import 'styles/variables.scss';
.wallet {
background: $bluegrey;

10
webpack.config.renderer.dev.dll.js

@ -72,7 +72,10 @@ export default merge.smart(baseConfig, {
}
},
{
loader: 'sass-loader'
loader: 'sass-loader',
options: {
includePaths: [path.join(__dirname, 'app')]
}
}
]
},
@ -93,7 +96,10 @@ export default merge.smart(baseConfig, {
}
},
{
loader: 'sass-loader'
loader: 'sass-loader',
options: {
includePaths: [path.join(__dirname, 'app')]
}
}
]
},

12
webpack.config.renderer.dev.js

@ -115,7 +115,11 @@ export default merge.smart(baseConfig, {
}
},
{
loader: 'sass-loader'
loader: 'sass-loader',
options: {
sourceMap: true,
includePaths: [path.join(__dirname, 'app')]
}
}
]
},
@ -136,7 +140,11 @@ export default merge.smart(baseConfig, {
}
},
{
loader: 'sass-loader'
loader: 'sass-loader',
options: {
sourceMap: true,
includePaths: [path.join(__dirname, 'app')]
}
}
]
},

10
webpack.config.renderer.prod.js

@ -59,7 +59,10 @@ export default merge.smart(baseConfig, {
loader: 'css-loader'
},
{
loader: 'sass-loader'
loader: 'sass-loader',
options: {
includePaths: [path.join(__dirname, 'app')]
}
}
],
fallback: 'style-loader'
@ -79,7 +82,10 @@ export default merge.smart(baseConfig, {
}
},
{
loader: 'sass-loader'
loader: 'sass-loader',
options: {
includePaths: [path.join(__dirname, 'app')]
}
}
]
})

Loading…
Cancel
Save