diff --git a/graph/client/src/main.tsx b/graph/client/src/main.tsx
index 57ab842a11..7ad6c5b98f 100644
--- a/graph/client/src/main.tsx
+++ b/graph/client/src/main.tsx
@@ -1,3 +1,9 @@
+/* eslint-disable import/first */
+// debug must be first import
+if (process.env.NODE_ENV === 'development') {
+ require('preact/debug');
+}
+
import { StrictMode } from 'react';
import { inspect } from '@xstate/inspect';
import { App } from './app/app';
diff --git a/graph/project-details/src/lib/target.tsx b/graph/project-details/src/lib/target.tsx
index f52dfa269d..06707c8f67 100644
--- a/graph/project-details/src/lib/target.tsx
+++ b/graph/project-details/src/lib/target.tsx
@@ -14,7 +14,7 @@ import {
useEnvironmentConfig,
useRouteConstructor,
} from '@nx/graph/shared';
-import { Fence } from '@nx/shared-ui-fence';
+import { JsonCodeBlock } from '@nx/graph/ui-code-block';
import { useEffect, useState } from 'react';
import { useNavigate, useSearchParams } from 'react-router-dom';
import { FadingCollapsible } from './ui/fading-collapsible.component';
@@ -194,17 +194,9 @@ export function Target({
Options
-
+
{JSON.stringify(targetConfiguration.options, null, 2)}
-
+
>
@@ -225,17 +217,9 @@ export function Target({
)}
-
+
{JSON.stringify(targetConfiguration.configurations, null, 2)}
-
+
>
) : (
diff --git a/nx-dev/shared-ui-fence/.babelrc b/graph/ui-code-block/.babelrc
similarity index 100%
rename from nx-dev/shared-ui-fence/.babelrc
rename to graph/ui-code-block/.babelrc
diff --git a/nx-dev/shared-ui-fence/.eslintrc.json b/graph/ui-code-block/.eslintrc.json
similarity index 100%
rename from nx-dev/shared-ui-fence/.eslintrc.json
rename to graph/ui-code-block/.eslintrc.json
diff --git a/graph/ui-code-block/README.md b/graph/ui-code-block/README.md
new file mode 100644
index 0000000000..d6418d0487
--- /dev/null
+++ b/graph/ui-code-block/README.md
@@ -0,0 +1,7 @@
+# graph-ui-code-block
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test graph-ui-code-block` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/graph/ui-code-block/jest.config.ts b/graph/ui-code-block/jest.config.ts
new file mode 100644
index 0000000000..5d772775f4
--- /dev/null
+++ b/graph/ui-code-block/jest.config.ts
@@ -0,0 +1,11 @@
+/* eslint-disable */
+export default {
+ testEnvironment: 'jsdom',
+ displayName: 'graph-ui-code-block',
+ preset: '../../jest.preset.js',
+ transform: {
+ '^.+\\.[tj]sx?$': 'babel-jest',
+ },
+ moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+ coverageDirectory: '../../coverage/graph/ui-graph',
+};
diff --git a/nx-dev/shared-ui-selector/project.json b/graph/ui-code-block/project.json
similarity index 64%
rename from nx-dev/shared-ui-selector/project.json
rename to graph/ui-code-block/project.json
index 3e0f62c430..1115c54748 100644
--- a/nx-dev/shared-ui-selector/project.json
+++ b/graph/ui-code-block/project.json
@@ -1,7 +1,7 @@
{
- "name": "shared-ui-selector",
+ "name": "graph-ui-code-block",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
- "sourceRoot": "nx-dev/shared-ui-selector/src",
+ "sourceRoot": "graph/ui-code-block/src",
"projectType": "library",
"tags": [],
"targets": {
@@ -12,8 +12,7 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
- "jestConfig": "nx-dev/shared-ui-selector/jest.config.ts",
- "passWithNoTests": true
+ "jestConfig": "graph/ui-code-block/jest.config.ts"
}
}
}
diff --git a/graph/ui-code-block/src/index.ts b/graph/ui-code-block/src/index.ts
new file mode 100644
index 0000000000..31e71c05f7
--- /dev/null
+++ b/graph/ui-code-block/src/index.ts
@@ -0,0 +1 @@
+export { JsonCodeBlock } from './lib/json-code-block';
diff --git a/graph/ui-code-block/src/lib/json-code-block.tsx b/graph/ui-code-block/src/lib/json-code-block.tsx
new file mode 100644
index 0000000000..140bf07d59
--- /dev/null
+++ b/graph/ui-code-block/src/lib/json-code-block.tsx
@@ -0,0 +1,75 @@
+import {
+ ClipboardDocumentCheckIcon,
+ ClipboardDocumentIcon,
+ InformationCircleIcon,
+ SparklesIcon,
+} from '@heroicons/react/24/outline';
+// @ts-ignore
+import { CopyToClipboard } from 'react-copy-to-clipboard';
+// @ts-ignore
+import SyntaxHighlighter from 'react-syntax-highlighter';
+import { Children, JSX, ReactNode, useEffect, useState } from 'react';
+import { twMerge } from 'tailwind-merge';
+
+export function JsonCodeBlockPreTag({
+ children,
+}: {
+ children: ReactNode;
+}): JSX.Element {
+ return (
+
+ );
+}
+
+export function JsonCodeBlock(props: { children: ReactNode }): JSX.Element {
+ const [copied, setCopied] = useState(false);
+ useEffect(() => {
+ if (!copied) return;
+ const t = setTimeout(() => {
+ setCopied(false);
+ }, 3000);
+ return () => clearTimeout(t);
+ }, [copied]);
+ return (
+
+
+ {
+ setCopied(true);
+ }}
+ >
+
+
+
+
+
+ );
+}
diff --git a/nx-dev/shared-ui-fence/tsconfig.json b/graph/ui-code-block/tsconfig.json
similarity index 100%
rename from nx-dev/shared-ui-fence/tsconfig.json
rename to graph/ui-code-block/tsconfig.json
diff --git a/nx-dev/shared-ui-selector/tsconfig.lib.json b/graph/ui-code-block/tsconfig.lib.json
similarity index 100%
rename from nx-dev/shared-ui-selector/tsconfig.lib.json
rename to graph/ui-code-block/tsconfig.lib.json
diff --git a/nx-dev/shared-ui-fence/tsconfig.spec.json b/graph/ui-code-block/tsconfig.spec.json
similarity index 100%
rename from nx-dev/shared-ui-fence/tsconfig.spec.json
rename to graph/ui-code-block/tsconfig.spec.json
diff --git a/nx-dev/shared-ui-fence/src/index.ts b/nx-dev/shared-ui-fence/src/index.ts
deleted file mode 100644
index 2c1b823535..0000000000
--- a/nx-dev/shared-ui-fence/src/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './lib/fence.component';
-export { TerminalOutput } from './lib/fences/terminal-output.component';
-export { TerminalShellWrapper } from './lib/fences/terminal-shell.component';
diff --git a/nx-dev/shared-ui-selector/README.md b/nx-dev/shared-ui-selector/README.md
deleted file mode 100644
index 3c3e739a9f..0000000000
--- a/nx-dev/shared-ui-selector/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# shared-ui-selector
-
-This library was generated with [Nx](https://nx.dev).
-
-## Running unit tests
-
-Run `nx test shared-ui-selector` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/nx-dev/shared-ui-selector/jest.config.ts b/nx-dev/shared-ui-selector/jest.config.ts
deleted file mode 100644
index 105b77273a..0000000000
--- a/nx-dev/shared-ui-selector/jest.config.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* eslint-disable */
-export default {
- displayName: 'shared-ui-selector',
- preset: '../../jest.preset.js',
- transform: {
- '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
- },
- moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
- coverageDirectory: '../../coverage/nx-dev/shared-ui-selector',
-};
diff --git a/nx-dev/shared-ui-selector/src/index.ts b/nx-dev/shared-ui-selector/src/index.ts
deleted file mode 100644
index 54b1296ed6..0000000000
--- a/nx-dev/shared-ui-selector/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './lib/selector';
diff --git a/nx-dev/shared-ui-selector/.babelrc b/nx-dev/ui-fence/.babelrc
similarity index 100%
rename from nx-dev/shared-ui-selector/.babelrc
rename to nx-dev/ui-fence/.babelrc
diff --git a/nx-dev/shared-ui-selector/.eslintrc.json b/nx-dev/ui-fence/.eslintrc.json
similarity index 100%
rename from nx-dev/shared-ui-selector/.eslintrc.json
rename to nx-dev/ui-fence/.eslintrc.json
diff --git a/nx-dev/shared-ui-fence/README.md b/nx-dev/ui-fence/README.md
similarity index 55%
rename from nx-dev/shared-ui-fence/README.md
rename to nx-dev/ui-fence/README.md
index ebf1662adb..c8f90fa4c2 100644
--- a/nx-dev/shared-ui-fence/README.md
+++ b/nx-dev/ui-fence/README.md
@@ -1,7 +1,7 @@
-# shared-ui-fence
+# nx-dev-ui-fence
This library was generated with [Nx](https://nx.dev).
## Running unit tests
-Run `nx test shared-ui-fence` to execute the unit tests via [Jest](https://jestjs.io).
+Run `nx test nx-dev-ui-fence` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/nx-dev/shared-ui-fence/jest.config.ts b/nx-dev/ui-fence/jest.config.ts
similarity index 69%
rename from nx-dev/shared-ui-fence/jest.config.ts
rename to nx-dev/ui-fence/jest.config.ts
index 1320b46391..3b7c5e6d51 100644
--- a/nx-dev/shared-ui-fence/jest.config.ts
+++ b/nx-dev/ui-fence/jest.config.ts
@@ -1,10 +1,10 @@
/* eslint-disable */
export default {
- displayName: 'shared-ui-fence',
+ displayName: 'nx-dev-ui-fence',
preset: '../../jest.preset.js',
transform: {
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
- coverageDirectory: '../../coverage/nx-dev/shared-ui-fence',
+ coverageDirectory: '../../coverage/nx-dev/ui-fence',
};
diff --git a/nx-dev/shared-ui-fence/project.json b/nx-dev/ui-fence/project.json
similarity index 72%
rename from nx-dev/shared-ui-fence/project.json
rename to nx-dev/ui-fence/project.json
index 7bf73137a8..8dfc1510a3 100644
--- a/nx-dev/shared-ui-fence/project.json
+++ b/nx-dev/ui-fence/project.json
@@ -1,7 +1,7 @@
{
- "name": "shared-ui-fence",
+ "name": "nx-dev-ui-fence",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
- "sourceRoot": "nx-dev/shared-ui-fence/src",
+ "sourceRoot": "nx-dev/ui-fence/src",
"projectType": "library",
"tags": [],
"targets": {
@@ -12,7 +12,7 @@
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
- "jestConfig": "nx-dev/shared-ui-fence/jest.config.ts",
+ "jestConfig": "nx-dev/ui-fence/jest.config.ts",
"passWithNoTests": true
}
}
diff --git a/nx-dev/ui-fence/src/index.ts b/nx-dev/ui-fence/src/index.ts
new file mode 100644
index 0000000000..a61dfe7061
--- /dev/null
+++ b/nx-dev/ui-fence/src/index.ts
@@ -0,0 +1,3 @@
+export { Fence, FenceProps } from './lib/fence';
+export { TerminalOutput } from './lib/fences/terminal-output';
+export { TerminalShellWrapper } from './lib/fences/terminal-shell';
diff --git a/nx-dev/shared-ui-fence/src/lib/fence.component.tsx b/nx-dev/ui-fence/src/lib/fence.tsx
similarity index 96%
rename from nx-dev/shared-ui-fence/src/lib/fence.component.tsx
rename to nx-dev/ui-fence/src/lib/fence.tsx
index 23c61464d7..057ed3e494 100644
--- a/nx-dev/shared-ui-fence/src/lib/fence.component.tsx
+++ b/nx-dev/ui-fence/src/lib/fence.tsx
@@ -4,14 +4,15 @@ import {
InformationCircleIcon,
SparklesIcon,
} from '@heroicons/react/24/outline';
-import React, { ReactNode, useEffect, useState } from 'react';
+import { ReactNode, JSX, useEffect, useState } from 'react';
// @ts-ignore
import { CopyToClipboard } from 'react-copy-to-clipboard';
// @ts-ignore
import SyntaxHighlighter from 'react-syntax-highlighter';
-import { CodeOutput } from './fences/code-output.component';
-import { TerminalOutput } from './fences/terminal-output.component';
-import { Selector } from '@nx/shared-ui-selector';
+import { CodeOutput } from './fences/code-output';
+import { TerminalOutput } from './fences/terminal-output';
+
+import { Selector } from './selector';
function resolveLanguage(lang: string) {
switch (lang) {
diff --git a/nx-dev/shared-ui-fence/src/lib/fences/code-output.component.tsx b/nx-dev/ui-fence/src/lib/fences/code-output.tsx
similarity index 95%
rename from nx-dev/shared-ui-fence/src/lib/fences/code-output.component.tsx
rename to nx-dev/ui-fence/src/lib/fences/code-output.tsx
index c14fe20cd8..9dbeb29286 100644
--- a/nx-dev/shared-ui-fence/src/lib/fences/code-output.component.tsx
+++ b/nx-dev/ui-fence/src/lib/fences/code-output.tsx
@@ -1,5 +1,5 @@
import { cx } from '@nx/nx-dev/ui-primitives';
-import { ReactNode } from 'react';
+import { JSX, ReactNode } from 'react';
export function CodeOutput({
content,
diff --git a/nx-dev/shared-ui-fence/src/lib/fences/terminal-output.component.tsx b/nx-dev/ui-fence/src/lib/fences/terminal-output.tsx
similarity index 94%
rename from nx-dev/shared-ui-fence/src/lib/fences/terminal-output.component.tsx
rename to nx-dev/ui-fence/src/lib/fences/terminal-output.tsx
index 8c80fa7002..eebb77b97a 100644
--- a/nx-dev/shared-ui-fence/src/lib/fences/terminal-output.component.tsx
+++ b/nx-dev/ui-fence/src/lib/fences/terminal-output.tsx
@@ -1,5 +1,5 @@
import { ReactNode } from 'react';
-import { TerminalShellWrapper } from './terminal-shell.component';
+import { TerminalShellWrapper } from './terminal-shell';
export function TerminalOutput({
content,
diff --git a/nx-dev/shared-ui-fence/src/lib/fences/terminal-shell.component.tsx b/nx-dev/ui-fence/src/lib/fences/terminal-shell.tsx
similarity index 96%
rename from nx-dev/shared-ui-fence/src/lib/fences/terminal-shell.component.tsx
rename to nx-dev/ui-fence/src/lib/fences/terminal-shell.tsx
index 297042b2e7..9ebd1121eb 100644
--- a/nx-dev/shared-ui-fence/src/lib/fences/terminal-shell.component.tsx
+++ b/nx-dev/ui-fence/src/lib/fences/terminal-shell.tsx
@@ -1,5 +1,5 @@
import { cx } from '@nx/nx-dev/ui-primitives';
-import { ReactNode } from 'react';
+import { JSX, ReactNode } from 'react';
export function TerminalShellWrapper({
isMessageBelow,
diff --git a/nx-dev/shared-ui-selector/src/lib/selector.tsx b/nx-dev/ui-fence/src/lib/selector.tsx
similarity index 96%
rename from nx-dev/shared-ui-selector/src/lib/selector.tsx
rename to nx-dev/ui-fence/src/lib/selector.tsx
index 4f9a4be3b9..ad1b060082 100644
--- a/nx-dev/shared-ui-selector/src/lib/selector.tsx
+++ b/nx-dev/ui-fence/src/lib/selector.tsx
@@ -1,6 +1,6 @@
import { Listbox, Transition } from '@headlessui/react';
-import { CheckIcon, ChevronUpDownIcon } from '@heroicons/react/24/solid';
-import { Fragment } from 'react';
+import { ChevronUpDownIcon } from '@heroicons/react/24/solid';
+import { Fragment, JSX } from 'react';
export interface SelectorProps {
children: JSX.Element;
diff --git a/nx-dev/shared-ui-selector/tsconfig.json b/nx-dev/ui-fence/tsconfig.json
similarity index 100%
rename from nx-dev/shared-ui-selector/tsconfig.json
rename to nx-dev/ui-fence/tsconfig.json
diff --git a/nx-dev/shared-ui-fence/tsconfig.lib.json b/nx-dev/ui-fence/tsconfig.lib.json
similarity index 100%
rename from nx-dev/shared-ui-fence/tsconfig.lib.json
rename to nx-dev/ui-fence/tsconfig.lib.json
diff --git a/nx-dev/shared-ui-selector/tsconfig.spec.json b/nx-dev/ui-fence/tsconfig.spec.json
similarity index 100%
rename from nx-dev/shared-ui-selector/tsconfig.spec.json
rename to nx-dev/ui-fence/tsconfig.spec.json
diff --git a/nx-dev/ui-markdoc/src/lib/nodes/fence-wrapper.component.tsx b/nx-dev/ui-markdoc/src/lib/nodes/fence-wrapper.component.tsx
index e5022936c2..75798acf9d 100644
--- a/nx-dev/ui-markdoc/src/lib/nodes/fence-wrapper.component.tsx
+++ b/nx-dev/ui-markdoc/src/lib/nodes/fence-wrapper.component.tsx
@@ -1,4 +1,4 @@
-import { Fence, FenceProps } from '@nx/shared-ui-fence';
+import { Fence, FenceProps } from '@nx/nx-dev/ui-fence';
import { useRouter } from 'next/router';
import { useEffect, useState } from 'react';
diff --git a/nx-dev/ui-markdoc/src/lib/tags/terminal-video.component.tsx b/nx-dev/ui-markdoc/src/lib/tags/terminal-video.component.tsx
index c0ffb755e2..c6635b8c60 100644
--- a/nx-dev/ui-markdoc/src/lib/tags/terminal-video.component.tsx
+++ b/nx-dev/ui-markdoc/src/lib/tags/terminal-video.component.tsx
@@ -1,4 +1,4 @@
-import { TerminalShellWrapper } from '@nx/shared-ui-fence';
+import { TerminalShellWrapper } from '@nx/nx-dev/ui-fence';
import { VideoLoop } from './video-loop.component';
import { Schema } from '@markdoc/markdoc';
diff --git a/packages/remix/src/utils/create-watch-paths.spec.ts b/packages/remix/src/utils/create-watch-paths.spec.ts
index 268b04a092..fe657316ce 100644
--- a/packages/remix/src/utils/create-watch-paths.spec.ts
+++ b/packages/remix/src/utils/create-watch-paths.spec.ts
@@ -9,12 +9,7 @@ describe('createWatchPaths', () => {
const testDir = joinPathFragments(workspaceRoot, 'e2e/remix');
const paths = await createWatchPaths(testDir);
- expect(paths).toEqual([
- '../../packages',
- '../../graph',
- '../../nx-dev',
- '../../e2e/utils',
- ]);
+ expect(paths).toEqual(['../../packages', '../../graph', '../../e2e/utils']);
});
});
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 3174166565..7ea9e376d1 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -37,6 +37,7 @@
"@nx/express": ["packages/express"],
"@nx/graph/project-details": ["graph/project-details/src/index.ts"],
"@nx/graph/shared": ["graph/shared/src/index.ts"],
+ "@nx/graph/ui-code-block": ["graph/ui-code-block/src/index.ts"],
"@nx/graph/ui-components": ["graph/ui-components/src/index.ts"],
"@nx/graph/ui-graph": ["graph/ui-graph/src/index.ts"],
"@nx/graph/ui-theme": ["graph/ui-theme/src/index.ts"],
@@ -84,6 +85,7 @@
"@nx/nx-dev/ui-common": ["nx-dev/ui-common/src/index.ts"],
"@nx/nx-dev/ui-community": ["nx-dev/ui-community/src/index.ts"],
"@nx/nx-dev/ui-conference": ["nx-dev/ui-conference/src/index.ts"],
+ "@nx/nx-dev/ui-fence": ["nx-dev/ui-fence/src/index.ts"],
"@nx/nx-dev/ui-home": ["nx-dev/ui-home/src/index.ts"],
"@nx/nx-dev/ui-markdoc": ["nx-dev/ui-markdoc/src/index.ts"],
"@nx/nx-dev/ui-member-card": ["nx-dev/ui-member-card/src/index.ts"],
@@ -103,8 +105,6 @@
"@nx/remix/*": ["packages/remix/*"],
"@nx/rollup": ["packages/rollup"],
"@nx/rollup/*": ["packages/rollup/*"],
- "@nx/shared-ui-fence": ["nx-dev/shared-ui-fence/src/index.ts"],
- "@nx/shared-ui-selector": ["nx-dev/shared-ui-selector/src/index.ts"],
"@nx/storybook": ["packages/storybook"],
"@nx/storybook/*": ["packages/storybook/*"],
"@nx/typedoc-theme": ["typedoc-theme/src/index.ts"],