chore(package): upgrade tauri

Author: nklayman

generator/index.js

@@ -1,14 +1,19 @@
 const execa = require('execa')
 const { error } = require('@vue/cli-shared-utils')
 const fs = require('fs-extra')
+const init = require('tauri/api/init')
 
 module.exports = async api => {
   await execa('cargo', ['tauri-cli', '--version']).catch(() => {
     // TODO: provide better error
     error('Tauri CLI crate not installed')
     process.exit(1)
   })
-  require('tauri/bin/tauri-init')
+
+  init({
+    directory: api.resolve('.')
+  })
+
   api.extendPackage({
     scripts: {
       'tauri:serve': 'vue-cli-service tauri:serve',

index.js

@@ -1,4 +1,38 @@
-module.exports = api => {
+module.exports = (api, options) => {
+  // If plugin options are provided in vue.config.js, those will be used. Otherwise it is empty object
+  const pluginOptions =
+    options.pluginOptions && options.pluginOptions.electronBuilder
+      ? options.pluginOptions.electronBuilder
+      : {}
+
+  api.chainWebpack(cfg => {
+    if (process.env.TAURI_BUILD) {
+      // Setup require for no-server mode
+      const TauriRequirePlugin = require('@tauri-apps/tauri-webpack/plugins/tauri-require')
+        .plugin
+      cfg.plugin('tauri-require').use(TauriRequirePlugin)
+
+      // Set IS_TAURI
+      if (cfg.plugins.has('define')) {
+        cfg.plugin('define').tap(args => {
+          args[0]['process.env'].IS_TAURI = true
+          return args
+        })
+      } else {
+        cfg.plugin('define').use(DefinePlugin, [
+          {
+            'process.env': { IS_TAURI: true }
+          }
+        ])
+      }
+
+      // Apply custom config from user
+      if (pluginOptions.chainWebpack) {
+        pluginOptions.chainWebpack(cfg)
+      }
+    }
+  })
+
   api.registerCommand(
     'tauri:serve',
     {
@@ -7,25 +41,15 @@ module.exports = api => {
       usage: 'todo'
     },
     async () => {
-      const { tauriDir } = require('tauri/helpers/app-paths')
-      const Runner = require('tauri/runner')
-      const tauri = new Runner()
+      const dev = require('tauri/api/dev')
 
       const server = await api.service.run('serve')
 
-      const tauriConfig = require('tauri/helpers/tauri-config')({
-        ctx: {
-          debug: true
-        },
+      return dev({
         build: {
           devPath: server.url
         }
       })
-
-      require('tauri/generator').generate(tauriConfig.tauri)
-      require('tauri/entry').generate(tauriDir, tauriConfig)
-
-      tauri.run(tauriConfig)
     }
   )
 
@@ -37,33 +61,31 @@ module.exports = api => {
       usage: 'todo'
     },
     async args => {
-      const { tauriDir } = require('tauri/helpers/app-paths')
-      const Runner = require('tauri/runner')
-      const tauri = new Runner()
-      const tauriConfig = require('tauri/helpers/tauri-config')({
-        ctx: {
-          debug: args.debug,
-          modeDir: tauriDir
-        },
+      const build = require('tauri/api/build')
+
+      // Use custom config for webpack
+      process.env.TAURI_BUILD = true
+      // Set publicPath so that scripts are properly imported
+      options.publicPath = './'
+
+      if (!args.skipBundle) {
+        try {
+          await api.service.run('build', {
+            dest: 'dist_tauri/bundled'
+          })
+        } catch (e) {
+          error(
+            'Vue CLI build failed. Please resolve any issues with your build and try again.'
+          )
+          process.exit(1)
+        }
+      }
+
+      build({
         build: {
           distDir: 'dist_tauri/bundled'
         }
       })
-      require('tauri/generator').generate(tauriConfig.tauri)
-      require('tauri/entry').generate(tauriDir, tauriConfig)
-
-      try {
-        await api.service.run('build', {
-          dest: 'dist_tauri/bundled'
-        })
-      } catch (e) {
-        error(
-          'Vue CLI build failed. Please resolve any issues with your build and try again.'
-        )
-        process.exit(1)
-      }
-
-      tauri.build(tauriConfig)
     }
   )
 }

package.json

@@ -7,8 +7,9 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
+    "@tauri-apps/tauri-webpack": "^0.1.4",
     "@vue/cli-shared-utils": "^4.1.1",
     "execa": "^3.4.0",
-    "tauri": "^0.1.9"
+    "tauri": "^0.2.0"
   }
 }