Merge pull request #774 from Emurgo/dependabot/npm_and_yarn/babel/pre…

…set-env-7.5.0 Bump @babel/preset-env from 7.4.5 to 7.5.0
Emurgo · Jul 13, 2019 · 3734a38 · 3734a38
2 parents 99bb66e + f257618
commit 3734a38
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 64 deletions.
diff --git a/app/components/wallet/transactions/Transaction.js b/app/components/wallet/transactions/Transaction.js
@@ -88,26 +88,26 @@ const messages = defineMessages({
 });
 
 const assuranceLevelTranslations = defineMessages({
-  [assuranceLevels.LOW]: {
+  low: {
     id: 'wallet.transaction.assuranceLevel.low',
     defaultMessage: '!!!low',
   },
-  [assuranceLevels.MEDIUM]: {
+  medium: {
     id: 'wallet.transaction.assuranceLevel.medium',
     defaultMessage: '!!!medium',
   },
-  [assuranceLevels.HIGH]: {
+  high: {
     id: 'wallet.transaction.assuranceLevel.high',
     defaultMessage: '!!!high',
   },
 });
 
 const stateTranslations = defineMessages({
-  [transactionStates.PENDING]: {
+  pending: {
     id: 'wallet.transaction.state.pending',
     defaultMessage: '!!!pending',
   },
-  [transactionStates.FAILED]: {
+  failed: {
     id: 'wallet.transaction.state.failed',
     defaultMessage: '!!!failed',
   },

diff --git a/app/stores/toplevel/ProfileStore.js b/app/stores/toplevel/ProfileStore.js
@@ -359,7 +359,7 @@ export default class ProfileStore extends Store {
   };
 
   getThemeVars = ({ theme }: { theme: string }) => {
-    if (theme) return require(`../../themes/prebuilt/${theme}.js`);
+    if (theme) return require(`../../themes/prebuilt/${theme}.js`).default;
     return require(`../../themes/prebuilt/${ProfileStore.getDefaultTheme()}.js`); // default
   };
 
@@ -381,7 +381,8 @@ export default class ProfileStore extends Store {
   // ========== Terms of Use ========== //
 
   @computed get termsOfUse(): string {
-    return require(`../../i18n/locales/terms-of-use/${environment.API}/${this.currentLocale}.md`);
+    const API = environment.API;
+    return require(`../../i18n/locales/terms-of-use/${API}/${this.currentLocale}.md`);
   }
 
   @computed get hasLoadedTermsOfUseAcceptance(): boolean {

diff --git a/babel.config.js b/babel.config.js
@@ -10,7 +10,7 @@ module.exports = function(api) {
         "@babel/preset-env",
         {
           "corejs": 2,
-          "modules": "commonjs",
+          "modules": api.env('jest') ? "commonjs" : 'auto',
           "useBuiltIns": "entry"
         }
       ],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
     "@babel/plugin-proposal-export-namespace-from": "7.5.2",
     "@babel/plugin-syntax-dynamic-import": "7.2.0",
     "@babel/plugin-transform-runtime": "7.5.0",
-    "@babel/preset-env": "7.4.5",
+    "@babel/preset-env": "7.5.0",
     "@babel/preset-flow": "7.0.0",
     "@babel/preset-react": "7.0.0",
     "@babel/register": "7.4.4",