feat: no need for copy cli script, use web app build dir

package.json

@@ -7,6 +7,7 @@
     "publish:next-prerelease": "env-cmd lerna publish prerelease --preid alpha --dist-tag alpha --pre-dist-tag alpha --conventional-commits --create-release github --force-publish",
     "publish:next": "env-cmd lerna publish --preid next --dist-tag next --pre-dist-tag next --conventional-commits --create-release github --force-publish",
     "build-all": "lerna run build --stream",
+    "fmt": "lerna run fmt --stream",
     "postinstall": "lerna bootstrap",
     "env-cmd": "env-cmd",
     "shx": "shx"

platform/src/cli-scripts/add.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { existsSync, mkdirSync } from 'fs';
 import { copySync } from 'fs-extra';
-import { join } from 'path';
+import path from 'path';
 import { extract } from 'tar';
 
 import {
@@ -12,10 +12,16 @@ import {
   formatHrTime,
 } from './common';
 
+const relative = path.relative;
+const join = path.join;
+const sep = path.sep;
+const posixSep = path.posix.sep;
+
 export async function doAdd(): Promise<void> {
   const start = process.hrtime();
   log(`\n${chalk.bold('Tauri Platform:')} Starting add task 🚀`);
   const usersProjectDir = process.env.CAPACITOR_ROOT_DIR;
+  const builtWebAppDir = process.env.CAPACITOR_WEB_DIR;
   const platformNodeModuleTemplateTar = join(
     usersProjectDir,
     'node_modules',
@@ -62,11 +68,18 @@ export async function doAdd(): Promise<void> {
     log(`\n${chalk.bold('Tauri Platform:')} Setting up Tauri project files 📋`);
     writePrettyJSON(join(destDir, 'package.json'), platformPackageJson);
 
+    const srcTauriPath = join(destDir, 'src-tauri');
     const platformTauriConfigJson = readJSON(
-      join(destDir, 'src-tauri', 'tauri.conf.json'),
+      join(srcTauriPath, 'tauri.conf.json'),
     );
     platformTauriConfigJson.package.productName = appName;
     platformTauriConfigJson.tauri.windows[0].title = appName;
+    platformTauriConfigJson.build.distDir = relative(
+      srcTauriPath,
+      builtWebAppDir,
+    )
+      .split(sep)
+      .join(posixSep);
     writePrettyJSON(
       join(destDir, 'src-tauri', 'tauri.conf.json'),
       platformTauriConfigJson,

platform/src/cli-scripts/index.ts

@@ -1,6 +1,9 @@
+import chalk from 'chalk';
+
 import { doAdd } from './add';
-import { doCopy } from './copy';
+import { log } from './common';
 import { doOpen } from './open';
+// import { doCopy } from './copy';
 // import { doUpdate } from './update';
 
 /*
@@ -13,9 +16,11 @@ async function doAddTask() {
   return await doAdd();
 }
 
+/*
 async function doCopyTask() {
   return await doCopy();
 }
+*/
 
 async function doOpenTask() {
   return await doOpen();
@@ -27,11 +32,16 @@ async function doOpenTask() {
     switch (scriptToRun) {
       case 'add':
         await doAddTask();
-        await doCopyTask();
+        // await doCopyTask();
         // await doUpdateTask();
         break;
       case 'copy':
-        await doCopyTask();
+        log(
+          `\n${chalk.bold(
+            'Tauri Platform:',
+          )} Copy isn't necessary on the Tauri platform, as it uses your build folder from the web app directly 👍\n`,
+        );
+        // await doCopyTask();
         break;
       case 'run':
       case 'open':
@@ -43,7 +53,7 @@ async function doOpenTask() {
       // break;
       case 'sync':
         throw new Error(`Invalid script chosen: ${scriptToRun}`);
-      // await doCopyTask();
+      // await doSyncTask();
       // await doUpdateTask();
       // break;
       default: