create-rsbuild 0.7.6 → 0.7.8

package/dist/index.js

@@ -38,12 +38,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/@modern-js+module-tools@2.52.0_eslint@9.4.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js
+// ../../node_modules/.pnpm/@modern-js+module-tools@2.52.0_eslint@9.5.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename, getDirname, __dirname;
 var init_esm = __esm({
-  "../../node_modules/.pnpm/@modern-js+module-tools@2.52.0_eslint@9.4.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js"() {
+  "../../node_modules/.pnpm/@modern-js+module-tools@2.52.0_eslint@9.5.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js"() {
     "use strict";
     getFilename = () => fileURLToPath(import.meta.url);
     getDirname = () => path.dirname(getFilename());
@@ -1270,12 +1270,13 @@ async function main() {
   );
   const tools = checkCancel(
     await ae({
-      message: "Select additional tools (use arrow keys / space bar)",
+      message: "Select additional tools (press enter to continue)",
       options: [
         { value: "biome", label: "Add Biome for code linting and formatting" },
         { value: "eslint", label: "Add ESLint for code linting" },
         { value: "prettier", label: "Add Prettier for code formatting" }
-      ]
+      ],
+      required: false
     })
   );
   const srcFolder = path2.join(packageRoot, `template-${framework}-${language}`);
@@ -1314,17 +1315,19 @@ function mergePackageJson(targetPackage, extraPackage) {
   if (!fs.existsSync(targetPackage)) {
     return;
   }
-  const content = (0, import_deepmerge.default)(
-    JSON.parse(fs.readFileSync(targetPackage, "utf-8")),
-    JSON.parse(fs.readFileSync(extraPackage, "utf-8"))
-  );
+  const targetJson = JSON.parse(fs.readFileSync(targetPackage, "utf-8"));
+  const extraJson = JSON.parse(fs.readFileSync(extraPackage, "utf-8"));
+  const mergedJson = (0, import_deepmerge.default)(targetJson, extraJson);
+  mergedJson.name = targetJson.name || extraJson.name;
   for (const key of ["scripts", "dependencies", "devDependencies"]) {
-    if (!(key in content)) {
+    if (!(key in mergedJson)) {
       continue;
     }
-    content[key] = sortObjectKeys(content[key]);
+    mergedJson[key] = sortObjectKeys(
+      mergedJson[key]
+    );
   }
-  fs.writeFileSync(targetPackage, `${JSON.stringify(content, null, 2)}
+  fs.writeFileSync(targetPackage, `${JSON.stringify(mergedJson, null, 2)}
 `);
 }
 function copyFolder(src, dist, version, name) {
@@ -1342,14 +1345,16 @@ function copyFolder(src, dist, version, name) {
     const stat = fs.statSync(srcFile);
     if (stat.isDirectory()) {
       copyFolder(srcFile, distFile, version);
-    } else if (file === "extra-package.json") {
+    } else if (file === "package.json") {
       const targetPackage = path2.resolve(dist, "package.json");
-      mergePackageJson(targetPackage, srcFile);
-    } else {
-      fs.copyFileSync(srcFile, distFile);
-      if (file === "package.json") {
+      if (fs.existsSync(targetPackage)) {
+        mergePackageJson(targetPackage, srcFile);
+      } else {
+        fs.copyFileSync(srcFile, distFile);
         updatePackageJson(distFile, version, name);
       }
+    } else {
+      fs.copyFileSync(srcFile, distFile);
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-rsbuild",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "description": "Create a new Rsbuild project",
   "homepage": "https://rsbuild.dev",
   "repository": {

package/template-biome/{extra-package.json → package.json}

@@ -1,9 +1,12 @@
 {
+  "name": "rsbuild-biome",
+  "private": true,
+  "version": "1.0.0",
   "scripts": {
     "check": "biome check --write",
     "format": "biome format --write"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.8.0"
+    "@biomejs/biome": "^1.8.1"
   }
 }

package/template-eslint/common-js/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "rsbuild-eslint-common-js",
+  "private": true,
+  "version": "1.0.0",
+  "scripts": {
+    "lint": "eslint ."
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.5.0",
+    "eslint": "^9.5.0",
+    "globals": "^15.4.0"
+  }
+}

package/template-eslint/{react-ts/extra-package.json → common-ts/package.json}

@@ -1,12 +1,13 @@
 {
+  "name": "rsbuild-eslint-common-ts",
+  "private": true,
+  "version": "1.0.0",
   "scripts": {
     "lint": "eslint ."
   },
   "devDependencies": {
-    "@eslint/compat": "^1.0.3",
-    "@eslint/js": "^9.4.0",
-    "eslint": "9.x",
-    "eslint-plugin-react": "^7.34.2",
+    "@eslint/js": "^9.5.0",
+    "eslint": "^9.5.0",
     "globals": "^15.4.0",
     "typescript-eslint": "^7.12.0"
   }

package/template-eslint/react-js/eslint.config.mjs

@@ -1,11 +1,29 @@
-import { fixupConfigRules } from '@eslint/compat';
+import { fixupConfigRules, fixupPluginRules } from '@eslint/compat';
 import js from '@eslint/js';
+import reactHooks from 'eslint-plugin-react-hooks';
+import reactJsx from 'eslint-plugin-react/configs/jsx-runtime.js';
 import react from 'eslint-plugin-react/configs/recommended.js';
 import globals from 'globals';
 
 export default [
   { languageOptions: { globals: globals.browser } },
   js.configs.recommended,
-  ...fixupConfigRules(react),
+  ...fixupConfigRules([
+    {
+      ...react,
+      settings: {
+        react: { version: 'detect' },
+      },
+    },
+    reactJsx,
+  ]),
+  {
+    plugins: {
+      'react-hooks': fixupPluginRules(reactHooks),
+    },
+    rules: {
+      ...reactHooks.configs.recommended.rules,
+    },
+  },
   { ignores: ['dist/'] },
 ];

package/template-eslint/react-js/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "rsbuild-eslint-react-js",
+  "private": true,
+  "version": "1.0.0",
+  "scripts": {
+    "lint": "eslint ."
+  },
+  "devDependencies": {
+    "@eslint/compat": "^1.1.0",
+    "@eslint/js": "^9.5.0",
+    "eslint": "^9.5.0",
+    "eslint-plugin-react": "^7.34.2",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "globals": "^15.4.0"
+  }
+}

package/template-eslint/react-ts/eslint.config.mjs

@@ -1,5 +1,7 @@
-import { fixupConfigRules } from '@eslint/compat';
+import { fixupConfigRules, fixupPluginRules } from '@eslint/compat';
 import js from '@eslint/js';
+import reactHooks from 'eslint-plugin-react-hooks';
+import reactJsx from 'eslint-plugin-react/configs/jsx-runtime.js';
 import react from 'eslint-plugin-react/configs/recommended.js';
 import globals from 'globals';
 import ts from 'typescript-eslint';
@@ -8,6 +10,22 @@ export default [
   { languageOptions: { globals: globals.browser } },
   js.configs.recommended,
   ...ts.configs.recommended,
-  ...fixupConfigRules(react),
+  ...fixupConfigRules([
+    {
+      ...react,
+      settings: {
+        react: { version: 'detect' },
+      },
+    },
+    reactJsx,
+  ]),
+  {
+    plugins: {
+      'react-hooks': fixupPluginRules(reactHooks),
+    },
+    rules: {
+      ...reactHooks.configs.recommended.rules,
+    },
+  },
   { ignores: ['dist/'] },
 ];

package/template-eslint/react-ts/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "rsbuild-eslint-react-ts",
+  "private": true,
+  "version": "1.0.0",
+  "scripts": {
+    "lint": "eslint ."
+  },
+  "devDependencies": {
+    "@eslint/compat": "^1.1.0",
+    "@eslint/js": "^9.5.0",
+    "eslint": "^9.5.0",
+    "eslint-plugin-react": "^7.34.2",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "globals": "^15.4.0",
+    "typescript-eslint": "^7.12.0"
+  }
+}

package/template-eslint/svelte-js/{extra-package.json → package.json}

@@ -1,10 +1,13 @@
 {
+  "name": "rsbuild-eslint-svelte-js",
+  "private": true,
+  "version": "1.0.0",
   "scripts": {
     "lint": "eslint ."
   },
   "devDependencies": {
-    "@eslint/js": "^9.4.0",
-    "eslint": "9.x",
+    "@eslint/js": "^9.5.0",
+    "eslint": "^9.5.0",
     "eslint-plugin-svelte": "^2.36.0",
     "globals": "^15.4.0"
   }

package/template-eslint/svelte-ts/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "rsbuild-eslint-svelte-ts",
+  "private": true,
+  "version": "1.0.0",
+  "scripts": {
+    "lint": "eslint ."
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.5.0",
+    "eslint": "^9.5.0",
+    "eslint-plugin-svelte": "^2.36.0",
+    "globals": "^15.4.0",
+    "typescript-eslint": "^8.0.0-alpha.30"
+  },
+  "type": "module"
+}

package/template-eslint/vue-js/{extra-package.json → package.json}

@@ -1,10 +1,13 @@
 {
+  "name": "rsbuild-eslint-vue-js",
+  "private": true,
+  "version": "1.0.0",
   "scripts": {
     "lint": "eslint ."
   },
   "devDependencies": {
-    "@eslint/js": "^9.4.0",
-    "eslint": "9.x",
+    "@eslint/js": "^9.5.0",
+    "eslint": "^9.5.0",
     "eslint-plugin-vue": "^9.26.0",
     "globals": "^15.4.0"
   }

package/template-eslint/vue-ts/{extra-package.json → package.json}

@@ -1,10 +1,13 @@
 {
+  "name": "rsbuild-eslint-vue-ts",
+  "private": true,
+  "version": "1.0.0",
   "scripts": {
     "lint": "eslint ."
   },
   "devDependencies": {
-    "@eslint/js": "^9.4.0",
-    "eslint": "9.x",
+    "@eslint/js": "^9.5.0",
+    "eslint": "^9.5.0",
     "eslint-plugin-vue": "^9.26.0",
     "globals": "^15.4.0",
     "typescript-eslint": "^7.12.0"

package/template-lit-js/package.json

@@ -9,6 +9,6 @@
   },
   "devDependencies": {
     "@rsbuild/core": "workspace:*",
-    "lit": "^3.1.3"
+    "lit": "^3.1.4"
   }
 }

package/template-lit-ts/package.json

@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "@rsbuild/core": "workspace:*",
-    "lit": "^3.1.3",
+    "lit": "^3.1.4",
     "typescript": "^5.4.2"
   }
 }

package/template-prettier/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "rsbuild-prettier",
+  "private": true,
+  "version": "1.0.0",
+  "scripts": {
+    "format": "prettier --write ."
+  },
+  "devDependencies": {
+    "prettier": "^3.3.2"
+  }
+}

package/template-svelte-js/package.json

@@ -8,7 +8,7 @@
     "preview": "rsbuild preview"
   },
   "dependencies": {
-    "svelte": "^4.2.17"
+    "svelte": "^4.2.18"
   },
   "devDependencies": {
     "@rsbuild/core": "workspace:*",

package/template-svelte-ts/package.json

@@ -9,7 +9,7 @@
     "svelte-check": "svelte-check --tsconfig ./tsconfig.json"
   },
   "dependencies": {
-    "svelte": "^4.2.17"
+    "svelte": "^4.2.18"
   },
   "devDependencies": {
     "@rsbuild/core": "workspace:*",

package/template-eslint/common-js/extra-package.json

@@ -1,10 +0,0 @@
-{
-  "scripts": {
-    "lint": "eslint ."
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.4.0",
-    "eslint": "9.x",
-    "globals": "^15.4.0"
-  }
-}

package/template-eslint/common-ts/extra-package.json

@@ -1,11 +0,0 @@
-{
-  "scripts": {
-    "lint": "eslint ."
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.4.0",
-    "eslint": "9.x",
-    "globals": "^15.4.0",
-    "typescript-eslint": "^7.12.0"
-  }
-}

package/template-eslint/react-js/extra-package.json

@@ -1,12 +0,0 @@
-{
-  "scripts": {
-    "lint": "eslint ."
-  },
-  "devDependencies": {
-    "@eslint/compat": "^1.0.3",
-    "@eslint/js": "^9.4.0",
-    "eslint": "9.x",
-    "eslint-plugin-react": "^7.34.2",
-    "globals": "^15.4.0"
-  }
-}

package/template-eslint/svelte-ts/extra-package.json

@@ -1,13 +0,0 @@
-{
-  "scripts": {
-    "lint": "eslint ."
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.4.0",
-    "eslint": "9.x",
-    "eslint-plugin-svelte": "^2.36.0",
-    "globals": "^15.4.0",
-    "typescript-eslint": "^8.0.0-alpha.20"
-  },
-  "type": "module"
-}

package/template-prettier/extra-package.json

@@ -1,8 +0,0 @@
-{
-  "scripts": {
-    "format": "prettier --write ."
-  },
-  "devDependencies": {
-    "prettier": "^3.1.1"
-  }
-}