Merge branch 'main' into usage-stats

Author: davidsklar99

.idea/inspectionProfiles/Project_Default.xml

@@ -1 +1 @@
-20.7.0
+22.13.1

.node-version

@@ -1,8 +1,4 @@
-compressionLevel: mixed
-
-enableGlobalCache: false
-
-nodeLinker: node-modules
+nodeLinker: pnp
 
 packageExtensions:
   debug@*:
@@ -16,4 +12,4 @@ pnpFallbackMode: all
 
 pnpMode: loose
 
-yarnPath: .yarn/releases/yarn-4.3.1.cjs
+yarnPath: .yarn/releases/yarn-4.9.4.cjs

.prettierignore

@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:22
 
 # Install rsync
 RUN apt-get update && apt-get install -y rsync
@@ -10,27 +10,13 @@ WORKDIR /usr/src/app
 COPY .yarn/releases .yarn/releases
 COPY .yarnrc.yml yarn.lock package.json ./
 
-# Copy only the elements needed for a Yarn install to take advantage of
-# Docker's layer caching
-# This is complex because we are working with multiple workspaces.
-
-# Copy package JSON files with wildcards
-# This scoops up all package.json files in the directory and subdirectories
-# to deal with Yarn workspaces. However it requires BUILDKIT to be enabled,
-# which is done by setting DOCKER_BUILDKIT=1 in the environment
-RUN --mount=type=bind,target=/docker-context \
-    cd /docker-context/; \
-    find . -name "package.json" -mindepth 0 -maxdepth 5 -exec cp --parents "{}" /usr/src/app/ \;
-
 RUN yarn install --immutable
 
-
-
 # Load the cache from the previous build
-RUN --mount=type=cache,target=/yarn-cache \
-     rsync -a /yarn-cache/ .yarn/cache/ \
-  && yarn install --immutable \
-  && rsync -a .yarn/cache/ /yarn-cache
+#RUN --mount=type=cache,target=/yarn-cache \
+#     rsync -a /yarn-cache/ .yarn/cache/ \
+#  && yarn install --immutable \
+#  && rsync -a .yarn/cache/ /yarn-cache
 
 # # Remove rsync
 RUN apt-get remove -y rsync

.tool-versions

@@ -19,6 +19,6 @@ debug:
 		node --inspect=0.0.0.0:9229 /code/server.js
 
 publish:
-	docker build --platform=linux/amd64 -t $(TAG) .
-	docker push $(TAG)
-
+	# Ensure the git repository is clean
+	@git diff --quiet || (echo "Uncommitted changes present. Please commit or stash them before publishing." && exit 1)
+	git tag -a v$(VERSION) -m "Version $(VERSION)"

.yarn/releases/yarn-4.3.1.cjs

@@ -15,3 +15,9 @@ The new website also contains an updated version of [trips viewer](https://githu
 4. Run `make` (or `yarn install`) to pull down submodules and update packages
 5. Start the live-reloading development server with `yarn run dev`. The server will be available at
    `http://localhost:3000` by default.
+
+## Publishing
+
+- Commit all changes and merge to `main` (optional). Update the package.json version to the desired number.
+- Run `make publish` to sync the `package.json` version to a git tag
+- Push the tag to GitHub, which should kick off CI to build and publish to OSG Harbor.