From abe7c3983931c8dbb7b730a5b77559c9d1c43add Mon Sep 17 00:00:00 2001 From: c-bata Date: Wed, 7 Aug 2024 19:18:43 +0900 Subject: [PATCH 1/2] Remove recoil dependency from @optuna/storage --- optuna_dashboard/package-lock.json | 25 +----------------- standalone_app/package-lock.json | 3 +-- tslib/react/package-lock.json | 27 +------------------- tslib/react/package.json | 3 +-- tslib/react/src/utils/loadStorageFromFile.ts | 3 ++- 5 files changed, 6 insertions(+), 55 deletions(-) diff --git a/optuna_dashboard/package-lock.json b/optuna_dashboard/package-lock.json index 0513b6c2..a26d6e09 100644 --- a/optuna_dashboard/package-lock.json +++ b/optuna_dashboard/package-lock.json @@ -76,8 +76,7 @@ "@tanstack/react-table": "^8.17.3", "plotly.js-dist-min": "^2.30.1", "react": "^18.2.0", - "react-dom": "^18.2.0", - "recoil": "^0.7.7" + "react-dom": "^18.2.0" }, "devDependencies": { "@optuna/types": "file:../types", @@ -7185,10 +7184,6 @@ "gunzip-maybe": "bin.js" } }, - "../tslib/react/node_modules/hamt_plus": { - "version": "1.0.2", - "license": "MIT" - }, "../tslib/react/node_modules/handlebars": { "version": "4.7.8", "dev": true, @@ -9943,24 +9938,6 @@ "dev": true, "license": "0BSD" }, - "../tslib/react/node_modules/recoil": { - "version": "0.7.7", - "license": "MIT", - "dependencies": { - "hamt_plus": "1.0.2" - }, - "peerDependencies": { - "react": ">=16.13.1" - }, - "peerDependenciesMeta": { - "react-dom": { - "optional": true - }, - "react-native": { - "optional": true - } - } - }, "../tslib/react/node_modules/redent": { "version": "3.0.0", "dev": true, diff --git a/standalone_app/package-lock.json b/standalone_app/package-lock.json index 67c7ef31..a90f2302 100644 --- a/standalone_app/package-lock.json +++ b/standalone_app/package-lock.json @@ -60,8 +60,7 @@ "@tanstack/react-table": "^8.17.3", "plotly.js-dist-min": "^2.30.1", "react": "^18.2.0", - "react-dom": "^18.2.0", - "recoil": "^0.7.7" + "react-dom": "^18.2.0" }, "devDependencies": { "@optuna/types": "file:../types", diff --git a/tslib/react/package-lock.json b/tslib/react/package-lock.json index 1ef5fac4..513fca4d 100644 --- a/tslib/react/package-lock.json +++ b/tslib/react/package-lock.json @@ -19,8 +19,7 @@ "@tanstack/react-table": "^8.17.3", "plotly.js-dist-min": "^2.30.1", "react": "^18.2.0", - "react-dom": "^18.2.0", - "recoil": "^0.7.7" + "react-dom": "^18.2.0" }, "devDependencies": { "@optuna/types": "file:../types", @@ -8409,11 +8408,6 @@ "gunzip-maybe": "bin.js" } }, - "node_modules/hamt_plus": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hamt_plus/-/hamt_plus-1.0.2.tgz", - "integrity": "sha512-t2JXKaehnMb9paaYA7J0BX8QQAY8lwfQ9Gjf4pg/mk4krt+cmwmU652HOoWonf+7+EQV97ARPMhhVgU1ra2GhA==" - }, "node_modules/handlebars": { "version": "4.7.8", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", @@ -11430,25 +11424,6 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", "dev": true }, - "node_modules/recoil": { - "version": "0.7.7", - "resolved": "https://registry.npmjs.org/recoil/-/recoil-0.7.7.tgz", - "integrity": "sha512-8Og5KPQW9LwC577Vc7Ug2P0vQshkv1y3zG3tSSkWMqkWSwHmE+by06L8JtnGocjW6gcCvfwB3YtrJG6/tWivNQ==", - "dependencies": { - "hamt_plus": "1.0.2" - }, - "peerDependencies": { - "react": ">=16.13.1" - }, - "peerDependenciesMeta": { - "react-dom": { - "optional": true - }, - "react-native": { - "optional": true - } - } - }, "node_modules/redent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", diff --git a/tslib/react/package.json b/tslib/react/package.json index cbb072c8..df193489 100644 --- a/tslib/react/package.json +++ b/tslib/react/package.json @@ -36,8 +36,7 @@ "@tanstack/react-table": "^8.17.3", "plotly.js-dist-min": "^2.30.1", "react": "^18.2.0", - "react-dom": "^18.2.0", - "recoil": "^0.7.7" + "react-dom": "^18.2.0" }, "devDependencies": { "@optuna/types": "file:../types", diff --git a/tslib/react/src/utils/loadStorageFromFile.ts b/tslib/react/src/utils/loadStorageFromFile.ts index eac68ac4..abc298b9 100644 --- a/tslib/react/src/utils/loadStorageFromFile.ts +++ b/tslib/react/src/utils/loadStorageFromFile.ts @@ -1,6 +1,7 @@ import { JournalFileStorage, SQLite3Storage } from "@optuna/storage" import * as Optuna from "@optuna/types" -import { SetterOrUpdater } from "recoil" + +type SetterOrUpdater = (valOrUpdater: ((currVal: T) => T) | T) => void const readFile = async (file: File) => { return new Promise((resolve, reject) => { From 91faf1b33df5f120de849830054179a86a8f8dda Mon Sep 17 00:00:00 2001 From: c-bata Date: Wed, 7 Aug 2024 19:40:12 +0900 Subject: [PATCH 2/2] Remoev @optuna/storage dependency from @optuna/react --- optuna_dashboard/package-lock.json | 4 +++- standalone_app/package-lock.json | 2 +- tslib/react/package-lock.json | 3 ++- tslib/react/package.json | 2 +- tslib/react/{src/utils => test}/loadStorageFromFile.ts | 0 tslib/react/test/setup_studies.ts | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) rename tslib/react/{src/utils => test}/loadStorageFromFile.ts (100%) diff --git a/optuna_dashboard/package-lock.json b/optuna_dashboard/package-lock.json index a26d6e09..247fb1cf 100644 --- a/optuna_dashboard/package-lock.json +++ b/optuna_dashboard/package-lock.json @@ -72,13 +72,13 @@ "@mui/lab": "^5.0.0-alpha.170", "@mui/material": "^5.15.10", "@mui/system": "^5.15.9", - "@optuna/storage": "file:../storage", "@tanstack/react-table": "^8.17.3", "plotly.js-dist-min": "^2.30.1", "react": "^18.2.0", "react-dom": "^18.2.0" }, "devDependencies": { + "@optuna/storage": "file:../storage", "@optuna/types": "file:../types", "@storybook/addon-essentials": "^8.0.4", "@storybook/addon-interactions": "^8.0.4", @@ -12065,6 +12065,7 @@ "../tslib/storage": { "name": "@optuna/storage", "version": "0.0.1", + "dev": true, "license": "MIT", "dependencies": { "@sqlite.org/sqlite-wasm": "^3.45.1-build1" @@ -12080,6 +12081,7 @@ }, "../tslib/storage/node_modules/@sqlite.org/sqlite-wasm": { "version": "3.45.1-build1", + "dev": true, "license": "Apache-2.0", "bin": { "sqlite-wasm": "bin/index.js" diff --git a/standalone_app/package-lock.json b/standalone_app/package-lock.json index a90f2302..9ee8c8d7 100644 --- a/standalone_app/package-lock.json +++ b/standalone_app/package-lock.json @@ -56,13 +56,13 @@ "@mui/lab": "^5.0.0-alpha.170", "@mui/material": "^5.15.10", "@mui/system": "^5.15.9", - "@optuna/storage": "file:../storage", "@tanstack/react-table": "^8.17.3", "plotly.js-dist-min": "^2.30.1", "react": "^18.2.0", "react-dom": "^18.2.0" }, "devDependencies": { + "@optuna/storage": "file:../storage", "@optuna/types": "file:../types", "@storybook/addon-essentials": "^8.0.4", "@storybook/addon-interactions": "^8.0.4", diff --git a/tslib/react/package-lock.json b/tslib/react/package-lock.json index 513fca4d..a0ef388c 100644 --- a/tslib/react/package-lock.json +++ b/tslib/react/package-lock.json @@ -15,13 +15,13 @@ "@mui/lab": "^5.0.0-alpha.170", "@mui/material": "^5.15.10", "@mui/system": "^5.15.9", - "@optuna/storage": "file:../storage", "@tanstack/react-table": "^8.17.3", "plotly.js-dist-min": "^2.30.1", "react": "^18.2.0", "react-dom": "^18.2.0" }, "devDependencies": { + "@optuna/storage": "file:../storage", "@optuna/types": "file:../types", "@storybook/addon-essentials": "^8.0.4", "@storybook/addon-interactions": "^8.0.4", @@ -46,6 +46,7 @@ "../storage": { "name": "@optuna/storage", "version": "0.0.1", + "dev": true, "license": "MIT", "dependencies": { "@sqlite.org/sqlite-wasm": "^3.45.1-build1" diff --git a/tslib/react/package.json b/tslib/react/package.json index df193489..bb920b8c 100644 --- a/tslib/react/package.json +++ b/tslib/react/package.json @@ -32,7 +32,6 @@ "@mui/lab": "^5.0.0-alpha.170", "@mui/material": "^5.15.10", "@mui/system": "^5.15.9", - "@optuna/storage": "file:../storage", "@tanstack/react-table": "^8.17.3", "plotly.js-dist-min": "^2.30.1", "react": "^18.2.0", @@ -40,6 +39,7 @@ }, "devDependencies": { "@optuna/types": "file:../types", + "@optuna/storage": "file:../storage", "@storybook/addon-essentials": "^8.0.4", "@storybook/addon-interactions": "^8.0.4", "@storybook/addon-links": "^8.0.4", diff --git a/tslib/react/src/utils/loadStorageFromFile.ts b/tslib/react/test/loadStorageFromFile.ts similarity index 100% rename from tslib/react/src/utils/loadStorageFromFile.ts rename to tslib/react/test/loadStorageFromFile.ts diff --git a/tslib/react/test/setup_studies.ts b/tslib/react/test/setup_studies.ts index e3c77059..905d448d 100644 --- a/tslib/react/test/setup_studies.ts +++ b/tslib/react/test/setup_studies.ts @@ -1,6 +1,6 @@ import fs from "node:fs" import * as Optuna from "@optuna/types" -import { loadStorageFromFile } from "../src/utils/loadStorageFromFile" +import { loadStorageFromFile } from "./loadStorageFromFile" declare global { interface Window {