bump

.changeset/config.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://unpkg.com/@changesets/config@1.6.0/schema.json",
+  "$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",
   "changelog": ["@changesets/changelog-github", { "repo": "accounts-js/accounts" }],
   "commit": false,
   "linked": [],
@@ -28,5 +28,9 @@
   ],
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true
+  },
+  "snapshot": {
+    "useCalculatedVersion": true,
+    "prereleaseTemplate": "{tag}-{datetime}-{commit}"
   }
 }

.changeset/cyan-laws-perform.md

@@ -0,0 +1,5 @@
+---
+'darkbasic-accounts-typeorm': patch
+---
+
+Test the new CI

.github/workflows/codeql-analysis.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.

.github/workflows/pr.yml

@@ -9,21 +9,13 @@ jobs:
     uses: darkbasic/shared-config/.github/workflows/release-snapshot.yml@main
     with:
       npmTag: alpha
-      buildScript: build
+      buildScript: compile
       nodeVersion: 18
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
-      npmToken: ${{ secrets.NODE_AUTH_TOKEN }}
+      npmToken: ${{ secrets.NPM_TOKEN }}
 
   dependencies:
     uses: darkbasic/shared-config/.github/workflows/changesets-dependencies.yaml@main
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
-
-  algolia:
-    uses: darkbasic/shared-config/.github/workflows/algolia-integrity.yml@main
-    with:
-      domain: https://www.the-guild.dev/graphql/modules/
-      source: 'Modules'
-    secrets:
-      githubToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-stable.yml

@@ -12,13 +12,4 @@ jobs:
       nodeVersion: 18
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
-      npmToken: ${{ secrets.NODE_AUTH_TOKEN }}
-
-  algolia:
-    uses: darkbasic/shared-config/.github/workflows/algolia-publish.yml@main
-    secrets:
-      githubToken: ${{ secrets.GITHUB_TOKEN }}
-      algoliaAdminApiKey: ${{ secrets.ALGOLIA_ADMIN_API_KEY }}
-    with:
-      domain: https://www.the-guild.dev/graphql/modules/
-      source: 'Modules'
+      npmToken: ${{ secrets.NPM_TOKEN }}

.github/workflows/nodejs.yml → .github/workflows/tests.yml

@@ -12,19 +12,13 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout Master
+        uses: actions/checkout@v4
 
-      - name: Set Node.js 18.x
-        uses: actions/setup-node@v3
+      - name: Setup env
+        uses: darkbasic/shared-config/setup@main
         with:
-          node-version: 18.x
-          cache: 'yarn'
-
-      - name: Enable corepack
-        run: corepack enable
-
-      - name: Install Dependencies
-        run: yarn install
+          nodeVersion: 18
 
       - name: Check lint
         run: yarn run test:lint
@@ -46,19 +40,13 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout Master
+        uses: actions/checkout@v4
 
-      - name: Set Node.js 18.x
-        uses: actions/setup-node@v3
+      - name: Setup env
+        uses: darkbasic/shared-config/setup@main
         with:
-          node-version: 18.x
-          cache: 'yarn'
-
-      - name: Enable corepack
-        run: corepack enable
-
-      - name: Install Dependencies
-        run: yarn install
+          nodeVersion: 18
 
       - name: Compile packages
         run: yarn run compile
@@ -73,19 +61,13 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout Master
+        uses: actions/checkout@v4
 
-      - name: Set Node.js 18.x
-        uses: actions/setup-node@v3
+      - name: Setup env
+        uses: darkbasic/shared-config/setup@main
         with:
-          node-version: 18.x
-          cache: 'yarn'
-
-      - name: Enable corepack
-        run: corepack enable
-
-      - name: Install Dependencies
-        run: yarn install
+          nodeVersion: 18
 
       - name: Test documentation
         run: yarn workspace accounts-js run build

.github/workflows/website.yml

@@ -0,0 +1,37 @@
+name: website
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  deployment:
+    runs-on: ubuntu-22.04
+    if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'push'
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: darkbasic/shared-config/setup@main
+        name: setup env
+        with:
+          nodeVersion: 18
+          packageManager: yarn
+
+      - uses: darkbasic/shared-config/website-cf@main
+        name: build and deploy website
+        with:
+          cloudflareApiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          cloudflareAccountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          projectName: accounts-js
+          prId: ${{ github.event.pull_request.number }}
+          websiteDirectory: ./
+          buildScript: yarn compile && cd website && yarn build
+          artifactDir: website/build

examples/graphql-server-typeorm-postgres/package.json

