Resolve conflicts

This commit is contained in:
porink0424
2024-03-27 13:38:25 +09:00
parent d0dde67b45
commit 08016ddd60
10 changed files with 2432 additions and 7775 deletions
-6437
View File
File diff suppressed because it is too large Load Diff
+35 -35
View File
@@ -1,37 +1,37 @@
{
"name": "optuna-dashboard-wasm",
"private": true,
"version": "0.0.0",
"description": "",
"scripts": {
"watch": "vite",
"build:vscode": "webpack"
},
"devDependencies": {
"@types/plotly.js": "^2.29.2",
"@types/react": "^18.2.64",
"@types/react-dom": "^18.2.21",
"@types/react-router-dom": "^5.3.3",
"@vitejs/plugin-react": "^4.2.1",
"compression-webpack-plugin": "^11.1.0",
"esbuild-loader": "^4.0.3",
"vite": "^5.1.5",
"webpack": "^5.90.3",
"webpack-cli": "^5.1.4"
},
"dependencies": {
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.15.12",
"@mui/lab": "^5.0.0-alpha.167",
"@mui/material": "^5.15.12",
"@optuna/storage": "../tslib/storage",
"module-workers-polyfill": "^0.3.2",
"notistack": "^3.0.1",
"optuna": "../rustlib/pkg",
"plotly.js-dist-min": "^2.30.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.22.3"
}
"name": "optuna-dashboard-wasm",
"private": true,
"version": "0.0.0",
"description": "",
"scripts": {
"watch": "vite",
"build:vscode": "webpack"
},
"devDependencies": {
"@types/plotly.js": "^2.29.2",
"@types/react": "^18.2.64",
"@types/react-dom": "^18.2.21",
"@types/react-router-dom": "^5.3.3",
"@vitejs/plugin-react": "^4.2.1",
"compression-webpack-plugin": "^11.1.0",
"esbuild-loader": "^4.0.3",
"vite": "^5.1.5",
"webpack": "^5.90.3",
"webpack-cli": "^5.1.4"
},
"dependencies": {
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.15.12",
"@mui/lab": "^5.0.0-alpha.167",
"@mui/material": "^5.15.12",
"@optuna/storage": "../tslib/storage",
"module-workers-polyfill": "^0.3.2",
"notistack": "^3.0.1",
"optuna": "../rustlib/pkg",
"plotly.js-dist-min": "^2.30.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.22.3"
}
}
+1
View File
@@ -9,6 +9,7 @@ lerna-debug.log*
node_modules
pkg
types
# Editor directories and files
.vscode/*
+1 -1
View File
@@ -4,7 +4,7 @@
"enabled": true
},
"files": {
"ignore": ["node_modules", "src/components/PlotlyDarkMode.ts"]
"ignore": ["node_modules", "src/components/PlotlyDarkMode.ts", "pkg"]
},
"linter": {
"enabled": true,
+2338 -1283
View File
File diff suppressed because it is too large Load Diff
+15 -2
View File
@@ -1,8 +1,11 @@
{
"name": "tslib",
"name": "@optuna/storybook",
"private": true,
"version": "0.0.0",
"version": "0.0.1",
"type": "module",
"description": "UI Storybook for Optuna-Dashboard",
"main": "pkg/index.js",
"types": "types/index.d.ts",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
@@ -12,6 +15,16 @@
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
},
"repository": {
"type": "git",
"url": "git+https://github.com/optuna/optuna-dashboard.git"
},
"author": "Optuna Development Team",
"license": "MIT",
"bugs": {
"url": "https://github.com/optuna/optuna-dashboard/issues"
},
"homepage": "https://github.com/optuna/optuna-dashboard#readme",
"dependencies": {
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
+2
View File
@@ -0,0 +1,2 @@
export { DataGrid } from "./DataGrid";
export type { DataGridColumn } from "./DataGrid";
+1 -1
View File
@@ -1,6 +1,6 @@
import React from "react";
import ReactDOM from "react-dom/client";
import App from "./App.tsx";
import App from "./App";
import "./index.css";
const root = document.getElementById("root");
+20 -16
View File
@@ -1,25 +1,29 @@
{
"compilerOptions": {
"target": "ES2020",
"useDefineForClassFields": true,
"isolatedModules": true,
"skipLibCheck": true,
"strictNullChecks": true,
"moduleResolution": "Node",
"noUnusedLocals": true,
"noImplicitThis": true,
"alwaysStrict": true,
"noImplicitAny": true,
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"skipLibCheck": true,
/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
/* Linting */
"esModuleInterop": true,
"rootDir": "./src",
"outDir": "./pkg",
"allowSyntheticDefaultImports": true,
"target": "ES2020",
"sourceMap": true,
"emitDeclarationOnly": true,
"declaration": true,
"declarationDir": "./types",
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true
"noFallthroughCasesInSwitch": true,
"jsx": "react-jsx"
},
"include": ["src"],
"include": ["src/**/*.ts", "src/**/*.tsx"],
"references": [{ "path": "./tsconfig.node.json" }]
}
+19
View File
@@ -1,5 +1,6 @@
import react from "@vitejs/plugin-react-swc";
import { defineConfig } from "vite";
import { resolve } from "path";
// https://vitejs.dev/config/
export default defineConfig({
@@ -15,4 +16,22 @@ export default defineConfig({
exclude: ["@sqlite.org/sqlite-wasm"],
},
plugins: [react()],
build: {
lib: {
entry: resolve(__dirname, "src/components/index.ts"),
name: "@optuna/storybook",
fileName: "index",
},
rollupOptions: {
external: ["react", "react-dom"],
output: {
globals: {
react: "React",
"react-dom": "ReactDOM",
},
},
},
outDir: "pkg",
emptyOutDir: false,
}
});