Feature/merge 1.15.0

.github/workflows/alteration-compatibility-integration-test.yml

@@ -51,7 +51,7 @@ jobs:
     env:
       INTEGRATION_TEST: true
     steps:
-      - uses: logto-io/actions-package-logto-artifact@v1.1.0
+      - uses: logto-io/actions-package-logto-artifact@v2
         with:
           artifact-name: alteration-integration-test-${{ github.sha }}
           branch: ${{github.base_ref}}
@@ -68,7 +68,7 @@ jobs:
       DB_URL: postgres://postgres:postgres@localhost:5432/postgres
 
     steps:
-      - uses: logto-io/actions-run-logto-integration-tests@v1.1.0
+      - uses: logto-io/actions-run-logto-integration-tests@v2
         with:
           branch: ${{github.base_ref}}
           logto_artifact: alteration-integration-test-${{ github.sha }}

.github/workflows/commitlint.yml

@@ -24,7 +24,8 @@ jobs:
         uses: silverhand-io/actions-node-pnpm-run-steps@v4
 
       - name: Commitlint
-        run: npx commitlint --from HEAD~${{ github.event.pull_request.commits }} --to HEAD
+        # Credit to https://stackoverflow.com/a/67365254/12514940
+        run: npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} --verbose
 
       - name: Commitlint on PR title
         run: echo '${{ github.event.pull_request.title }}' | npx commitlint

.github/workflows/integration-test.yml

@@ -18,7 +18,7 @@ jobs:
       INTEGRATION_TEST: true
 
     steps:
-      - uses: logto-io/actions-package-logto-artifact@v1.1.0
+      - uses: logto-io/actions-package-logto-artifact@v2
         with:
           artifact-name: integration-test-${{ github.sha }}
 
@@ -34,7 +34,7 @@ jobs:
       DB_URL: postgres://postgres:postgres@localhost:5432/postgres
 
     steps:
-      - uses: logto-io/actions-run-logto-integration-tests@v1.1.0
+      - uses: logto-io/actions-run-logto-integration-tests@v2
         with:
           logto_artifact: integration-test-${{ github.sha }}
           test_target: ${{ matrix.target }}

.github/workflows/release.yml

@@ -118,7 +118,7 @@ jobs:
         run: ./.scripts/package.sh
 
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           token: ${{ secrets.BOT_PAT }}
           body: ""

.gitignore

@@ -35,3 +35,6 @@ dump.rdb
 
 # connectors
 /packages/core/connectors
+
+# console auto generated files
+/packages/console/src/consts/jwt-customizer-type-definition.ts

.gitpod.yml

@@ -12,7 +12,7 @@ tasks:
       cd packages/core
       pnpm build
       cd -
-      pnpm connectors:build
+      pnpm connectors build
       pnpm cli connector link
     command: |
       gp ports await 5432

README.md

