Merge pull request #461 from easyops-cn/steve/move-tsx

Steve/move-tsx

Author: weareoutman

bricks/ai-portal/package.json

@@ -55,8 +55,9 @@
     "@next-shared/hooks": "^0.1.0",
     "@next-shared/markdown": "^0.7.3",
     "@next-shared/shiki": "^0.1.0",
-    "@next-shared/tsx-converter": "^0.5.2",
-    "@next-shared/tsx-parser": "^0.6.2",
+    "@next-tsx/converter": "^0.0.4",
+    "@next-tsx/core": "^0.0.5",
+    "@next-tsx/parser": "^0.0.4",
     "classnames": "^2.3.2",
     "comlink": "^4.4.2",
     "d3-selection": "^3.0.0",

bricks/ai-portal/src/data-providers/call-tool.ts

@@ -1,6 +1,6 @@
 import { http } from "@next-core/http";
 import { createProviderClass } from "@next-core/utils/general";
-import type { ToolInfo } from "@next-shared/tsx-parser";
+import type { ToolInfo } from "@next-tsx/parser";
 
 export async function callTool(
   tool: ToolInfo,

bricks/ai-portal/src/gantt-chart/styles.shadow.css

@@ -156,7 +156,7 @@ ul {
   }
 
   &.failed {
-    --gantt-chart-bar-bg: rgba(240, 76, 37, 0.5);
+    --gantt-chart-bar-bg: #ff754f;
   }
 }
 

bricks/ai-portal/src/preview-container/index.spec.tsx

@@ -1,7 +1,7 @@
 import { describe, test, expect, jest } from "@jest/globals";
 import { act } from "react-dom/test-utils";
 import type { EoPageTitle } from "@next-bricks/basic/page-title";
-import type { ModulePartOfComponent, ParsedApp } from "@next-shared/tsx-parser";
+import type { ModulePartOfComponent, ParsedApp } from "@next-tsx/parser";
 import "./";
 import type { PreviewContainer } from "./index.js";
 
@@ -24,7 +24,7 @@ jest.mock("../shared/workers/tsxParser.js", () => ({
     })
   ),
 }));
-jest.mock("@next-shared/tsx-converter", () => ({
+jest.mock("@next-tsx/converter", () => ({
   convertView: jest.fn((parsedResult: ParsedApp) =>
     (
       (parsedResult.entry?.defaultExport as ModulePartOfComponent)

bricks/ai-portal/src/preview-container/index.tsx

@@ -4,8 +4,8 @@ import { ReactNextElement, wrapBrick } from "@next-core/react-element";
 import "@next-core/theme";
 import { initializeI18n } from "@next-core/i18n";
 import { unstable_createRoot } from "@next-core/runtime";
-import type { ModulePartOfComponent, ParsedApp } from "@next-shared/tsx-parser";
-import { convertView, type ConvertResult } from "@next-shared/tsx-converter";
+import type { ModulePartOfComponent, ParsedApp } from "@next-tsx/parser";
+import { convertView, type ConvertResult } from "@next-tsx/converter";
 import type {
   GeneralIcon,
   GeneralIconProps,

bricks/ai-portal/src/shared/CreatedView/CreatedView.tsx

@@ -3,8 +3,8 @@ import React, { useContext, useEffect, useMemo, useRef, useState } from "react";
 import { unstable_createRoot } from "@next-core/runtime";
 import classNames from "classnames";
 import { uniqueId } from "lodash";
-import { convertView } from "@next-shared/tsx-converter";
-import type { ModulePartOfComponent } from "@next-shared/tsx-parser";
+import { convertView } from "@next-tsx/converter";
+import type { ModulePartOfComponent } from "@next-tsx/parser";
 import styles from "./CreatedView.module.css";
 import sharedStyles from "../../cruise-canvas/shared.module.css";
 import type { Job, ParsedView } from "../../shared/interfaces";

bricks/ai-portal/src/shared/ExpandedView/ExpandedView.module.css

@@ -1,7 +1,7 @@
 .expanded-view {
   position: fixed;
   inset: 0;
-  z-index: 2;
+  z-index: 3;
   background: rgba(247, 248, 250, 0.5);
   backdrop-filter: blur(74px);
   padding: 106px var(--page-padding-right) 40px var(--page-padding-left);

bricks/ai-portal/src/shared/ExpandedView/ExpandedView.tsx

@@ -9,7 +9,7 @@ import React, {
 import classNames from "classnames";
 import { getBasePath, unstable_createRoot } from "@next-core/runtime";
 import { uniqueId } from "lodash";
-import { convertView } from "@next-shared/tsx-converter";
+import { convertView } from "@next-tsx/converter";
 import type { GraphGeneratedView } from "../../cruise-canvas/interfaces";
 import styles from "./ExpandedView.module.css";
 import { WrappedIcon, WrappedIconButton } from "../../shared/bricks";
@@ -19,7 +19,7 @@ import { TaskContext } from "../TaskContext";
 import { useViewFeedbackDone } from "../useViewFeedbackDone";
 import { parseTemplate } from "../parseTemplate";
 import type { ParsedView } from "../interfaces";
-import type { ModulePartOfComponent } from "@next-shared/tsx-parser";
+import type { ModulePartOfComponent } from "@next-tsx/parser";
 
 export interface ExpandedViewProps {
   views: GraphGeneratedView[];

bricks/ai-portal/src/shared/FilePreview/FilePreview.module.css

@@ -1,7 +1,7 @@
 .preview {
   position: fixed;
   inset: 0;
-  z-index: 2;
+  z-index: 3;
   background: #fff;
   display: flex;
   flex-direction: column;

bricks/ai-portal/src/shared/FilePreview/ImagesPreview.module.css

@@ -1,7 +1,7 @@
 .preview {
   position: fixed;
   inset: 0;
-  z-index: 2;
+  z-index: 3;
   background: #f9fafb;
   display: flex;
   flex-direction: column;