Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructure the repository #10796

Merged
merged 33 commits into from
Aug 27, 2024
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ebc3802
Restructure the repository
amrbashir Aug 27, 2024
86caf40
Merge branch 'dev' into chore/restructure-repo
amrbashir Aug 27, 2024
c485e7a
lock file
amrbashir Aug 27, 2024
7e8dbf5
fmt
amrbashir Aug 27, 2024
e6df9dd
fix bench
amrbashir Aug 27, 2024
ddee179
fix cli template test
amrbashir Aug 27, 2024
e914ca6
remove accidental file
amrbashir Aug 27, 2024
86a9a2c
fix mv command
amrbashir Aug 27, 2024
d039d89
clippy
amrbashir Aug 27, 2024
98a3bd2
upgrade paths-filter github action
amrbashir Aug 27, 2024
c4c936f
fix cli migration tests
amrbashir Aug 27, 2024
515ab5e
Merge branch 'dev' into chore/restructure-repo
amrbashir Aug 27, 2024
842ac1d
lockfile
amrbashir Aug 27, 2024
bb40265
license headers
amrbashir Aug 27, 2024
7d6ba8e
clippy
amrbashir Aug 27, 2024
860fd08
scope test-core to tauri crate
amrbashir Aug 27, 2024
4d4cb08
license header
amrbashir Aug 27, 2024
40e30a0
correct --manifest-path usage
amrbashir Aug 27, 2024
03b24a7
Merge branch 'dev' into chore/restructure-repo
amrbashir Aug 27, 2024
4e53315
lockfile
amrbashir Aug 27, 2024
78fa9fc
fix tauri-driver on macOS [skip ci]
lucasfernog Aug 27, 2024
74f5d7e
build target ios
lucasfernog Aug 27, 2024
bc533ff
try downgrade env_logger
amrbashir Aug 27, 2024
860ce1d
Merge branch 'dev' into chore/restructure-repo
amrbashir Aug 27, 2024
83d2d4e
downgrade 0.1.7
amrbashir Aug 27, 2024
f4d5f78
try to fix bench
amrbashir Aug 27, 2024
5756a81
bench overflow
amrbashir Aug 27, 2024
ac5f593
revert overflow fix, fix tauri_root_path
amrbashir Aug 27, 2024
63fb0d2
revert env_logger downgrade
amrbashir Aug 27, 2024
d5c02af
fmt
amrbashir Aug 27, 2024
c30067a
raise msrv to 1.71
amrbashir Aug 27, 2024
2713520
fmt
amrbashir Aug 27, 2024
bbc892f
delete .cargo/config.toml [skip ci]
lucasfernog Aug 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix cli template test
  • Loading branch information
amrbashir committed Aug 27, 2024
commit ddee17941729117d0dbeb3f14778faaae13c084c
2 changes: 2 additions & 0 deletions packages/cli/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# debug builds of NAPI
*.node
Binary file modified packages/cli/cli.win32-x64-msvc.node
Binary file not shown.
12 changes: 2 additions & 10 deletions packages/cli/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT

/* tslint:disable */
/* eslint-disable */

/* auto-generated by NAPI-RS */

export function run(
args: Array<string>,
binName: string | undefined | null,
callback: (...args: any[]) => any
): void
export function logError(error: string): void
export declare function run(args: Array<string>, binName: string | undefined | null, callback: (...args: any[]) => any): void
export declare function logError(error: string): void
81 changes: 66 additions & 15 deletions packages/cli/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT

/* tslint:disable */
/* eslint-disable */
/* prettier-ignore */
@@ -21,10 +17,7 @@ function isMusl() {
// For Node 10
if (!process.report || typeof process.report.getReport !== 'function') {
try {
const lddPath = require('child_process')
.execSync('which ldd')
.toString()
.trim()
const lddPath = require('child_process').execSync('which ldd').toString().trim()
return readFileSync(lddPath, 'utf8').includes('musl')
} catch (e) {
return true
@@ -51,9 +44,7 @@ switch (platform) {
}
break
case 'arm':
localFileExisted = existsSync(
join(__dirname, 'cli.android-arm-eabi.node')
)
localFileExisted = existsSync(join(__dirname, 'cli.android-arm-eabi.node'))
try {
if (localFileExisted) {
nativeBinding = require('./cli.android-arm-eabi.node')
@@ -140,7 +131,9 @@ switch (platform) {
}
break
case 'arm64':
localFileExisted = existsSync(join(__dirname, 'cli.darwin-arm64.node'))
localFileExisted = existsSync(
join(__dirname, 'cli.darwin-arm64.node')
)
try {
if (localFileExisted) {
nativeBinding = require('./cli.darwin-arm64.node')
@@ -231,14 +224,72 @@ switch (platform) {
}
break
case 'arm':
if (isMusl()) {
localFileExisted = existsSync(
join(__dirname, 'cli.linux-arm-musleabihf.node')
)
try {
if (localFileExisted) {
nativeBinding = require('./cli.linux-arm-musleabihf.node')
} else {
nativeBinding = require('@tauri-apps/cli-linux-arm-musleabihf')
}
} catch (e) {
loadError = e
}
} else {
localFileExisted = existsSync(
join(__dirname, 'cli.linux-arm-gnueabihf.node')
)
try {
if (localFileExisted) {
nativeBinding = require('./cli.linux-arm-gnueabihf.node')
} else {
nativeBinding = require('@tauri-apps/cli-linux-arm-gnueabihf')
}
} catch (e) {
loadError = e
}
}
break
case 'riscv64':
if (isMusl()) {
localFileExisted = existsSync(
join(__dirname, 'cli.linux-riscv64-musl.node')
)
try {
if (localFileExisted) {
nativeBinding = require('./cli.linux-riscv64-musl.node')
} else {
nativeBinding = require('@tauri-apps/cli-linux-riscv64-musl')
}
} catch (e) {
loadError = e
}
} else {
localFileExisted = existsSync(
join(__dirname, 'cli.linux-riscv64-gnu.node')
)
try {
if (localFileExisted) {
nativeBinding = require('./cli.linux-riscv64-gnu.node')
} else {
nativeBinding = require('@tauri-apps/cli-linux-riscv64-gnu')
}
} catch (e) {
loadError = e
}
}
break
case 's390x':
localFileExisted = existsSync(
join(__dirname, 'cli.linux-arm-gnueabihf.node')
join(__dirname, 'cli.linux-s390x-gnu.node')
)
try {
if (localFileExisted) {
nativeBinding = require('./cli.linux-arm-gnueabihf.node')
nativeBinding = require('./cli.linux-s390x-gnu.node')
} else {
nativeBinding = require('@tauri-apps/cli-linux-arm-gnueabihf')
nativeBinding = require('@tauri-apps/cli-linux-s390x-gnu')
}
} catch (e) {
loadError = e
6 changes: 5 additions & 1 deletion packages/cli/test/jest/__tests__/template.spec.js
Original file line number Diff line number Diff line change
@@ -36,7 +36,11 @@ describe('[CLI] @tauri-apps/cli template', () => {
process.cwd(),
'--force',
'--tauri-path',
resolve(currentDirName, '../../../../../..'),
resolve(currentDirName, '../../../../..'),
'--before-build-command',
'',
'--before-dev-command',
'',
'--ci'
])