Skip to content

Commit

Permalink
Merge branch 'remove-v1' into v3
Browse files Browse the repository at this point in the history
* remove-v1:
  Added some notes about v3
  Remove sharp dependency (unused)
  Fully remove v1 code
  Added dev version to package.json
  Remove package lockfile
  Updated to yarn v4
  Start eventaul transition to yarn
  Updated PG querying for new version of PG utils
  Remove some aspects of v1 code
  Seems to work OK with units route at least
  Added sharp back
  • Loading branch information
davenquinn committed Jan 17, 2024
2 parents b8daf07 + edcf17d commit b4097d5
Show file tree
Hide file tree
Showing 91 changed files with 5,727 additions and 7,616 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
node_modules
credentials.js
credentials.js
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,6 @@ Icon

# Files that might appear on external disk
.Spotlight-V100
.Trashes
.Trashes

.yarn/install-state.gz
10 changes: 10 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"debug.javascript.terminalOptions": {
"skipFiles": [
"<node_internals>/**",
"<rootDir>/node_modules/**",
"<rootDir>/v1/node_modules/**",
"<rootDir>/v2/node_modules/**",
]
},
}
893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.2.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.0.2.cjs
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ RUN apt-get -y update && \

WORKDIR /code

COPY ./v1/package.json /code/v1/
#COPY ./v1/package.json /code/v1/
COPY ./v2/package.json /code/v2/
COPY ./package.json package.json

RUN npm install
RUN npm --prefix v1 install
#RUN npm --prefix v1 install
RUN npm --prefix v2 install

# We had to switch to native postgres bindings
Expand Down
16 changes: 16 additions & 0 deletions NOTES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Version 3

- Fully remove deprecated v1 API
- Switch to Yarn for package management
- Move to Node 18
- Move to PostgreSQL exclusively for compatibility with Macrostrat v2

# Version 2.1

- Added a basic `Dockerfile` for the entire application.

## Debugging with VS Code

- Added [VSCode debugger configuration](https://code.visualstudio.com/docs/nodejs/nodejs-debugging)
- Enable 'Auto attach' in the VSCode configuration
- Run `npm start` *in VS Code's integrated terminal*.
Empty file removed ingestion-query.sql
Empty file.
Loading

0 comments on commit b4097d5

Please sign in to comment.