Merge pull request #1011 from brave/remove-babel

webui generates es2017 output and removes confusing babel config
brave · Dec 13, 2018 · a35a3e3 · a35a3e3
1 parent dfa05d9
commit a35a3e3
Show file tree

Hide file tree

Showing 8 changed files with 141 additions and 973 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/components/brave_rewards/resources/ui/components/pageWallet.tsx b/components/brave_rewards/resources/ui/components/pageWallet.tsx
@@ -24,7 +24,7 @@ import * as utils from '../utils'
 import WalletOff from 'brave-ui/features/rewards/walletOff'
 import ModalAddFunds from 'brave-ui/features/rewards/modalAddFunds'
 
-import clipboardCopy = require('clipboard-copy')
+const clipboardCopy = require('clipboard-copy')
 
 interface State {
   activeTabId: number
@@ -74,10 +74,14 @@ class PageWallet extends React.Component<Props, State> {
     })
   }
 
-  onModalBackupOnCopy = (backupKey: string) => {
-    const success = clipboardCopy(backupKey)
+  onModalBackupOnCopy = async (backupKey: string) => {
     // TODO(jsadler) possibly flash a message that copy was completed
-    console.log(success ? 'Copy successful' : 'Copy failed')
+    try {
+      await clipboardCopy(backupKey)
+      console.log('Copy successful')
+    } catch (e) {
+      console.log('Copy failed')
+    }
   }
 
   onModalBackupOnPrint = (backupKey: string) => {

diff --git a/components/common/locale.ts b/components/common/locale.ts
@@ -27,4 +27,3 @@ export const getLocale = (key: string, replacements?: Record<string, string>) =>
   return returnVal
 }
 
-module.exports = { getLocale }
diff --git a/components/webpack/webpack.config.js b/components/webpack/webpack.config.js
@@ -24,14 +24,6 @@ module.exports = (env, argv) => ({
         test: /\.tsx?$/,
         loader: 'awesome-typescript-loader'
       },
-      {
-        test: /\.js$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
-        query: {
-          presets: ['react-optimize']
-        }
-      },
       {
         test: /\.less$/,
         loader: 'style-loader!css-loader?-minimize!less-loader'