move scripts back

Author: arcoraven

Dockerfile

@@ -64,7 +64,6 @@ COPY --from=build /app/package.json .
 COPY --from=build /app/node_modules ./node_modules
 COPY --from=build /app/src/prisma/* ./src/prisma/
 COPY --from=build /app/dist ./dist
-COPY --from=build /app/scripts ./dist/scripts
 
 # Replace the schema path in the package.json file
 RUN sed -i 's_"schema": "./src/prisma/schema.prisma"_"schema": "./dist/prisma/schema.prisma"_g' package.json

package.json

@@ -1,117 +1,117 @@
 {
-	"name": "engine",
-	"version": "0.1.0",
-	"license": "Apache-2.0",
-	"description": "thirdweb Engine",
-	"main": "src/server/index.ts",
-	"author": "thirdweb engineering <eng@thirdweb.com>",
-	"type": "module",
-	"scripts": {
-		"dev": "yarn dev:infra && yarn dev:db && yarn dev:run",
-		"dev:infra": "docker compose -f ./docker-compose.yml up -d",
-		"dev:db": "yarn prisma:setup:dev",
-		"dev:run": "npx nodemon --watch 'src/**/*.ts' --exec 'npx tsx ./src/index.ts' --files src/index.ts",
-		"build": "rm -rf dist && tsc -p ./tsconfig.json --outDir dist",
-		"build:docker": "docker build . -f Dockerfile -t prod",
-		"generate:sdk": "npx tsx ./scripts/generate-sdk && cd ./sdk && yarn build",
-		"prisma:setup:dev": "npx tsx ./scripts/setup-db.ts",
-		"prisma:setup:prod": "npx tsx ./dist/scripts/setup-db.js",
-		"start": "yarn prisma:setup:prod && yarn start:migrations && yarn start:run",
-		"start:migrations": "npx tsx ./dist/scripts/apply-migrations.js",
-		"start:run": "node --experimental-specifier-resolution=node ./dist/index.js",
-		"start:docker": "docker compose --profile engine --env-file ./.env up --remove-orphans",
-		"start:docker-force-build": "docker compose --profile engine --env-file ./.env up --remove-orphans --build",
-		"lint:fix": "eslint --fix 'src/**/*.ts'",
-		"test:unit": "vitest",
-		"test:coverage": "vitest run --coverage",
-		"copy-files": "cp -r ./src/prisma ./dist/ && cp -r ./scripts ./dist/"
-	},
-	"dependencies": {
-		"@aws-sdk/client-kms": "^3.679.0",
-		"@bull-board/fastify": "^5.23.0",
-		"@cloud-cryptographic-wallet/cloud-kms-signer": "^0.1.2",
-		"@cloud-cryptographic-wallet/signer": "^0.0.5",
-		"@ethersproject/json-wallets": "^5.7.0",
-		"@fastify/swagger": "^8.9.0",
-		"@fastify/type-provider-typebox": "^3.2.0",
-		"@fastify/websocket": "^8.2.0",
-		"@google-cloud/kms": "^4.4.0",
-		"@prisma/client": "5.17.0",
-		"@sinclair/typebox": "^0.31.28",
-		"@t3-oss/env-core": "^0.6.0",
-		"@thirdweb-dev/auth": "^4.1.87",
-		"@thirdweb-dev/chains": "^0.1.77",
-		"@thirdweb-dev/sdk": "^4.0.89",
-		"@thirdweb-dev/service-utils": "^0.4.28",
-		"@types/base-64": "^1.0.2",
-		"aws-kms-signer": "^0.5.3",
-		"base-64": "^1.0.0",
-		"bullmq": "^5.11.0",
-		"cron-parser": "^4.9.0",
-		"crypto": "^1.0.1",
-		"crypto-js": "^4.2.0",
-		"dd-trace": "^5.23.0",
-		"dotenv": "^16.0.3",
-		"ethers": "5",
-		"ethers-aws-kms-signer": "^1.3.2",
-		"ethers-gcp-kms-signer": "^1.1.6",
-		"fastify": "^4.28.1",
-		"fastify-plugin": "^4.5.0",
-		"http-status-codes": "^2.2.0",
-		"ioredis": "^5.4.1",
-		"jsonwebtoken": "^9.0.2",
-		"knex": "^3.1.0",
-		"mnemonist": "^0.39.8",
-		"node-cron": "^3.0.2",
-		"pg": "^8.11.3",
-		"prisma": "^5.14.0",
-		"prom-client": "^15.1.3",
-		"superjson": "^2.2.1",
-		"thirdweb": "^5.71.0",
-		"uuid": "^9.0.1",
-		"winston": "^3.14.1",
-		"zod": "^3.23.8"
-	},
-	"devDependencies": {
-		"@biomejs/biome": "^1.9.2",
-		"@types/cli-progress": "^3.11.3",
-		"@types/crypto-js": "^4.2.2",
-		"@types/jsonwebtoken": "^9.0.6",
-		"@types/node": "^18.15.4",
-		"@types/node-cron": "^3.0.8",
-		"@types/pg": "^8.6.6",
-		"@types/uuid": "^9.0.1",
-		"@types/ws": "^8.5.5",
-		"@typescript-eslint/eslint-plugin": "^5.55.0",
-		"@typescript-eslint/parser": "^5.55.0",
-		"@vitest/coverage-v8": "^2.0.3",
-		"eslint": "^9.3.0",
-		"eslint-config-prettier": "^8.7.0",
-		"openapi-typescript-codegen": "^0.25.0",
-		"prettier": "^2.8.7",
-		"prool": "^0.0.16",
-		"typescript": "^5.1.3",
-		"vitest": "^2.0.3"
-	},
-	"lint-staged": {
-		"*.{js,ts}": "eslint --cache --fix",
-		"*.{js,ts,md}": "prettier --write"
-	},
-	"prisma": {
-		"schema": "./src/prisma/schema.prisma"
-	},
-	"resolutions": {
-		"@thirdweb-dev/auth/**/axios": ">=1.7.8",
-		"@thirdweb-dev/auth/**/web3-utils": ">=4.2.1",
-		"ethers-gcp-kms-signer/**/protobufjs": ">=7.2.5",
-		"fastify/**/find-my-way": ">=8.2.2",
-		"@grpc/grpc-js": ">=1.8.22",
-		"body-parser": ">=1.20.3",
-		"cookie": ">=0.7.0",
-		"elliptic": ">=6.6.0",
-		"micromatch": ">=4.0.8",
-		"secp256k1": ">=4.0.4",
-		"ws": ">=8.17.1",
-		"cross-spawn": ">=7.0.6"
-	}
+  "name": "engine",
+  "version": "0.1.0",
+  "license": "Apache-2.0",
+  "description": "thirdweb Engine",
+  "main": "src/server/index.ts",
+  "author": "thirdweb engineering <eng@thirdweb.com>",
+  "type": "module",
+  "scripts": {
+    "dev": "yarn dev:infra && yarn dev:db && yarn dev:run",
+    "dev:infra": "docker compose -f ./docker-compose.yml up -d",
+    "dev:db": "yarn prisma:setup:dev",
+    "dev:run": "npx nodemon --watch 'src/**/*.ts' --exec 'npx tsx ./src/index.ts' --files src/index.ts",
+    "build": "rm -rf dist && tsc -p ./tsconfig.json --outDir dist",
+    "build:docker": "docker build . -f Dockerfile -t prod",
+    "generate:sdk": "npx tsx ./src/scripts/generate-sdk && cd ./sdk && yarn build",
+    "prisma:setup:dev": "npx tsx ./src/scripts/setup-db.ts",
+    "prisma:setup:prod": "npx tsx ./dist/scripts/setup-db.js",
+    "start": "yarn prisma:setup:prod && yarn start:migrations && yarn start:run",
+    "start:migrations": "npx tsx ./dist/scripts/apply-migrations.js",
+    "start:run": "node --experimental-specifier-resolution=node ./dist/index.js",
+    "start:docker": "docker compose --profile engine --env-file ./.env up --remove-orphans",
+    "start:docker-force-build": "docker compose --profile engine --env-file ./.env up --remove-orphans --build",
+    "lint:fix": "eslint --fix 'src/**/*.ts'",
+    "test:unit": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "copy-files": "cp -r ./src/prisma ./dist/"
+  },
+  "dependencies": {
+    "@aws-sdk/client-kms": "^3.679.0",
+    "@bull-board/fastify": "^5.23.0",
+    "@cloud-cryptographic-wallet/cloud-kms-signer": "^0.1.2",
+    "@cloud-cryptographic-wallet/signer": "^0.0.5",
+    "@ethersproject/json-wallets": "^5.7.0",
+    "@fastify/swagger": "^8.9.0",
+    "@fastify/type-provider-typebox": "^3.2.0",
+    "@fastify/websocket": "^8.2.0",
+    "@google-cloud/kms": "^4.4.0",
+    "@prisma/client": "5.17.0",
+    "@sinclair/typebox": "^0.31.28",
+    "@t3-oss/env-core": "^0.6.0",
+    "@thirdweb-dev/auth": "^4.1.87",
+    "@thirdweb-dev/chains": "^0.1.77",
+    "@thirdweb-dev/sdk": "^4.0.89",
+    "@thirdweb-dev/service-utils": "^0.4.28",
+    "@types/base-64": "^1.0.2",
+    "aws-kms-signer": "^0.5.3",
+    "base-64": "^1.0.0",
+    "bullmq": "^5.11.0",
+    "cron-parser": "^4.9.0",
+    "crypto": "^1.0.1",
+    "crypto-js": "^4.2.0",
+    "dd-trace": "^5.23.0",
+    "dotenv": "^16.0.3",
+    "ethers": "5",
+    "ethers-aws-kms-signer": "^1.3.2",
+    "ethers-gcp-kms-signer": "^1.1.6",
+    "fastify": "^4.28.1",
+    "fastify-plugin": "^4.5.0",
+    "http-status-codes": "^2.2.0",
+    "ioredis": "^5.4.1",
+    "jsonwebtoken": "^9.0.2",
+    "knex": "^3.1.0",
+    "mnemonist": "^0.39.8",
+    "node-cron": "^3.0.2",
+    "pg": "^8.11.3",
+    "prisma": "^5.14.0",
+    "prom-client": "^15.1.3",
+    "superjson": "^2.2.1",
+    "thirdweb": "^5.71.0",
+    "uuid": "^9.0.1",
+    "winston": "^3.14.1",
+    "zod": "^3.23.8"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "^1.9.2",
+    "@types/cli-progress": "^3.11.3",
+    "@types/crypto-js": "^4.2.2",
+    "@types/jsonwebtoken": "^9.0.6",
+    "@types/node": "^18.15.4",
+    "@types/node-cron": "^3.0.8",
+    "@types/pg": "^8.6.6",
+    "@types/uuid": "^9.0.1",
+    "@types/ws": "^8.5.5",
+    "@typescript-eslint/eslint-plugin": "^5.55.0",
+    "@typescript-eslint/parser": "^5.55.0",
+    "@vitest/coverage-v8": "^2.0.3",
+    "eslint": "^9.3.0",
+    "eslint-config-prettier": "^8.7.0",
+    "openapi-typescript-codegen": "^0.25.0",
+    "prettier": "^2.8.7",
+    "prool": "^0.0.16",
+    "typescript": "^5.1.3",
+    "vitest": "^2.0.3"
+  },
+  "lint-staged": {
+    "*.{js,ts}": "eslint --cache --fix",
+    "*.{js,ts,md}": "prettier --write"
+  },
+  "prisma": {
+    "schema": "./src/prisma/schema.prisma"
+  },
+  "resolutions": {
+    "@thirdweb-dev/auth/**/axios": ">=1.7.8",
+    "@thirdweb-dev/auth/**/web3-utils": ">=4.2.1",
+    "ethers-gcp-kms-signer/**/protobufjs": ">=7.2.5",
+    "fastify/**/find-my-way": ">=8.2.2",
+    "@grpc/grpc-js": ">=1.8.22",
+    "body-parser": ">=1.20.3",
+    "cookie": ">=0.7.0",
+    "elliptic": ">=6.6.0",
+    "micromatch": ">=4.0.8",
+    "secp256k1": ">=4.0.4",
+    "ws": ">=8.17.1",
+    "cross-spawn": ">=7.0.6"
+  }
 }

scripts/apply-migrations.ts renamed to src/scripts/apply-migrations.ts

@@ -1,10 +1,10 @@
-import { logger } from "../src/shared/utils/logger";
+import { logger } from "../shared/utils/logger";
 import {
   acquireLock,
   releaseLock,
   waitForLock,
-} from "../src/shared/utils/redis/lock";
-import { redis } from "../src/shared/utils/redis/redis";
+} from "../shared/utils/redis/lock";
+import { redis } from "../shared/utils/redis/redis";
 
 const MIGRATION_LOCK_TTL_SECONDS = 60;