Moved command package into common package.

DA0-DA0 · Oct 21, 2022 · e0473d1 · e0473d1
1 parent 4177c11
commit e0473d1
Show file tree

Hide file tree

Showing 19 changed files with 5 additions and 85 deletions.
diff --git a/apps/dapp/components/AppLayout.tsx b/apps/dapp/components/AppLayout.tsx
@@ -15,13 +15,13 @@ import toast from 'react-hot-toast'
 import { useTranslation } from 'react-i18next'
 import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'
 
-import { CommandModal, makeGenericContext } from '@dao-dao/command'
 import {
   PfpkNftSelectionModal,
   SidebarWallet,
   daoCreatedCardPropsAtom,
   pinnedDaoDropdownInfosSelector,
 } from '@dao-dao/common'
+import { CommandModal, makeGenericContext } from '@dao-dao/common/command'
 import {
   mountedInBrowserAtom,
   navigationCompactAtom,

diff --git a/apps/dapp/next.config.js b/apps/dapp/next.config.js
@@ -16,7 +16,6 @@ const withTM = require('next-transpile-modules')([
   '@dao-dao/voting-module-adapter',
   '@dao-dao/proposal-module-adapter',
   '@dao-dao/types',
-  '@dao-dao/command',
 ])
 
 const { withSentryConfig } = require('@sentry/nextjs')

diff --git a/apps/dapp/package.json b/apps/dapp/package.json
@@ -19,7 +19,6 @@
     "@cosmjs/encoding": "0.28.10",
     "@cosmjs/proto-signing": "0.28.10",
     "@cosmjs/stargate": "0.28.10",
-    "@dao-dao/command": "2.0.1",
     "@dao-dao/common": "2.0.1",
     "@dao-dao/i18n": "2.0.1",
     "@dao-dao/proposal-module-adapter": "2.0.1",

diff --git a/package.json b/package.json
@@ -20,7 +20,6 @@
     "storybook": "yarn workspace @dao-dao/storybook",
     "proposal-module-adapter": "yarn workspace @dao-dao/proposal-module-adapter",
     "voting-module-adapter": "yarn workspace @dao-dao/voting-module-adapter",
-    "command": "yarn workspace @dao-dao/command",
     "types": "yarn workspace @dao-dao/types"
   },
   "devDependencies": {

diff --git a/packages/command/.eslintrc.js b/packages/command/.eslintrc.js
diff --git a/packages/command/LICENSE b/packages/command/LICENSE
diff --git a/packages/command/package.json b/packages/command/package.json
diff --git a/packages/command/tsconfig.json b/packages/command/tsconfig.json
diff --git a/packages/command/README.md → packages/common/command/README.md b/packages/command/README.md → packages/common/command/README.md
@@ -1,4 +1,4 @@
-# @dao-dao/command
+# @dao-dao/common/command
 
 This package provides a convenient interface for customizing the command modal
 (command-K/control-K), the component that lets you quickly navigate the site and

diff --git a/packages/command/components/CommandModal.tsx → ...ommon/command/components/CommandModal.tsx b/packages/command/components/CommandModal.tsx → ...ommon/command/components/CommandModal.tsx
@@ -4,10 +4,10 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { SuspenseLoader } from '@dao-dao/common'
 import { CommandModal as StatelessCommandModal } from '@dao-dao/stateless'
 import { CommandModalContext, CommandModalProps } from '@dao-dao/types/command'
 
+import { SuspenseLoader } from '../../components/SuspenseLoader'
 import { CommandModalContextView } from './CommandModalContextView'
 
 export const CommandModal = ({

diff --git a/...nd/components/CommandModalContextView.tsx → ...nd/components/CommandModalContextView.tsx b/...nd/components/CommandModalContextView.tsx → ...nd/components/CommandModalContextView.tsx
@@ -1,7 +1,6 @@
 import Fuse from 'fuse.js'
 import { useMemo } from 'react'
 
-import { SuspenseLoader } from '@dao-dao/common'
 import {
   CommandModalContextViewLoader,
   CommandModalContextView as StatelessCommandModalContextView,
@@ -11,6 +10,8 @@ import {
   CommandModalContextSection,
 } from '@dao-dao/types/command'
 
+import { SuspenseLoader } from '../../components/SuspenseLoader'
+
 export interface CommandModalContextViewProps {
   filter: string
   contexts: CommandModalContext[]

diff --git a/packages/command/components/index.tsx → packages/common/command/components/index.tsx b/packages/command/components/index.tsx → packages/common/command/components/index.tsx
diff --git a/packages/command/contexts/generic/dao.ts → ...es/common/command/contexts/generic/dao.ts b/packages/command/contexts/generic/dao.ts → ...es/common/command/contexts/generic/dao.ts
diff --git a/packages/command/contexts/generic/index.ts → .../common/command/contexts/generic/index.ts b/packages/command/contexts/generic/index.ts → .../common/command/contexts/generic/index.ts
diff --git a/packages/command/contexts/index.ts → packages/common/command/contexts/index.ts b/packages/command/contexts/index.ts → packages/common/command/contexts/index.ts
diff --git a/packages/command/hooks/index.ts → packages/common/command/hooks/index.ts b/packages/command/hooks/index.ts → packages/common/command/hooks/index.ts
diff --git a/...ges/command/hooks/useNavigationSection.ts → ...mon/command/hooks/useNavigationSection.ts b/...ges/command/hooks/useNavigationSection.ts → ...mon/command/hooks/useNavigationSection.ts
diff --git a/...hooks/usePinnedAndFilteredDaosSections.ts → ...hooks/usePinnedAndFilteredDaosSections.ts b/...hooks/usePinnedAndFilteredDaosSections.ts → ...hooks/usePinnedAndFilteredDaosSections.ts
diff --git a/packages/command/index.tsx → packages/common/command/index.tsx b/packages/command/index.tsx → packages/common/command/index.tsx