feat: add args option, closes #131 (#134)

tauri-apps · May 13, 2021 · f564b01 · f564b01
1 parent 0e9704e
commit f564b01
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 23 deletions.
diff --git a/.changes/args.md b/.changes/args.md
@@ -0,0 +1,6 @@
+---
+"@tauri-apps/action-core": patch
+"action": patch
+---
+
+Adds `args` option to pass arguments to the tauri command.
diff --git a/action.yml b/action.yml
@@ -34,6 +34,8 @@ inputs:
     description: 'the package.json script to run to build the Tauri app'
   preferGlobal:
     description: 'set this to true to use a globally installed tauri instead'
+  args:
+    description: 'arguments for the tauri command'
 outputs:
   releaseId:
     description: 'The ID of the created release'

diff --git a/packages/action/__fixtures__/example-with-tauri/src-tauri/Cargo.toml b/packages/action/__fixtures__/example-with-tauri/src-tauri/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = [ "derive" ] }
-tauri = { version = "1.0.0-beta-rc.2", features =["api-all"]}
+tauri = { version = "1.0.0-beta-rc.2", features = ["api-all", "updater"] }
 
 [build-dependencies]
 tauri-build = "1.0.0-beta-rc.0"

diff --git a/packages/action/dist/index.js b/packages/action/dist/index.js
diff --git a/packages/action/package.json b/packages/action/package.json
@@ -20,6 +20,7 @@
     "@actions/core": "1.2.7",
     "@actions/github": "4.0.0",
     "@tauri-apps/action-core": "0.1.1",
+    "string-argv": "0.3.1",
     "tslib": "2.2.0"
   },
   "devDependencies": {

diff --git a/packages/action/src/index.ts b/packages/action/src/index.ts
@@ -6,6 +6,7 @@ import uploadReleaseAssets from './upload-release-assets'
 import createRelease from './create-release'
 import { getPackageJson, buildProject, execCommand } from '@tauri-apps/action-core'
 import type { BuildOptions } from '@tauri-apps/action-core'
+import stringArgv from 'string-argv'
 
 async function run(): Promise<void> {
   try {
@@ -22,6 +23,7 @@ async function run(): Promise<void> {
     const iconPath = core.getInput('iconPath')
     const includeDebug = core.getInput('includeDebug') === 'true'
     const npmScript = core.getInput('npmScript')
+    const args = stringArgv(core.getInput('args'))
 
     let tagName = core.getInput('tagName').replace('refs/tags/', '')
     let releaseName = core.getInput('releaseName').replace('refs/tags/', '')
@@ -40,7 +42,8 @@ async function run(): Promise<void> {
       configPath: existsSync(configPath) ? configPath : null,
       distPath,
       iconPath,
-      npmScript
+      npmScript,
+      args
     }
     const artifacts = await buildProject(preferGlobal, projectPath, false, options)
     if (includeDebug) {

diff --git a/packages/cli/index.ts b/packages/cli/index.ts
@@ -21,12 +21,14 @@ export async function run(): Promise<void> {
   const iconPath = argv['icon-path']
   const includeDebug = argv['include-debug']
   const npmScript = argv['npm-script']
+  const args = argv._
 
   const options: BuildOptions = {
     configPath: existsSync(configPath) ? configPath : null,
     distPath,
     iconPath,
-    npmScript
+    npmScript,
+    args
   }
   const artifacts = await buildProject(preferGlobal, projectPath, false, options)
   if (includeDebug) {

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -14,7 +14,7 @@
     "url": "git+https://github.com/tauri-apps/tauri-action.git"
   },
   "dependencies": {
-    "@tauri-apps/action-core": "0.1.0",
+    "@tauri-apps/action-core": "0.1.1",
     "minimist": "1.2.5",
     "tslib": "2.2.0"
   },

diff --git a/packages/cli/rollup.config.js b/packages/cli/rollup.config.js
@@ -11,7 +11,9 @@ export default {
     entryFileNames: "[name].js",
     exports: "named",
   },
-  plugins: [typescript()],
+  plugins: [typescript({
+    allowSyntheticDefaultImports: true
+  })],
   external: [
     ...Object.keys(pkg.dependencies || {}),
     "path",

diff --git a/packages/core/index.ts b/packages/core/index.ts
@@ -1,7 +1,7 @@
 import { platform } from 'os'
 import { readFileSync, existsSync, copyFileSync, writeFileSync } from 'fs'
 import execa from 'execa'
-import toml from '@iarna/toml'
+import { parse as parseToml } from '@iarna/toml'
 import { join } from 'path'
 
 export function getPackageJson(root: string): any {
@@ -68,6 +68,7 @@ export interface BuildOptions {
   distPath: string | null
   iconPath: string | null
   npmScript: string | null
+  args: string[] | null
 }
 
 export interface Runner {
@@ -79,7 +80,7 @@ export async function buildProject(
   preferGlobal: boolean,
   root: string,
   debug: boolean,
-  { configPath, distPath, iconPath, npmScript }: BuildOptions
+  { configPath, distPath, iconPath, npmScript, args }: BuildOptions
 ): Promise<string[]> {
   return new Promise<Runner>((resolve, reject) => {
     if (preferGlobal) {
@@ -118,7 +119,7 @@ export async function buildProject(
         }
         if (!(name && version)) {
           const manifestPath = join(root, 'src-tauri/Cargo.toml')
-          const cargoManifest = (toml.parse(
+          const cargoManifest = (parseToml(
             readFileSync(manifestPath).toString()
           ) as any) as CargoManifest
           name = name || cargoManifest.package.name
@@ -191,7 +192,7 @@ export async function buildProject(
         writeFileSync(tauriConfPath, JSON.stringify(tauriConf))
       }
 
-      const args = debug ? ['--debug'] : []
+      const tauriArgs = debug ? ['--debug', ...(args ?? [])] : (args ?? [])
       let buildCommand
       let buildArgs: string[] = []
 
@@ -209,7 +210,7 @@ export async function buildProject(
 
       return execCommand(
         buildCommand,
-        [...buildArgs, ...args],
+        [...buildArgs, ...tauriArgs],
         { cwd: root }
       )
         .then(() => {

diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js
@@ -11,7 +11,9 @@ export default {
     entryFileNames: "[name].js",
     exports: "named",
   },
-  plugins: [typescript()],
+  plugins: [typescript({
+    tsconfig: './tsconfig.json'
+  })],
   external: [
     ...Object.keys(pkg.dependencies || {}),
     "path",

diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -2,7 +2,8 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist",
-    "rootDir": "."
+    "rootDir": ".",
+    "allowSyntheticDefaultImports": true
   },
   "include": ["index.ts"]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -249,14 +249,6 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@tauri-apps/[email protected]":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/action-core/-/action-core-0.1.0.tgz#dec84eb4d6eb4e37c6772fa5edac5457331c7a10"
-  integrity sha512-apyQvpGejwqra2oWRhOHlC8wFS1MzqXKaDkwqutEmQ2G4COg2d1sON/UKYamlTTw33E8gsoz8HMhph8XXVkJsA==
-  dependencies:
-    "@iarna/toml" "2.2.5"
-    execa "5.0.0"
-
 "@tauri-apps/toml@^2.2.4":
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/@tauri-apps/toml/-/toml-2.2.4.tgz#2b4f637aded7fc3a7302724605682c8fa3ac7505"
@@ -1605,6 +1597,11 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
   integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
 
+[email protected]:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
+  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
+
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"