进入polakdot dapp判断

webpack打包的问题
consenlabs · Mar 24, 2021 · d55e786 · d55e786
1 parent 83a930f
commit d55e786
Show file tree

Hide file tree

Showing 12 changed files with 258 additions and 295 deletions.
diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js
@@ -30,7 +30,7 @@ let rendererConfig = {
         polkadotdapp: path.join(__dirname, '../src/api/polkadotdapp.js'),
         ethereumdapp: path.join(__dirname, '../src/api/ethereumdapp.js'),
         ethereumdapp_imkey_web3: path.join(__dirname, '../src/api/ethereumdapp_imkey_web3.js'),
-        imkey_web3_provider: path.join(__dirname, '../src/api/imkey_web3_provider.js')
+        // imkey_web3_provider: path.join(__dirname, '../src/api/imkey_web3_provider.js')
     },
     externals: [
         ...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d))
@@ -118,18 +118,6 @@ let rendererConfig = {
     plugins: [
         new VueLoaderPlugin(),
         new MiniCssExtractPlugin({filename: 'styles.css'}),
-        // new HtmlWebpackPlugin({
-        //   filename: 'index.html',
-        //   template: path.resolve(__dirname, '../src/index.ejs'),
-        //   minify: {
-        //     collapseWhitespace: true,
-        //     removeAttributeQuotes: true,
-        //     removeComments: true
-        //   },
-        //   nodeModules: process..env.NODE_ENV !== 'production'
-        //     ? path.resolve(__dirname, '../node_modules')
-        //     : false
-        // }),
         new HtmlWebpackPlugin({
             filename: 'index.html',
             template: path.resolve(__dirname, '../src/index.ejs'),
@@ -180,106 +168,6 @@ let rendererConfig = {
                 ? path.resolve(__dirname, '../node_modules')
                 : false
         }),
-        new HtmlWebpackPlugin({
-            filename: 'polkadotdapp.html',
-            template: path.resolve(__dirname, '../src/polkadotdapp.ejs'),
-            chunks: ['polkadotdapp', 'vendor'],
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true
-            },
-            templateParameters(compilation, assets, options) {
-                return {
-                    compilation: compilation,
-                    webpack: compilation.getStats().toJson(),
-                    webpackConfig: compilation.options,
-                    htmlWebpackPlugin: {
-                        files: assets,
-                        options: options
-                    },
-                    process,
-                };
-            },
-            nodeModules: process.env.NODE_ENV !== 'production'
-                ? path.resolve(__dirname, '../node_modules')
-                : false
-        }),
-        new HtmlWebpackPlugin({
-            filename: 'ethereumdapp_imkey_web3.html',
-            template: path.resolve(__dirname, '../src/ethereumdapp_imkey_web3.ejs'),
-            chunks: ['ethereumdapp_imkey_web3', 'vendor'],
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true
-            },
-            templateParameters(compilation, assets, options) {
-                return {
-                    compilation: compilation,
-                    webpack: compilation.getStats().toJson(),
-                    webpackConfig: compilation.options,
-                    htmlWebpackPlugin: {
-                        files: assets,
-                        options: options
-                    },
-                    process,
-                };
-            },
-            nodeModules: process.env.NODE_ENV !== 'production'
-                ? path.resolve(__dirname, '../node_modules')
-                : false
-        }),
-        new HtmlWebpackPlugin({
-            filename: 'imkey_web3_provider.html',
-            template: path.resolve(__dirname, '../src/imkey_web3_provider.ejs'),
-            chunks: ['imkey_web3_provider', 'vendor'],
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true
-            },
-            templateParameters(compilation, assets, options) {
-                return {
-                    compilation: compilation,
-                    webpack: compilation.getStats().toJson(),
-                    webpackConfig: compilation.options,
-                    htmlWebpackPlugin: {
-                        files: assets,
-                        options: options
-                    },
-                    process,
-                };
-            },
-            nodeModules: process.env.NODE_ENV !== 'production'
-                ? path.resolve(__dirname, '../node_modules')
-                : false
-        }),
-        new HtmlWebpackPlugin({
-            filename: 'ethereumdapp.html',
-            template: path.resolve(__dirname, '../src/ethereumdapp.ejs'),
-            chunks: ['ethereumdapp', 'vendor'],
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true
-            },
-            templateParameters(compilation, assets, options) {
-                return {
-                    compilation: compilation,
-                    webpack: compilation.getStats().toJson(),
-                    webpackConfig: compilation.options,
-                    htmlWebpackPlugin: {
-                        files: assets,
-                        options: options
-                    },
-                    process,
-                };
-            },
-            nodeModules: process.env.NODE_ENV !== 'production'
-                ? path.resolve(__dirname, '../node_modules')
-                : false
-        }),
         new webpack.HotModuleReplacementPlugin(),
         new webpack.NoEmitOnErrorsPlugin()
     ],