@@ -88,7 +88,6 @@ Logto uses the [default browserslist config](https://github.com/browserslist/bro
 - About other bug reports, feature requests, and feedback, you can:
   - Directly 🙋 [open an issue](https://github.com/logto-io/logto/issues/new) on GitHub;
   - 💬 [join our Discord server](https://discord.gg/vRvwuwgpVX) to have a live chat;
-  - Engage in our 📍 [public roadmap](https://github.com/logto-io/logto/issues/1937).
 
 ## Licensing
 

commitlint.config.cjs → commitlint.config.ts

@@ -1,15 +1,17 @@
-const { rules } = require('@commitlint/config-conventional');
+import conventional from '@commitlint/config-conventional';
+import { UserConfig } from '@commitlint/types';
 
 const isCi = process.env.CI === 'true';
 
-/** @type {import('@commitlint/types').UserConfig} **/
-module.exports = {
+const config: UserConfig = {
   extends: ['@commitlint/config-conventional'],
   rules: {
-    'type-enum': [2, 'always', [...rules['type-enum'][2], 'api', 'release']],
+    'type-enum': [2, 'always', [...conventional.rules['type-enum'][2], 'api', 'release']],
     'scope-enum': [2, 'always', ['connector', 'console', 'core', 'demo-app', 'test', 'phrases', 'schemas', 'shared', 'experience', 'deps', 'deps-dev', 'cli', 'toolkit', 'cloud', 'app-insights']],
     // Slightly increase the tolerance to allow the appending PR number
     ...(isCi && { 'header-max-length': [2, 'always', 110] }),
     'body-max-line-length': [2, 'always', 110],
   },
 };
+
+export default config;

package.json

@@ -15,7 +15,7 @@
     "cli": "logto",
     "changeset": "changeset",
     "alteration": "logto db alt",
-    "connectors:build": "pnpm -r --filter \"./packages/connectors/connector-*\" build",
+    "connectors": "pnpm -r --filter \"./packages/connectors/connector-*\"",
     "//": "# `changeset version` won't run version lifecycle scripts, see https://github.com/changesets/changesets/issues/860",
     "ci:version": "changeset version && pnpm -r version",
     "ci:build": "pnpm -r build",
@@ -25,9 +25,9 @@
   },
   "devDependencies": {
     "@changesets/cli": "^2.26.2",
-    "@commitlint/cli": "^18.0.0",
-    "@commitlint/config-conventional": "^18.0.0",
-    "@commitlint/types": "^18.0.0",
+    "@commitlint/cli": "^19.0.0",
+    "@commitlint/config-conventional": "^19.0.0",
+    "@commitlint/types": "^19.0.0",
     "@types/pg": "^8.6.6",
     "husky": "^9.0.0",
     "pg": "^8.8.0",

packages/app-insights/package.json

@@ -24,30 +24,29 @@
   "scripts": {
     "precommit": "lint-staged",
     "build": "rm -rf lib/ && tsc -p tsconfig.build.json",
-    "build:test": "rm -rf lib/ && tsc -p tsconfig.test.json --sourcemap",
+    "build:test": "pnpm build",
     "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput --incremental",
     "lint": "eslint --ext .ts src",
     "lint:report": "pnpm lint --format json --output-file report.json",
-    "test:only": "NODE_OPTIONS=--experimental-vm-modules jest",
-    "test": "pnpm build:test && pnpm test:only",
+    "test": "vitest src",
+    "test:ci": "pnpm run test --silent --coverage",
     "prepack": "pnpm build"
   },
   "devDependencies": {
     "@silverhand/eslint-config": "5.0.0",
     "@silverhand/eslint-config-react": "5.0.0",
     "@silverhand/ts-config": "5.0.0",
     "@silverhand/ts-config-react": "5.0.0",
-    "@types/jest": "^29.4.0",
     "@types/node": "^20.9.5",
     "@types/react": "^18.0.31",
+    "@vitest/coverage-v8": "^1.4.0",
     "eslint": "^8.44.0",
     "history": "^5.3.0",
-    "jest": "^29.7.0",
     "lint-staged": "^15.0.0",
     "prettier": "^3.0.0",
     "react": "^18.0.0",
-    "tslib": "^2.4.1",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "vitest": "^1.4.0"
   },
   "engines": {
     "node": "^20.9.0"

packages/app-insights/src/normalize-error.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from 'vitest';
+
 import { normalizeError } from './normalize-error.js';
 
 describe('normalizeError()', () => {

packages/app-insights/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "@silverhand/ts-config-react/tsconfig.base",
   "compilerOptions": {
     "outDir": "lib",
-    "types": ["node", "jest"],
+    "types": ["node"],
   },
   "include": [
     "src"

packages/cli/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## 1.15.0
+
+### Patch Changes
+
+- Updated dependencies [5758f84f5]
+- Updated dependencies [57d97a4df]
+- Updated dependencies [abffb9f95]
+- Updated dependencies [746483c49]
+- Updated dependencies [2cbc591ff]
+- Updated dependencies [57d97a4df]
+- Updated dependencies [cc01acbd0]
+- Updated dependencies [951865859]
+- Updated dependencies [57d97a4df]
+- Updated dependencies [2c10c2423]
+  - @logto/[email protected]
+  - @logto/[email protected]
+  - @logto/[email protected]
+  - @logto/[email protected]
+  - @logto/[email protected]
+  - @logto/[email protected]
+
 ## 1.14.0
 
 ### Patch Changes

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/cli",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "description": "Logto CLI.",
   "author": "Silverhand Inc. <[email protected]>",
   "homepage": "https://github.com/logto-io/logto#readme",
@@ -25,15 +25,14 @@
     "precommit": "lint-staged",
     "prepare:package-json": "node -p \"'export const packageJson = ' + JSON.stringify(require('./package.json'), undefined, 2) + ';'\" > src/package-json.ts",
     "build": "rm -rf lib && pnpm prepare:package-json && tsc -p tsconfig.build.json",
-    "build:test": "rm -rf lib/ && pnpm prepare:package-json && tsc -p tsconfig.test.json --sourcemap",
+    "build:test": "pnpm build",
     "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput --incremental",
     "start": "node .",
     "start:dev": "pnpm build && node .",
     "lint": "eslint --ext .ts src",
     "lint:report": "pnpm lint --format json --output-file report.json",
-    "test:only": "NODE_OPTIONS=--experimental-vm-modules jest",
-    "test": "pnpm build:test && pnpm test:only",
-    "test:ci": "pnpm test:only",
+    "test": "vitest src",
+    "test:ci": "pnpm run test --silent --coverage",
     "prepack": "pnpm build"
   },
   "engines": {
@@ -43,14 +42,15 @@
     "url": "https://github.com/logto-io/logto/issues"
   },
   "dependencies": {
-    "@logto/connector-kit": "workspace:^2.1.0",
-    "@logto/core-kit": "workspace:^2.3.0",
+    "@logto/connector-kit": "workspace:^3.0.0",
+    "@logto/core-kit": "workspace:^2.4.0",
     "@logto/language-kit": "workspace:^1.1.0",
-    "@logto/phrases": "workspace:^1.9.0",
-    "@logto/phrases-experience": "workspace:^1.6.0",
-    "@logto/schemas": "workspace:1.14.0",
+    "@logto/phrases": "workspace:^1.10.0",
+    "@logto/phrases-experience": "workspace:^1.6.1",
+    "@logto/schemas": "workspace:1.15.0",
     "@logto/shared": "workspace:^3.1.0",
     "@silverhand/essentials": "^2.9.0",
+    "@silverhand/slonik": "31.0.0-beta.2",
     "chalk": "^5.0.0",
     "decamelize": "^6.0.0",
     "dotenv": "^16.0.0",
@@ -65,9 +65,6 @@
     "pg-protocol": "^1.6.0",
     "roarr": "^7.11.0",
     "semver": "^7.3.8",
-    "slonik": "^30.0.0",
-    "slonik-interceptor-preset": "^1.2.10",
-    "slonik-sql-tag-raw": "^1.1.4",
     "tar": "^6.1.11",
     "typescript": "^5.3.3",
     "yargs": "^17.6.0",
@@ -76,19 +73,19 @@
   "devDependencies": {
     "@silverhand/eslint-config": "5.0.0",
     "@silverhand/ts-config": "5.0.0",
-    "@withtyped/server": "^0.12.9",
     "@types/inquirer": "^9.0.0",
-    "@types/jest": "^29.4.0",
     "@types/node": "^20.9.5",
     "@types/semver": "^7.3.12",
     "@types/sinon": "^17.0.0",
     "@types/tar": "^6.1.2",
     "@types/yargs": "^17.0.13",
+    "@vitest/coverage-v8": "^1.4.0",
+    "@withtyped/server": "^0.13.3",
     "eslint": "^8.44.0",
-    "jest": "^29.7.0",
     "lint-staged": "^15.0.0",
     "prettier": "^3.0.0",
-    "sinon": "^17.0.0"
+    "sinon": "^17.0.0",
+    "vitest": "^1.4.0"
   },
   "eslintConfig": {
     "extends": "@silverhand",

packages/cli/src/commands/database/alteration/index.test.ts

@@ -1,14 +1,11 @@
-import { createMockUtils } from '@logto/shared/esm';
+import { createMockPool } from '@silverhand/slonik';
 import Sinon from 'sinon';
-import { createMockPool } from 'slonik';
+import { vi, expect, afterAll, describe, it } from 'vitest';
 
 import { chooseAlterationsByVersion } from './version.js';
 
-const { jest } = import.meta;
-const { mockEsmWithActual } = createMockUtils(jest);
-
 const pool = createMockPool({
-  query: jest.fn(),
+  query: vi.fn(),
 });
 
 const files = Object.freeze([
@@ -17,16 +14,19 @@ const files = Object.freeze([
   { filename: '1.0.0-1663923772-c.js', path: '/alterations-js/1.0.0-1663923772-c.js' },
 ]);
 
-await mockEsmWithActual('./utils.js', () => ({
+vi.mock('./utils.js', async (importOriginal) => ({
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  ...(await importOriginal<object>()),
   getAlterationFiles: async () => files,
 }));
 
-const { getCurrentDatabaseAlterationTimestamp } = await mockEsmWithActual(
-  '../../../queries/system.js',
-  () => ({
-    getCurrentDatabaseAlterationTimestamp: jest.fn(),
-  })
-);
+const getCurrentDatabaseAlterationTimestamp = vi.fn();
+
+vi.doMock('../../../queries/system.js', async (importOriginal) => ({
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  ...(await importOriginal<object>()),
+  getCurrentDatabaseAlterationTimestamp,
+}));
 
 const { getAvailableAlterations } = await import('./index.js');
 

packages/cli/src/commands/database/alteration/index.ts

@@ -1,7 +1,7 @@
 import type { AlterationScript } from '@logto/schemas/lib/types/alteration.js';
 import { conditionalString } from '@silverhand/essentials';
+import type { DatabasePool } from '@silverhand/slonik';
 import chalk from 'chalk';
-import type { DatabasePool } from 'slonik';
 import type { CommandModule } from 'yargs';
 
 import { createPoolFromConfig } from '../../../database.js';

packages/cli/src/commands/database/ogcio/applications.ts

@@ -4,7 +4,7 @@
 /* eslint-disable @silverhand/fp/no-mutation */
 import { ApplicationType } from '@logto/schemas';
 import { generateStandardSecret } from '@logto/shared';
-import { sql, type DatabaseTransactionConnection } from 'slonik';
+import { sql, type DatabaseTransactionConnection } from '@silverhand/slonik';
 
 import { type OgcioParams } from './index.js';
 import { createItem } from './queries.js';

packages/cli/src/commands/database/ogcio/ogcio.ts

@@ -3,7 +3,7 @@
 /* eslint-disable @silverhand/fp/no-let */
 
 import { defaultTenantId } from '@logto/schemas';
-import type { CommonQueryMethods, DatabaseTransactionConnection } from 'slonik';
+import type { CommonQueryMethods, DatabaseTransactionConnection } from '@silverhand/slonik';
 
 import { seedApplications } from './applications.js';
 import { type OgcioParams } from './index.js';