Rename gcp-migrations to gcp-firestore-migrations and convert to ESM …

…and vitest - package.json update - replace jest config with vitest config - search/replace to add js extension - manually fix directory imports with index.js - jest.xxx to vi.xxx - setup-tests to use globals, etc - skip updating firestore lib for now because of breaking changes - jump a couple of versions in gcp-firestore alpha because of mess up with lib updates
mondo-mob · Dec 8, 2023 · 15a628b · 15a628b
1 parent 3a9ac07
commit 15a628b
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 69 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/gcp-migrations/CHANGELOG.md → ...ges/gcp-firestore-migrations/CHANGELOG.md b/packages/gcp-migrations/CHANGELOG.md → ...ges/gcp-firestore-migrations/CHANGELOG.md
diff --git a/packages/gcp-migrations/README.md → packages/gcp-firestore-migrations/README.md b/packages/gcp-migrations/README.md → packages/gcp-firestore-migrations/README.md
@@ -1,4 +1,4 @@
-# MONDOKIT GCP MIGRATIONS
+# MONDOKIT GCP FIRESTORE MIGRATIONS
 
 Setup and Run migrations, with state stored in firestore and a mutex lock to ensure only one is run at a time
 

diff --git a/packages/gcp-migrations/firebase.json → ...es/gcp-firestore-migrations/firebase.json b/packages/gcp-migrations/firebase.json → ...es/gcp-firestore-migrations/firebase.json
diff --git a/packages/gcp-migrations/package.json → ...ges/gcp-firestore-migrations/package.json b/packages/gcp-migrations/package.json → ...ges/gcp-firestore-migrations/package.json
@@ -1,7 +1,8 @@
 {
-  "name": "@mondokit/gcp-migrations",
+  "name": "@mondokit/gcp-firestore-migrations",
   "version": "1.0.0-alpha.0",
   "description": "",
+  "type": "module",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -13,8 +14,8 @@
     "firestore:start": "npx --yes firebase-tools emulators:start --project firestore-tests",
     "format": "prettier --write \"./src/**/*.ts\"",
     "prepublishOnly": "npm run build",
-    "test": "jest --runInBand",
-    "test:ci": "firebase emulators:exec --only firestore --project firestore-tests \"jest --runInBand\""
+    "test": "vitest run",
+    "test:ci": "npx --yes firebase-tools emulators:exec --only firestore --project firestore-tests \"vitest run\""
   },
   "publishConfig": {
     "access": "public"
@@ -23,16 +24,16 @@
   "license": "MIT",
   "homepage": "https://github.com/mondo-mob/mondokit",
   "dependencies": {
-    "lodash": "^4.17.21"
+    "lodash-es": "^4.17.21"
   },
   "peerDependencies": {
-    "@mondomob/gae-js-core": "^7.0.0",
-    "@mondomob/gae-js-firestore": "^17.0.0"
+    "@mondokit/gcp-core": "^1.0.0-alpha.1",
+    "@mondokit/gcp-firestore": "^1.0.0-alpha.2"
   },
   "devDependencies": {
-    "@google-cloud/firestore": "6.6.1",
-    "@mondomob/gae-js-core": "7.0.3",
-    "@mondomob/gae-js-firestore": "17.0.0"
+    "@google-cloud/firestore": "^6.6.1",
+    "@mondokit/gcp-core": "1.0.0-alpha.1",
+    "@mondokit/gcp-firestore": "1.0.0-alpha.2"
   },
   "gitHead": "087032afa8903aa576041cdfe4913fe8f115e919"
 }
diff --git a/...-migrations/src/__test/setup-after-env.ts → ...-migrations/src/__test/setup-after-env.ts b/...-migrations/src/__test/setup-after-env.ts → ...-migrations/src/__test/setup-after-env.ts
diff --git a/.../gcp-migrations/src/__test/setup-tests.ts → ...tore-migrations/src/__test/setup-tests.ts b/.../gcp-migrations/src/__test/setup-tests.ts → ...tore-migrations/src/__test/setup-tests.ts
@@ -1,5 +1,9 @@
+import "vitest/globals.d.ts";
 import "jest-extended";
 import nock from "nock";
