Preview/spanner googlesql

.github/workflows/release-feature-branch.yaml

@@ -4,6 +4,7 @@ on:
   push:
     branches-ignore:
       - main
+      - preview/spanner-googlesql
   pull_request: {}
 
 jobs:
@@ -158,7 +159,7 @@ jobs:
           if [[ ${{ github.event_name }} != "push" && "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" ]]; then
             export SKIP_EXTERNAL_DB_TESTS=1
           fi
-          if [[ "${{ matrix.package }}" == "drizzle-orm" ]]; then
+          if [[ "${{ matrix.package }}" == "@dotcom-dev/drizzle-orm" ]]; then
             pnpm test --filter ${{ matrix.package }} --filter integration-tests
           else
             pnpm test --filter ${{ matrix.package }}

.github/workflows/release-preview.yml

@@ -1,4 +1,4 @@
-name: Internal Release (preview)
+name: Internal Release (RC/next)
 
 on: workflow_dispatch
 
@@ -14,11 +14,11 @@ jobs:
         package:
           - drizzle-orm
           - drizzle-kit
-          - drizzle-zod
-          - drizzle-seed
-          - drizzle-typebox
-          - drizzle-valibot
-          - eslint-plugin-drizzle
+          # - drizzle-zod
+          # - drizzle-seed
+          # - drizzle-typebox
+          # - drizzle-valibot
+          # - eslint-plugin-drizzle
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
@@ -58,17 +58,18 @@ jobs:
         shell: bash
         working-directory: ${{ matrix.package }}
         run: |
-          # Prepare package name with scope for GitHub registry
-          package_name="@dotcom-dev/${{ matrix.package }}"
+          # Get original package name from package.json
+          package_name="$(jq -r .name package.json)"
 
           # Get version from package.json and create RC version
           original_version="$(jq -r .version package.json)"
           rc_version="${original_version}-rc.$(date +'%Y%m%d%H%M%S')"
-
+
+          echo "GitHub registry package name: $package_name"
           echo "Original version: $original_version"
           echo "RC version: $rc_version"
 
-          # Update package.json with RC version
+          # Update package.json with RC version only (not changing name)
           jq --arg version "$rc_version" '.version = $version' package.json > package.json.tmp
           mv package.json.tmp package.json
 
@@ -87,19 +88,6 @@ jobs:
             echo "package_name=$package_name"
           } >> $GITHUB_OUTPUT
 
-      - name: Update package.json for GitHub registry
-        if: steps.checks.outputs.has_new_release == 'true'
-        working-directory: ${{ matrix.package }}
-        shell: bash
-        run: |
-          # Update package.json to use GitHub registry name format
-          jq '.name = "@dotcom-dev/${{ matrix.package }}"' package.json > package.json.tmp
-          mv package.json.tmp package.json
-
-          # Add publishConfig to ensure it goes to GitHub registry with next tag
-          jq '.publishConfig = {"registry": "https://npm.pkg.github.com", "access": "restricted", "tag": "next"}' package.json > package.json.tmp
-          mv package.json.tmp package.json
-
       - name: Build
         if: steps.checks.outputs.has_new_release == 'true'
         run: |
@@ -116,12 +104,12 @@ jobs:
         run: |
           npm run pack
 
-      - name: Run @arethetypeswrong/cli
-        if: steps.checks.outputs.has_new_release == 'true'
-        working-directory: ${{ matrix.package }}
-        shell: bash
-        run: |
-          pnpm attw package.tgz
+      # - name: Run @arethetypeswrong/cli # broke for drizzle-orm?
+      #   if: steps.checks.outputs.has_new_release == 'true'
+      #   working-directory: ${{ matrix.package }}
+      #   shell: bash
+      #   run: |
+      #     pnpm attw package.tgz
 
       - name: Publish to GitHub registry
         if: steps.checks.outputs.has_new_release == 'true'
@@ -134,96 +122,13 @@ jobs:
           package_name="${{ steps.checks.outputs.package_name }}"
 
           echo "Publishing $package_name@$version to GitHub registry with tag 'next'"
-          npm run publish -- --tag next
-
+
+          # Create .npmrc in the package directory
+          # echo "registry=https://npm.pkg.github.com" > .npmrc
+          echo "@dotcom-dev:registry=https://npm.pkg.github.com" >> .npmrc
+          echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> .npmrc
+
+          # Publish using npm directly
+          npm run publish -- --registry=https://npm.pkg.github.com --tag next
+
           echo "GitHub registry (next): \`+ $package_name@$version\`" >> $GITHUB_STEP_SUMMARY
