Merge pull request #245 from Dreaming-Codes/next

Support Tauri 2.0.0-alpha release
2025-08-14 21:05:05 +00:00 · 2023-05-04 09:54:29 +02:00 · 2023-05-04 09:54:29 +02:00 · 810cab5ef8
commit 810cab5ef8
parent eba09975bb 09cae2e40a
11 changed files with 110 additions and 68 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -62,9 +62,9 @@ jobs:
      if: matrix.platform.os == 'ubuntu-latest'
      run: |
        sudo apt-get update
-        sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
+        sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1 libappindicator3-dev librsvg2-dev patchelf

-    - uses: JonasKruckenberg/tauri-build@v1.2.3
+    - uses: JonasKruckenberg/tauri-build@next
      id: tauri_build
      with:
        target: ${{ matrix.platform.rust_target }}
--- a/dist/cli.darwin-x64.node
+++ b/dist/cli.darwin-x64.node
--- a/dist/cli.linux-x64-gnu.node
+++ b/dist/cli.linux-x64-gnu.node
--- a/dist/cli.win32-x64-msvc.node
+++ b/dist/cli.win32-x64-msvc.node
--- a/dist/index.js
+++ b/dist/index.js
@ -1,21 +1,28 @@
 require('./sourcemap-register.js');/******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({

-/***/ 2994:
+/***/ 1533:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {

 module.exports = require(__nccwpck_require__.ab + "cli.darwin-x64.node")

 /***/ }),

-/***/ 4458:
+/***/ 7382:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {

 module.exports = require(__nccwpck_require__.ab + "cli.linux-x64-gnu.node")

 /***/ }),

