feat: add support for building with vue cli (#60)

tauri-apps · Jan 30, 2021 · f043343 · f043343
1 parent 2dd3c00
commit f043343
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 19 deletions.
diff --git a/.changes/vue-cli-support.md b/.changes/vue-cli-support.md
@@ -0,0 +1,5 @@
+---
+"action": minor
+---
+
+If vue-cli-plugin-tauri is detected, the tauri:build command will be used.
diff --git a/README.md b/README.md
@@ -80,6 +80,8 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y webkit2gtk-4.0
     - name: install app dependencies and build it
+    # If using the Vue CLI plugin, tauri:build will be run automatically by tauri-action
+    # and you can remove `&& yarn build` from this command
       run: yarn && yarn build
     - uses: tauri-apps/tauri-action@v0
       env:
@@ -149,6 +151,8 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y webkit2gtk-4.0
     - name: install app dependencies and build it
+    # If using the Vue CLI plugin, tauri:build will be run automatically by tauri-action
+    # and you can remove `&& yarn build` from this command
       run: yarn && yarn build
     - uses: tauri-apps/tauri-action@v0
       env:

diff --git a/dist/index.js b/dist/index.js
@@ -10664,11 +10664,12 @@ function getPackageJson(root) {
     }
     return null;
 }
-function hasTauriDependency(root) {
+function hasDependency(dependencyName, root) {
     const packageJson = getPackageJson(root);
     return (packageJson &&
-        ((packageJson.dependencies && packageJson.dependencies.tauri) ||
-            (packageJson.devDependencies && packageJson.devDependencies.tauri)));
+        ((packageJson.dependencies && packageJson.dependencies[dependencyName]) ||
+            (packageJson.devDependencies &&
+                packageJson.devDependencies[dependencyName])));
 }
 function usesYarn(root) {
     return fs_1.existsSync(path_1.join(root, 'yarn.lock'));
@@ -10687,10 +10688,10 @@ function execCommand(command, { cwd }) {
 function buildProject(root, debug, { configPath, distPath, iconPath, npmScript }) {
     return __awaiter(this, void 0, void 0, function* () {
         return new Promise(resolve => {
-            if (core.getInput('preferGlobal') === "true") {
+            if (core.getInput('preferGlobal') === 'true') {
                 resolve('tauri');
             }
-            else if (hasTauriDependency(root)) {
+            else if (hasDependency('tauri', root) || hasDependency('vue-cli-plugin-tauri', root)) {
                 if (npmScript) {
                     resolve(usesYarn(root) ? `yarn ${npmScript}` : `npm run ${npmScript}`);
                 }
@@ -10750,7 +10751,10 @@ function buildProject(root, debug, { configPath, distPath, iconPath, npmScript }
                 fs_1.writeFileSync(tauriConfPath, JSON.stringify(tauriConf));
             }
             const args = debug ? ['--debug'] : [];
-            return execCommand(`${app.runner} build` + (args.length ? ` ${args.join(' ')}` : ''), { cwd: root })
+            const buildCommand = hasDependency('vue-cli-plugin-tauri', root)
+                ? (usesYarn(root) ? 'yarn' : 'npm run') + ' tauri:build'
+                : `${app.runner} build`;
+            return execCommand(buildCommand + (args.length ? ` ${args.join(' ')}` : ''), { cwd: root })
                 .then(() => {
                 const appName = app.name;
                 const artifactsPath = path_1.join(root, `src-tauri/target/${debug ? 'debug' : 'release'}`);

diff --git a/dist/main.js b/dist/main.js
@@ -48,11 +48,12 @@ function getPackageJson(root) {
     }
     return null;
 }
-function hasTauriDependency(root) {
+function hasDependency(dependencyName, root) {
     const packageJson = getPackageJson(root);
     return (packageJson &&
-        ((packageJson.dependencies && packageJson.dependencies.tauri) ||
-            (packageJson.devDependencies && packageJson.devDependencies.tauri)));
+        ((packageJson.dependencies && packageJson.dependencies[dependencyName]) ||
+            (packageJson.devDependencies &&
+                packageJson.devDependencies[dependencyName])));
 }
 function usesYarn(root) {
     return fs_1.existsSync(path_1.join(root, 'yarn.lock'));
@@ -71,10 +72,10 @@ function execCommand(command, { cwd }) {
 function buildProject(root, debug, { configPath, distPath, iconPath, npmScript }) {
     return __awaiter(this, void 0, void 0, function* () {
         return new Promise(resolve => {
-            if (core.getInput('preferGlobal') === "true") {
+            if (core.getInput('preferGlobal') === 'true') {
                 resolve('tauri');
             }
-            else if (hasTauriDependency(root)) {
+            else if (hasDependency('tauri', root) || hasDependency('vue-cli-plugin-tauri', root)) {
                 if (npmScript) {
                     resolve(usesYarn(root) ? `yarn ${npmScript}` : `npm run ${npmScript}`);
                 }
@@ -134,7 +135,10 @@ function buildProject(root, debug, { configPath, distPath, iconPath, npmScript }
                 fs_1.writeFileSync(tauriConfPath, JSON.stringify(tauriConf));
             }
             const args = debug ? ['--debug'] : [];
-            return execCommand(`${app.runner} build` + (args.length ? ` ${args.join(' ')}` : ''), { cwd: root })
+            const buildCommand = hasDependency('vue-cli-plugin-tauri', root)
+                ? (usesYarn(root) ? 'yarn' : 'npm run') + ' tauri:build'
+                : `${app.runner} build`;
+            return execCommand(buildCommand + (args.length ? ` ${args.join(' ')}` : ''), { cwd: root })
                 .then(() => {
                 const appName = app.name;
                 const artifactsPath = path_1.join(root, `src-tauri/target/${debug ? 'debug' : 'release'}`);

diff --git a/src/main.ts b/src/main.ts
@@ -17,12 +17,13 @@ function getPackageJson(root: string): any {
   return null
 }
 
-function hasTauriDependency(root: string): boolean {
+function hasDependency(dependencyName: string, root: string): boolean {
   const packageJson = getPackageJson(root)
   return (
     packageJson &&
-    ((packageJson.dependencies && packageJson.dependencies.tauri) ||
-      (packageJson.devDependencies && packageJson.devDependencies.tauri))
+    ((packageJson.dependencies && packageJson.dependencies[dependencyName]) ||
+      (packageJson.devDependencies &&
+        packageJson.devDependencies[dependencyName]))
   )
 }
 
@@ -73,9 +74,9 @@ async function buildProject(
   {configPath, distPath, iconPath, npmScript}: BuildOptions
 ): Promise<string[]> {
   return new Promise<string>(resolve => {
-    if (core.getInput('preferGlobal') === "true") {
+    if (core.getInput('preferGlobal') === 'true') {
       resolve('tauri')
-    } else if (hasTauriDependency(root)) {
+    } else if (hasDependency('tauri', root) || hasDependency('vue-cli-plugin-tauri', root)) {
       if (npmScript) {
         resolve(usesYarn(root) ? `yarn ${npmScript}` : `npm run ${npmScript}`)
       } else {
@@ -145,8 +146,11 @@ async function buildProject(
       }
 
       const args = debug ? ['--debug'] : []
+      const buildCommand = hasDependency('vue-cli-plugin-tauri', root)
+        ? (usesYarn(root) ? 'yarn' : 'npm run') + ' tauri:build'
+        : `${app.runner} build`
       return execCommand(
-        `${app.runner} build` + (args.length ? ` ${args.join(' ')}` : ''),
+        buildCommand + (args.length ? ` ${args.join(' ')}` : ''),
         {cwd: root}
       )
         .then(() => {
@@ -298,4 +302,4 @@ async function run(): Promise<void> {
   }
 }
 
-run()
+run()