+import matchers from "jest-extended";
+
+expect.extend(matchers);
 
 nock.disableNetConnect();
 nock.enableNetConnect("127.0.0.1");
diff --git a/...s/gcp-migrations/src/__test/test-utils.ts → ...store-migrations/src/__test/test-utils.ts b/...s/gcp-migrations/src/__test/test-utils.ts → ...store-migrations/src/__test/test-utils.ts
@@ -1,13 +1,7 @@
 import { CollectionReference, Firestore, Settings } from "@google-cloud/firestore";
-import { configurationProvider, runWithRequestStorage, zodValidator } from "@mondomob/gae-js-core";
-import {
-  FirestoreLoader,
-  firestoreLoaderRequestStorage,
-  firestoreProvider,
-  GaeJsFirestoreConfiguration,
-  gaeJsFirestoreConfigurationSchema,
-} from "@mondomob/gae-js-firestore";
-import ProvidesCallback = jest.ProvidesCallback;
+import { configurationProvider, runWithRequestStorage, zodValidator } from "@mondokit/gcp-core";
+import { FirestoreLoader, firestoreLoaderRequestStorage, firestoreProvider, GaeJsFirestoreConfiguration, gaeJsFirestoreConfigurationSchema } from "@mondokit/gcp-firestore";
+
 
 export const initTestConfig = async (
   config?: Partial<GaeJsFirestoreConfiguration>
@@ -62,7 +56,7 @@ export const useFirestoreTest = (collectionsToClear: string[] = []) => {
 };
 
 // Helper for standalone tests that require transaction support
-export const transactional = (testFn: () => Promise<unknown>): ProvidesCallback => {
+export const transactional = (testFn: () => Promise<unknown>) => {
   return () =>
     runWithRequestStorage(async () => {
       // We need firestore loader in request storage if we want to use gae-js transactions

diff --git a/...ages/gcp-migrations/src/auto-migration.ts → ...irestore-migrations/src/auto-migration.ts b/...ages/gcp-migrations/src/auto-migration.ts → ...irestore-migrations/src/auto-migration.ts
@@ -1,5 +1,5 @@
-import { Logger } from "@mondomob/gae-js-core";
-import { MigrationOptions } from "./migration";
+import { Logger } from "@mondokit/gcp-core";
+import { MigrationOptions } from "./migration.js";
 
 export interface MigrateParams {
   /**

diff --git a/packages/gcp-firestore-migrations/src/index.ts b/packages/gcp-firestore-migrations/src/index.ts
@@ -0,0 +1,2 @@
+export * from "./auto-migration.js";
+export * from "./migration.js";
diff --git a/...tions/src/migration-results.repository.ts → ...tions/src/migration-results.repository.ts b/...tions/src/migration-results.repository.ts → ...tions/src/migration-results.repository.ts
@@ -1,4 +1,4 @@
-import { TimestampedEntity, TimestampedRepository } from "@mondomob/gae-js-firestore";
+import { TimestampedEntity, TimestampedRepository } from "@mondokit/gcp-firestore";
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface MigrationResult extends TimestampedEntity {

diff --git a/...ages/gcp-migrations/src/migration.test.ts → ...irestore-migrations/src/migration.test.ts b/...ages/gcp-migrations/src/migration.test.ts → ...irestore-migrations/src/migration.test.ts
@@ -4,12 +4,12 @@ import {
   newTimestampedEntity,
   TimestampedEntity,
   TimestampedRepository,
-} from "@mondomob/gae-js-firestore";
-import { transactional, useFirestoreTest } from "./__test/test-utils";
-import { AutoMigration } from "./auto-migration";
-import { runMigrations } from "./migration";
-import { migrationResultsRepository } from "./migration-results.repository";
-import { mutexServiceProvider } from "./mutex";
+} from "@mondokit/gcp-firestore";
+import { transactional, useFirestoreTest } from "./__test/test-utils.js";
+import { AutoMigration } from "./auto-migration.js";
+import { runMigrations } from "./migration.js";
+import { migrationResultsRepository } from "./migration-results.repository.js";
+import { mutexServiceProvider } from "./mutex.js";
 
 const dummyEntityCollectionName = "migrations-dummy-entities";
 const ORIG_CREATED_AT = new Date("1999-01-01T00:00:00");

diff --git a/packages/gcp-migrations/src/migration.ts → ...gcp-firestore-migrations/src/migration.ts b/packages/gcp-migrations/src/migration.ts → ...gcp-firestore-migrations/src/migration.ts
@@ -1,15 +1,15 @@
-import { Bootstrapper, createLogger, runWithRequestStorage, setRequestStorageValue } from "@mondomob/gae-js-core";
+import { Bootstrapper, createLogger, runWithRequestStorage, setRequestStorageValue } from "@mondokit/gcp-core";
 import {
   DISABLE_TIMESTAMP_UPDATE,
   FirestoreLoader,
   firestoreLoaderRequestStorage,
   firestoreProvider,
   newTimestampedEntity,
-} from "@mondomob/gae-js-firestore";
-import { merge } from "lodash";
-import { AutoMigration } from "./auto-migration";
-import { migrationResultsRepository } from "./migration-results.repository";
-import { mutexServiceProvider } from "./mutex";
+} from "@mondokit/gcp-firestore";
+import { merge } from "lodash-es";
+import { AutoMigration } from "./auto-migration.js";
+import { migrationResultsRepository } from "./migration-results.repository.js";
+import { mutexServiceProvider } from "./mutex.js";
 
 const logger = createLogger("migrations");
 const MUTEX_ID = "migrations";

diff --git a/packages/gcp-migrations/src/mutex.ts → ...ges/gcp-firestore-migrations/src/mutex.ts b/packages/gcp-migrations/src/mutex.ts → ...ges/gcp-firestore-migrations/src/mutex.ts
@@ -1,5 +1,5 @@
-import { LazyProvider } from "@mondomob/gae-js-core";
-import { MutexService } from "@mondomob/gae-js-firestore";
+import { LazyProvider } from "@mondokit/gcp-core";
+import { MutexService } from "@mondokit/gcp-firestore";
 
 export const mutexServiceProvider = new LazyProvider(
   () =>

diff --git a/packages/gcp-migrations/tsconfig.json → ...es/gcp-firestore-migrations/tsconfig.json b/packages/gcp-migrations/tsconfig.json → ...es/gcp-firestore-migrations/tsconfig.json
diff --git a/packages/gcp-migrations/tsconfig.prod.json → ...p-firestore-migrations/tsconfig.prod.json b/packages/gcp-migrations/tsconfig.prod.json → ...p-firestore-migrations/tsconfig.prod.json
diff --git a/packages/gcp-firestore-migrations/vitest.config.ts b/packages/gcp-firestore-migrations/vitest.config.ts
@@ -0,0 +1,4 @@
+import { defineConfig } from "vitest/config";
+import { vitestConfig } from "../../vitest.config.base";
+
+export default defineConfig(vitestConfig());
diff --git a/packages/gcp-firestore/package.json b/packages/gcp-firestore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mondokit/gcp-firestore",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.2",
   "description": "",
   "main": "dist/index.js",
   "type": "module",

diff --git a/packages/gcp-migrations/jest.config.js b/packages/gcp-migrations/jest.config.js
diff --git a/packages/gcp-migrations/src/index.ts b/packages/gcp-migrations/src/index.ts
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from "./auto-migration.js";
		export * from "./migration.js";