Skip to content

Commit e94b8f0

Browse files
committed
Added local links to web dependencies
1 parent 58551c4 commit e94b8f0

File tree

5 files changed

+1167
-9944
lines changed

5 files changed

+1167
-9944
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "bundledDeps/cesium-martini"]
22
path = packages/cesium-martini
33
url = https://github.com/davenquinn/cesium-martini.git
4-
[submodule "deps/ui-components"]
5-
path = deps/web-components
6-
url = https://github.com/UW-Macrostrat/web-components.git

deps/web-components

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,23 @@
6565
"@macrostrat-web/sift": "workspace:*",
6666
"@macrostrat-web/text-toolchain": "workspace:*",
6767
"@macrostrat-web/utility-functions": "workspace:*",
68-
"@macrostrat/api-utils": "workspace:*",
69-
"@macrostrat/api-views": "workspace:*",
70-
"@macrostrat/auth-components": "workspace:*",
71-
"@macrostrat/color-utils": "workspace:*",
72-
"@macrostrat/column-components": "workspace:*",
73-
"@macrostrat/column-views": "workspace:*",
68+
"@macrostrat/api-types": "^1.0.0",
69+
"@macrostrat/color-utils": "^1.0.0",
70+
"@macrostrat/column-components": "^1.0.0",
71+
"@macrostrat/column-views": "^1.0.0",
7472
"@macrostrat/corelle": "^2.0.1",
75-
"@macrostrat/data-components": "workspace:*",
76-
"@macrostrat/data-sheet2": "workspace:*",
77-
"@macrostrat/feedback-components": "workspace:*",
73+
"@macrostrat/data-components": "^0.0.5",
74+
"@macrostrat/data-sheet": "^2.0.0",
75+
"@macrostrat/feedback-components": "^1.1.0",
7876
"@macrostrat/hyper": "^2.2.1",
79-
"@macrostrat/map-components": "workspace:*",
80-
"@macrostrat/map-interface": "workspace:*",
81-
"@macrostrat/mapbox-react": "workspace:^2.1.0",
82-
"@macrostrat/mapbox-styles": "workspace:*",
83-
"@macrostrat/mapbox-utils": "workspace:*",
84-
"@macrostrat/style-system": "workspace:*",
85-
"@macrostrat/timescale": "workspace:*",
86-
"@macrostrat/ui-components": "workspace:*",
77+
"@macrostrat/map-interface": "^1.1.0",
78+
"@macrostrat/map-styles": "^1.0.3",
79+
"@macrostrat/mapbox-react": "^2.4.0",
80+
"@macrostrat/mapbox-utils": "^1.3.2",
81+
"@macrostrat/style-system": "^0.2.0",
82+
"@macrostrat/svg-map-components": "^1.0.0",
83+
"@macrostrat/timescale": "^2.1.0",
84+
"@macrostrat/ui-components": "^4.1.0",
8785
"@react-hook/size": "^2.1.2",
8886
"@supabase/postgrest-js": "^1.11.0",
8987
"@turf/bbox": "^6.5.0",
@@ -161,7 +159,26 @@
161159
},
162160
"resolutions": {
163161
"cesium": "^1.123.1",
164-
"resium:": "1.17.1"
162+
"resium:": "1.17.1",
163+
"@macrostrat/api-types": "portal:../web-components/packages/api-types",
164+
"@macrostrat/color-utils": "portal:../web-components/packages/color-utils",
165+
"@macrostrat/column-components": "portal:../web-components/packages/column-components",
166+
"@macrostrat/column-views": "portal:../web-components/packages/column-views",
167+
"@macrostrat/data-components": "portal:../web-components/packages/data-components",
168+
"@macrostrat/data-sheet": "portal:../web-components/packages/data-sheet",
169+
"@macrostrat/feedback-components": "portal:../web-components/packages/feedback-components",
170+
"@macrostrat/form-components": "portal:../web-components/packages/form-components",
171+
"@macrostrat/map-interface": "portal:../web-components/packages/map-interface",
172+
"@macrostrat/map-styles": "portal:../web-components/packages/map-styles",
173+
"@macrostrat/mapbox-react": "portal:../web-components/packages/mapbox-react",
174+
"@macrostrat/mapbox-utils": "portal:../web-components/packages/mapbox-utils",
175+
"@macrostrat/stratigraphy-utils": "portal:../web-components/packages/stratigraphy-utils",
176+
"@macrostrat/style-system": "portal:../web-components/packages/style-system",
177+
"@macrostrat/svg-map-components": "portal:../web-components/packages/svg-map-components",
178+
"@macrostrat/timescale": "portal:../web-components/packages/timescale",
179+
"@macrostrat/ui-components": "portal:../web-components/packages/ui-components",
180+
"@macrostrat/hyperstyle-loader": "portal:../web-components/toolchain/hyperstyle-loader",
181+
"@macrostrat/vite-plugin-hyperstyles": "portal:../web-components/toolchain/vite-plugin-hyperstyles"
165182
},
166183
"prettier": {
167184
"proseWrap": "always"

vite.config.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,6 @@ import pkg from "./package.json";
1010
// Non-transpiled typescript can't be imported as a standalone package
1111
import textToolchain from "./packages/text-toolchain/src";
1212

13-
const aliasedModules = [
14-
"ui-components",
15-
"column-components",
16-
"api-types",
17-
"api-views",
18-
"column-views",
19-
"timescale",
20-
"map-interface",
21-
"mapbox-utils",
22-
"mapbox-react",
23-
"mapbox-styles",
24-
"map-components",
25-
"data-components",
26-
];
27-
2813
const gitEnv = revisionInfo(pkg, "https://github.com/UW-Macrostrat/web");
2914
// prefix with VITE_ to make available to client
3015
for (const [key, value] of Object.entries(gitEnv)) {
@@ -67,7 +52,6 @@ export default defineConfig({
6752
"~": path.resolve("./src"),
6853
"#": path.resolve("./pages"),
6954
},
70-
dedupe: [...aliasedModules.map((d) => "@macrostrat/" + d)],
7155
},
7256
plugins: [
7357
react(),

0 commit comments

Comments
 (0)