Merge branch 'main' into static-rendering

vivid-planet · Dec 2, 2024 · f8ed764 · f8ed764
2 parents 7dcb93a + 68f4588
commit f8ed764
Show file tree

Hide file tree

Showing 16 changed files with 251 additions and 189 deletions.
diff --git a/admin/cspell.config.yaml b/admin/cspell.config.yaml
diff --git a/admin/package-lock.json b/admin/package-lock.json
diff --git a/admin/package.json b/admin/package.json
@@ -36,9 +36,9 @@
         "@emotion/react": "^11.13.5",
         "@emotion/styled": "^11.13.5",
         "@fontsource/roboto": "^5.1.0",
-        "@mui/lab": "^5.0.0-alpha.173",
-        "@mui/material": "^5.16.7",
-        "@mui/system": "^5.16.7",
+        "@mui/lab": "^5.0.0-alpha.174",
+        "@mui/material": "^5.16.8",
+        "@mui/system": "^5.16.8",
         "@mui/x-data-grid": "^5.17.26",
         "@mui/x-data-grid-pro": "^5.17.26",
         "change-case": "^5.4.4",
@@ -73,8 +73,8 @@
         "@graphql-codegen/introspection": "^4.0.3",
         "@graphql-codegen/named-operations-object": "^3.1.0",
         "@graphql-codegen/near-operation-file-preset": "^3.0.0",
-        "@graphql-codegen/typescript": "^4.1.1",
-        "@graphql-codegen/typescript-operations": "^4.3.1",
+        "@graphql-codegen/typescript": "^4.1.2",
+        "@graphql-codegen/typescript-operations": "^4.4.0",
         "@parcel/watcher": "^2.5.0",
         "@swc/plugin-emotion": "^3.0.13",
         "@types/lodash.isequal": "^4.5.8",

diff --git a/admin/project-words.txt b/admin/project-words.txt
diff --git a/api/cspell.config.yaml b/api/cspell.config.yaml
diff --git a/api/project-words.txt b/api/project-words.txt
diff --git a/api/schema.gql b/api/schema.gql
@@ -2,7 +2,7 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY)
 # ------------------------------------------------------
 
-type User {
+type UserPermissionsUser {
   id: String!
   name: String!
   email: String!
@@ -26,7 +26,7 @@ type CurrentUser {
   email: String!
   permissions: [CurrentUserPermission!]!
   impersonated: Boolean
-  authenticatedUser: User
+  authenticatedUser: UserPermissionsUser
   permissionsForScope(scope: JSONObject!): [String!]!
 }
 
@@ -123,8 +123,8 @@ type FilenameResponse {
   isOccupied: Boolean!
 }
 
-type PaginatedUserList {
-  nodes: [User!]!
+type UserPermissionPaginatedUserList {
+  nodes: [UserPermissionsUser!]!
   totalCount: Int!
 }
 
@@ -344,8 +344,8 @@ input RedirectScopeInput {
 
 type Query {
   currentUser: CurrentUser!
-  userPermissionsUserById(id: String!): User!
-  userPermissionsUsers(offset: Int! = 0, limit: Int! = 25, search: String, filter: UserFilter, sort: [UserSort!]): PaginatedUserList!
+  userPermissionsUserById(id: String!): UserPermissionsUser!
+  userPermissionsUsers(offset: Int! = 0, limit: Int! = 25, search: String, filter: UserPermissionsUserFilter, sort: [UserPermissionsUserSort!]): UserPermissionPaginatedUserList!
   userPermissionsPermissionList(userId: String!): [UserPermission!]!
   userPermissionsPermission(id: ID!, userId: String): UserPermission!
   userPermissionsAvailablePermissions: [String!]!
@@ -379,12 +379,12 @@ type Query {
   footer(scope: FooterScopeInput!): Footer
 }
 
-input UserFilter {
+input UserPermissionsUserFilter {
   name: StringFilter
   email: StringFilter
   status: StringFilter
-  and: [UserFilter!]
-  or: [UserFilter!]
+  and: [UserPermissionsUserFilter!]
+  or: [UserPermissionsUserFilter!]
 }
 
 input StringFilter {
@@ -395,12 +395,12 @@ input StringFilter {
   notEqual: String
 }
 
-input UserSort {
-  field: UserSortField!
+input UserPermissionsUserSort {
+  field: UserPermissionsUserSortField!
   direction: SortDirection! = ASC
 }
 
-enum UserSortField {
+enum UserPermissionsUserSortField {
   name
   email
   status

diff --git a/create-app/cspell.config.yaml b/create-app/cspell.config.yaml
diff --git a/create-app/package-lock.json b/create-app/package-lock.json
diff --git a/create-app/package.json b/create-app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@comet/create-app",
-    "version": "1.53.0",
+    "version": "1.54.0",
     "description": "Command-line interface to create a new Comet application",
     "homepage": "https://github.com/vivid-planet/comet-starter/tree/main/create-app#readme",
     "bugs": {

diff --git a/create-app/project-words.txt b/create-app/project-words.txt
diff --git a/project-words.txt b/project-words.txt
@@ -1,14 +1,25 @@
+allkeys
+authproxy
+Autopurge
 bitnami
 codegen
 darthsim
+Flexbox
 imgproxy
 jaegertracing
+loglevel
+maxmemory
+mikro
+nanospinner
+nestjs
+nowait
 oltp
+ormconfig
+pagetree
+pkey
+prelint
 prelogin
-maxmemory
-allkeys
-loglevel
+rdndmb
 requirepass
-mikro
-Mikro
-nestjs
+schemaname
+tablename
diff --git a/site/cspell.config.yaml b/site/cspell.config.yaml
diff --git a/site/package-lock.json b/site/package-lock.json
diff --git a/site/package.json b/site/package.json
@@ -49,8 +49,8 @@
         "@graphql-codegen/cli": "^5.0.3",
         "@graphql-codegen/named-operations-object": "^3.1.0",
         "@graphql-codegen/near-operation-file-preset": "^3.0.0",
-        "@graphql-codegen/typescript": "^4.1.1",
-        "@graphql-codegen/typescript-operations": "^4.3.1",
+        "@graphql-codegen/typescript": "^4.1.2",
+        "@graphql-codegen/typescript-operations": "^4.4.0",
         "@parcel/watcher": "^2.5.0",
         "@types/node": "^22.10.1",
         "@types/react": "^18.3.12",

diff --git a/site/project-words.txt b/site/project-words.txt