From 180e7839860523a8590480253703536890352f1a Mon Sep 17 00:00:00 2001 From: Gearonix Date: Thu, 17 Aug 2023 21:08:23 +0300 Subject: [PATCH] chore(whole project): fixed fatal yarn errors, fixed linting --- .eslintrc.js | 24 +- .github/dependabot.yml | 4 +- .prettierignore | 2 - apps/client/.eslintrc.js | 2 +- apps/client/config/defineAliases.ts | 21 +- apps/client/package.json | 4 +- .../client/src/app/entrypoint/application.tsx | 5 +- .../shared/lib/components/page/auth-guard.tsx | 3 +- .../sign-in-modal/store/auth.services.ts | 8 +- .../client/src/widgets/sign-in-modal/types.ts | 2 - .../sign-in-modal/ui/sign-in-modal.tsx | 1 - apps/client/tsconfig.json | 2 +- apps/server/package.json | 4 +- apps/server/project.json | 7 +- apps/server/tsconfig.json | 2 +- libs/client-shared/.eslintrc.json | 2 +- libs/client-shared/package.json | 4 +- .../ui/popover/hooks/use-popover-animation.ts | 1 + libs/client-shared/tsconfig.json | 2 +- libs/config/package.json | 2 +- libs/config/tsconfig.json | 2 +- libs/editor/package.json | 4 +- libs/editor/tsconfig.json | 2 +- libs/generator/package.json | 4 + libs/nest-common/.eslintrc.json | 36 +-- libs/nest-common/package.json | 2 +- libs/nest-common/project.json | 1 + libs/nest-common/tsconfig.json | 2 +- libs/nest-services/package.json | 4 +- libs/nest-services/tsconfig.json | 2 +- libs/nest-services/tsconfig.lib.json | 2 +- package.json | 14 +- tsconfig.base.json | 11 +- yarn.lock | 273 ++++++++++-------- 34 files changed, 232 insertions(+), 229 deletions(-) delete mode 100644 apps/client/src/widgets/sign-in-modal/types.ts create mode 100644 libs/generator/package.json diff --git a/.eslintrc.js b/.eslintrc.js index c49b1e64..1c98d4bc 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,16 +1,5 @@ -// eslint-disable-next-line @typescript-eslint/no-var-requires const {configure, presets} = require('eslint-kit') -/** - * Creates eslint config - * - * @param {string} root - define root of project (ex: __dirname) - * @param {string} tsconfig - specify tsconfig name - * @param {Object} rules - eslint additional rules - * @param {Array} ignorePatterns - eslint ignorePatterns property - * @return {Linter.Config} - */ - module.exports = configure({ mode: 'only-errors', allowDebug: process.env.NODE_ENV !== 'production', @@ -27,13 +16,16 @@ module.exports = configure({ root: './' }), presets.react(), - presets.imports({ - sort: { - newline: true - } - }) + // eslint runs forever because of this preset + // --- + // presets.imports({ + // sort: { + // newline: true + // } + // }) ], extend: { + root: true, ignorePatterns: ["**/*"], plugins: ['@nx', 'prefer-arrow'], rules: { diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 90877c42..ff9caa97 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,6 +1,6 @@ version: 2 updates: - - package-ecosystem: "yarn" + - package-ecosystem: "npm" directory: "/" schedule: - interval: "weekly" + interval: "monthly" diff --git a/.prettierignore b/.prettierignore index a60f9ce8..e69de29b 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,2 +0,0 @@ -/dist -/coverage diff --git a/apps/client/.eslintrc.js b/apps/client/.eslintrc.js index d865b647..6505182a 100644 --- a/apps/client/.eslintrc.js +++ b/apps/client/.eslintrc.js @@ -1,6 +1,6 @@ module.exports = { parser: '@typescript-eslint/parser', plugins: ['preact'], - extends: ['./eslint-test.js'], + extends: ['../../.eslintrc.js'], ignorePatterns: ['!**/*'] } diff --git a/apps/client/config/defineAliases.ts b/apps/client/config/defineAliases.ts index 5881eac5..6da0ee26 100644 --- a/apps/client/config/defineAliases.ts +++ b/apps/client/config/defineAliases.ts @@ -1,19 +1,18 @@ -import { resolve } from 'path' import { AliasOptions, ResolveOptions } from 'vite' type DefineAliases = ResolveOptions & { alias: AliasOptions } -const resolveLibs = (...args: string[]) => - resolve(__dirname, '..', '..', '..', 'libs', ...args) - export const defineAliases = (): DefineAliases => { return { - preserveSymlinks: true, - alias: { - '@code-gear/client-shared': resolve( - __dirname, - resolveLibs('client-shared', 'src', 'index.js') - ) - } + preserveSymlinks: true + // Nx and Vite have issues with full support for yarn workspaces, + // so i just will use tsconfig paths ;) + + // alias: { + // '@code-gear/client-shared': resolve( + // __dirname, + // resolveLibs('client-shared', 'src', 'index.js') + // ) + // } } } diff --git a/apps/client/package.json b/apps/client/package.json index ab4fed8d..777e6bf3 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -1,8 +1,8 @@ { - "name": "@client", + "name": "cg-client", "version": "0.0.1", "packageManager": "yarn@3.6.0", "devDependencies": { - "@config": "workspace:^" + "cg-config": "workspace:^" } } diff --git a/apps/client/src/app/entrypoint/application.tsx b/apps/client/src/app/entrypoint/application.tsx index bb88de59..c37ab839 100644 --- a/apps/client/src/app/entrypoint/application.tsx +++ b/apps/client/src/app/entrypoint/application.tsx @@ -1,8 +1,9 @@ -import { RouterProvider } from '../providers/router' -import { StoreProvider } from '../providers/store' import { ThemeProvider } from '@/app/providers/theme' import { GlobalStyles } from '@/app/styles' +import { RouterProvider } from '../providers/router' +import { StoreProvider } from '../providers/store' + import 'normalize.css' const App = () => { diff --git a/apps/client/src/shared/lib/components/page/auth-guard.tsx b/apps/client/src/shared/lib/components/page/auth-guard.tsx index 50ae57b3..c9c3e28b 100644 --- a/apps/client/src/shared/lib/components/page/auth-guard.tsx +++ b/apps/client/src/shared/lib/components/page/auth-guard.tsx @@ -3,13 +3,14 @@ import { observer } from 'mobx-react-lite' import { useLocation, useNavigate } from 'react-router-dom' import { useStore } from '@/shared/hooks' + import { PrivatePaths, RoutePaths, useAsyncEffect, useBooleanState, WithChildren -} from '@code-gear/client-shared' +} from '$/client-shared' const AuthGuard = observer(({ children }: WithChildren) => { const { isAuthorized, services } = useStore('auth') diff --git a/apps/client/src/widgets/sign-in-modal/store/auth.services.ts b/apps/client/src/widgets/sign-in-modal/store/auth.services.ts index 164e1e36..373a3b55 100644 --- a/apps/client/src/widgets/sign-in-modal/store/auth.services.ts +++ b/apps/client/src/widgets/sign-in-modal/store/auth.services.ts @@ -1,7 +1,3 @@ -import {UserEntity} from '$/common-types' -import {SignInResponse} from '$/common-types' -import {SignInForm} from '$/common-types' -import {AccessToken} from '$/common-types' import { makeAutoObservable } from 'mobx' import { AuthStore } from '@/widgets/sign-in-modal' @@ -10,6 +6,10 @@ import { getProfileQuery } from '@/widgets/sign-in-modal/graphql/get-profile.que import { SignInMutation } from '../graphql/sign-in.mutation' import { ApolloMiddleware, LocalStorageClient } from '$/client-shared' +import { UserEntity } from '$/common-types' +import { SignInResponse } from '$/common-types' +import { SignInForm } from '$/common-types' +import { AccessToken } from '$/common-types' export class AuthServices { private state: AuthStore diff --git a/apps/client/src/widgets/sign-in-modal/types.ts b/apps/client/src/widgets/sign-in-modal/types.ts deleted file mode 100644 index 06ccb2cd..00000000 --- a/apps/client/src/widgets/sign-in-modal/types.ts +++ /dev/null @@ -1,2 +0,0 @@ -import {WithUsername} from '$/common-types' - diff --git a/apps/client/src/widgets/sign-in-modal/ui/sign-in-modal.tsx b/apps/client/src/widgets/sign-in-modal/ui/sign-in-modal.tsx index 7b01661f..92858e01 100644 --- a/apps/client/src/widgets/sign-in-modal/ui/sign-in-modal.tsx +++ b/apps/client/src/widgets/sign-in-modal/ui/sign-in-modal.tsx @@ -3,7 +3,6 @@ import { useNavigate } from 'react-router-dom' import { SignInModalTemplate } from '@/entities/sign-in-modal-template' import { useStore } from '@/shared/hooks' - import { WrongPassword } from '@/widgets/sign-in-modal/lib/exceptions' import { SignInForm } from '@/widgets/sign-in-modal/types' diff --git a/apps/client/tsconfig.json b/apps/client/tsconfig.json index 35b566b6..798f52dc 100644 --- a/apps/client/tsconfig.json +++ b/apps/client/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@config/tsconfig/base.json", + "extends": "cg-config/tsconfig/base.json", "compilerOptions": { "target": "ESNext", "module": "ESNext", diff --git a/apps/server/package.json b/apps/server/package.json index c859a7f4..8001a120 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -1,7 +1,7 @@ { - "name": "@server", + "name": "cg-server", "version": "1.0.0", "devDependencies": { - "@config": "workspace:^" + "cg-config": "workspace:^" } } diff --git a/apps/server/project.json b/apps/server/project.json index 126b370e..665147ce 100644 --- a/apps/server/project.json +++ b/apps/server/project.json @@ -22,7 +22,7 @@ "cwd": "apps/server", "envFile": ".serve.env" }, - "dependsOn": ["concat-prisma-files"] + "dependsOn": ["prisma:generate","concat-prisma-files"] }, "migrate:prod": { "command": "yarn dlx prisma migrate deploy", @@ -30,7 +30,7 @@ "cwd": "apps/server", "envFile": ".build.env" }, - "dependsOn": ["concat-prisma-files"] + "dependsOn": ["prisma:generate","concat-prisma-files"] }, "generate-prisma-types": { "command": "yarn dlx @kalissaac/prisma-typegen ./../../libs/nest-common/src/types/_prisma.ts ./prisma/schema.prisma", @@ -53,7 +53,8 @@ "tsConfig": "apps/server/tsconfig.app.json", "assets": ["apps/server/src/assets"], "isolatedConfig": true, - "webpackConfig": "apps/server/webpack.config.js" + "webpackConfig": "apps/server/webpack.config.js", + "skipTypeCheck": true }, "configurations": { "development": {}, diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.json index 86f5eb8a..8f4c2e2c 100644 --- a/apps/server/tsconfig.json +++ b/apps/server/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@config/tsconfig/base.json", + "extends": "cg-config/tsconfig/base.json", "files": [], "include": [], "references": [ diff --git a/libs/client-shared/.eslintrc.json b/libs/client-shared/.eslintrc.json index 43591fed..c093f1d5 100644 --- a/libs/client-shared/.eslintrc.json +++ b/libs/client-shared/.eslintrc.json @@ -1,4 +1,4 @@ { - "extends": ["plugin:@nx/react", "../../.eslintrc.js"], + "extends": ["../../.eslintrc.js"], "ignorePatterns": ["!**/*", "env.d.ts"] } diff --git a/libs/client-shared/package.json b/libs/client-shared/package.json index 57a9cf86..a5e1c261 100644 --- a/libs/client-shared/package.json +++ b/libs/client-shared/package.json @@ -1,5 +1,5 @@ { - "name": "@client-shared", + "name": "cg-client-shared", "version": "0.0.1", "main": "src/index.ts", "exports": { @@ -9,6 +9,6 @@ } }, "devDependencies": { - "@config": "workspace:^" + "cg-config": "workspace:^" } } diff --git a/libs/client-shared/src/ui/popover/hooks/use-popover-animation.ts b/libs/client-shared/src/ui/popover/hooks/use-popover-animation.ts index f032cac8..e69d733c 100644 --- a/libs/client-shared/src/ui/popover/hooks/use-popover-animation.ts +++ b/libs/client-shared/src/ui/popover/hooks/use-popover-animation.ts @@ -25,6 +25,7 @@ export const usePopoverAnimation = ( ({ last, velocity: [, vy], direction: [, dy], offset: [, oy], cancel }) => { if (oy < -70) cancel() if (last) { + // eslint-disable-next-line @typescript-eslint/no-unused-expressions oy > height * 0.5 || (vy > 0.5 && dy === 1) ? close(vy) : open() } else api.start({ y: oy, immediate: dy === -1 }) }, diff --git a/libs/client-shared/tsconfig.json b/libs/client-shared/tsconfig.json index 729a9d69..f0f57317 100644 --- a/libs/client-shared/tsconfig.json +++ b/libs/client-shared/tsconfig.json @@ -17,5 +17,5 @@ "path": "./tsconfig.spec.json" } ], - "extends": "@config/tsconfig/base.json" + "extends": "cg-config/tsconfig/base.json" } diff --git a/libs/config/package.json b/libs/config/package.json index f98b088f..a88979da 100644 --- a/libs/config/package.json +++ b/libs/config/package.json @@ -1,4 +1,4 @@ { - "name": "@config", + "name": "cg-config", "version": "1.0.0" } diff --git a/libs/config/tsconfig.json b/libs/config/tsconfig.json index 2fe97d71..a0820496 100644 --- a/libs/config/tsconfig.json +++ b/libs/config/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@config/tsconfig/base.json", + "extends": "cg-config/tsconfig/base.json", "compilerOptions": { "module": "commonjs", "forceConsistentCasingInFileNames": true, diff --git a/libs/editor/package.json b/libs/editor/package.json index 2461869c..7d7098c8 100644 --- a/libs/editor/package.json +++ b/libs/editor/package.json @@ -1,5 +1,5 @@ { - "name": "@editor", + "name": "cg-editor", "version": "0.0.1", "main": "./index.js", "types": "./index.d.ts", @@ -10,6 +10,6 @@ } }, "devDependencies": { - "@config": "workspace:^" + "cg-config": "workspace:^" } } diff --git a/libs/editor/tsconfig.json b/libs/editor/tsconfig.json index 729a9d69..f0f57317 100644 --- a/libs/editor/tsconfig.json +++ b/libs/editor/tsconfig.json @@ -17,5 +17,5 @@ "path": "./tsconfig.spec.json" } ], - "extends": "@config/tsconfig/base.json" + "extends": "cg-config/tsconfig/base.json" } diff --git a/libs/generator/package.json b/libs/generator/package.json new file mode 100644 index 00000000..59ba9771 --- /dev/null +++ b/libs/generator/package.json @@ -0,0 +1,4 @@ +{ + "name": "cg-generator", + "version": "1.0.0" +} diff --git a/libs/nest-common/.eslintrc.json b/libs/nest-common/.eslintrc.json index 9f611653..74cf2a9b 100644 --- a/libs/nest-common/.eslintrc.json +++ b/libs/nest-common/.eslintrc.json @@ -3,40 +3,6 @@ "../../.eslintrc.js" ], "ignorePatterns": [ - "!**/*" - ], - "overrides": [ - { - "files": [ - "*.ts", - "*.tsx", - "*.js", - "*.jsx" - ], - "rules": {} - }, - { - "files": [ - "*.ts", - "*.tsx" - ], - "rules": {} - }, - { - "files": [ - "*.js", - "*.jsx" - ], - "rules": {} - }, - { - "files": [ - "*.json" - ], - "parser": "jsonc-eslint-parser", - "rules": { - "@nx/dependency-checks": "error" - } - } + "!**/*", "package.json", "jest.config.ts" ] } diff --git a/libs/nest-common/package.json b/libs/nest-common/package.json index b286001f..050c1871 100644 --- a/libs/nest-common/package.json +++ b/libs/nest-common/package.json @@ -1,5 +1,5 @@ { - "name": "@nest-common", + "name": "nest-common", "version": "0.0.1", "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nest-common/project.json b/libs/nest-common/project.json index b9ba2c8f..c57d2606 100644 --- a/libs/nest-common/project.json +++ b/libs/nest-common/project.json @@ -10,6 +10,7 @@ "{options.outputPath}" ], "options": { + "skipTypeCheck": true, "outputPath": "dist/libs/nest-common", "tsConfig": "libs/nest-common/tsconfig.lib.json", "packageJson": "libs/nest-common/package.json", diff --git a/libs/nest-common/tsconfig.json b/libs/nest-common/tsconfig.json index 38332d4e..49984ab7 100644 --- a/libs/nest-common/tsconfig.json +++ b/libs/nest-common/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@config/tsconfig/base.json", + "extends": "cg-config/tsconfig/base.json", "compilerOptions": { "module": "commonjs", "forceConsistentCasingInFileNames": true, diff --git a/libs/nest-services/package.json b/libs/nest-services/package.json index e8e5096e..0ef95d06 100644 --- a/libs/nest-services/package.json +++ b/libs/nest-services/package.json @@ -1,8 +1,8 @@ { - "name": "@nest-services", + "name": "nest-services", "version": "1.0.0", "main": "./src/index.ts", "devDependencies": { - "@config": "workspace:^" + "cg-config": "workspace:^" } } diff --git a/libs/nest-services/tsconfig.json b/libs/nest-services/tsconfig.json index c5b82a32..38788800 100644 --- a/libs/nest-services/tsconfig.json +++ b/libs/nest-services/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@config/tsconfig/base.json", + "extends": "cg-config/tsconfig/base.json", "compilerOptions": { "module": "commonjs", "forceConsistentCasingInFileNames": true, diff --git a/libs/nest-services/tsconfig.lib.json b/libs/nest-services/tsconfig.lib.json index 850cb685..d4bb5c62 100644 --- a/libs/nest-services/tsconfig.lib.json +++ b/libs/nest-services/tsconfig.lib.json @@ -1,5 +1,5 @@ { - "extends": "@config/tsconfig/base.json", + "extends": "cg-config/tsconfig/base.json", "compilerOptions": { "outDir": "../../dist/out-tsc", "declaration": true, diff --git a/package.json b/package.json index 5d7e2ed0..8d7ff4a7 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,9 @@ "name": "@code-gear/source", "version": "1.1.0", "license": "MIT", + "auhtor": "Gearonix egor.uzhanin@gmail.com", + "repository": "git@github.com:Gearonix/CodeGear.git", + "description": "Fast online code editor built on Preact, Nest and Nx.", "packageManager": "yarn@3.6.1", "engines": { "node": ">=16.0.0", @@ -20,9 +23,10 @@ } }, "scripts": { - "serve": "nx run-many --targets=serve --all", - "build": "nx run-many --targets=build --all", + "serve": "nx run-many -t=serve -p client server --parallel", + "build": "nx run-many -t=build -p client server --parallel", "lint": "nx run-many --targets=lint --all", + "test": "nx run-many --targets=test --all", "dep-graph": "nx dep-graph", "preinstall": "node -e \"if(process.env.npm_execpath.indexOf('yarn') === -1) throw new Error('You must use Yarn to install, not NPM')\"", "prepare": "husky install", @@ -69,7 +73,6 @@ "@babel/preset-react": "^7.22.5", "@commitlint/cli": "^17.7.0", "@commitlint/config-conventional": "^17.7.0", - "@config": "workspace:^", "@kalissaac/prisma-typegen": "^0.0.7", "@nestjs/schematics": "^10.0.1", "@nestjs/testing": "^10.0.2", @@ -112,15 +115,16 @@ "@vitest/ui": "^0.32.0", "babel-plugin-styled-components": "1.10.7", "babel-plugin-transform-hook-names": "^1.0.2", + "cg-config": "workspace:^", "concat-files": "^0.1.1", "cross-env": "^7.0.3", "cypress": "^12.11.0", - "eslint": "~8.41.0", + "eslint": "^8.41.0", "eslint-config-gearonix": "1.0.2", "eslint-config-google": "^0.14.0", "eslint-config-preact": "^1.2.0", "eslint-config-prettier": "8.1.0", - "eslint-kit": "10.0.0", + "eslint-kit": "^10.0.0", "eslint-plugin-cypress": "^2.10.3", "eslint-plugin-import": "2.27.5", "eslint-plugin-jsx-a11y": "6.7.1", diff --git a/tsconfig.base.json b/tsconfig.base.json index b9ba16db..89df04a7 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1,14 +1,9 @@ { - "extends": "@config/tsconfig/base.json", + "extends": "cg-config/tsconfig/base.json", "compileOnSave": false, "compilerOptions": { "rootDir": ".", - "baseUrl": ".", - "paths": { - "@code-gear/nest-common": [ - "libs/nest-common/src/index.ts" - ] - } + "baseUrl": "." }, - "include": [] + "exclude": ["node_modules", "tmp"] } diff --git a/yarn.lock b/yarn.lock index 017ee026..0bc00eb3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -741,7 +741,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.19.1, @babel/helper-validator-identifier@npm:^7.22.5": +"@babel/helper-validator-identifier@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-validator-identifier@npm:7.22.5" checksum: 7f0f30113474a28298c12161763b49de5018732290ca4de13cdaefd4fd0d635a6fe3f6686c37a02905fb1e64f21a5ee2b55140cf7b070e729f1bd66866506aea @@ -2003,22 +2003,6 @@ __metadata: languageName: node linkType: hard -"@client-shared@workspace:libs/client-shared": - version: 0.0.0-use.local - resolution: "@client-shared@workspace:libs/client-shared" - dependencies: - "@config": "workspace:^" - languageName: unknown - linkType: soft - -"@client@workspace:apps/client": - version: 0.0.0-use.local - resolution: "@client@workspace:apps/client" - dependencies: - "@config": "workspace:^" - languageName: unknown - linkType: soft - "@code-gear/source@workspace:.": version: 0.0.0-use.local resolution: "@code-gear/source@workspace:." @@ -2032,7 +2016,6 @@ __metadata: "@babel/preset-react": ^7.22.5 "@commitlint/cli": ^17.7.0 "@commitlint/config-conventional": ^17.7.0 - "@config": "workspace:^" "@kalissaac/prisma-typegen": ^0.0.7 "@monaco-editor/react": ^4.5.1 "@nestjs/apollo": ^12.0.7 @@ -2093,18 +2076,19 @@ __metadata: babel-plugin-styled-components: 1.10.7 babel-plugin-transform-hook-names: ^1.0.2 bcryptjs: ^2.4.3 + cg-config: "workspace:^" class-transformer: ^0.5.1 class-validator: ^0.14.0 concat-files: ^0.1.1 cross-env: ^7.0.3 cypress: ^12.11.0 dotenv: ^16.3.1 - eslint: ~8.41.0 + eslint: ^8.41.0 eslint-config-gearonix: 1.0.2 eslint-config-google: ^0.14.0 eslint-config-preact: ^1.2.0 eslint-config-prettier: 8.1.0 - eslint-kit: 10.0.0 + eslint-kit: ^10.0.0 eslint-plugin-cypress: ^2.10.3 eslint-plugin-import: 2.27.5 eslint-plugin-jsx-a11y: 6.7.1 @@ -2371,12 +2355,6 @@ __metadata: languageName: node linkType: hard -"@config@workspace:^, @config@workspace:libs/config": - version: 0.0.0-use.local - resolution: "@config@workspace:libs/config" - languageName: unknown - linkType: soft - "@cspotcode/source-map-support@npm:^0.8.0": version: 0.8.1 resolution: "@cspotcode/source-map-support@npm:0.8.1" @@ -2429,14 +2407,6 @@ __metadata: languageName: node linkType: hard -"@editor@workspace:libs/editor": - version: 0.0.0-use.local - resolution: "@editor@workspace:libs/editor" - dependencies: - "@config": "workspace:^" - languageName: unknown - linkType: soft - "@emotion/hash@npm:^0.8.0": version: 0.8.0 resolution: "@emotion/hash@npm:0.8.0" @@ -2653,7 +2623,7 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.0.3, @eslint/eslintrc@npm:^2.1.1": +"@eslint/eslintrc@npm:^2.1.1": version: 2.1.1 resolution: "@eslint/eslintrc@npm:2.1.1" dependencies: @@ -2670,10 +2640,20 @@ __metadata: languageName: node linkType: hard -"@eslint/js@npm:8.41.0": - version: 8.41.0 - resolution: "@eslint/js@npm:8.41.0" - checksum: af013d70fe8d0429cdf5cd8b5dcc6fc384ed026c1eccb0cfe30f5849b968ab91645111373fd1b83282b38955b1bdfbe667c1a7dbda3b06cae753521223cad775 +"@eslint/eslintrc@npm:^2.1.2": + version: 2.1.2 + resolution: "@eslint/eslintrc@npm:2.1.2" + dependencies: + ajv: ^6.12.4 + debug: ^4.3.2 + espree: ^9.6.0 + globals: ^13.19.0 + ignore: ^5.2.0 + import-fresh: ^3.2.1 + js-yaml: ^4.1.0 + minimatch: ^3.1.2 + strip-json-comments: ^3.1.1 + checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7 languageName: node linkType: hard @@ -2684,6 +2664,13 @@ __metadata: languageName: node linkType: hard +"@eslint/js@npm:^8.47.0": + version: 8.47.0 + resolution: "@eslint/js@npm:8.47.0" + checksum: 0ef57fe27b6d4c305b33f3b2d2fee1ab397a619006f1d6f4ce5ee4746b8f03d11a4e098805a7d78601ca534cf72917d37f0ac19896c992a32e26299ecb9f9de1 + languageName: node + linkType: hard + "@graphql-tools/merge@npm:9.0.0, @graphql-tools/merge@npm:^9.0.0": version: 9.0.0 resolution: "@graphql-tools/merge@npm:9.0.0" @@ -2782,7 +2769,7 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.11.10, @humanwhocodes/config-array@npm:^0.11.8": +"@humanwhocodes/config-array@npm:^0.11.10": version: 0.11.10 resolution: "@humanwhocodes/config-array@npm:0.11.10" dependencies: @@ -3290,22 +3277,6 @@ __metadata: languageName: node linkType: hard -"@nest-common@workspace:libs/nest-common": - version: 0.0.0-use.local - resolution: "@nest-common@workspace:libs/nest-common" - dependencies: - tslib: ^2.3.0 - languageName: unknown - linkType: soft - -"@nest-services@workspace:libs/nest-services": - version: 0.0.0-use.local - resolution: "@nest-services@workspace:libs/nest-services" - dependencies: - "@config": "workspace:^" - languageName: unknown - linkType: soft - "@nestjs/apollo@npm:^12.0.7": version: 12.0.7 resolution: "@nestjs/apollo@npm:12.0.7" @@ -5280,14 +5251,6 @@ __metadata: languageName: node linkType: hard -"@server@workspace:apps/server": - version: 0.0.0-use.local - resolution: "@server@workspace:apps/server" - dependencies: - "@config": "workspace:^" - languageName: unknown - linkType: soft - "@sinclair/typebox@npm:^0.27.8": version: 0.27.8 resolution: "@sinclair/typebox@npm:0.27.8" @@ -7032,7 +6995,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.10.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:~6.12.6": +"ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:~6.12.6": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -8405,6 +8368,50 @@ __metadata: languageName: node linkType: hard +"cg-client-shared@workspace:libs/client-shared": + version: 0.0.0-use.local + resolution: "cg-client-shared@workspace:libs/client-shared" + dependencies: + cg-config: "workspace:^" + languageName: unknown + linkType: soft + +"cg-client@workspace:apps/client": + version: 0.0.0-use.local + resolution: "cg-client@workspace:apps/client" + dependencies: + cg-config: "workspace:^" + languageName: unknown + linkType: soft + +"cg-config@workspace:^, cg-config@workspace:libs/config": + version: 0.0.0-use.local + resolution: "cg-config@workspace:libs/config" + languageName: unknown + linkType: soft + +"cg-editor@workspace:libs/editor": + version: 0.0.0-use.local + resolution: "cg-editor@workspace:libs/editor" + dependencies: + cg-config: "workspace:^" + languageName: unknown + linkType: soft + +"cg-generator@workspace:libs/generator": + version: 0.0.0-use.local + resolution: "cg-generator@workspace:libs/generator" + languageName: unknown + linkType: soft + +"cg-server@workspace:apps/server": + version: 0.0.0-use.local + resolution: "cg-server@workspace:apps/server" + dependencies: + cg-config: "workspace:^" + languageName: unknown + linkType: soft + "chai@npm:^4.3.7": version: 4.3.7 resolution: "chai@npm:4.3.7" @@ -11089,9 +11096,9 @@ __metadata: languageName: node linkType: hard -"eslint-kit@npm:10.0.0": - version: 10.0.0 - resolution: "eslint-kit@npm:10.0.0" +"eslint-kit@npm:^10.0.0": + version: 10.5.0 + resolution: "eslint-kit@npm:10.5.0" dependencies: "@babel/core": ^7.18.6 "@babel/eslint-parser": ^7.17.0 @@ -11103,24 +11110,24 @@ __metadata: eslint-import-resolver-custom-alias: ^1.3.0 eslint-import-resolver-jsconfig: ^1.1.0 eslint-import-resolver-typescript: ^3.5.5 - eslint-plugin-effector: 0.10.5 + eslint-plugin-effector: 0.11.0 eslint-plugin-import: 2.27.5 eslint-plugin-jsx-a11y: 6.7.1 eslint-plugin-prettier: 5.0.0 - eslint-plugin-react: 7.32.2 + eslint-plugin-react: 7.33.0 eslint-plugin-react-hooks: 4.6.0 eslint-plugin-simple-import-sort: ^10.0.0 eslint-plugin-solid: 0.12.1 eslint-plugin-sonarjs: 0.19.0 eslint-plugin-svelte3: ^4.0.0 - eslint-plugin-unicorn: 47.0.0 + eslint-plugin-unicorn: 48.0.1 eslint-plugin-vue: 9.15.1 semver: ^7.3.8 vue-eslint-parser: 9.1.1 peerDependencies: eslint: ^8.41.0 prettier: ^3.0.0 - checksum: ce91503ae3de62830473c51d7b62ba0bef7538121e1f18673304a3b88b138ac8fa2866bdf0f0486e74016f2c8f0b4c8e9fec0521e17f23510ff3b16ab02f5b52 + checksum: cb9f078c9f6cfb7a0916d558b3e7df713a7f921af8ca9bb1cdb85f399bccaf3649e84e83e406ed1a93bfc32c30e3f52e58bc6a32d818580f0e7d4fb23012dd6f languageName: node linkType: hard @@ -11183,15 +11190,15 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-effector@npm:0.10.5": - version: 0.10.5 - resolution: "eslint-plugin-effector@npm:0.10.5" +"eslint-plugin-effector@npm:0.11.0": + version: 0.11.0 + resolution: "eslint-plugin-effector@npm:0.11.0" dependencies: prettier: ^2.3.2 peerDependencies: effector: "*" eslint: 7 || 8 - checksum: 2cb42e409ef3454fa31781944fabc871288891d54ac0d24f176758b7a3fec3786fc227c5095b6f8de688ec2a329ea68a3d632aa7c4f6c53e16aa9b57c221df1a + checksum: a374209055013d920018895cb68411a5344ddca7bc36c9b546aa47b2a600b95d7aaf2614e789860a573d7c0e96d7db2c0b4a74863a1c6e3ca8070404979ad4cf languageName: node linkType: hard @@ -11372,6 +11379,31 @@ __metadata: languageName: node linkType: hard +"eslint-plugin-react@npm:7.33.0": + version: 7.33.0 + resolution: "eslint-plugin-react@npm:7.33.0" + dependencies: + array-includes: ^3.1.6 + array.prototype.flatmap: ^1.3.1 + array.prototype.tosorted: ^1.1.1 + doctrine: ^2.1.0 + estraverse: ^5.3.0 + jsx-ast-utils: ^2.4.1 || ^3.0.0 + minimatch: ^3.1.2 + object.entries: ^1.1.6 + object.fromentries: ^2.0.6 + object.hasown: ^1.1.2 + object.values: ^1.1.6 + prop-types: ^15.8.1 + resolve: ^2.0.0-next.4 + semver: ^6.3.1 + string.prototype.matchall: ^4.0.8 + peerDependencies: + eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 + checksum: f3ce2978322efd3c698b802dabfad070109dd1935c4e468545992b82b5fb8257ea3ad56732330bb46643182a09560129a259b436952b3e2aa426947d3abd2b1a + languageName: node + linkType: hard + "eslint-plugin-react@npm:^7.0.0, eslint-plugin-react@npm:^7.27.0, eslint-plugin-react@npm:^7.31.11": version: 7.33.1 resolution: "eslint-plugin-react@npm:7.33.1" @@ -11441,11 +11473,11 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-unicorn@npm:47.0.0": - version: 47.0.0 - resolution: "eslint-plugin-unicorn@npm:47.0.0" +"eslint-plugin-unicorn@npm:48.0.1": + version: 48.0.1 + resolution: "eslint-plugin-unicorn@npm:48.0.1" dependencies: - "@babel/helper-validator-identifier": ^7.19.1 + "@babel/helper-validator-identifier": ^7.22.5 "@eslint-community/eslint-utils": ^4.4.0 ci-info: ^3.8.0 clean-regexp: ^1.0.0 @@ -11456,14 +11488,13 @@ __metadata: lodash: ^4.17.21 pluralize: ^8.0.0 read-pkg-up: ^7.0.1 - regexp-tree: ^0.1.24 + regexp-tree: ^0.1.27 regjsparser: ^0.10.0 - safe-regex: ^2.1.1 - semver: ^7.3.8 + semver: ^7.5.4 strip-indent: ^3.0.0 peerDependencies: - eslint: ">=8.38.0" - checksum: 8d93bd76d54fb44e134c6576e3bda72dbf4c9cb5bae90451ace6acf1c48e6d7329f1e36db1d19266a5da499afeff6bf0c647875d69adc92d546bcc2d8b765cca + eslint: ">=8.44.0" + checksum: e63112cbaa3a1347cbb427160d7b3c6a1f8cc8ef512075a0ab285c64761772356f4eb5f82c9fb1a8cde63d8794f8aa819eda02fa0a7c44bc9955c5113f87be78 languageName: node linkType: hard @@ -11494,7 +11525,7 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:^7.1.1, eslint-scope@npm:^7.2.0, eslint-scope@npm:^7.2.2": +"eslint-scope@npm:^7.1.1, eslint-scope@npm:^7.2.2": version: 7.2.2 resolution: "eslint-scope@npm:7.2.2" dependencies: @@ -11534,6 +11565,13 @@ __metadata: languageName: node linkType: hard +"eslint-visitor-keys@npm:^3.4.3": + version: 3.4.3 + resolution: "eslint-visitor-keys@npm:3.4.3" + checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60 + languageName: node + linkType: hard + "eslint@npm:^8.30.0": version: 8.46.0 resolution: "eslint@npm:8.46.0" @@ -11581,26 +11619,26 @@ __metadata: languageName: node linkType: hard -"eslint@npm:~8.41.0": - version: 8.41.0 - resolution: "eslint@npm:8.41.0" +"eslint@npm:^8.41.0": + version: 8.47.0 + resolution: "eslint@npm:8.47.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 - "@eslint-community/regexpp": ^4.4.0 - "@eslint/eslintrc": ^2.0.3 - "@eslint/js": 8.41.0 - "@humanwhocodes/config-array": ^0.11.8 + "@eslint-community/regexpp": ^4.6.1 + "@eslint/eslintrc": ^2.1.2 + "@eslint/js": ^8.47.0 + "@humanwhocodes/config-array": ^0.11.10 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 - ajv: ^6.10.0 + ajv: ^6.12.4 chalk: ^4.0.0 cross-spawn: ^7.0.2 debug: ^4.3.2 doctrine: ^3.0.0 escape-string-regexp: ^4.0.0 - eslint-scope: ^7.2.0 - eslint-visitor-keys: ^3.4.1 - espree: ^9.5.2 + eslint-scope: ^7.2.2 + eslint-visitor-keys: ^3.4.3 + espree: ^9.6.1 esquery: ^1.4.2 esutils: ^2.0.2 fast-deep-equal: ^3.1.3 @@ -11610,7 +11648,6 @@ __metadata: globals: ^13.19.0 graphemer: ^1.4.0 ignore: ^5.2.0 - import-fresh: ^3.0.0 imurmurhash: ^0.1.4 is-glob: ^4.0.0 is-path-inside: ^3.0.3 @@ -11620,17 +11657,16 @@ __metadata: lodash.merge: ^4.6.2 minimatch: ^3.1.2 natural-compare: ^1.4.0 - optionator: ^0.9.1 + optionator: ^0.9.3 strip-ansi: ^6.0.1 - strip-json-comments: ^3.1.0 text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 09979a6f8451dcc508a7005b6670845c8a518376280b3fd96657a406b8b6ef29d0e480d1ba11b4eb48da93d607e0c55c9b877676fe089d09973ec152354e23b2 + checksum: 1988617f703eadc5c7540468d54dc8e5171cf2bb9483f6172799cd1ff54a9a5e4470f003784e8cef92687eaa14de37172732787040e67817581a20bcb9c15970 languageName: node linkType: hard -"espree@npm:^9.0.0, espree@npm:^9.3.1, espree@npm:^9.5.2, espree@npm:^9.6.0, espree@npm:^9.6.1": +"espree@npm:^9.0.0, espree@npm:^9.3.1, espree@npm:^9.6.0, espree@npm:^9.6.1": version: 9.6.1 resolution: "espree@npm:9.6.1" dependencies: @@ -16528,6 +16564,22 @@ __metadata: languageName: node linkType: hard +"nest-common@workspace:libs/nest-common": + version: 0.0.0-use.local + resolution: "nest-common@workspace:libs/nest-common" + dependencies: + tslib: ^2.3.0 + languageName: unknown + linkType: soft + +"nest-services@workspace:libs/nest-services": + version: 0.0.0-use.local + resolution: "nest-services@workspace:libs/nest-services" + dependencies: + cg-config: "workspace:^" + languageName: unknown + linkType: soft + "netmask@npm:^2.0.2": version: 2.0.2 resolution: "netmask@npm:2.0.2" @@ -17206,7 +17258,7 @@ __metadata: languageName: node linkType: hard -"optionator@npm:^0.9.1, optionator@npm:^0.9.3": +"optionator@npm:^0.9.3": version: 0.9.3 resolution: "optionator@npm:0.9.3" dependencies: @@ -19448,7 +19500,7 @@ __metadata: languageName: node linkType: hard -"regexp-tree@npm:^0.1.24, regexp-tree@npm:~0.1.1": +"regexp-tree@npm:^0.1.27": version: 0.1.27 resolution: "regexp-tree@npm:0.1.27" bin: @@ -20003,15 +20055,6 @@ __metadata: languageName: node linkType: hard -"safe-regex@npm:^2.1.1": - version: 2.1.1 - resolution: "safe-regex@npm:2.1.1" - dependencies: - regexp-tree: ~0.1.1 - checksum: 5d734e2193c63ef0cb00f60c0244e0f8a30ecb31923633cd34636808d6a7c4c206d650017953ae1db8bc33967c2f06af33488dea6f038f4e38212beb7bed77b4 - languageName: node - linkType: hard - "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" @@ -20199,7 +20242,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.4, semver@npm:^7.0.0, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:~7.5.4": +"semver@npm:7.5.4, semver@npm:^7.0.0, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:~7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -21015,7 +21058,7 @@ __metadata: languageName: node linkType: hard -"strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1, strip-json-comments@npm:~3.1.1": +"strip-json-comments@npm:^3.1.1, strip-json-comments@npm:~3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443