Merge pull request #5 from dcramer/ref/cleanup-env

ref: Cleanup env vars to use nx

.envrc

@@ -1,3 +1,3 @@
 layout node
 
-dotenv .env
+# dotenv .env

.local.env

@@ -0,0 +1,2 @@
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/peated
+JWT_SECRET=super-duper-s3cret

apps/api/.env.test → .test.env

@@ -1,3 +1,2 @@
-NODE_ENV=test
 DATABASE_URL=postgresql://postgres:postgres@localhost:5432/test_peated
 JWT_SECRET=super-secret-test-secret

Procfile

@@ -1,2 +1,2 @@
-web: npm run dev:web
-api: npm run dev:api
+web: nx dev web
+api: nx dev api

apps/api/package.json

@@ -3,21 +3,21 @@
  "name": "api",
  "scripts": {
  "build": "tsc",
- "dev": "nodemon --exec ts-node --require dotenv/config ./src/server.ts",
- "dev:load-mocks": "ts-node --require dotenv/config ./src/bin/load-mocks.ts",
+ "dev": "nodemon --exec ts-node ./src/server.ts",
+ "dev:load-mocks": "ts-node ./src/bin/load-mocks.ts",
  "db:deploy": "npx prisma migrate deploy",
  "db:migrate": "run-s db:migrate:*",
  "db:migrate:dev": "npx prisma migrate dev",
- "db:migrate:test": "dotenv -e .env.test -- npx prisma db push --accept-data-loss",
- "generate-token": "ts-node --require dotenv/config ./src/bin/generate-token.ts",
- "user:create": "ts-node --require dotenv/config ./src/bin/create-user.ts",
- "user:admin": "ts-node --require dotenv/config ./src/bin/make-admin.ts",
- "user:generate-token": "ts-node --require dotenv/config ./src/bin/generate-token.ts",
+ "db:migrate:test": "npx prisma db push --accept-data-loss",
+ "generate-token": "ts-node ./src/bin/generate-token.ts",
+ "user:create": "ts-node ./src/bin/create-user.ts",
+ "user:admin": "ts-node ./src/bin/make-admin.ts",
+ "user:generate-token": "ts-node ./src/bin/generate-token.ts",
  "postinstall": "npx prisma generate",
  "tsc": "tsc",
- "start": "ts-node --require dotenv/config ./src/server.ts",
+ "start": "ts-node ./src/server.ts",
  "test": "run-s db:migrate:test test:vitest",
- "test:vitest": "dotenv -e .env.test -- vitest --no-threads"
+ "test:vitest": "vitest --no-threads"
  },
  "dependencies": {
  "@faker-js/faker": "^7.6.0",

package.json

@@ -13,12 +13,12 @@
  "setup:deps": "npm install --workspaces --package-lock-only",
  "setup:db": "npm run db:migrate",
  "dev": "nf start",
- "dev:web": "API_SERVER=http://localhost:4000 dotenv -e ./.env -- npm run dev -w apps/web",
- "dev:api": "CORS_HOST=http://localhost:5173 PORT=4000 dotenv -e ./.env -- npm run dev -w apps/api",
- "db:studio": "dotenv -e ./.env -- npx -w packages/api prisma studio",
- "db:migrate": "dotenv -e ./.env -- npm run db:migrate -w apps/api",
- "test:api": "dotenv -e ./.env -- npm run test -w apps/api",
- "token": "dotenv -e ./.env -- npm run token -w apps/api"
+ "dev:web": "API_SERVER=http://localhost:4000 npm run dev -w apps/web",
+ "dev:api": "CORS_HOST=http://localhost:5173 PORT=4000 npm run dev -w apps/api",
+ "db:studio": "npx -w packages/api prisma studio",
+ "db:migrate": "npm run db:migrate -w apps/api",
+ "test:api": "npm run test -w apps/api",
+ "token": "npm run token -w apps/api"
  },
  "author": "David Cramer",
  "license": "Apache-2.0",
@@ -27,10 +27,9 @@
  "@nx/node": "^16.1.1",
  "dotenv": "^16.0.3",
  "dotenv-cli": "^7.1.0",
- "foreman": "^3.0.1",
- "npm-run-all": "^4.1.5"
+ "foreman": "^3.0.1"
  },
- "devDependencies": {
- "nx": "^16.1.0"
+ "engines": {
+ "node": ">=18.0.0 <19.0.0"
  }
 }