@@ -17,10 +17,10 @@
     "@accounts/module-typeorm": "^0.34.0",
     "@accounts/password": "^0.32.2",
     "@accounts/server": "^0.33.1",
-    "@accounts/typeorm": "^0.33.1",
     "@envelop/core": "4.0.3",
     "@envelop/graphql-modules": "5.0.3",
     "@graphql-tools/merge": "9.0.0",
+    "darkbasic-accounts-typeorm": "^0.33.1",
     "dotenv": "16.3.1",
     "graphql": "16.8.1",
     "graphql-modules": "3.0.0-alpha-20231010152921-a1eddea3",

examples/graphql-server-typeorm-postgres/src/connect.ts

@@ -4,7 +4,7 @@ export const connect = (url = process.env.DATABASE_URL) => {
   return createConnection({
     type: 'postgres',
     url,
-    entities: [...require('@accounts/typeorm').entities],
+    entities: [...require('darkbasic-accounts-typeorm').entities],
     synchronize: true,
   }).then((connection) => {
     return connection;

modules/module-typeorm/package.json

@@ -36,8 +36,8 @@
     "@accounts/module-core": "^0.34.0",
     "@accounts/password": "^0.32.0",
     "@accounts/server": "^0.32.0 || ^0.33.0",
-    "@accounts/typeorm": "^0.33.1",
     "@accounts/types": "^0.32.0 || ^0.33.0",
+    "darkbasic-accounts-typeorm": "^0.33.1",
     "graphql": "^16.0.0",
     "graphql-modules": "^3.0.0",
     "graphql-tag": "^2.10.0",
@@ -54,7 +54,6 @@
     "@accounts/module-core": "^0.34.0",
     "@accounts/password": "^0.32.1",
     "@accounts/server": "^0.33.1",
-    "@accounts/typeorm": "^0.33.1",
     "@accounts/types": "^0.33.2",
     "@graphql-codegen/add": "5.0.0",
     "@graphql-codegen/cli": "5.0.0",
@@ -64,6 +63,7 @@
     "@graphql-codegen/typescript-resolvers": "4.0.1",
     "@graphql-codegen/typescript-type-graphql": "3.0.0",
     "@types/request-ip": "0.0.39",
+    "darkbasic-accounts-typeorm": "^0.33.1",
     "graphql": "16.8.1",
     "graphql-modules": "3.0.0-alpha-20231010152921-a1eddea3",
     "graphql-tag": "2.12.6",

modules/module-typeorm/src/index.ts

@@ -12,7 +12,7 @@ import {
   UserService,
   AccountsTypeormOptions,
   AccountsTypeORMConfigToken,
-} from '@accounts/typeorm';
+} from 'darkbasic-accounts-typeorm';
 import { DatabaseType } from '@accounts/types';
 import { Connection } from 'typeorm';
 

packages/database-typeorm/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@accounts/typeorm",
+  "name": "darkbasic-accounts-typeorm",
   "version": "0.33.1",
   "description": "TypeORM adaptor for accounts",
   "main": "lib/index.js",

packages/e2e/package.json

@@ -44,12 +44,12 @@
     "@accounts/rest-client": "^0.33.1",
     "@accounts/rest-express": "^0.33.1",
     "@accounts/server": "^0.33.1",
-    "@accounts/typeorm": "^0.33.1",
     "@accounts/types": "^0.33.2",
     "@apollo/client": "3.8.5",
     "@apollo/server": "4.9.4",
     "body-parser": "1.20.2",
     "core-js": "3.33.0",
+    "darkbasic-accounts-typeorm": "^0.33.1",
     "express": "4.18.2",
     "graphql": "16.8.1",
     "graphql-modules": "3.0.0-alpha-20231010152921-a1eddea3",

yarn.lock

@@ -85,7 +85,6 @@ __metadata:
     "@accounts/rest-client": "npm:^0.33.1"
     "@accounts/rest-express": "npm:^0.33.1"
     "@accounts/server": "npm:^0.33.1"
-    "@accounts/typeorm": "npm:^0.33.1"
     "@accounts/types": "npm:^0.33.2"
     "@apollo/client": "npm:3.8.5"
     "@apollo/server": "npm:4.9.4"
@@ -94,6 +93,7 @@ __metadata:
     "@types/node-fetch": "npm:2.6.6"
     body-parser: "npm:1.20.2"
     core-js: "npm:3.33.0"
+    darkbasic-accounts-typeorm: "npm:^0.33.1"
     express: "npm:4.18.2"
     graphql: "npm:16.8.1"
     graphql-modules: "npm:3.0.0-alpha-20231010152921-a1eddea3"
@@ -408,7 +408,6 @@ __metadata:
     "@accounts/module-core": "npm:^0.34.0"
     "@accounts/password": "npm:^0.32.1"
     "@accounts/server": "npm:^0.33.1"
-    "@accounts/typeorm": "npm:^0.33.1"
     "@accounts/types": "npm:^0.33.2"
     "@graphql-codegen/add": "npm:5.0.0"
     "@graphql-codegen/cli": "npm:5.0.0"
@@ -420,6 +419,7 @@ __metadata:
     "@graphql-tools/merge": "npm:9.0.0"
     "@graphql-tools/utils": "npm:10.0.7"
     "@types/request-ip": "npm:0.0.39"
+    darkbasic-accounts-typeorm: "npm:^0.33.1"
     graphql: "npm:16.8.1"
     graphql-modules: "npm:3.0.0-alpha-20231010152921-a1eddea3"
     graphql-tag: "npm:2.12.6"
@@ -432,8 +432,8 @@ __metadata:
     "@accounts/module-core": ^0.34.0
     "@accounts/password": ^0.32.0
     "@accounts/server": ^0.32.0 || ^0.33.0
-    "@accounts/typeorm": ^0.33.1
     "@accounts/types": ^0.32.0 || ^0.33.0
+    darkbasic-accounts-typeorm: ^0.33.1
     graphql: ^16.0.0
     graphql-modules: ^3.0.0
     graphql-tag: ^2.10.0
@@ -636,27 +636,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@accounts/typeorm@npm:^0.33.1, @accounts/typeorm@workspace:packages/database-typeorm":
-  version: 0.0.0-use.local
-  resolution: "@accounts/typeorm@workspace:packages/database-typeorm"
-  dependencies:
-    "@accounts/database-tests": "npm:^0.32.2"
-    "@accounts/types": "npm:^0.33.1"
-    "@types/lodash": "npm:4.14.199"
-    graphql: "npm:16.8.1"
-    graphql-modules: "npm:3.0.0-alpha-20231010152921-a1eddea3"
-    lodash: "npm:4.17.21"
-    pg: "npm:8.11.3"
-    reflect-metadata: "npm:0.1.13"
-    tslib: "npm:2.6.2"
-    typeorm: "npm:0.3.17"
-  peerDependencies:
-    graphql: ^16.0.0
-    graphql-modules: ^3.0.0
-    typeorm: ^0.3.0
-  languageName: unknown
-  linkType: soft
-
 "@accounts/types@npm:^0.33.1, @accounts/types@npm:^0.33.2, @accounts/types@workspace:packages/types":
   version: 0.0.0-use.local
   resolution: "@accounts/types@workspace:packages/types"
@@ -4200,11 +4179,11 @@ __metadata:
     "@accounts/module-typeorm": "npm:^0.34.0"
     "@accounts/password": "npm:^0.32.2"
     "@accounts/server": "npm:^0.33.1"
-    "@accounts/typeorm": "npm:^0.33.1"
     "@accounts/types": "npm:^0.33.2"
     "@envelop/core": "npm:4.0.3"
     "@envelop/graphql-modules": "npm:5.0.3"
     "@graphql-tools/merge": "npm:9.0.0"
+    darkbasic-accounts-typeorm: "npm:^0.33.1"
     dotenv: "npm:16.3.1"
     graphql: "npm:16.8.1"
     graphql-modules: "npm:3.0.0-alpha-20231010152921-a1eddea3"
@@ -12351,6 +12330,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"darkbasic-accounts-typeorm@npm:^0.33.1, darkbasic-accounts-typeorm@workspace:packages/database-typeorm":
+  version: 0.0.0-use.local
+  resolution: "darkbasic-accounts-typeorm@workspace:packages/database-typeorm"
+  dependencies:
+    "@accounts/database-tests": "npm:^0.32.2"
+    "@accounts/types": "npm:^0.33.1"
+    "@types/lodash": "npm:4.14.199"
+    graphql: "npm:16.8.1"
+    graphql-modules: "npm:3.0.0-alpha-20231010152921-a1eddea3"
+    lodash: "npm:4.17.21"
+    pg: "npm:8.11.3"
+    reflect-metadata: "npm:0.1.13"
+    tslib: "npm:2.6.2"
+    typeorm: "npm:0.3.17"
+  peerDependencies:
+    graphql: ^16.0.0
+    graphql-modules: ^3.0.0
+    typeorm: ^0.3.0
+  languageName: unknown
+  linkType: soft
+
 "dashdash@npm:^1.12.0":
   version: 1.14.1
   resolution: "dashdash@npm:1.14.1"