Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Clarify WASM build scripts

Manav Rathicc330c499f26
diff --git a/.github/workflows/ensu-build.yml b/.github/workflows/ensu-build.yml
index 9ebee68820..d6067a1160 100644
--- a/.github/workflows/ensu-build.yml
+++ b/.github/workflows/ensu-build.yml
@@ -153,7 +153,7 @@ jobs:
- name: Build WASM
working-directory: web
- run: npm run build:wasm
+ run: npm run build:core-wasm
- name: Install Tauri dependencies
run: npm ci --prefix rust/apps/ensu
diff --git a/.github/workflows/warm-caches.yml b/.github/workflows/warm-caches.yml
index 07be34fcb2..4b32756de0 100644
--- a/.github/workflows/warm-caches.yml
+++ b/.github/workflows/warm-caches.yml
@@ -114,10 +114,6 @@ jobs:
- run: npm run build:wasm
- - run: npm run build:cast-wasm
-
- - run: npm run build:space-wasm
-
photos-desktop-ensu-android:
# For desktop-lint.yml and ensu-android-build.yml.
runs-on: ubuntu-latest
diff --git a/.github/workflows/web-lint.yml b/.github/workflows/web-lint.yml
index dcf62edb9d..ca5abe8a20 100644
--- a/.github/workflows/web-lint.yml
+++ b/.github/workflows/web-lint.yml
@@ -52,12 +52,6 @@ jobs:
- run: npm run build:wasm
- - run: npm run build:cast-wasm
-
- - run: npm run build:paste-wasm
-
- - run: npm run build:space-wasm
-
- run: npm run lint
- run: npm test
diff --git a/rust/apps/ensu/scripts/tauri-dev.mjs b/rust/apps/ensu/scripts/tauri-dev.mjs
index 7c3c22f2fc..8141018722 100644
--- a/rust/apps/ensu/scripts/tauri-dev.mjs
+++ b/rust/apps/ensu/scripts/tauri-dev.mjs
@@ -18,7 +18,7 @@ const desktopVersion = config.version;
if (!desktopVersion) throw new Error("Missing Ensu desktop version");
config.build = config.build || {};
-config.build.beforeDevCommand = `node ../../../web/scripts/check-deps.mjs && cd ../../../web && npm run build:wasm && NEXT_PUBLIC_ENSU_DESKTOP_VERSION=${desktopVersion} npm exec --workspace ensu -- next dev --webpack -p ${port}`;
+config.build.beforeDevCommand = `node ../../../web/scripts/check-deps.mjs && cd ../../../web && npm run build:core-wasm && NEXT_PUBLIC_ENSU_DESKTOP_VERSION=${desktopVersion} npm exec --workspace ensu -- next dev --webpack -p ${port}`;
config.build.devUrl = `http://localhost:${port}`;
await fs.writeFile(devConfigPath, JSON.stringify(config, null, 2));
diff --git a/rust/apps/ensu/src-tauri/tauri.conf.json b/rust/apps/ensu/src-tauri/tauri.conf.json
index 2059c978ba..f1fa91f32c 100644
--- a/rust/apps/ensu/src-tauri/tauri.conf.json
+++ b/rust/apps/ensu/src-tauri/tauri.conf.json
@@ -5,7 +5,7 @@
"identifier": "io.ente.ensu",
"mainBinaryName": "Ensu",
"build": {
- "beforeDevCommand": "node ../../../web/scripts/check-deps.mjs && cd ../../../web && npm run build:wasm && npm exec --workspace ensu -- next dev --webpack -p 3010",
+ "beforeDevCommand": "node ../../../web/scripts/check-deps.mjs && cd ../../../web && npm run build:core-wasm && npm exec --workspace ensu -- next dev --webpack -p 3010",
"beforeBuildCommand": "node scripts/tauri-build-web.mjs",
"devUrl": "http://localhost:3010",
"frontendDist": "../../../../web/apps/ensu/out"
diff --git a/web/package.json b/web/package.json
index 54f23ee631..29e5c9def1 100644
--- a/web/package.json
+++ b/web/package.json
@@ -9,40 +9,41 @@
],
"scripts": {
"build": "npm run build:photos",
- "build:accounts": "npm run build:wasm && npm exec --workspace accounts -- next build --webpack",
- "build:albums": "npm run build:wasm && npm exec --workspace albums -- next build --webpack",
- "build:auth": "npm run build:wasm && npm exec --workspace auth -- next build --webpack",
- "build:cast": "npm run build:wasm && npm run build:cast-wasm && npm exec --workspace cast -- next build --webpack",
+ "build:accounts": "npm run build:core-wasm && npm exec --workspace accounts -- next build --webpack",
+ "build:albums": "npm run build:core-wasm && npm exec --workspace albums -- next build --webpack",
+ "build:auth": "npm run build:core-wasm && npm exec --workspace auth -- next build --webpack",
+ "build:cast": "npm run build:core-wasm && npm run build:cast-wasm && npm exec --workspace cast -- next build --webpack",
"build:cast-wasm": "npm run build --workspace ente-cast-wasm",
- "build:embed": "npm run build:wasm && npm exec --workspace embed -- next build --webpack",
- "build:ensu": "npm run build:wasm && npm exec --workspace ensu -- next build --webpack",
- "build:legacy": "npm run build:wasm && npm exec --workspace legacy -- next build --webpack",
- "build:locker": "npm run build:wasm && npm exec --workspace locker -- next build --webpack",
- "build:memories": "npm run build:wasm && npm exec --workspace memories -- next build --webpack && npm run build:post --workspace memories",
+ "build:core-wasm": "npm run build --workspace ente-core-wasm",
+ "build:embed": "npm run build:core-wasm && npm exec --workspace embed -- next build --webpack",
+ "build:ensu": "npm run build:core-wasm && npm exec --workspace ensu -- next build --webpack",
+ "build:legacy": "npm run build:core-wasm && npm exec --workspace legacy -- next build --webpack",
+ "build:locker": "npm run build:core-wasm && npm exec --workspace locker -- next build --webpack",
+ "build:memories": "npm run build:core-wasm && npm exec --workspace memories -- next build --webpack && npm run build:post --workspace memories",
"build:paste": "npm run build:paste-wasm && npm exec --workspace paste -- next build --webpack && npm run build:post --workspace paste",
- "build:paste-wasm": "npm run build --workspace ente-paste-wasm -- --no-pack",
+ "build:paste-wasm": "npm run build --workspace ente-paste-wasm",
"build:payments": "npm run build --workspace payments",
- "build:photos": "npm run build:wasm && npm run build:cast-wasm && npm exec --workspace photos -- next build --webpack",
- "build:share": "npm run build:wasm && npm exec --workspace share -- next build --webpack && npm run build:post --workspace share",
- "build:space": "npm run build:wasm && npm run build:space-wasm && npm exec --workspace space -- next build --webpack && npm run build:post --workspace space",
- "build:space-wasm": "npm run build --workspace ente-space-wasm -- --no-pack",
+ "build:photos": "npm run build:core-wasm && npm run build:cast-wasm && npm exec --workspace photos -- next build --webpack",
+ "build:share": "npm run build:core-wasm && npm exec --workspace share -- next build --webpack && npm run build:post --workspace share",
+ "build:space": "npm run build:core-wasm && npm run build:space-wasm && npm exec --workspace space -- next build --webpack && npm run build:post --workspace space",
+ "build:space-wasm": "npm run build --workspace ente-space-wasm",
"build:twoof3": "npm exec --workspace twoof3 -- next build --webpack",
- "build:wasm": "npm run build --workspace ente-core-wasm -- --no-pack",
+ "build:wasm": "npm run build:core-wasm && npm run build:cast-wasm && npm run build:paste-wasm && npm run build:space-wasm",
"dev": "npm run dev:photos",
- "dev:accounts": "npm run build:wasm && npm exec --workspace accounts -- next dev --webpack -p 3001",
- "dev:albums": "npm run build:wasm && npm exec --workspace albums -- next dev --webpack -p 3002",
- "dev:auth": "npm run build:wasm && npm exec --workspace auth -- next dev --webpack -p 3003",
- "dev:cast": "npm run build:wasm && npm run build:cast-wasm && npm exec --workspace cast -- next dev --webpack -p 3004",
- "dev:embed": "npm run build:wasm && npm exec --workspace embed -- next dev --webpack -p 3006",
- "dev:ensu": "npm run build:wasm && npm exec --workspace ensu -- next dev --webpack -p 3007",
- "dev:legacy": "npm run build:wasm && npm exec --workspace legacy -- next dev --webpack -p 3011",
- "dev:locker": "npm run build:wasm && npm exec --workspace locker -- next dev --webpack -p 3009",
- "dev:memories": "npm run build:wasm && npm exec --workspace memories -- next dev --webpack -p 3010",
+ "dev:accounts": "npm run build:core-wasm && npm exec --workspace accounts -- next dev --webpack -p 3001",
+ "dev:albums": "npm run build:core-wasm && npm exec --workspace albums -- next dev --webpack -p 3002",
+ "dev:auth": "npm run build:core-wasm && npm exec --workspace auth -- next dev --webpack -p 3003",
+ "dev:cast": "npm run build:core-wasm && npm run build:cast-wasm && npm exec --workspace cast -- next dev --webpack -p 3004",
+ "dev:embed": "npm run build:core-wasm && npm exec --workspace embed -- next dev --webpack -p 3006",
+ "dev:ensu": "npm run build:core-wasm && npm exec --workspace ensu -- next dev --webpack -p 3007",
+ "dev:legacy": "npm run build:core-wasm && npm exec --workspace legacy -- next dev --webpack -p 3011",
+ "dev:locker": "npm run build:core-wasm && npm exec --workspace locker -- next dev --webpack -p 3009",
+ "dev:memories": "npm run build:core-wasm && npm exec --workspace memories -- next dev --webpack -p 3010",
"dev:paste": "npm run build:paste-wasm && npm exec --workspace paste -- next dev --webpack -p 3008",
"dev:payments": "npm run dev --workspace payments",
- "dev:photos": "npm run build:wasm && npm run build:cast-wasm && npm exec --workspace photos -- next dev --webpack -p 3000",
- "dev:share": "npm run build:wasm && npm exec --workspace share -- next dev --webpack -p 3005",
- "dev:space": "npm run build:wasm && npm run build:space-wasm && npm exec --workspace space -- next dev --webpack -p 3013",
+ "dev:photos": "npm run build:core-wasm && npm run build:cast-wasm && npm exec --workspace photos -- next dev --webpack -p 3000",
+ "dev:share": "npm run build:core-wasm && npm exec --workspace share -- next dev --webpack -p 3005",
+ "dev:space": "npm run build:core-wasm && npm run build:space-wasm && npm exec --workspace space -- next dev --webpack -p 3013",
"dev:twoof3": "npm exec --workspace twoof3 -- next dev --webpack -p 3012",
"lint": "concurrently --names 'prettier,eslint,tsc' \"prettier --check --log-level warn .\" \"npm exec --workspaces -- eslint --max-warnings 0\" \"npm exec --workspaces -- tsc\"",
"lint:fix": "concurrently --names 'prettier,eslint,tsc' \"prettier --write --log-level warn .\" \"npm exec --workspaces -- eslint --fix --max-warnings 0\" \"npm exec --workspaces -- tsc\"",
diff --git a/web/packages/wasm/core/package.json b/web/packages/wasm/core/package.json
index 3d3b6fa97b..1bdb112d35 100644
--- a/web/packages/wasm/core/package.json
+++ b/web/packages/wasm/core/package.json
@@ -15,7 +15,7 @@
"module": "./pkg/ente_core_wasm.js",
"types": "./pkg/ente_core_wasm.d.ts",
"scripts": {
- "build": "wasm-pack build ../../../../rust/bindings/wasm/core --target bundler --out-dir ../../../../web/packages/wasm/core/pkg",
+ "build": "wasm-pack build ../../../../rust/bindings/wasm/core --target bundler --out-dir ../../../../web/packages/wasm/core/pkg --no-pack",
"test": "vitest --run"
},
"devDependencies": {
diff --git a/web/packages/wasm/paste/package.json b/web/packages/wasm/paste/package.json
index ed790ac893..72d4c3b470 100644
--- a/web/packages/wasm/paste/package.json
+++ b/web/packages/wasm/paste/package.json
@@ -11,7 +11,7 @@
"module": "./index.ts",
"types": "./index.ts",
"scripts": {
- "build": "wasm-pack build ../../../../rust/bindings/wasm/paste --target bundler --out-dir ../../../../web/packages/wasm/paste/pkg",
+ "build": "wasm-pack build ../../../../rust/bindings/wasm/paste --target bundler --out-dir ../../../../web/packages/wasm/paste/pkg --no-pack",
"test": "vitest --run"
},
"dependencies": {
diff --git a/web/packages/wasm/space/package.json b/web/packages/wasm/space/package.json
index 7de4c1fb78..2e0df024ba 100644
--- a/web/packages/wasm/space/package.json
+++ b/web/packages/wasm/space/package.json
@@ -11,7 +11,7 @@
"module": "./index.ts",
"types": "./index.ts",
"scripts": {
- "build": "wasm-pack build ../../../../rust/bindings/wasm/space --target bundler --out-dir ../../../../web/packages/wasm/space/pkg"
+ "build": "wasm-pack build ../../../../rust/bindings/wasm/space --target bundler --out-dir ../../../../web/packages/wasm/space/pkg --no-pack"
},
"devDependencies": {
"ente-build-config": "*",