Skip to content

Commit c20f397

Browse files
authored
Merge branch 'tauri-apps:v2' into updates-2508
2 parents b0f205a + a7cc2f8 commit c20f397

File tree

5 files changed

+63
-53
lines changed

5 files changed

+63
-53
lines changed

packages/cli-generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "",
1313
"license": "MIT",
1414
"dependencies": {
15-
"@tauri-apps/cli": "2.7.1",
15+
"@tauri-apps/cli": "2.8.3",
1616
"@types/node": "^22.0.0",
1717
"github-slugger": "^2.0.0",
1818
"tsm": "^2.3.0",

packages/js-api-generator/build.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
type MarkdownApplication,
1616
type PluginOptions,
1717
} from 'typedoc-plugin-markdown';
18-
import { existsSync } from 'node:fs';
18+
import { existsSync, readFileSync, writeFileSync } from 'node:fs';
1919

2020
const typeDocConfigBaseOptions: Partial<TypeDocOptions | PluginOptions> = {
2121
// TypeDoc options
@@ -88,6 +88,16 @@ async function generator() {
8888
];
8989

9090
if (existsSync('../plugins-workspace/node_modules')) {
91+
// TODO: Actually fix this
92+
const data = readFileSync('../plugins-workspace/plugins/fs/guest-js/index.ts', {
93+
encoding: 'utf8',
94+
});
95+
writeFileSync(
96+
'../plugins-workspace/plugins/fs/guest-js/index.ts',
97+
data.replace(/Uint8Array<ArrayBuffer>/g, 'Uint8Array'),
98+
{ encoding: 'utf8' }
99+
);
100+
91101
plugins.forEach(async (plugin) => {
92102
const pluginJsOptions: Partial<TypeDocOptions> = {
93103
entryPoints: [`../plugins-workspace/plugins/${plugin}/guest-js/index.ts`],

packages/plugins-workspace

Submodule plugins-workspace updated 141 files

packages/tauri

Submodule tauri updated 79 files

pnpm-lock.yaml

Lines changed: 49 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)