Skip to content

Commit 25a30d2

Browse files
Suhayb-ASuhayb-A
authored
Merge pull request #19 from mapmanager/dev
Moved from create react app to Vite! Refined the UI, simplified the loader, bug fixes, package updates & more
2 parents 2a4f2e8 + ae7e600 commit 25a30d2

44 files changed

Lines changed: 4646 additions & 10507 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MapManagerCore‎

Submodule MapManagerCore updated 30 files

‎build_python.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ fi
1515

1616
rm -rf ./public/py/* || true
1717

18+
# TODO: Consider Pulling bioio and embed it!
19+
# TODO: Consider adding another
20+
1821
python -m build --wheel --sdist ./MapManagerCore/ --outdir ./public/py/
1922

2023
WHEEL_FILE=$(basename ./public/py/*.whl)

‎config-overrides.js‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎index.html‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<link rel="icon" href="/favicon.ico" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1" />
7+
<meta name="theme-color" content="#000000" />
8+
<meta
9+
name="description"
10+
content="Web Map Manager"
11+
/>
12+
<script src="https://cdn.jsdelivr.net/pyodide/v0.27.2/full/pyodide.js"></script>
13+
<link rel="apple-touch-icon" href="/logo192.png" />
14+
<link rel="manifest" href="/manifest.json" />
15+
<link rel="stylesheet" href="/src/index.css" />
16+
<script type="module" src="/src/index.tsx"></script>
17+
<title>Web Map Manager</title>
18+
</head>
19+
<body>
20+
<noscript>You need to enable JavaScript to run this app.</noscript>
21+
<div class="layout">
22+
<div id="main-view"></div>
23+
</div>
24+
</body>
25+
</html>

‎next-env.d.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/// <reference types="next" />
2+
/// <reference types="next/image-types/global" />
3+
4+
// NOTE: This file should not be edited
5+
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

‎next.config.mjs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/** @type {import('next').NextConfig} */
2+
const nextConfig = {
3+
output: "export", // Outputs a Single-Page Application (SPA).
4+
distDir: "./build", // Changes the build output directory to `./build`.
5+
};
6+
7+
export default nextConfig;

