Fix build script

Author: dankochetov

.github/workflows/release.yaml

@@ -57,12 +57,16 @@ jobs:
               run: |
                   npm run pack
 
+            - name: Run @arethetypeswrong/cli
+              run: |
+                  pn attw package.tgz
+
             - name: Publish
               shell: bash
               env:
                   NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
               run: |
-                  version="0.1.0"
+                  version="$(jq -r .version package.json)"
 
                   echo "Publishing ${{ matrix.package }}@$version"
                   npm run publish --access public

.gitignore

@@ -9,4 +9,5 @@ dist.new
 server
 runMysql.ts
 Tests/.temp
-Tests/Migrations
+Tests/Migrations
+.DS_Store

package.json

@@ -2,7 +2,7 @@
 	"name": "drizzle-graphql",
 	"type": "module",
 	"author": "Drizzle Team",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"description": "Automatically generate GraphQL schema or customizable schema config fields from Drizzle ORM schema",
 	"scripts": {
 		"build": "pnpm tsx scripts/build.ts",
@@ -17,6 +17,20 @@
 		"test-generate-migrations": "DB_TYPE=pg drizzle-kit generate:pg --config=./drizzle.test-config.ts && DB_TYPE=mysql drizzle-kit generate:mysql --config=./drizzle.test-config.ts && DB_TYPE=sqlite drizzle-kit generate:sqlite --config=./drizzle.test-config.ts",
 		"lint": "dprint check --list-different"
 	},
+	"exports": {
+		".": {
+			"import": {
+				"types": "./index.d.ts",
+				"default": "./index.js"
+			},
+			"require": {
+				"types": "./index.d.cjs",
+				"default": "./index.cjs"
+			},
+			"types": "./index.d.ts",
+			"default": "./index.js"
+		}
+	},
 	"license": "Apache-2.0",
 	"devDependencies": {
 		"@arethetypeswrong/cli": "^0.15.2",

scripts/build.ts

@@ -1,76 +1,28 @@
-#!/usr/bin/env -S pnpm tsx
 import 'zx/globals';
-import cpy from 'cpy';
 
-async function updateAndCopyPackageJson() {
-	const pkg = await fs.readJSON('package.json');
-
-	const entries = await glob('src/**/*.ts');
-
-	pkg.exports = entries.reduce<
-		Record<
-			string,
-			{
-				import: {
-					types?: string;
-					default: string;
-				};
-				require: {
-					types: string;
-					default: string;
-				};
-				default: string;
-				types: string;
-			}
-		>
-	>((acc, rawEntry) => {
-		const entry = rawEntry.match(/src\/(.*)\.ts/)![1]!;
-		const exportsEntry = entry === 'index' ? '.' : './' + entry.replace(/\/index$/, '');
-		const importEntry = `./${entry}.js`;
-		const requireEntry = `./${entry}.cjs`;
-		acc[exportsEntry] = {
-			import: {
-				types: `./${entry}.d.ts`,
-				default: importEntry,
-			},
-			require: {
-				types: `./${entry}.d.cts`,
-				default: requireEntry,
-			},
-			types: `./${entry}.d.ts`,
-			default: importEntry,
+import { build } from 'tsup';
+
+fs.removeSync('dist');
+
+await build({
+	entry: ['src/index.ts'],
+	splitting: false,
+	sourcemap: true,
+	dts: true,
+	format: ['cjs', 'esm'],
+	outExtension(ctx) {
+		if (ctx.format === 'cjs') {
+			return {
+				dts: '.d.cts',
+				js: '.cjs',
+			};
+		}
+		return {
+			dts: '.d.ts',
+			js: '.js',
 		};
-		return acc;
-	}, {});
-
-	await fs.writeJSON('dist.new/package.json', pkg, { spaces: 4 });
-}
-
-await fs.remove('dist.new');
-
-await Promise.all([
-	(async () => {
-		await $`tsup`;
-	})(),
-	(async () => {
-		await $`tsc -p tsconfig.dts.json`;
-		await cpy('dist-dts/**/*.d.ts', 'dist.new', {
-			rename: (basename) => basename.replace(/\.d\.ts$/, '.d.cts'),
-		});
-		await cpy('dist-dts/**/*.d.ts', 'dist.new', {
-			rename: (basename) => basename.replace(/\.d\.ts$/, '.d.ts'),
-		});
-	})(),
-]);
-
-await Promise.all([
-	$`tsup src/version.ts --no-config --dts --format esm --outDir dist.new`,
-	$`tsup src/version.ts --no-config --dts --format cjs --outDir dist.new`,
-]);
-
-await $`pnpm tsx scripts/fix-imports.ts`;
+	},
+});
 
-await fs.copy('./README.md', 'dist.new/README.md');
-await updateAndCopyPackageJson();
-await fs.remove('dist');
-await fs.rename('dist.new', 'dist');
+fs.copyFileSync('package.json', 'dist/package.json');
+fs.copyFileSync('README.md', 'dist/README.md');