-
-      - name: Create GitHub release for ORM package
-        uses: actions/github-script@v6
-        if: matrix.package == 'drizzle-orm' && steps.checks.outputs.has_new_release == 'true'
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            try {
-              const fs = require("fs");
-              const path = require("path");
-
-              const version = "${{ steps.checks.outputs.version }}";
-              const originalVersion = "${{ steps.checks.outputs.original_version }}";
-
-              let releaseBody = `# Release Candidate for v${originalVersion}\n\nThis is a pre-release build for testing purposes.`;
-
-              const changelogPath = "${{ steps.checks.outputs.changelog_path }}";
-              if (changelogPath) {
-                try {
-                  const changelog = fs.readFileSync(changelogPath, "utf8");
-                  releaseBody += `\n\n## Upcoming Changes\n\n${changelog}`;
-                } catch (e) {
-                  console.log(`Could not read changelog: ${e.message}`);
-                }
-              }
-
-              const release = await github.rest.repos.createRelease({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                tag_name: `rc-${version}`,
-                name: `Release Candidate ${version}`,
-                body: releaseBody,
-                prerelease: true
-              });
-
-              await github.rest.repos.uploadReleaseAsset({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                release_id: release.data.id,
-                name: `${{ matrix.package }}-${version}-dist.tgz`,
-                data: fs.readFileSync(path.resolve("${{ matrix.package }}", "package.tgz")),
-              });
-            } catch (e) {
-              core.setFailed(e.message);
-            }
-
-      - name: Create GitHub release for KIT package
-        uses: actions/github-script@v6
-        if: matrix.package == 'drizzle-kit' && steps.checks.outputs.has_new_release == 'true'
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            try {
-              const fs = require("fs");
-              const path = require("path");
-
-              const version = "${{ steps.checks.outputs.version }}";
-              const originalVersion = "${{ steps.checks.outputs.original_version }}";
-
-              let releaseBody = `# Release Candidate for v${originalVersion}\n\nThis is a pre-release build for testing purposes.`;
-
-              const changelogPath = "${{ steps.checks.outputs.changelog_path }}";
-              if (changelogPath) {
-                try {
-                  const changelog = fs.readFileSync(changelogPath, "utf8");
-                  releaseBody += `\n\n## Upcoming Changes\n\n${changelog}`;
-                } catch (e) {
-                  console.log(`Could not read changelog: ${e.message}`);
-                }
-              }
-
-              const release = await github.rest.repos.createRelease({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                tag_name: `rc-drizzle-kit@${version}`,
-                name: `Release Candidate drizzle-kit@${version}`,
-                body: releaseBody,
-                prerelease: true
-              });
-
-              await github.rest.repos.uploadReleaseAsset({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                release_id: release.data.id,
-                name: `${{ matrix.package }}-${version}-dist.tgz`,
-                data: fs.readFileSync(path.resolve("${{ matrix.package }}", "package.tgz")),
-              });
-            } catch (e) {
-              core.setFailed(e.message);
-            }

drizzle-kit/build.dev.ts

