From bf30bb229a6296e16bd4aab4cf7285f7dd187288 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Fri, 26 Jul 2024 19:19:25 +0200 Subject: [PATCH] refactor: move buidling, bundling, ... scripts into a directory MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .vscode/settings.json | 3 ++- package.json | 12 ++++++------ .../build-requirements.js | 2 +- bundle.js => scripts/bundle.js | 0 prepare.js => scripts/prepare.js | 0 {utils => scripts}/runtime.js | 0 skip-preinstall.js => scripts/skip-preinstall.js | 0 tests/utils/Utils.test.ts | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) rename build-requirements.js => scripts/build-requirements.js (94%) rename bundle.js => scripts/bundle.js (100%) rename prepare.js => scripts/prepare.js (100%) rename {utils => scripts}/runtime.js (100%) rename skip-preinstall.js => scripts/skip-preinstall.js (100%) diff --git a/.vscode/settings.json b/.vscode/settings.json index ba2b6f57..3b13f1a8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -48,9 +48,10 @@ "parens", "piment", "poolifier", + "postject", "preinstall", "rambda", - "Recurrency", + "recurrency", "RFID", "runtimes", "shutdowning", diff --git a/package.json b/package.json index f5828d85..e12ea7a8 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,8 @@ "useTsNode": true }, "scripts": { - "prepare": "node prepare.js", - "build-requirements": "node build-requirements.js", + "prepare": "node scripts/prepare.js", + "build-requirements": "node scripts/build-requirements.js", "start": "pnpm build && cross-env NODE_ENV=production node dist/start.js", "start:dev": "pnpm build:dev && cross-env NODE_ENV=development node --enable-source-maps dist/start.js", "start:dev:debug": "pnpm build:dev && cross-env NODE_ENV=development node --enable-source-maps --inspect dist/start.js", @@ -56,7 +56,7 @@ "start:flameprof": "cross-env NODE_ENV=production clinic flame -- node --enable-source-maps dist/start.js", "start:bubbleprof": "cross-env NODE_ENV=production clinic bubbleprof -- node --enable-source-maps dist/start.js", "start:heapprofiler": "cross-env NODE_ENV=production clinic heapprofiler -- node --enable-source-maps dist/start.js", - "esbuild": "pnpm build-requirements && node bundle.js", + "esbuild": "pnpm build-requirements && node scripts/bundle.js", "build": "pnpm esbuild", "build:dev": "cross-env BUILD=development pnpm esbuild", "build:cf": "pnpm clean:node_modules && pnpm exec cross-env SKIP_PREINSTALL=1 npm install && pnpm build", @@ -64,9 +64,9 @@ "build:entities": "tsc -p tsconfig-mikro-orm.json", "clean:dist": "pnpm exec rimraf dist", "clean:node_modules": "pnpm exec rimraf node_modules", - "lint": "cross-env TIMING=1 eslint --cache src tests utils ./*.js ./*.ts", - "lint:fix": "cross-env TIMING=1 eslint --cache --fix src tests utils ./*.js ./*.ts", - "format": "prettier --cache --write .; eslint --cache --fix src tests utils ./*.js ./*.ts", + "lint": "cross-env TIMING=1 eslint --cache src tests scripts ./*.js ./*.ts", + "lint:fix": "cross-env TIMING=1 eslint --cache --fix src tests scripts ./*.js ./*.ts", + "format": "prettier --cache --write .; eslint --cache --fix src tests scripts ./*.js ./*.ts", "test": "glob -c \"c8 node --import tsx --test\" \"tests/**/*.test.ts\"", "test:debug": "glob -c \"node --import tsx --test --inspect\" \"tests/**/*.test.ts\"", "coverage": "c8 report --reporter=lcov", diff --git a/build-requirements.js b/scripts/build-requirements.js similarity index 94% rename from build-requirements.js rename to scripts/build-requirements.js index 453e3d15..75617fd6 100644 --- a/build-requirements.js +++ b/scripts/build-requirements.js @@ -5,7 +5,7 @@ import chalk from 'chalk' // eslint-disable-next-line n/no-unpublished-import import { satisfies } from 'semver' -import { runtime, runtimes } from './utils/runtime.js' +import { runtime, runtimes } from './runtime.js' const packageJson = JSON.parse(readFileSync('./package.json', 'utf8')) diff --git a/bundle.js b/scripts/bundle.js similarity index 100% rename from bundle.js rename to scripts/bundle.js diff --git a/prepare.js b/scripts/prepare.js similarity index 100% rename from prepare.js rename to scripts/prepare.js diff --git a/utils/runtime.js b/scripts/runtime.js similarity index 100% rename from utils/runtime.js rename to scripts/runtime.js diff --git a/skip-preinstall.js b/scripts/skip-preinstall.js similarity index 100% rename from skip-preinstall.js rename to scripts/skip-preinstall.js diff --git a/tests/utils/Utils.test.ts b/tests/utils/Utils.test.ts index d7ab58f3..3fe46842 100644 --- a/tests/utils/Utils.test.ts +++ b/tests/utils/Utils.test.ts @@ -7,6 +7,7 @@ import { expect } from 'expect' import { CircularBuffer } from 'mnemonist' import { satisfies } from 'semver' +import { runtime, runtimes } from '../../scripts/runtime.js' import type { TimestampedData } from '../../src/types/index.js' import { Constants } from '../../src/utils/Constants.js' import { @@ -33,7 +34,6 @@ import { sleep, validateUUID, } from '../../src/utils/Utils.js' -import { runtime, runtimes } from '../../utils/runtime.js' await describe('Utils test suite', async () => { await it('Verify generateUUID()/validateUUID()', () => { -- 2.34.1