deps(global): INFRA-979 finalize missing deps (#6069)

SavelevMatthew · web-flow · commit 6904cc898ade · 2025-04-16T12:57:02.000+05:00
* deps(global): INFRA-979 finalize clean missing deps

* deps(global): INFRA-979 finalize clean missing deps

* deps(global): INFRA-979 finalize clean missing deps

* deps(global): INFRA-979 sync submodules
diff --git a/apps/announcements b/apps/announcements
@@ -1 +1 @@
-Subproject commit 33e7aafc8edbe5e1be58e805e3ac0704fe7535a7
+Subproject commit 063b877a86b8541ba6cfb6dbaa6acd66547cb9e6
diff --git a/apps/condo/domains/common/components/ImagesUploadList.tsx b/apps/condo/domains/common/components/ImagesUploadList.tsx
@@ -105,7 +105,7 @@ export type UploadFileType = {
     name: string
     status: 'done' | 'uploading'
     url: string
-    response: { id: string, url: string },
+    response: { id: string, url: string }
 }
 
 export type DBFile = {
diff --git a/apps/condo/domains/common/components/Import/BaseImportWrapper.tsx b/apps/condo/domains/common/components/Import/BaseImportWrapper.tsx
@@ -62,7 +62,7 @@ export type ExtraModalContentType = Record<Extract<ActiveModalType, 'example'>,
 
 type TBaseImportWrapperProps = {
     importCardButton?: {
-        header: Pick<CardHeaderProps, 'emoji' | 'headingTitle'>,
+        header: Pick<CardHeaderProps, 'emoji' | 'headingTitle'>
         body: Pick<CardBodyProps, 'description'>
     }
     setActiveModal: (type: ActiveModalType) => void
diff --git a/apps/condo/domains/common/components/Import/Index.tsx b/apps/condo/domains/common/components/Import/Index.tsx
@@ -33,7 +33,7 @@ export interface IImportWrapperProps<TExtraProps = unknown> {
     uploadButtonLabel?: string
     domainName: string
     importCardButton?: {
-        header: Pick<CardHeaderProps, 'emoji' | 'headingTitle'>,
+        header: Pick<CardHeaderProps, 'emoji' | 'headingTitle'>
         body: Pick<CardBodyProps, 'description'>
     }
     extraModalContent?: ExtraModalContentType
diff --git a/apps/condo/domains/common/components/MultipleFileUpload.tsx b/apps/condo/domains/common/components/MultipleFileUpload.tsx
@@ -97,7 +97,7 @@ interface IMultipleFileUploadHookArgs {
     Model: Module
     relationField: string
     initialFileList?: DBFile[]
-    initialCreateValues?: Record<string, unknown>,
+    initialCreateValues?: Record<string, unknown>
     dependenciesForRerenderUploadComponent?: Array<unknown>
 }
 
diff --git a/apps/condo/domains/common/components/Pickers/DatePicker.tsx b/apps/condo/domains/common/components/Pickers/DatePicker.tsx
@@ -21,12 +21,12 @@ type PickerType =
 type PropsWithRef<P, R = any> = P & { ref?: React.Ref<R> }
 
 export type DatePickerType = React.FC<PropsWithRef<PickerProps<Dayjs>>> & {
-    WeekPicker: React.FC<PropsWithRef<Omit<PickerDateProps<Dayjs>, 'picker'>>>,
-    MonthPicker: React.FC<PropsWithRef<Omit<PickerDateProps<Dayjs>, 'picker'>>>,
-    YearPicker: React.FC<PropsWithRef<Omit<PickerDateProps<Dayjs>, 'picker'>>>,
+    WeekPicker: React.FC<PropsWithRef<Omit<PickerDateProps<Dayjs>, 'picker'>>>
+    MonthPicker: React.FC<PropsWithRef<Omit<PickerDateProps<Dayjs>, 'picker'>>>
+    YearPicker: React.FC<PropsWithRef<Omit<PickerDateProps<Dayjs>, 'picker'>>>
     RangePicker: React.FC<PropsWithRef<RangePickerProps<Dayjs>>>
-    TimePicker: React.FC<PropsWithRef<Omit<PickerTimeProps<Dayjs>, 'picker'>>>,
-    QuarterPicker: React.FC<PropsWithRef<Omit<PickerTimeProps<Dayjs>, 'picker'>>>,
+    TimePicker: React.FC<PropsWithRef<Omit<PickerTimeProps<Dayjs>, 'picker'>>>
+    QuarterPicker: React.FC<PropsWithRef<Omit<PickerTimeProps<Dayjs>, 'picker'>>>
 }
 
 const PickerStyle = css`
diff --git a/apps/dev-portal-api/domains/miniapp/constants/oidc.js b/apps/dev-portal-api/domains/miniapp/constants/oidc.js
@@ -1,4 +1,4 @@
-const { CONDO_SUPPORTED_RESPONSE_TYPES } = require('@condo/domains/user/constants/oidc')
+const { CONDO_SUPPORTED_RESPONSE_TYPES } = require('@app/condo/domains/user/constants/oidc')
 
 const OIDC_SECRET_LENGTH = 32
 
diff --git a/apps/dev-portal-api/domains/miniapp/schema/B2CAppAccessRight.test.js b/apps/dev-portal-api/domains/miniapp/schema/B2CAppAccessRight.test.js
@@ -10,7 +10,7 @@ const {
     expectToThrowAuthenticationErrorToObj,
 } = require('@open-condo/keystone/test.utils')
 
-const { normalizeEmail } = require('@condo/domains/common/utils/mail')
+const { normalizeEmail } = require('@app/condo/domains/common/utils/mail')
 const {
     createTestB2CApp,
     B2CAppAccessRight,
diff --git a/apps/dev-portal-api/domains/miniapp/schema/RegisterAppServiceUserService.js b/apps/dev-portal-api/domains/miniapp/schema/RegisterAppServiceUserService.js
@@ -9,7 +9,7 @@ const { safeFormatError } = require('@open-condo/keystone/apolloErrorFormatter')
 const { GQLError, GQLErrorCode: { BAD_USER_INPUT } } = require('@open-condo/keystone/errors')
 const { GQLCustomSchema, getByCondition } = require('@open-condo/keystone/schema')
 
-const { EMAIL_ALREADY_REGISTERED_ERROR } = require('@condo/domains/user/constants/errors')
+const { EMAIL_ALREADY_REGISTERED_ERROR } = require('@app/condo/domains/user/constants/errors')
 const { REMOTE_SYSTEM } = require('@dev-portal-api/domains/common/constants/common')
 const { REGISTER_SERVICE_USER_MUTATION } = require('@dev-portal-api/domains/common/gql')
 const { productionClient, developmentClient } = require('@dev-portal-api/domains/common/utils/serverClients')
diff --git a/apps/dev-portal-api/domains/miniapp/schema/RegisterAppServiceUserService.test.js b/apps/dev-portal-api/domains/miniapp/schema/RegisterAppServiceUserService.test.js
@@ -12,7 +12,7 @@ const {
     expectToThrowGQLError,
 } = require('@open-condo/keystone/test.utils')
 
-const { SERVICE } = require('@condo/domains/user/constants/common')
+const { SERVICE } = require('@app/condo/domains/user/constants/common')
 const { REMOTE_SYSTEM } = require('@dev-portal-api/domains/common/constants/common')
 const { PROD_ENVIRONMENT, DEV_ENVIRONMENT } = require('@dev-portal-api/domains/miniapp/constants/publishing')
 const {
diff --git a/apps/dev-portal-api/domains/miniapp/utils/testSchema/index.js b/apps/dev-portal-api/domains/miniapp/utils/testSchema/index.js
@@ -7,8 +7,8 @@ const { faker } = require('@faker-js/faker')
 const conf = require('@open-condo/config')
 const path = require('path')
 const { generateGQLTestUtils, throwIfError } = require('@open-condo/codegen/generate.test.utils')
-const { buildFakeAddressAndMeta } = require('@condo/domains/property/utils/testSchema/factories')
-const { registerNewServiceUserByTestClient } = require('@condo/domains/user/utils/testSchema')
+const { buildFakeAddressAndMeta } = require('@app/condo/domains/property/utils/testSchema/factories')
+const { registerNewServiceUserByTestClient } = require('@app/condo/domains/user/utils/testSchema')
 
 const {
     B2CApp: B2CAppGQL,
diff --git a/apps/dev-portal-api/domains/user/schema/ConfirmEmailActionService.js b/apps/dev-portal-api/domains/user/schema/ConfirmEmailActionService.js
@@ -8,7 +8,7 @@ const conf = require('@open-condo/config')
 const { GQLError, GQLErrorCode: { BAD_USER_INPUT, TOO_MANY_REQUESTS } } = require('@open-condo/keystone/errors')
 const { GQLCustomSchema } = require('@open-condo/keystone/schema')
 
-const { normalizeEmail } = require('@condo/domains/common/utils/mail')
+const { normalizeEmail } = require('@app/condo/domains/common/utils/mail')
 const { sendMessage } = require('@dev-portal-api/domains/common/utils/email')
 const { extractReqLocale, getLocalizedMessage } = require('@dev-portal-api/domains/common/utils/messages')
 const access = require('@dev-portal-api/domains/user/access/ConfirmEmailActionService')
diff --git a/apps/insurance b/apps/insurance
@@ -1 +1 @@
-Subproject commit 179b003aa4a06887319fb59d82506145e61c4b3f
+Subproject commit a1a9ba95a8b1e6a0815aca99f27edc6420f5ff96
diff --git a/apps/miniapp/next.config.js b/apps/miniapp/next.config.js
@@ -5,7 +5,7 @@ const withTMModule = require('next-transpile-modules')
 
 const conf = require('@open-condo/config')
 
-const { antGlobalVariables } = require('@condo/domains/common/constants/style')
+const { antGlobalVariables } = require('@app/condo/domains/common/constants/style')
 const { DEFAULT_LOCALE } = require('@miniapp/domains/common/constants')
 
 // Tell webpack to compile the "@open-condo/next" package, necessary
@@ -15,13 +15,7 @@ const { DEFAULT_LOCALE } = require('@miniapp/domains/common/constants')
 const withTM = withTMModule([
     '@open-condo/codegen',
     '@open-condo/next',
-    '@open-condo/bridge',
-    '@open-condo/featureflags',
-    '@open-condo/keystone',
-    '@emotion/styled',
     '@app/condo',
-    '@app/miniapp',
-    '@condo/domains',
     '@miniapp/domains',
 ])
 
diff --git a/apps/miniapp/package.json b/apps/miniapp/package.json
@@ -24,9 +24,7 @@
     "createservice": "node ./../../bin/createservice"
   },
   "dependencies": {
-    "@apollo/client": "^3.11.8",
     "@app/condo": "workspace:^",
-    "@condo/domains": "link:../condo/domains",
     "@emotion/babel-plugin": "^11.10.0",
     "@emotion/core": "^10.1.1",
     "@emotion/react": "^11.9.3",
@@ -49,7 +47,6 @@
     "emotion-server": "^10.0.27",
     "express": "^4.17.1",
     "graphql-tag": "^2.12.6",
-    "graphql-upload": "^15.0.1",
     "less": "^3.12.2",
     "lodash": "^4.17.21",
     "next": "^9.5.5",
diff --git a/apps/miniapp/pages/_app.tsx b/apps/miniapp/pages/_app.tsx
@@ -15,7 +15,7 @@ import { withAuth } from '@open-condo/next/auth'
 import { LocaleContext, useIntl, withIntl } from '@open-condo/next/intl'
 import '@open-condo/ui/dist/styles.min.css'
 
-import GlobalStyle from '@condo/domains/common/components/containers/GlobalStyle'
+import GlobalStyle from '@app/condo/domains/common/components/containers/GlobalStyle'
 import { AppFrameWrapper } from '@miniapp/domains/common/components/AppFrameWrapper'
 import { BaseLayout } from '@miniapp/domains/common/components/containers/BaseLayout'
 import { useLaunchParams } from '@miniapp/domains/common/hooks/useLaunchParams'
diff --git a/apps/miniapp/pages/index.tsx b/apps/miniapp/pages/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { useLaunchParams } from '@condo/domains/miniapp/hooks/useLaunchParams'
+import { useLaunchParams } from '@app/condo/domains/miniapp/hooks/useLaunchParams'
 
 
 const IndexPage = () => {
diff --git a/apps/news-greenhouse b/apps/news-greenhouse
@@ -1 +1 @@
-Subproject commit a5ac62d39590ed6eeecb176b740351e736431fc2
+Subproject commit 2a8a1774c67b3edde067a1d58028aac6e4d93668
diff --git a/apps/news-telegram-api b/apps/news-telegram-api
@@ -1 +1 @@
-Subproject commit 787d456aa6f859e822dd77a80c9cd8192acea688
+Subproject commit 4c836ee4e3ecbd19e92b8e0399f500d548c50a95
diff --git a/apps/news-telegram-web b/apps/news-telegram-web
@@ -1 +1 @@
-Subproject commit 406325a189848262b68bf5b820451a7061f9d52d
+Subproject commit 5f38b14e15061f56c96588d1a38e36a11d7cdb72
diff --git a/apps/pass b/apps/pass
@@ -1 +1 @@
-Subproject commit f80cc457d365b4a526bac12f7b666a4067b49f4c
+Subproject commit 82c154d9c8c6e7ad5d320a9041bfb6ce85996498
diff --git a/apps/property-importer b/apps/property-importer
@@ -1 +1 @@
-Subproject commit 66ed38c0fdf6c8087281bc5b29a2b139b9ea5227
+Subproject commit 0744c7e9b8cb2bfdf83ab03b844ce2dd27c29fc9
diff --git a/knip.js b/knip.js
@@ -5,24 +5,41 @@ const { glob } = require('glob')
 
 function _extractAppDeps (packageJsonPath) {
     const pkgInfo = JSON.parse(fs.readFileSync(packageJsonPath).toString())
-    const devDependencies = Object.keys(pkgInfo.devDependencies || {})
-    const dependencies = Object.keys(pkgInfo.dependencies || {})
 
-    return { devDependencies, dependencies }
+    return {
+        devDependencies: pkgInfo.devDependencies || {},
+        dependencies: pkgInfo.dependencies || {},
+    }
 }
 
 function hasDependency (packageJsonPath, dependency) {
     const { dependencies, devDependencies } = _extractAppDeps(packageJsonPath)
 
-    return dependencies.includes(dependency) || devDependencies.includes(dependency)
+    return Object.keys(dependencies).includes(dependency) || Object.keys(devDependencies).includes(dependency)
 }
 
 function hasPath (packageJsonPath, relativePath) {
-    // Controlled traverse inside repo
-    // nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal
-    const combinedPath = path.join(path.dirname(packageJsonPath), relativePath)
+    const packageDir = path.dirname(packageJsonPath)
+
+    const files = glob.sync(relativePath, {
+        cwd: packageDir,
+        ignore: ['**/node_modules/**'],
+    })
+
+    return Boolean(files.length)
+}
+
+function getMajorRequirement (packageJsonPath, depName) {
+    const { dependencies, devDependencies } = _extractAppDeps(packageJsonPath)
+    if (!dependencies[depName] && !devDependencies[depName]) return null
+
+    const requirement = dependencies[depName] || devDependencies[depName]
 
-    return fs.existsSync(combinedPath)
+    const majorPart = requirement.split('.')[0]
+    const clearedPart = majorPart.replace(/\D+/g, '')
+    const majorVersion = parseInt(clearedPart)
+
+    return Number.isNaN(majorVersion) ? null : majorVersion
 }
 
 function isApp (packageJsonPath) {
@@ -124,6 +141,32 @@ async function config () {
             packageConfig.entry.push('src/**/*.ts')
         }
 
+        // NODE: requireTs app util to import ts constants into next.config.js
+        // TODO: move this util to package, add to specific package ignore and remove this rule
+        if (isApp(packageJsonPath) && hasPath(packageJsonPath, '**/requireTs.js')) {
+            if (hasDependency(packageJsonPath, '@babel/preset-typescript')) {
+                packageConfig.ignoreDependencies.push('@babel/preset-typescript')
+            }
+            if (hasDependency(packageJsonPath, '@babel/preset-env')) {
+                packageConfig.ignoreDependencies.push('@babel/preset-env')
+            }
+        }
+
+        // Raw-loader, currently used only for messaging
+        if (isKSApp(packageJsonPath) && hasDependency(packageJsonPath, 'raw-loader')) {
+            // TODO: clean raw-loader from unused apps
+            // if (hasPath(packageJsonPath, 'lang/**/*.njk')) {
+            packageConfig.ignoreDependencies.push('raw-loader')
+            // }
+        }
+
+        // old Next.js apps requires webpack4 not to compete with webpack5 from UI-kit
+        if (hasDependency(packageJsonPath, 'webpack') && hasDependency(packageJsonPath, 'next')) {
+            if (getMajorRequirement(packageJsonPath, 'next') <= 9) {
+                packageConfig.ignoreDependencies.push('webpack')
+            }
+        }
+
         return [getPackageDir(packageJsonPath), packageConfig]
     }))
 
diff --git a/packages/ui/src/components/Dropdown/button/index.tsx b/packages/ui/src/components/Dropdown/button/index.tsx
@@ -33,8 +33,8 @@ export type DropdownButtonProps = {
     id?: string
     disabled?: boolean
     type: ExtendedButtonProps['type']
-    buttonProps?: Omit<ExtendedButtonProps, 'type'>,
-    dropdownProps?: Omit<DropdownProps, 'children' | 'disabled' | 'menu'>,
+    buttonProps?: Omit<ExtendedButtonProps, 'type'>
+    dropdownProps?: Omit<DropdownProps, 'children' | 'disabled' | 'menu'>
 }
 
 const DropdownButton: React.FC<DropdownButtonProps> = (props) => {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ export type UploadFileType = {`
`105`	`105`	`name: string`
`106`	`106`	`status: 'done' \| 'uploading'`
`107`	`107`	`url: string`
`108`		`- response: { id: string, url: string },`
	`108`	`+ response: { id: string, url: string }`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`export type DBFile = {`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ export type ExtraModalContentType = Record<Extract<ActiveModalType, 'example'>,`
`62`	`62`
`63`	`63`	`type TBaseImportWrapperProps = {`
`64`	`64`	`importCardButton?: {`
`65`		`- header: Pick<CardHeaderProps, 'emoji' \| 'headingTitle'>,`
	`65`	`+ header: Pick<CardHeaderProps, 'emoji' \| 'headingTitle'>`
`66`	`66`	`body: Pick<CardBodyProps, 'description'>`
`67`	`67`	`}`
`68`	`68`	`setActiveModal: (type: ActiveModalType) => void`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export interface IImportWrapperProps<TExtraProps = unknown> {`
`33`	`33`	`uploadButtonLabel?: string`
`34`	`34`	`domainName: string`
`35`	`35`	`importCardButton?: {`
`36`		`- header: Pick<CardHeaderProps, 'emoji' \| 'headingTitle'>,`
	`36`	`+ header: Pick<CardHeaderProps, 'emoji' \| 'headingTitle'>`
`37`	`37`	`body: Pick<CardBodyProps, 'description'>`
`38`	`38`	`}`
`39`	`39`	`extraModalContent?: ExtraModalContentType`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ interface IMultipleFileUploadHookArgs {`
`97`	`97`	`Model: Module`
`98`	`98`	`relationField: string`
`99`	`99`	`initialFileList?: DBFile[]`
`100`		`- initialCreateValues?: Record<string, unknown>,`
	`100`	`+ initialCreateValues?: Record<string, unknown>`
`101`	`101`	`dependenciesForRerenderUploadComponent?: Array<unknown>`
`102`	`102`	`}`
`103`	`103`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { CONDO_SUPPORTED_RESPONSE_TYPES } = require('@condo/domains/user/constants/oidc')`
	`1`	`+const { CONDO_SUPPORTED_RESPONSE_TYPES } = require('@app/condo/domains/user/constants/oidc')`
`2`	`2`
`3`	`3`	`const OIDC_SECRET_LENGTH = 32`
`4`	`4`