Merge changes from v2.1.1-next.1 into main (#22)

.github/workflows/deploy.yaml

@@ -29,6 +29,11 @@ jobs:
           # Note: The above makes "outputs.registry" unavailable in any subsequent jobs.
 
       - name: Build and Push Image+Tags
+        # IMAGE TAGS:
+        # 1. commit sha        (always added)
+        # 2. release tag       (if release/pre-release)
+        # 3. env tag           (if release: "prod", anything else: "staging")
+        # 4. relative pointer  (if release: "latest", anything else: "next")
         run: |
           IMAGE_TAGS=( "${{ github.sha }}" )
 

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+## [2.1.1-next.1](https://github.com/Nerdware-LLC/fixit-api/compare/v2.1.0...v2.1.1-next.1) (2024-03-26)
+
+
+### Bug Fixes
+
+* add '.js' extensions to local imports ([7210346](https://github.com/Nerdware-LLC/fixit-api/commit/7210346bd5cdb7f609f47e3b19edb8c887ff201d))
+
 # [2.1.0](https://github.com/Nerdware-LLC/fixit-api/compare/v2.0.1...v2.1.0) (2024-03-24)
 
 

docker-compose.yaml

@@ -16,12 +16,13 @@ services:
     ports:
       - "8080:8080"
     env_file:
-      - .env.dev
+      - .api.dev.env
     environment:
       AWS_ACCESS_KEY_ID: local
       AWS_SECRET_ACCESS_KEY: local
       DYNAMODB_ENDPOINT: "http://dynamodb-local:8000"
     tty: true
+    stop_grace_period: 2s # default is 10s
 
   dynamodb-local:
     container_name: dynamodb-local

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fixit-api",
-  "version": "2.1.0",
+  "version": "2.1.1-next.1",
   "description": "Fixit API services built on NodeJS and Apollo GraphQL.",
   "author": {
     "name": "Trevor Anderson",
@@ -21,10 +21,10 @@
   },
   "type": "module",
   "scripts": {
-    "start": "docker compose up",
-    "start:dist": "API_COMMAND='node dist/index.js' docker compose up",
+    "start": "docker compose up --abort-on-container-exit",
+    "start:dist": "API_COMMAND='node dist/index.js' && npm start",
     "prebuild": "[ -d dist ] && rm -rf dist || true",
-    "build": "swc src --out-dir dist",
+    "build": "swc src --out-dir dist --strip-leading-paths",
     "lint": "eslint src",
     "postlint": "npm run test:types",
     "test": "vitest run",

src/lib/googleOAuth2Client/helpers.ts

@@ -10,7 +10,7 @@ import {
 } from "@nerdware/ts-string-helpers";
 import { getTypeSafeError } from "@nerdware/ts-type-safety-utils";
 import { AuthError } from "@/utils/httpErrors.js";
-import { googleOAuth2Client } from "./googleOAuth2Client";
+import { googleOAuth2Client } from "./googleOAuth2Client.js";
 import type { TokenPayload as GoogleOAuth2IDTokenPayload } from "google-auth-library";
 
 /**

src/lib/googleOAuth2Client/index.ts

@@ -1,2 +1,2 @@
-export * from "./googleOAuth2Client";
-export * from "./helpers";
+export * from "./googleOAuth2Client.js";
+export * from "./helpers.js";