Merge pull request #4819 from easyops-cn/steve/v3-fix-jsx

fix(): use jsx.ts instead of jsx.d.ts for source file

Author: weareoutman

packages/yo/src/plopfile.js

@@ -318,15 +318,15 @@ export default function (
             const jsxDtsFile = path.join(
               bricksDir,
               answers.pkgName,
-              "src/jsx.d.ts"
+              "src/jsx.ts"
             );
             /** @type {string} */
             let jsxDtsContent;
             if (!existsSync(jsxDtsFile)) {
               // jsxDtsContent = `import type { DetailedHTMLProps, HTMLAttributes } from "react"`;
               const jsxDtsTemplateFile = path.join(
                 __dirname,
-                "templates/bricks/src/jsx.d.ts.hbs"
+                "templates/bricks/src/jsx.ts.hbs"
               );
               jsxDtsContent = await readFile(jsxDtsTemplateFile, "utf-8");
             } else {
@@ -361,14 +361,14 @@ export default function (
               const newJsxDts = jsxDtsContent.replace(pattern, replacement);
               if (newJsxDts === jsxDtsContent) {
                 throw new Error(
-                  `Failed to add definition in jsx.d.ts for ${tagName}.`
+                  `Failed to add definition in jsx.ts for ${tagName}.`
                 );
               }
               jsxDtsContent = newJsxDts;
             }
 
             await writeFile(jsxDtsFile, jsxDtsContent);
-            return `Updated jsx.d.ts to include ${tagName} definition.`;
+            return `Updated jsx.ts to include ${tagName} definition.`;
           },
           async function modifyCommonBricksJson(answers) {
             if (answers.brickType === "common") {

packages/yo/src/templates/bricks/package.json.hbs

@@ -25,7 +25,7 @@
     "start": "cross-env NODE_ENV=development build-next-bricks --watch",
     "build": "npm run build:main && npm run build:types",
     "build:main": "cross-env NODE_ENV=production build-next-bricks",
-    "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist-types --project tsconfig.json && copy-jsx-d-ts",
+    "build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist-types --project tsconfig.json",
     "build:manifest": "cross-env NODE_ENV=production build-next-bricks --manifest-only",
     "test": "cross-env NODE_ENV='test' test-next",
     "test:ci": "cross-env NODE_ENV='test' CI=true test-next",

packages/yo/src/templates/bricks/src/jsx.d.ts.hbs renamed to packages/yo/src/templates/bricks/src/jsx.ts.hbs

@@ -1,6 +1,7 @@
 import type { DetailedHTMLProps, HTMLAttributes } from "react";
 
 declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace JSX {
     interface IntrinsicElements {
       // Extend with brick definitions here