Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,13 @@ jobs:
with:
node-version: 24
cache: npm
cache-dependency-path: explore/package-lock.json

- name: Cache Explore node_modules
id: explore-cache-node_modules
uses: actions/cache@v4
with:
path: node_modules
key: node_modules-${{ hashFiles('explore/package-lock.json') }}
key: node_modules-${{ hashFiles('package-lock.json') }}
restore-keys: node_modules

- name: npm clean-install
Expand Down Expand Up @@ -147,7 +146,6 @@ jobs:
node-version: 24
registry-url: 'https://registry.npmjs.org'
cache: npm
cache-dependency-path: schemas/package-lock.json

- name: NPM Publish
if: startsWith(github.ref, 'refs/tags/v')
Expand Down Expand Up @@ -213,14 +211,13 @@ jobs:
with:
node-version: 24
cache: npm
cache-dependency-path: explore/package-lock.json

- name: Cache Explore node_modules
id: explore-cache-node_modules
uses: actions/cache@v4
with:
path: node_modules
key: node_modules-${{ hashFiles('explore/package-lock.json') }}
key: node_modules-${{ hashFiles('package-lock.json') }}
restore-keys: node_modules

- name: npm clean-install
Expand Down Expand Up @@ -297,14 +294,13 @@ jobs:
with:
node-version: 24
cache: npm
cache-dependency-path: observe/web/client/package-lock.json

- name: Cache Observe node_modules
id: observe-cache-node_modules
uses: actions/cache@v4
with:
path: node_modules
key: node_modules-${{ hashFiles('observe/web/client/package-lock.json') }}
key: node_modules-${{ hashFiles('package-lock.json') }}
restore-keys: node_modules

- name: npm clean-install
Expand Down
File renamed without changes.
23 changes: 10 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ lazy val schemas_lib =
// Include schema files in jar.
Compile / unmanagedResourceDirectories += (Compile / clueSourceDirectory).value / "resources",
createNpmProject := {
val npmDir = target.value / "npm"
val npmDir = target.value / "npm"

val odbSchemaFile =
(Compile / clueSourceDirectory).value / "resources" / "lucuma" / "schemas" / "ObservationDB.graphql"
Expand Down Expand Up @@ -1000,9 +1000,8 @@ lazy val exploreSetupNodeNpmInstall =
UseRef.Public("actions", "setup-node", "v6"),
name = Some("Explore Setup Node.js"),
params = Map(
"node-version" -> "24",
"cache" -> "npm",
"cache-dependency-path" -> "explore/package-lock.json"
"node-version" -> "24",
"cache" -> "npm"
)
),
// Explore NPM cache
Expand All @@ -1012,7 +1011,7 @@ lazy val exploreSetupNodeNpmInstall =
id = Some("explore-cache-node_modules"),
params = {
val prefix = "node_modules"
val key = s"$prefix-$${{ hashFiles('explore/package-lock.json') }}"
val key = s"$prefix-$${{ hashFiles('package-lock.json') }}"
Map("path" -> "node_modules", "key" -> key, "restore-keys" -> prefix)
}
),
Expand All @@ -1029,9 +1028,8 @@ lazy val exploreSetupNodeNpmInstall =
UseRef.Public("actions", "setup-node", "v6"),
name = Some("Setup Node.js"),
params = Map(
"node-version" -> "24",
"cache" -> "npm",
"cache-dependency-path" -> "observe/web/client/package-lock.json"
"node-version" -> "24",
"cache" -> "npm"
)
),
// Observe NPM cache
Expand All @@ -1041,7 +1039,7 @@ lazy val exploreSetupNodeNpmInstall =
id = Some("observe-cache-node_modules"),
params = {
val prefix = "node_modules"
val key = s"$prefix-$${{ hashFiles('observe/web/client/package-lock.json') }}"
val key = s"$prefix-$${{ hashFiles('package-lock.json') }}"
Map("path" -> "node_modules", "key" -> key, "restore-keys" -> prefix)
}
),
Expand Down Expand Up @@ -1202,10 +1200,9 @@ ThisBuild / githubWorkflowPublishPreamble +=
WorkflowStep.Use(
UseRef.Public("actions", "setup-node", "v6"),
Map(
"node-version" -> "24",
"registry-url" -> "https://registry.npmjs.org",
"cache" -> "npm",
"cache-dependency-path" -> "schemas/package-lock.json"
"node-version" -> "24",
"registry-url" -> "https://registry.npmjs.org",
"cache" -> "npm"
)
)

Expand Down
6 changes: 5 additions & 1 deletion explore/package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "explore",
"private": true,
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-migration": "1.3.1",
"@floating-ui/react": "^0.27.8",
Expand All @@ -12,6 +14,7 @@
"@fortawesome/pro-thin-svg-icons": "^6.7.2",
"@honeycombio/opentelemetry-web": "^1.0.1",
"@opentelemetry/auto-instrumentations-web": "^0.46.0",
"@react-hook/resize-observer": "^2.0.2",
"@react-hook/size": "^2.1.2",
"@tanstack/react-table": "^8.21.3",
"@tanstack/react-virtual": "v3.13.9",
Expand Down Expand Up @@ -62,7 +65,8 @@
},
"browserslist": {
"production": [
"defaults and supports es6-module"
"defaults and supports es6-module",
"Firefox ESR"
],
"development": [
"last 1 chrome version",
Expand Down
2 changes: 0 additions & 2 deletions observe/web/.npmrc

This file was deleted.

2 changes: 0 additions & 2 deletions observe/web/client/.npmrc

This file was deleted.

Loading
Loading