diff --git a/drizzle-orm/package.json b/drizzle-orm/package.json index 732fe0f1a..6e47af8ac 100644 --- a/drizzle-orm/package.json +++ b/drizzle-orm/package.json @@ -140,7 +140,6 @@ "@vercel/postgres": "^0.3.0", "better-sqlite3": "^8.4.0", "bun-types": "^0.6.6", - "concurrently": "^8.1.0", "cpy": "^10.1.0", "cpy-cli": "^5.0.0", "knex": "^2.4.2", diff --git a/drizzle-orm/scripts/build.ts b/drizzle-orm/scripts/build.ts index 3af0d4259..e5cf56a94 100755 --- a/drizzle-orm/scripts/build.ts +++ b/drizzle-orm/scripts/build.ts @@ -1,6 +1,5 @@ #!/usr/bin/env -S pnpm tsx import 'zx/globals'; -import concurrently from 'concurrently'; import cpy from 'cpy'; import { entries } from '../rollup.common'; @@ -46,22 +45,9 @@ function updateAndCopyPackageJson() { fs.writeJSONSync('dist.new/package.json', pkg, { spaces: 2 }); } -await concurrently([ - { - command: 'rollup --config rollup.cjs.config.ts --configPlugin typescript', - name: 'cjs', - }, - { - command: 'rollup --config rollup.esm.config.ts --configPlugin typescript', - name: 'esm', - }, - { - command: `rimraf dist-dts && tsc -p tsconfig.dts.json && resolve-tspaths -p tsconfig.dts.json --out dist-dts`, - name: 'dts', - }, -], { - killOthers: 'failure', -}).result.catch(() => process.exit(1)); +await $`rollup --config rollup.cjs.config.ts --configPlugin typescript`; +await $`rollup --config rollup.esm.config.ts --configPlugin typescript`; +await $`rimraf dist-dts && tsc -p tsconfig.dts.json && resolve-tspaths -p tsconfig.dts.json --out dist-dts`; await cpy('dist-dts/**/*.d.ts', 'dist.new', { rename: (basename) => basename.replace(/\.d\.ts$/, '.d.mts'), }); diff --git a/drizzle-typebox/scripts/build.ts b/drizzle-typebox/scripts/build.ts index 1791a303d..1910feac6 100755 --- a/drizzle-typebox/scripts/build.ts +++ b/drizzle-typebox/scripts/build.ts @@ -6,12 +6,10 @@ await fs.remove('dist'); await $`rollup --config rollup.config.ts --configPlugin typescript`; await $`resolve-tspaths`; await fs.copy('README.md', 'dist/README.md'); -await Promise.all([ - cpy('dist/**/*.d.ts', 'dist', { - rename: (basename) => basename.replace(/\.d\.ts$/, '.d.mts'), - }), - cpy('dist/**/*.d.ts', 'dist', { - rename: (basename) => basename.replace(/\.d\.ts$/, '.d.cts'), - }), -]); +await cpy('dist/**/*.d.ts', 'dist', { + rename: (basename) => basename.replace(/\.d\.ts$/, '.d.mts'), +}); +await cpy('dist/**/*.d.ts', 'dist', { + rename: (basename) => basename.replace(/\.d\.ts$/, '.d.cts'), +}); await fs.copy('package.json', 'dist/package.json'); diff --git a/drizzle-valibot/scripts/build.ts b/drizzle-valibot/scripts/build.ts index 1791a303d..1910feac6 100755 --- a/drizzle-valibot/scripts/build.ts +++ b/drizzle-valibot/scripts/build.ts @@ -6,12 +6,10 @@ await fs.remove('dist'); await $`rollup --config rollup.config.ts --configPlugin typescript`; await $`resolve-tspaths`; await fs.copy('README.md', 'dist/README.md'); -await Promise.all([ - cpy('dist/**/*.d.ts', 'dist', { - rename: (basename) => basename.replace(/\.d\.ts$/, '.d.mts'), - }), - cpy('dist/**/*.d.ts', 'dist', { - rename: (basename) => basename.replace(/\.d\.ts$/, '.d.cts'), - }), -]); +await cpy('dist/**/*.d.ts', 'dist', { + rename: (basename) => basename.replace(/\.d\.ts$/, '.d.mts'), +}); +await cpy('dist/**/*.d.ts', 'dist', { + rename: (basename) => basename.replace(/\.d\.ts$/, '.d.cts'), +}); await fs.copy('package.json', 'dist/package.json'); diff --git a/drizzle-zod/scripts/build.ts b/drizzle-zod/scripts/build.ts index 1791a303d..1910feac6 100755 --- a/drizzle-zod/scripts/build.ts +++ b/drizzle-zod/scripts/build.ts @@ -6,12 +6,10 @@ await fs.remove('dist'); await $`rollup --config rollup.config.ts --configPlugin typescript`; await $`resolve-tspaths`; await fs.copy('README.md', 'dist/README.md'); -await Promise.all([ - cpy('dist/**/*.d.ts', 'dist', { - rename: (basename) => basename.replace(/\.d\.ts$/, '.d.mts'), - }), - cpy('dist/**/*.d.ts', 'dist', { - rename: (basename) => basename.replace(/\.d\.ts$/, '.d.cts'), - }), -]); +await cpy('dist/**/*.d.ts', 'dist', { + rename: (basename) => basename.replace(/\.d\.ts$/, '.d.mts'), +}); +await cpy('dist/**/*.d.ts', 'dist', { + rename: (basename) => basename.replace(/\.d\.ts$/, '.d.cts'), +}); await fs.copy('package.json', 'dist/package.json'); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d22f436fe..b2eaae777 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -127,9 +127,6 @@ importers: bun-types: specifier: ^0.6.6 version: 0.6.6 - concurrently: - specifier: ^8.1.0 - version: 8.1.0 cpy: specifier: ^10.1.0 version: 10.1.0 @@ -177,10 +174,10 @@ importers: version: 3.12.7 vite-tsconfig-paths: specifier: ^4.2.0 - version: 4.2.0(typescript@5.1.6)(vite@4.3.9) + version: 4.2.0(typescript@5.1.6) vitest: specifier: ^0.31.4 - version: 0.31.4(@vitest/ui@0.31.4) + version: 0.31.4 zod: specifier: ^3.20.2 version: 3.21.4 @@ -1514,6 +1511,7 @@ packages: /@babel/highlight@7.22.10: resolution: {integrity: sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==} engines: {node: '>=6.9.0'} + requiresBuild: true dependencies: '@babel/helper-validator-identifier': 7.22.5 chalk: 2.4.2 @@ -3766,22 +3764,6 @@ packages: semver: 7.5.1 well-known-symbols: 2.0.0 - /concurrently@8.1.0: - resolution: {integrity: sha512-0AB6eOAtaW/r/kX2lCdolaWtT191ICeuJjEJvI9hT3zbPFuZ/iZaJwMRKwbuwADome7OKxk73L7od+fsveZ7tA==} - engines: {node: ^14.13.0 || >=16.0.0} - hasBin: true - dependencies: - chalk: 4.1.2 - date-fns: 2.30.0 - lodash: 4.17.21 - rxjs: 7.8.1 - shell-quote: 1.8.1 - spawn-command: 0.0.2-1 - supports-color: 8.1.1 - tree-kill: 1.2.2 - yargs: 17.7.2 - dev: true - /concurrently@8.2.1: resolution: {integrity: sha512-nVraf3aXOpIcNud5pB9M82p1tynmZkrSGQ1p6X/VY8cJ+2LMVqAgXsJxYYefACSHbTYlm92O1xuhdGTjwoEvbQ==} engines: {node: ^14.13.0 || >=16.0.0} @@ -7618,10 +7600,6 @@ packages: resolution: {integrity: sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==} dev: true - /spawn-command@0.0.2-1: - resolution: {integrity: sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==} - dev: true - /spdx-correct@3.2.0: resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} dependencies: @@ -8380,6 +8358,22 @@ packages: - supports-color - terser + /vite-tsconfig-paths@4.2.0(typescript@5.1.6): + resolution: {integrity: sha512-jGpus0eUy5qbbMVGiTxCL1iB9ZGN6Bd37VGLJU39kTDD6ZfULTTb1bcc5IeTWqWJKiWV5YihCaibeASPiGi8kw==} + peerDependencies: + vite: '*' + peerDependenciesMeta: + vite: + optional: true + dependencies: + debug: 4.3.4 + globrex: 0.1.2 + tsconfck: 2.1.1(typescript@5.1.6) + transitivePeerDependencies: + - supports-color + - typescript + dev: true + /vite-tsconfig-paths@4.2.0(typescript@5.1.6)(vite@4.3.9): resolution: {integrity: sha512-jGpus0eUy5qbbMVGiTxCL1iB9ZGN6Bd37VGLJU39kTDD6ZfULTTb1bcc5IeTWqWJKiWV5YihCaibeASPiGi8kw==} peerDependencies: @@ -8429,6 +8423,71 @@ packages: optionalDependencies: fsevents: 2.3.3 + /vitest@0.31.4: + resolution: {integrity: sha512-GoV0VQPmWrUFOZSg3RpQAPN+LPmHg2/gxlMNJlyxJihkz6qReHDV6b0pPDcqFLNEPya4tWJ1pgwUNP9MLmUfvQ==} + engines: {node: '>=v14.18.0'} + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@vitest/browser': '*' + '@vitest/ui': '*' + happy-dom: '*' + jsdom: '*' + playwright: '*' + safaridriver: '*' + webdriverio: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + playwright: + optional: true + safaridriver: + optional: true + webdriverio: + optional: true + dependencies: + '@types/chai': 4.3.5 + '@types/chai-subset': 1.3.3 + '@types/node': 20.2.5 + '@vitest/expect': 0.31.4 + '@vitest/runner': 0.31.4 + '@vitest/snapshot': 0.31.4 + '@vitest/spy': 0.31.4 + '@vitest/utils': 0.31.4 + acorn: 8.8.2 + acorn-walk: 8.2.0 + cac: 6.7.14 + chai: 4.3.7 + concordance: 5.0.4 + debug: 4.3.4 + local-pkg: 0.4.3 + magic-string: 0.30.0 + pathe: 1.1.1 + picocolors: 1.0.0 + std-env: 3.3.3 + strip-literal: 1.0.1 + tinybench: 2.5.0 + tinypool: 0.5.0 + vite: 4.3.9(@types/node@20.2.5) + vite-node: 0.31.4(@types/node@20.2.5) + why-is-node-running: 2.2.2 + transitivePeerDependencies: + - less + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + /vitest@0.31.4(@vitest/ui@0.31.4): resolution: {integrity: sha512-GoV0VQPmWrUFOZSg3RpQAPN+LPmHg2/gxlMNJlyxJihkz6qReHDV6b0pPDcqFLNEPya4tWJ1pgwUNP9MLmUfvQ==} engines: {node: '>=v14.18.0'}