From 5ea7d046f991c7dca3e9044b522ddb40c1e240a6 Mon Sep 17 00:00:00 2001 From: "Yuichiro Tachibana (Tsuchiya)" Date: Sun, 28 Apr 2024 02:07:47 +0900 Subject: [PATCH] Bundle yargs and fs-extra into the dump command --- packages/desktop/bin-src/dump_artifacts/index.ts | 2 +- packages/desktop/package.json | 8 ++++---- yarn.lock | 15 +++------------ 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/packages/desktop/bin-src/dump_artifacts/index.ts b/packages/desktop/bin-src/dump_artifacts/index.ts index 425a99740..32d291b2c 100755 --- a/packages/desktop/bin-src/dump_artifacts/index.ts +++ b/packages/desktop/bin-src/dump_artifacts/index.ts @@ -3,7 +3,7 @@ import yargs from "yargs"; import { hideBin } from "yargs/helpers"; import path from "node:path"; -import fsPromises from "fs/promises"; +import fsPromises from "node:fs/promises"; import fsExtra from "fs-extra"; import fetch from "node-fetch"; import { loadPyodide, type PyodideInterface } from "pyodide"; diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 4c8253d20..2e77e34ca 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -61,10 +61,8 @@ }, "//": "The packages not bundled with bin/dump_artifacts.js must be specified here as the runtime dependencies. See `scripts/build_bin.js` for the details.", "dependencies": { - "fs-extra": "^11.2.0", "node-fetch": "2", - "pyodide": "0.25.0", - "yargs": "^17.7.2" + "pyodide": "0.25.0" }, "devDependencies": { "@craco/craco": "^7.0.0", @@ -84,6 +82,7 @@ "electron-builder": "^24.9.1", "electron-reload": "^2.0.0-alpha.1", "esbuild": "^0.20.0", + "fs-extra": "^11.2.0", "glob": "^10.3.12", "parquet-wasm": "^0.4.0", "raw-loader": "^4.0.2", @@ -93,7 +92,8 @@ "react-toastify": "^9.1.1", "superstruct": "^1.0.4", "ts-node": "^10.9.1", - "typescript": "^4.9.4" + "typescript": "^4.9.4", + "yargs": "^17.7.2" }, "///": "build.productName is necessary because electron-builder uses the package name for its purpose but the scoped name including '@' makes a problem: https://github.com/electron-userland/electron-builder/issues/3230", "build": { diff --git a/yarn.lock b/yarn.lock index 49179562a..01b0cd416 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5383,7 +5383,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.2.0": +"@types/react@*", "@types/react@^17", "@types/react@^17.0.7", "@types/react@^18.2.0": version "18.2.65" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.65.tgz#54eb311fa9aba173c9e163d42ec188d5a42878b8" integrity sha512-98TsY0aW4jqx/3RqsUXwMDZSWR1Z4CUlJNue8ueS2/wcxZOsz4xmW1X8ieaWVRHcmmQM3R8xVA4XWB3dJnWwDQ== @@ -5392,15 +5392,6 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@^17", "@types/react@^17.0.7": - version "17.0.80" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.80.tgz#a5dfc351d6a41257eb592d73d3a85d3b7dbcbb41" - integrity sha512-LrgHIu2lEtIo8M7d1FcI3BdwXWoRQwMoXOZ7+dPTW0lYREjmlHl3P0U1VD0i/9tppOuv8/sam7sOjx34TxSFbA== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "^0.16" - csstype "^3.0.2" - "@types/reactcss@*": version "1.2.11" resolved "https://registry.yarnpkg.com/@types/reactcss/-/reactcss-1.2.11.tgz#bfeadb67a704b4dba24c6c58d3c0e5cf87a0cb1b" @@ -5427,7 +5418,7 @@ resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== -"@types/scheduler@*", "@types/scheduler@^0.16": +"@types/scheduler@*": version "0.16.8" resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff" integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A== @@ -12868,7 +12859,7 @@ immer@^9.0.19, immer@^9.0.7: resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176" integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA== -immutable@^4.0.0: +immutable@4.2.3, immutable@^4.0.0: version "4.2.3" resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.3.tgz#a203cdda37a5a30bc351b982a1794c1930198815" integrity sha512-IHpmvaOIX4VLJwPOuQr1NpeBr2ZG6vpIj3blsLVxXRWJscLioaJRStqC+NcBsLeCDsnGlPpXd5/WZmnE7MbsKA==