From 986ceea2460b5050176707cc5a1159257bd31a09 Mon Sep 17 00:00:00 2001 From: Elliot DeNolf Date: Thu, 5 Oct 2023 16:49:58 -0400 Subject: [PATCH] chore: nodemon stdin:false, -I flag --- examples/auth/payload/nodemon.json | 4 ++-- examples/custom-server/nodemon.json | 4 ++-- examples/draft-preview/payload/nodemon.json | 4 ++-- examples/email/nodemon.json | 4 ++-- examples/form-builder/cms/nodemon.json | 4 ++-- examples/multi-tenant/nodemon.json | 4 ++-- examples/redirects/cms/nodemon.json | 4 ++-- examples/testing/nodemon.json | 8 +++----- examples/virtual-fields/nodemon.json | 4 ++-- examples/whitelabel/nodemon.json | 4 ++-- nodemon.json | 4 ++-- packages/payload/nodemon.json | 4 ++-- packages/payload/package.json | 2 +- packages/payload/src/bin/index.ts | 2 +- packages/payload/src/database/migrations/migrateDown.ts | 4 +++- templates/blank/nodemon.json | 4 ++-- templates/ecommerce/nodemon.json | 4 ++-- templates/website/nodemon.json | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/examples/auth/payload/nodemon.json b/examples/auth/payload/nodemon.json index 7b043bb4ae..ea985a4690 100644 --- a/examples/auth/payload/nodemon.json +++ b/examples/auth/payload/nodemon.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/nodemon.json", "ext": "ts", - "exec": "ts-node src/server.ts", - "stdin": true + "exec": "ts-node src/server.ts -- -I", + "stdin": false } diff --git a/examples/custom-server/nodemon.json b/examples/custom-server/nodemon.json index 3e55746f37..3a5123ea14 100644 --- a/examples/custom-server/nodemon.json +++ b/examples/custom-server/nodemon.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/nodemon.json", "watch": ["server.ts"], - "exec": "ts-node --project tsconfig.server.json src/server.ts", + "exec": "ts-node --project tsconfig.server.json src/server.ts -- -I", "ext": "js ts", - "stdin": true + "stdin": false } diff --git a/examples/draft-preview/payload/nodemon.json b/examples/draft-preview/payload/nodemon.json index 7b043bb4ae..ea985a4690 100644 --- a/examples/draft-preview/payload/nodemon.json +++ b/examples/draft-preview/payload/nodemon.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/nodemon.json", "ext": "ts", - "exec": "ts-node src/server.ts", - "stdin": true + "exec": "ts-node src/server.ts -- -I", + "stdin": false } diff --git a/examples/email/nodemon.json b/examples/email/nodemon.json index 7b043bb4ae..ea985a4690 100644 --- a/examples/email/nodemon.json +++ b/examples/email/nodemon.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/nodemon.json", "ext": "ts", - "exec": "ts-node src/server.ts", - "stdin": true + "exec": "ts-node src/server.ts -- -I", + "stdin": false } diff --git a/examples/form-builder/cms/nodemon.json b/examples/form-builder/cms/nodemon.json index 7b043bb4ae..ea985a4690 100644 --- a/examples/form-builder/cms/nodemon.json +++ b/examples/form-builder/cms/nodemon.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/nodemon.json", "ext": "ts", - "exec": "ts-node src/server.ts", - "stdin": true + "exec": "ts-node src/server.ts -- -I", + "stdin": false } diff --git a/examples/multi-tenant/nodemon.json b/examples/multi-tenant/nodemon.json index 7b043bb4ae..a564543df0 100644 --- a/examples/multi-tenant/nodemon.json +++ b/examples/multi-tenant/nodemon.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/nodemon.json", "ext": "ts", - "exec": "ts-node src/server.ts", - "stdin": true + "exec": "ts-node src/server.ts -- -I", + "stdin": false } diff --git a/examples/redirects/cms/nodemon.json b/examples/redirects/cms/nodemon.json index 7b043bb4ae..ea985a4690 100644 --- a/examples/redirects/cms/nodemon.json +++ b/examples/redirects/cms/nodemon.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/nodemon.json", "ext": "ts", - "exec": "ts-node src/server.ts", - "stdin": true + "exec": "ts-node src/server.ts -- -I", + "stdin": false } diff --git a/examples/testing/nodemon.json b/examples/testing/nodemon.json index 8bbc15b6cd..fbe1a7e987 100644 --- a/examples/testing/nodemon.json +++ b/examples/testing/nodemon.json @@ -1,6 +1,4 @@ { - "watch": [ - "./src/**/*.ts" - ], - "exec": "ts-node ./src/server.ts" -} \ No newline at end of file + "watch": ["./src/**/*.ts"], + "exec": "ts-node ./src/server.ts -- -I" +} diff --git a/examples/virtual-fields/nodemon.json b/examples/virtual-fields/nodemon.json index 7b043bb4ae..ea985a4690 100644 --- a/examples/virtual-fields/nodemon.json +++ b/examples/virtual-fields/nodemon.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/nodemon.json", "ext": "ts", - "exec": "ts-node src/server.ts", - "stdin": true + "exec": "ts-node src/server.ts -- -I", + "stdin": false } diff --git a/examples/whitelabel/nodemon.json b/examples/whitelabel/nodemon.json index 7b043bb4ae..ea985a4690 100644 --- a/examples/whitelabel/nodemon.json +++ b/examples/whitelabel/nodemon.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/nodemon.json", "ext": "ts", - "exec": "ts-node src/server.ts", - "stdin": true + "exec": "ts-node src/server.ts -- -I", + "stdin": false } diff --git a/nodemon.json b/nodemon.json index 9b72e81f4b..1e4392e86b 100644 --- a/nodemon.json +++ b/nodemon.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/nodemon.json", - "exec": "ts-node ./test/dev.ts", + "exec": "ts-node ./test/dev.ts -- -I", "ext": "ts,js,json", "ignore": [ ".git", @@ -11,5 +11,5 @@ "test/**/payload-types.ts" ], "watch": ["./test/", "./packages/**/*.ts"], - "stdin": true + "stdin": false } diff --git a/packages/payload/nodemon.json b/packages/payload/nodemon.json index 62d239a64a..4dcb2ed110 100644 --- a/packages/payload/nodemon.json +++ b/packages/payload/nodemon.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/nodemon.json", - "exec": "ts-node ../../test/dev.ts", + "exec": "ts-node ../../test/dev.ts -- -I", "ext": "ts,js,json", "ignore": [ ".git", @@ -11,5 +11,5 @@ "test/**/payload-types.ts" ], "watch": ["src/**/*.ts", "../../test/", "../../packages/**/*.ts"], - "stdin": true + "stdin": false } diff --git a/packages/payload/package.json b/packages/payload/package.json index 5ccafd2d81..0feea4a248 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -1,6 +1,6 @@ { "name": "payload", - "version": "2.0.0-beta.13", + "version": "2.0.0-beta.15", "description": "Node, React and MongoDB Headless CMS and Application Framework", "license": "MIT", "main": "./src/index.ts", diff --git a/packages/payload/src/bin/index.ts b/packages/payload/src/bin/index.ts index 80f70e8dd6..b729bd0ec6 100755 --- a/packages/payload/src/bin/index.ts +++ b/packages/payload/src/bin/index.ts @@ -58,7 +58,7 @@ const scriptIndex = args._.findIndex((x) => x === 'build') const script = scriptIndex === -1 ? args._[0] : args._[scriptIndex] if (script.startsWith('migrate')) { - migrate(args._).then(() => process.exit(0)) + migrate(args).then(() => process.exit(0)) } else { switch (script.toLowerCase()) { case 'build': { diff --git a/packages/payload/src/database/migrations/migrateDown.ts b/packages/payload/src/database/migrations/migrateDown.ts index 590a24bb83..200422f228 100644 --- a/packages/payload/src/database/migrations/migrateDown.ts +++ b/packages/payload/src/database/migrations/migrateDown.ts @@ -14,12 +14,14 @@ export async function migrateDown(this: BaseDatabaseAdapter): Promise { }) const migrationsToRollback = existingMigrations.filter( - (migration) => migration.batch === latestBatch, + (migration) => migration.batch === latestBatch && migration.batch !== -1, ) + if (!migrationsToRollback?.length) { payload.logger.info({ msg: 'No migrations to rollback.' }) return } + payload.logger.info({ msg: `Rolling back batch ${latestBatch} consisting of ${migrationsToRollback.length} migration(s).`, }) diff --git a/templates/blank/nodemon.json b/templates/blank/nodemon.json index 7b043bb4ae..ea985a4690 100644 --- a/templates/blank/nodemon.json +++ b/templates/blank/nodemon.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/nodemon.json", "ext": "ts", - "exec": "ts-node src/server.ts", - "stdin": true + "exec": "ts-node src/server.ts -- -I", + "stdin": false } diff --git a/templates/ecommerce/nodemon.json b/templates/ecommerce/nodemon.json index 3e55746f37..3a5123ea14 100644 --- a/templates/ecommerce/nodemon.json +++ b/templates/ecommerce/nodemon.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/nodemon.json", "watch": ["server.ts"], - "exec": "ts-node --project tsconfig.server.json src/server.ts", + "exec": "ts-node --project tsconfig.server.json src/server.ts -- -I", "ext": "js ts", - "stdin": true + "stdin": false } diff --git a/templates/website/nodemon.json b/templates/website/nodemon.json index 7b043bb4ae..ea985a4690 100644 --- a/templates/website/nodemon.json +++ b/templates/website/nodemon.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/nodemon.json", "ext": "ts", - "exec": "ts-node src/server.ts", - "stdin": true + "exec": "ts-node src/server.ts -- -I", + "stdin": false }