‎package.json‎

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
{
22
"name": "map-manager",
33
"version": "0.1.0",
4+
"type": "module",
45
"private": true,
56
"dependencies": {
6-
"@deck.gl/core": "^8",
7-
"@deck.gl/extensions": "^8",
8-
"@deck.gl/geo-layers": "^8",
9-
"@deck.gl/layers": "^8",
10-
"@deck.gl/mesh-layers": "^8",
11-
"@deck.gl/react": "^8.9.33",
12-
"@hms-dbmi/viv": "^0.16.1",
13-
"@loaders.gl/schema": "^4",
14-
"@luma.gl/core": "^8.5.21",
15-
"@preact/signals-react": "^2.2",
16-
"@types/d3": "^7.4.3",
17-
"@types/jest": "^29",
18-
"@types/jszip": "^3.4.1",
19-
"@types/node": "^22",
20-
"@types/react": "^18.3.11",
21-
"@types/react-dom": "^18.3.0",
7+
"@deck.gl/extensions": "=9.0.41",
8+
"@deck.gl/geo-layers": "=9.0.41",
9+
"@deck.gl/layers": "=9.0.41",
10+
"@deck.gl/mesh-layers": "=9.0.41",
11+
"@hms-dbmi/viv": "^0.17.0",
12+
"@luma.gl/core": "=9.0.28",
13+
"@luma.gl/engine": "=9.0.28",
14+
"@luma.gl/shadertools": "=9.0.28",
15+
"@preact/signals-react": "^3.0.1",
16+
"assert": "^2.1.0",
17+
"autoprefixer": "^10.4.20",
18+
"buffer": "^6.0.3",
2219
"d3": "^7.9.0",
23-
"flexlayout-react": "^0.8",
20+
"deck.gl": "=9.0.41",
21+
"flexlayout-react": "^0.8.1",
2422
"geotiff": "^2.1.3",
23+
"intro.js": "^7.2.0",
2524
"lodash": "^4.17.21",
26-
"plotly.js": "^2.35.2",
27-
"pyodide": "^0.26.4",
28-
"react": "^18.3.1",
25+
"plotly.js": "^3.0.0",
26+
"pyodide": "^0.27.2",
27+
"react": "^19.0.0",
2928
"react-color": "^2.19.3",
30-
"react-dom": "^18.3.1",
29+
"react-dom": "^19.0.0",
3130
"react-draggable": "^4.4.6",
3231
"react-dropzone": "^14.2.9",
3332
"react-icons": "^5",
3433
"react-plotly.js": "^2.6.0",
35-
"react-scripts": "^5.0.1",
3634
"react-use": "^17.5.1",
37-
"rsuite": "^5.71.0",
35+
"rsuite": "^5.77.1",
36+
"stream-browserify": "3.0.0",
37+
"use-resize-observer": "^9.1.0",
38+
"vite": "^6.1.0",
39+
"vite-tsconfig-paths": "^5.1.4",
3840
"web-vitals": "^4",
3941
"zip": "^1.2.0"
4042
},
4143
"scripts": {
42-
"start": "concurrently \"npm run watch-python\" \"react-app-rewired start\"",
43-
"build": "GENERATE_SOURCEMAP=false react-app-rewired build",
44+
"start": "concurrently \"npm run watch-python\" \"vite\"",
45+
"build": "GENERATE_SOURCEMAP=false vite build",
4446
"watch-python": "nodemon -V --watch ./MapManagerCore/mapmanagercore --ext py --ignore './MapManagerCore/mapmanagercore/_version.py' --exec 'npm run build-python' ",
4547
"build-python": "./build_python.sh",
46-
"test": "react-app-rewired test",
47-
"eject": "react-scripts eject"
48+
"preview": "vite preview"
4849
},
49-
"homepage": "/WebMapManager/",
5050
"eslintConfig": {
5151
"extends": [
5252
"react-app",
@@ -68,24 +68,35 @@
6868
"devDependencies": {
6969
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
7070
"@babel/plugin-syntax-import-attributes": "^7.25.7",
71+
"@preact/signals-react-transform": "^0.5.1",
72+
"@tailwindcss/vite": "^4.0.6",
73+
"@types/d3": "^7.4.3",
74+
"@types/jest": "^29",
75+
"@types/jszip": "^3.4.0",
76+
"@types/node": "^22",
77+
"@types/react": "^19.0.8",
7178
"@types/react-color": "^3.0.12",
79+
"@types/react-dom": "^19.0.3",
7280
"@types/react-grid-layout": "^1.3.5",
7381
"@types/react-plotly.js": "^2.6.3",
82+
"@vitejs/plugin-react": "^4.3.4",
83+
"concurrently": "^9.1.2",
84+
"customize-cra": "^1.0.0",
7485
"nodemon": "^3.1.9",
7586
"raw-loader": "^4.0.2",
76-
"react": "^18.3.1",
87+
"react": "^19.0.0",
7788
"react-app-rewired": "^2.2.1",
7889
"sass": "^1.79.4",
79-
"typescript": "5.1.6",
80-
"concurrently": "^9.1.2"
90+
"tailwindcss": "^4.0.6",
91+
"typescript": "5.7.3"
8192
},
8293
"overrides": {
8394
"@vivjs/viewers": {
84-
"react": "^18.2.0",
85-
"@deck.gl/react": "8.9.33"
95+
"react": "^19.0.0",
96+
"@deck.gl/react": "^9.1.0"
8697
},
8798
"@deck.gl/react": {
88-
"react": "^18.2.0"
99+
"react": "^19.0.0"
89100
}
90101
}
91102
}

‎public/icon.png‎

33.1 KB
Loading

‎public/index.html‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎setupProxy.js‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)