-/***/ 7191:
+/***/ 1626:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+module.exports = require(__nccwpck_require__.ab + "cli.linux-x64-musl.node")
+
+/***/ }),
+
+/***/ 5817:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {

 module.exports = require(__nccwpck_require__.ab + "cli.win32-x64-msvc.node")
@ -64,7 +71,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.buildProject = void 0;
-const cli_1 = __nccwpck_require__(879);
+const cli_1 = __nccwpck_require__(3642);
 const path_1 = __nccwpck_require__(1017);
 const tiny_glob_1 = __importDefault(__nccwpck_require__(8785));
 const core = __importStar(__nccwpck_require__(1368));
@ -109,7 +116,7 @@ function buildProject(options) {
            'AppImage.tar.gz.sig',
            'deb'
        ];
-        const windowsExts = ['msi', 'msi.zip', 'msi.zip.sig'];
+        const windowsExts = ['msi', 'msi.zip', 'msi.zip.sig', 'exe', 'nsis.zip', 'nsis.zip.sig'];
        const artifactsLookupPattern = `${bundleDir}/*/!(linuxdeploy)*.{${[
            ...macOSExts,
            linuxExts,
@ -1984,7 +1991,7 @@ exports.checkBypass = checkBypass;

 /***/ }),

-/***/ 5200:
+/***/ 6740:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {

 const { existsSync, readFileSync } = __nccwpck_require__(7147)
@ -2000,7 +2007,8 @@ function isMusl() {
  // For Node 10
  if (!process.report || typeof process.report.getReport !== 'function') {
    try {
-      return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
+      const lddPath = (__nccwpck_require__(2081).execSync)('which ldd').toString().trim();
+      return readFileSync(lddPath, 'utf8').includes('musl')
    } catch (e) {
      return true
    }
@ -2051,7 +2059,7 @@ switch (platform) {
          if (localFileExisted) {
            nativeBinding = __nccwpck_require__(2695)
          } else {
-            nativeBinding = __nccwpck_require__(7191)
+            nativeBinding = __nccwpck_require__(5817)
          }
        } catch (e) {
          loadError = e
@ -2090,6 +2098,15 @@ switch (platform) {
    }
    break
  case 'darwin':
+    localFileExisted = existsSync(join(__dirname, 'cli.darwin-universal.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = __nccwpck_require__(1822)
+      } else {
+        nativeBinding = __nccwpck_require__(8636)
+      }
+      break
+    } catch {}
    switch (arch) {
      case 'x64':
        localFileExisted = existsSync(join(__dirname, 'cli.darwin-x64.node'))
@ -2097,7 +2114,7 @@ switch (platform) {
          if (localFileExisted) {
            nativeBinding = __nccwpck_require__(5921)
          } else {
-            nativeBinding = __nccwpck_require__(2994)
+            nativeBinding = __nccwpck_require__(1533)
          }
        } catch (e) {
          loadError = e
@ -2147,7 +2164,7 @@ switch (platform) {
            if (localFileExisted) {
              nativeBinding = __nccwpck_require__(3578)
            } else {
-              nativeBinding = __nccwpck_require__(2896)
+              nativeBinding = __nccwpck_require__(1626)
            }
          } catch (e) {
            loadError = e
@ -2160,7 +2177,7 @@ switch (platform) {
            if (localFileExisted) {
              nativeBinding = __nccwpck_require__(4940)
            } else {
-              nativeBinding = __nccwpck_require__(4458)
+              nativeBinding = __nccwpck_require__(7382)
            }
          } catch (e) {
            loadError = e
@ -2233,10 +2250,14 @@ module.exports.logError = logError

 /***/ }),

-/***/ 879:
+/***/ 3642:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {

-const { run, logError } = __nccwpck_require__(5200)
+// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+const { run, logError } = __nccwpck_require__(6740)

 module.exports.run = (args, binName) => {
  return new Promise((resolve, reject) => {
@ -3081,6 +3102,14 @@ module.exports = eval("require")("./cli.android-arm64.node");
 module.exports = eval("require")("./cli.darwin-arm64.node");


+/***/ }),
+
+/***/ 1822:
+/***/ ((module) => {
+
+module.exports = eval("require")("./cli.darwin-universal.node");
+
+
 /***/ }),

 /***/ 5921:
@ -3185,6 +3214,14 @@ module.exports = eval("require")("@tauri-apps/cli-android-arm64");
 module.exports = eval("require")("@tauri-apps/cli-darwin-arm64");


+/***/ }),
+
+/***/ 8636:
+/***/ ((module) => {
+
+module.exports = eval("require")("@tauri-apps/cli-darwin-universal");
+
+
 /***/ }),

 /***/ 9968:
@ -3217,14 +3254,6 @@ module.exports = eval("require")("@tauri-apps/cli-linux-arm64-gnu");
 module.exports = eval("require")("@tauri-apps/cli-linux-arm64-musl");


-/***/ }),
-
-/***/ 2896:
-/***/ ((module) => {
-
-module.exports = eval("require")("@tauri-apps/cli-linux-x64-musl");
-
-
 /***/ }),

 /***/ 4523:
--- a/dist/index.js.map
+++ b/dist/index.js.map
--- a/dist/licenses.txt
+++ b/dist/licenses.txt
@ -222,6 +222,9 @@ MIT
@tauri-apps/cli-linux-x64-gnu
 MIT

+@tauri-apps/cli-linux-x64-musl
+MIT
+
@tauri-apps/cli-win32-x64-msvc
 MIT

--- a/package.json
+++ b/package.json
@ -24,10 +24,10 @@
  "license": "MIT",
  "dependencies": {
    "@actions/core": "^1.6.0",
-    "@tauri-apps/cli": "1.2.3",
-    "@tauri-apps/cli-darwin-x64": "1.2.3",
-    "@tauri-apps/cli-linux-x64-gnu": "1.2.3",
-    "@tauri-apps/cli-win32-x64-msvc": "1.2.3",
+    "@tauri-apps/cli": "2.0.0-alpha.8",
+    "@tauri-apps/cli-darwin-x64": "2.0.0-alpha.8",
+    "@tauri-apps/cli-linux-x64-gnu": "2.0.0-alpha.8",
+    "@tauri-apps/cli-win32-x64-msvc": "2.0.0-alpha.8",
    "string-argv": "^0.3.1",
    "tiny-glob": "^0.2.9"
  },
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -5,17 +5,17 @@ dependencies:
    specifier: ^1.6.0
    version: 1.9.0
  '@tauri-apps/cli':
-    specifier: 1.2.3
-    version: 1.2.3
+    specifier: 2.0.0-alpha.8
+    version: 2.0.0-alpha.8
  '@tauri-apps/cli-darwin-x64':
-    specifier: 1.2.3
-    version: 1.2.3
+    specifier: 2.0.0-alpha.8
+    version: 2.0.0-alpha.8
  '@tauri-apps/cli-linux-x64-gnu':
-    specifier: 1.2.3
-    version: 1.2.3
+    specifier: 2.0.0-alpha.8
+    version: 2.0.0-alpha.8
  '@tauri-apps/cli-win32-x64-msvc':
-    specifier: 1.2.3
-    version: 1.2.3
+    specifier: 2.0.0-alpha.8
+    version: 2.0.0-alpha.8
  string-argv:
    specifier: ^0.3.1
    version: 0.3.1
@ -152,8 +152,8 @@ packages:
      fastq: 1.13.0
    dev: true

-  /@tauri-apps/cli-darwin-arm64@1.2.3:
-    resolution: {integrity: sha512-phJN3fN8FtZZwqXg08bcxfq1+X1JSDglLvRxOxB7VWPq+O5SuB8uLyssjJsu+PIhyZZnIhTGdjhzLSFhSXfLsw==}
+  /@tauri-apps/cli-darwin-arm64@2.0.0-alpha.8:
+    resolution: {integrity: sha512-ZF9nkkYCDiAEKZFwjEbuqTcFVp+DBgem3edKjsZDYPQpWg0VcZOSYr0o3/RPC81T1/FAy1lq478mkcMe0efvEw==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [darwin]
@ -161,15 +161,16 @@ packages:
    dev: false
    optional: true

-  /@tauri-apps/cli-darwin-x64@1.2.3:
-    resolution: {integrity: sha512-jFZ/y6z8z6v4yliIbXKBXA7BJgtZVMsITmEXSuD6s5+eCOpDhQxbRkr6CA+FFfr+/r96rWSDSgDenDQuSvPAKw==}
+  /@tauri-apps/cli-darwin-x64@2.0.0-alpha.8:
+    resolution: {integrity: sha512-N5V+tbP3qeAoXrrTZXvaLIeEWKCq11tqXoNFTkIZNGNC5yQdNpZSX0LqFqzmxVR1SHiOymebvcUlx+ADIpuXGw==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [darwin]
+    requiresBuild: true
    dev: false

-  /@tauri-apps/cli-linux-arm-gnueabihf@1.2.3:
-    resolution: {integrity: sha512-C7h5vqAwXzY0kRGSU00Fj8PudiDWFCiQqqUNI1N+fhCILrzWZB9TPBwdx33ZfXKt/U4+emdIoo/N34v3TiAOmQ==}
+  /@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.8:
+    resolution: {integrity: sha512-7LHfZA99ncMDUO/wCGMtrqmDHt1uEKZiNmuzPljWLUwVvbAn0pNWNygnvPNVLEOyav5NnZSGPqT1Zmn+L6Fpyg==}
    engines: {node: '>= 10'}
    cpu: [arm]
    os: [linux]
@ -177,8 +178,8 @@ packages:
    dev: false
    optional: true

-  /@tauri-apps/cli-linux-arm64-gnu@1.2.3:
-    resolution: {integrity: sha512-buf1c8sdkuUzVDkGPQpyUdAIIdn5r0UgXU6+H5fGPq/Xzt5K69JzXaeo6fHsZEZghbV0hOK+taKV4J0m30UUMQ==}
+  /@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.8:
+    resolution: {integrity: sha512-imq2MdhWdREvL2sqbU26mzH9sgSvfNWP0uvCPvPxUhK157xqdtGw+Gqm00hwnhTuT5bOFlsUNfnG2U19k1qMpA==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [linux]
@ -186,8 +187,8 @@ packages:
    dev: false
    optional: true

-  /@tauri-apps/cli-linux-arm64-musl@1.2.3:
-    resolution: {integrity: sha512-x88wPS9W5xAyk392vc4uNHcKBBvCp0wf4H9JFMF9OBwB7vfd59LbQCFcPSu8f0BI7bPrOsyHqspWHuFL8ojQEA==}
+  /@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.8:
+    resolution: {integrity: sha512-7hXEyvCosBHIN6ahkbFOI5JoyWZAulc0sYd3hWh9V/MBfU+LlPiapsJi6fdde0zew5nnzwcCtfEKkoR737tAig==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [linux]
@ -195,15 +196,16 @@ packages:
    dev: false
    optional: true

-  /@tauri-apps/cli-linux-x64-gnu@1.2.3:
-    resolution: {integrity: sha512-ZMz1jxEVe0B4/7NJnlPHmwmSIuwiD6ViXKs8F+OWWz2Y4jn5TGxWKFg7DLx5OwQTRvEIZxxT7lXHi5CuTNAxKg==}
+  /@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.8:
+    resolution: {integrity: sha512-S9T/trKpXcLc7hVIv7xFrRBlaivHD/HLUz0nYAkI2izNGFmbP3QpkqQDdwpWN/fxneodNgI2/mDFC3NULClj+A==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [linux]
+    requiresBuild: true
    dev: false

-  /@tauri-apps/cli-linux-x64-musl@1.2.3:
-    resolution: {integrity: sha512-B/az59EjJhdbZDzawEVox0LQu2ZHCZlk8rJf85AMIktIUoAZPFbwyiUv7/zjzA/sY6Nb58OSJgaPL2/IBy7E0A==}
+  /@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.8:
+    resolution: {integrity: sha512-90mx6vSFNBbctaPaKhkH+um51gOoRJwLFOadOkklHS5Q6S6GjtSa1lmBEFyKUTAfFPtmiacuNYtoKx7nqm+z1Q==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [linux]
@ -211,8 +213,8 @@ packages:
    dev: false
    optional: true

-  /@tauri-apps/cli-win32-ia32-msvc@1.2.3:
-    resolution: {integrity: sha512-ypdO1OdC5ugNJAKO2m3sb1nsd+0TSvMS9Tr5qN/ZSMvtSduaNwrcZ3D7G/iOIanrqu/Nl8t3LYlgPZGBKlw7Ng==}
+  /@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.8:
+    resolution: {integrity: sha512-VAMsLJYfp6iVI7oJ+uIkfe8DKPRMtWDiSEkfFqvDyFX0WMTQl23B0AzYyapVwZc+WkTkLuoMLpIWMQCgAoQWfQ==}
    engines: {node: '>= 10'}
    cpu: [ia32]
    os: [win32]
@ -220,27 +222,28 @@ packages:
    dev: false
    optional: true

-  /@tauri-apps/cli-win32-x64-msvc@1.2.3:
-    resolution: {integrity: sha512-CsbHQ+XhnV/2csOBBDVfH16cdK00gNyNYUW68isedmqcn8j+s0e9cQ1xXIqi+Hue3awp8g3ImYN5KPepf3UExw==}
+  /@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.8:
+    resolution: {integrity: sha512-zvWd13hRfRM0AEJJZ4t4CeB/cyru8hvbB6c+sxYDS9GPRWfHSH5dIeKoHhnMwP5fEOPZLN7VaeEP6tC88trD6g==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [win32]
+    requiresBuild: true
    dev: false

-  /@tauri-apps/cli@1.2.3:
-    resolution: {integrity: sha512-erxtXuPhMEGJPBtnhPILD4AjuT81GZsraqpFvXAmEJZ2p8P6t7MVBifCL8LznRknznM3jn90D3M8RNBP3wcXTw==}
+  /@tauri-apps/cli@2.0.0-alpha.8:
+    resolution: {integrity: sha512-cXt6pxh7oiV8Htz7eTPor7if4aN9f9emn10+5h2Y82YzST7I7wKXsrjuk0HIyzUiqiQjUgl3iT9gh791zgtI3w==}
    engines: {node: '>= 10'}
    hasBin: true
    optionalDependencies:
-      '@tauri-apps/cli-darwin-arm64': 1.2.3
-      '@tauri-apps/cli-darwin-x64': 1.2.3
-      '@tauri-apps/cli-linux-arm-gnueabihf': 1.2.3
-      '@tauri-apps/cli-linux-arm64-gnu': 1.2.3
-      '@tauri-apps/cli-linux-arm64-musl': 1.2.3
-      '@tauri-apps/cli-linux-x64-gnu': 1.2.3
-      '@tauri-apps/cli-linux-x64-musl': 1.2.3
-      '@tauri-apps/cli-win32-ia32-msvc': 1.2.3
-      '@tauri-apps/cli-win32-x64-msvc': 1.2.3
+      '@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.8
+      '@tauri-apps/cli-darwin-x64': 2.0.0-alpha.8
+      '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-alpha.8
+      '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-alpha.8
+      '@tauri-apps/cli-linux-arm64-musl': 2.0.0-alpha.8
+      '@tauri-apps/cli-linux-x64-gnu': 2.0.0-alpha.8
+      '@tauri-apps/cli-linux-x64-musl': 2.0.0-alpha.8
+      '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-alpha.8
+      '@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.8
    dev: false

  /@types/json-schema@7.0.11:
--- a/src/build-project.ts
+++ b/src/build-project.ts
@ -70,7 +70,14 @@ export async function buildProject(options: BuildOptions): Promise<string[]> {
    'AppImage.tar.gz.sig',
    'deb'
  ]
-  const windowsExts = ['msi', 'msi.zip', 'msi.zip.sig']
+  const windowsExts = [
+    'msi',
+    'msi.zip',
+    'msi.zip.sig',
+    'exe',
+    'nsis.zip',
+    'nsis.zip.sig'
+  ]

  const artifactsLookupPattern = `${bundleDir}/*/!(linuxdeploy)*.{${[
    ...macOSExts,
--- a/test/fixture/src-tauri/Cargo.toml
+++ b/test/fixture/src-tauri/Cargo.toml
@ -12,12 +12,12 @@ rust-version = "1.57"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [build-dependencies]
-tauri-build = { version = "1.2.1", features = [] }
+tauri-build = { version = "2.0.0-alpha.4", features = [] }

 [dependencies]
 serde_json = "1.0.82"
 serde = { version = "1.0.138", features = ["derive"] }
-tauri = { version = "1.2.2", features = [] }
+tauri = { version = "2.0.0-alpha.8", features = [] }

 [features]
 # by default Tauri runs in production mode