@@ -22,7 +22,7 @@ esbuild.buildSync({
 	format: 'cjs',
 	target: 'node16',
 	platform: 'node',
-	external: ['drizzle-orm', 'esbuild', ...driversPackages],
+	external: ['@dotcom-dev/drizzle-orm', 'esbuild', ...driversPackages],
 	banner: {
 		js: `#!/usr/bin/env -S node --loader @esbuild-kit/esm-loader --no-warnings`,
 	},
@@ -40,7 +40,7 @@ esbuild.buildSync({
 		'json-diff',
 		'glob',
 		'esbuild',
-		'drizzle-orm',
+		'@dotcom-dev/drizzle-orm',
 		...driversPackages,
 	],
 	banner: {

drizzle-kit/build.ts

@@ -32,7 +32,7 @@ esbuild.buildSync({
 		'json-diff',
 		'glob',
 		'esbuild',
-		'drizzle-orm',
+		'@dotcom-dev/drizzle-orm',
 		...driversPackages,
 	],
 	banner: {
@@ -52,7 +52,7 @@ esbuild.buildSync({
 		'json-diff',
 		'glob',
 		'esbuild',
-		'drizzle-orm',
+		'@dotcom-dev/drizzle-orm',
 		...driversPackages,
 	],
 	banner: {
@@ -72,7 +72,7 @@ esbuild.buildSync({
 	},
 	external: [
 		'esbuild',
-		'drizzle-orm',
+		'@dotcom-dev/drizzle-orm',
 		...driversPackages,
 	],
 	banner: {

drizzle-kit/package.json

@@ -1,5 +1,5 @@
 {
-	"name": "drizzle-kit",
+	"name": "@dotcom-dev/drizzle-kit",
 	"version": "0.30.5",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
@@ -19,9 +19,6 @@
 		"migrations",
 		"schema"
 	],
-	"publishConfig": {
-		"provenance": true
-	},
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/drizzle-team/drizzle-orm.git"
@@ -84,7 +81,7 @@
 		"dockerode": "^3.3.4",
 		"dotenv": "^16.0.3",
 		"drizzle-kit": "0.25.0-b1faa33",
-		"drizzle-orm": "workspace:./drizzle-orm/dist",
+		"@dotcom-dev/drizzle-orm": "workspace:./drizzle-orm/dist",
 		"env-paths": "^3.0.0",
 		"esbuild-node-externals": "^1.9.0",
 		"eslint": "^8.57.0",

drizzle-kit/src/api.ts

@@ -1,8 +1,8 @@
 import { randomUUID } from 'crypto';
-import { LibSQLDatabase } from 'drizzle-orm/libsql';
-import type { MySql2Database } from 'drizzle-orm/mysql2';
-import { PgDatabase } from 'drizzle-orm/pg-core';
-import { SingleStoreDriverDatabase } from 'drizzle-orm/singlestore';
+import { LibSQLDatabase } from '@dotcom-dev/drizzle-orm/libsql';
+import type { MySql2Database } from '@dotcom-dev/drizzle-orm/mysql2';
+import { PgDatabase } from '@dotcom-dev/drizzle-orm/pg-core';
+import { SingleStoreDriverDatabase } from '@dotcom-dev/drizzle-orm/singlestore';
 import {
 	columnsResolver,
 	enumsResolver,
@@ -114,7 +114,7 @@ export const pushSchema = async (
 	extensionsFilters?: Config['extensionsFilters'],
 ) => {
 	const { applyPgSnapshotsDiff } = await import('./snapshotsDiffer');
-	const { sql } = await import('drizzle-orm');
+	const { sql } = await import('@dotcom-dev/drizzle-orm');
 	const filters = (tablesFilter ?? []).concat(
 		getTablesFilterByExtensions({ extensionsFilters, dialect: 'postgresql' }),
 	);
@@ -223,7 +223,7 @@ export const pushSQLiteSchema = async (
 	drizzleInstance: LibSQLDatabase<any>,
 ) => {
 	const { applySqliteSnapshotsDiff } = await import('./snapshotsDiffer');
-	const { sql } = await import('drizzle-orm');
+	const { sql } = await import('@dotcom-dev/drizzle-orm');
 
 	const db: SQLiteDB = {
 		query: async (query: string, params?: any[]) => {
@@ -336,7 +336,7 @@ export const pushMySQLSchema = async (
 	const { mysqlPushIntrospect } = await import(
 		'./cli/commands/mysqlIntrospect'
 	);
-	const { sql } = await import('drizzle-orm');
+	const { sql } = await import('@dotcom-dev/drizzle-orm');
 
 	const db: DB = {
 		query: async (query: string, params?: any[]) => {
@@ -442,7 +442,7 @@ export const pushSingleStoreSchema = async (
 	const { singlestorePushIntrospect } = await import(
 		'./cli/commands/singlestoreIntrospect'
 	);
-	const { sql } = await import('drizzle-orm');
+	const { sql } = await import('@dotcom-dev/drizzle-orm');
 
 	const db: DB = {
 		query: async (query: string) => {

drizzle-kit/src/cli/commands/introspect.ts

@@ -834,7 +834,7 @@ export const relationsToTypeScript = (
 
 	const uniqueImports = [...new Set(imports)];
 
-	const importsTs = `import { relations } from "drizzle-orm/relations";\nimport { ${
+	const importsTs = `import { relations } from "@dotcom-dev/drizzle-orm/relations";\nimport { ${
 		uniqueImports.join(
 			', ',
 		)