@@ -324,6 +212,8 @@ if (process.env.NODE_ENV === 'production') {
                 patterns: [
                     {  from: path.join(__dirname, '../static'),
                         to: path.join(__dirname, '../dist/electron/static')},
+                    {  from: path.join(__dirname, '../src/api/imkey_web3_provider.js'),
+                        to: path.join(__dirname, '../dist/electron/imkey_web3_provider.js')},
                 ]
             }),
         new webpack.DefinePlugin({

diff --git a/.electron-vue/webpack.web.config.js b/.electron-vue/webpack.web.config.js
@@ -19,7 +19,7 @@ let webConfig = {
         worker: path.join(__dirname, '../src/worker/worker.js'),
         polkadotdapp: path.join(__dirname, '../src/api/polkadotdapp.js'),
         ethereumdapp: path.join(__dirname, '../src/api/ethereumdapp.js'),
-        imkey_web3_provider: path.join(__dirname, '../src/api/imkey_web3_provider.js')
+        // imkey_web3_provider: path.join(__dirname, '../src/api/imkey_web3_provider.js')
     },
     module: {
         rules: [
@@ -89,16 +89,6 @@ let webConfig = {
     plugins: [
         new VueLoaderPlugin(),
         new MiniCssExtractPlugin({filename: 'styles.css'}),
-        // new HtmlWebpackPlugin({
-        //   filename: 'index.html',
-        //   template: path.resolve(__dirname, '../src/index.ejs'),
-        //   minify: {
-        //     collapseWhitespace: true,
-        //     removeAttributeQuotes: true,
-        //     removeComments: true
-        //   },
-        //   nodeModules: false
-        // }),
         new HtmlWebpackPlugin({
             filename: 'index.html',
             template: path.resolve(__dirname, '../src/index.ejs'),
@@ -150,81 +140,6 @@ let webConfig = {
                 ? path.resolve(__dirname, '../node_modules')
                 : false
         }),
-        new HtmlWebpackPlugin({
-            filename: 'polkadotdapp.html',
-            template: path.resolve(__dirname, '../src/polkadotdapp.ejs'),
-            chunks: ['polkadotdapp', 'vendor'],
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true
-            },
-            templateParameters(compilation, assets, options) {
-                return {
-                    compilation: compilation,
-                    webpack: compilation.getStats().toJson(),
-                    webpackConfig: compilation.options,
-                    htmlWebpackPlugin: {
-                        files: assets,
-                        options: options
-                    },
-                    process,
-                };
-            },
-            nodeModules: process.env.NODE_ENV !== 'production'
-                ? path.resolve(__dirname, '../node_modules')
-                : false
-        }),
-        new HtmlWebpackPlugin({
-            filename: 'imkey_web3_provider.html',
-            template: path.resolve(__dirname, '../src/imkey_web3_provider.ejs'),
-            chunks: ['imkey_web3_provider', 'vendor'],
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true
-            },
-            templateParameters(compilation, assets, options) {
-                return {
-                    compilation: compilation,
-                    webpack: compilation.getStats().toJson(),
-                    webpackConfig: compilation.options,
-                    htmlWebpackPlugin: {
-                        files: assets,
-                        options: options
-                    },
-                    process,
-                };
-            },
-            nodeModules: process.env.NODE_ENV !== 'production'
-                ? path.resolve(__dirname, '../node_modules')
-                : false
-        }),
-        new HtmlWebpackPlugin({
-            filename: 'ethereumdapp.html',
-            template: path.resolve(__dirname, '../src/ethereumdapp.ejs'),
-            chunks: ['ethereumdapp', 'vendor'],
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true
-            },
-            templateParameters(compilation, assets, options) {
-                return {
-                    compilation: compilation,
-                    webpack: compilation.getStats().toJson(),
-                    webpackConfig: compilation.options,
-                    htmlWebpackPlugin: {
-                        files: assets,
-                        options: options
-                    },
-                    process,
-                };
-            },
-            nodeModules: process.env.NODE_ENV !== 'production'
-                ? path.resolve(__dirname, '../node_modules')
-                : false
-        }),
         new webpack.HotModuleReplacementPlugin(),
         new webpack.NoEmitOnErrorsPlugin()
     ],
@@ -256,6 +171,8 @@ if (process.env.NODE_ENV === 'production') {
                 patterns: [
                     {  from: path.join(__dirname, '../static'),
                         to: path.join(__dirname, '../dist/web/static')},
+                    {  from: path.join(__dirname, '../src/api/imkey_web3_provider.js'),
+                        to: path.join(__dirname, '../dist/electron/imkey_web3_provider.js')},
                 ]
             }),
         new webpack.DefinePlugin({

diff --git a/.eslintignore b/.eslintignore
@@ -3,4 +3,5 @@ test/unit/*.js
 test/e2e/*.js
 src/proto/**
 src/api/devicemanagerapi.js
-src/api/walletapi.js
+src/api/walletapi.js
+src/api/imkey_web3_provider.js
diff --git a/src/api/ethereumdapp_imkey_web3.js b/src/api/ethereumdapp_imkey_web3.js
@@ -13,20 +13,19 @@
 // const ImKeyProvider = require('/Users/xyz/Code/imkey-web3-provider/dist/index').default
 const { contextBridge, ipcRenderer } = require('electron')
 
-
 // Expose protected methods that allow the renderer process to use
 // the ipcRenderer without exposing the entire object
 contextBridge.exposeInMainWorld(
   'imKeyManager',
   {
     accounts: () => {
-        const res = ipcRenderer.sendSync('message-from-get-address')
-        const walletAddressArray = res.result
-        for (let i = 0; i < walletAddressArray.length; i++) {
-            if (walletAddressArray[i].chain === 'Ethereum') {
-                return [walletAddressArray[i].address]
-            }
+      const res = ipcRenderer.sendSync('message-from-get-address')
+      const walletAddressArray = res.result
+      for (let i = 0; i < walletAddressArray.length; i++) {
+        if (walletAddressArray[i].chain === 'Ethereum') {
+          return [walletAddressArray[i].address]
         }
+      }
     },
     callNativeApi: async (data) => {
       // return await ipcRenderer.invoke('imkey-api', data)
@@ -40,7 +39,7 @@ contextBridge.exposeInMainWorld(
 // };
 
 const scriptContent = ipcRenderer.sendSync('read-file')
-// console.log(scriptContent)
+console.log(scriptContent)
 // let pathToInjectScript = `file://${imkeyWeb3ProviderSrc}`
 
 // window.accounts = store.accounts;
@@ -67,7 +66,6 @@ process.on('document-start', () => {
 //   document.documentElement.appendChild(script);
 // })
 
-
 // document.addEventListener(
 //   "DOMContentLoaded",
 //   function() {

diff --git a/src/api/polkadotdapp.js b/src/api/polkadotdapp.js
@@ -1,6 +1,5 @@
 const {
-  web3Enable,
-    web3Accounts
+  web3Enable
 } = require('@polkadot/extension-dapp')
 
 const { Decimal } = require('decimal.js')
@@ -163,8 +162,6 @@ function getAddress () {
     genesisHash: PolkadotGenesisHash
   }])
 }
-// const accounts =[{ address: 'J7Jnbiv5EZSTcD5qf2UdFcZVUY3x3S5r1VXNU3avaP4pqwE', name: 'Menglong', genesisHash: KusamaGenesisHash }]
-
 const accounts = getAddress()
 
 window.injectedWeb3 = {
@@ -200,7 +197,7 @@ web3Enable('imkey')
 
 // returns an array of { address, meta: { name, source } }
 // meta.source contains the name of the extension that provides this account
-const allAccounts = web3Accounts()
+// const allAccounts = web3Accounts()
 
 // the address we use to use for signing, as injected
 // const SENDER = '5DgzZQE9FS7G5CJLrLgVq2YNa4LM3oYdPh4DFfpp4cMRcWeM'