@moluoxixi/create-app 2.0.4 → 2.0.403

package/templates/react/base/src/App.tsx

@@ -1,18 +1,18 @@
-/**
- * 根组件
- */
-
-import { Route, Routes } from 'react-router-dom'
-import Home from '@/pages/home'
-import About from '@/pages/about'
-
-function App(): JSX.Element {
-  return (
-    <Routes>
-      <Route path="/" element={<Home />} />
-      <Route path="/about" element={<About />} />
-    </Routes>
-  )
-}
-
-export default App
+/**
+ * 根组件
+ */
+
+import { Route, Routes } from 'react-router-dom'
+import Home from '@/pages/home'
+import About from '@/pages/about'
+
+function App(): JSX.Element {
+  return (
+    <Routes>
+      <Route path="/" element={<Home />} />
+      <Route path="/about" element={<About />} />
+    </Routes>
+  )
+}
+
+export default App

package/templates/react/base/src/assets/styles/main.scss

@@ -1,8 +1,8 @@
-/**
- * 主样式文件
- * 导入所有样式
- */
-
-@import './base.scss';
-@import './custom.scss';
-@import './tailwind.scss';
+/**
+ * 主样式文件
+ * 导入所有样式
+ */
+
+@import './base.scss';
+@import './custom.scss';
+@import './tailwind.scss';

package/templates/react/base/src/main.tsx.ejs

@@ -3,6 +3,9 @@
  * 初始化 React 应用并挂载到 DOM
  */
 
+<% if (qiankun) { -%>
+import { qiankunWindow, renderWithQiankun } from 'vite-plugin-qiankun/dist/helper'
+<% } -%>
 import React from 'react'
 import ReactDOM from 'react-dom/client'
 import { RouterProvider } from 'react-router-dom'
@@ -29,11 +32,53 @@ initSentry({
 })
 
 <% } -%>
-const router = createRouter()
+let root: ReturnType<typeof ReactDOM.createRoot> | null = null
+
+/**
+ * 渲染应用
+ * @param props 渲染属性
+ */
+async function render(props: Record<string, unknown> = {}): Promise<void> {
+  const { container } = props as { container?: Element }
+<% if (qiankun) { -%>
+  const basename = qiankunWindow.__POWERED_BY_QIANKUN__
+    ? (qiankunWindow as { __INJECTED_PUBLIC_PATH_BY_QIANKUN__?: string }).__INJECTED_PUBLIC_PATH_BY_QIANKUN__?.split('/')[1]
+    : undefined
+  const router = createRouter({ basename })
+<% } else { -%>
+  const router = createRouter()
+<% } -%>
+
+  const containerElement = container
+    ? container.querySelector('#root') || container
+    : document.getElementById('root')!
 
-ReactDOM.createRoot(document.getElementById('root')!).render(
-  <React.StrictMode>
-    <RouterProvider router={router} />
-  </React.StrictMode>,
-)
+  root = ReactDOM.createRoot(containerElement)
+  root.render(
+    <React.StrictMode>
+      <RouterProvider router={router} />
+    </React.StrictMode>,
+  )
+}
+
+<% if (qiankun) { -%>
+if (!qiankunWindow.__POWERED_BY_QIANKUN__) {
+  render({})
+}
+else {
+  renderWithQiankun({
+    async mount(props: Record<string, unknown>) {
+      await render(props)
+    },
+    bootstrap() {},
+    unmount() {
+      root?.unmount()
+      root = null
+    },
+    update() {},
+  })
+}
+<% } else { -%>
+render({})
+<% } -%>
 

package/templates/react/base/src/pages/about/index.tsx

@@ -1,14 +1,14 @@
-/**
- * 关于页面
- */
-
-function About(): JSX.Element {
-  return (
-    <div className="about-page">
-      <h1>关于</h1>
-      <p>这是关于页面</p>
-    </div>
-  )
-}
-
-export default About
+/**
+ * 关于页面
+ */
+
+function About(): JSX.Element {
+  return (
+    <div className="about-page">
+      <h1>关于</h1>
+      <p>这是关于页面</p>
+    </div>
+  )
+}
+
+export default About

package/templates/react/base/src/pages/home/index.tsx

@@ -1,14 +1,14 @@
-/**
- * 首页
- */
-
-function Home(): JSX.Element {
-  return (
-    <div className="home-page">
-      <h1>欢迎使用 React Template</h1>
-      <p>这是一个基于 React + Vite + TypeScript 的项目模板</p>
-    </div>
-  )
-}
-
-export default Home
+/**
+ * 首页
+ */
+
+function Home(): JSX.Element {
+  return (
+    <div className="home-page">
+      <h1>欢迎使用 React Template</h1>
+      <p>这是一个基于 React + Vite + TypeScript 的项目模板</p>
+    </div>
+  )
+}
+
+export default Home

package/templates/react/base/tsconfig.app.json

@@ -1,17 +1,17 @@
-{
-  "extends": "./tsconfig.base.json",
-  "compilerOptions": {
-    "composite": true,
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  },
-  "include": [
-    "env.d.ts",
-    "src/**/*",
-    "src/**/*.tsx"
-  ]
-}
-
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  },
+  "include": [
+    "env.d.ts",
+    "src/**/*",
+    "src/**/*.tsx"
+  ]
+}
+

package/templates/react/base/tsconfig.base.json

@@ -1,23 +1,23 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
-    "skipLibCheck": true,
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "isolatedModules": true,
-    "moduleDetection": "force",
-    "noEmit": true,
-    "jsx": "react-jsx",
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUncheckedSideEffectImports": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true
-  }
-}
-
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "skipLibCheck": true,
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "isolatedModules": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+    "jsx": "react-jsx",
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedSideEffectImports": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true
+  }
+}
+

package/templates/react/base/tsconfig.json

@@ -1,12 +1,12 @@
-{
-  "files": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.node.json"
-    }
-  ]
-}
-
+{
+  "files": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.node.json"
+    }
+  ]
+}
+

package/templates/react/base/tsconfig.node.json

@@ -1,15 +1,15 @@
-{
-  "extends": "./tsconfig.base.json",
-  "compilerOptions": {
-    "composite": true,
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
-    "types": ["node"]
-  },
-  "include": [
-    "vite.config.*",
-    "eslint.config.*",
-    "commitlint.config.*",
-    "scripts/**/*"
-  ]
-}
-
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+    "types": ["node"]
+  },
+  "include": [
+    "vite.config.*",
+    "eslint.config.*",
+    "commitlint.config.*",
+    "scripts/**/*"
+  ]
+}
+

package/templates/react/features/ant-design/package.json

@@ -1,7 +1,6 @@
-{
-  "dependencies": {
-    "@ant-design/icons": "catalog:build",
-    "antd": "catalog:build"
-  }
-}
-
+{
+  "dependencies": {
+    "@ant-design/icons": "^5.5.1",
+    "antd": "^5.22.0"
+  }
+}

package/templates/react/features/eslint/node_modules/.bin/eslint

@@ -0,0 +1,17 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/mnt/e/project/template/vite-cli/node_modules/.pnpm/eslint@9.39.2_jiti@2.6.1/node_modules/eslint/bin/node_modules:/mnt/e/project/template/vite-cli/node_modules/.pnpm/eslint@9.39.2_jiti@2.6.1/node_modules/eslint/node_modules:/mnt/e/project/template/vite-cli/node_modules/.pnpm/eslint@9.39.2_jiti@2.6.1/node_modules:/mnt/e/project/template/vite-cli/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="/mnt/e/project/template/vite-cli/node_modules/.pnpm/eslint@9.39.2_jiti@2.6.1/node_modules/eslint/bin/node_modules:/mnt/e/project/template/vite-cli/node_modules/.pnpm/eslint@9.39.2_jiti@2.6.1/node_modules/eslint/node_modules:/mnt/e/project/template/vite-cli/node_modules/.pnpm/eslint@9.39.2_jiti@2.6.1/node_modules:/mnt/e/project/template/vite-cli/node_modules/.pnpm/node_modules:$NODE_PATH"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../eslint/bin/eslint.js" "$@"
+else
+  exec node  "$basedir/../eslint/bin/eslint.js" "$@"
+fi

package/templates/react/features/eslint/node_modules/.bin/eslint.CMD

@@ -0,0 +1,12 @@
+@SETLOCAL
+@IF NOT DEFINED NODE_PATH (
+  @SET "NODE_PATH=E:\project\template\vite-cli\node_modules\.pnpm\eslint@9.39.2_jiti@2.6.1\node_modules\eslint\bin\node_modules;E:\project\template\vite-cli\node_modules\.pnpm\eslint@9.39.2_jiti@2.6.1\node_modules\eslint\node_modules;E:\project\template\vite-cli\node_modules\.pnpm\eslint@9.39.2_jiti@2.6.1\node_modules;E:\project\template\vite-cli\node_modules\.pnpm\node_modules"
+) ELSE (
+  @SET "NODE_PATH=E:\project\template\vite-cli\node_modules\.pnpm\eslint@9.39.2_jiti@2.6.1\node_modules\eslint\bin\node_modules;E:\project\template\vite-cli\node_modules\.pnpm\eslint@9.39.2_jiti@2.6.1\node_modules\eslint\node_modules;E:\project\template\vite-cli\node_modules\.pnpm\eslint@9.39.2_jiti@2.6.1\node_modules;E:\project\template\vite-cli\node_modules\.pnpm\node_modules;%NODE_PATH%"
+)
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\eslint\bin\eslint.js" %*
+) ELSE (
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\eslint\bin\eslint.js" %*
+)

package/templates/react/features/eslint/node_modules/.bin/eslint.ps1

@@ -0,0 +1,41 @@
+#!/usr/bin/env pwsh
+$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+
+$exe=""
+$pathsep=":"
+$env_node_path=$env:NODE_PATH
+$new_node_path="E:\project\template\vite-cli\node_modules\.pnpm\eslint@9.39.2_jiti@2.6.1\node_modules\eslint\bin\node_modules;E:\project\template\vite-cli\node_modules\.pnpm\eslint@9.39.2_jiti@2.6.1\node_modules\eslint\node_modules;E:\project\template\vite-cli\node_modules\.pnpm\eslint@9.39.2_jiti@2.6.1\node_modules;E:\project\template\vite-cli\node_modules\.pnpm\node_modules"
+if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+  # Fix case when both the Windows and Linux builds of Node
+  # are installed in the same directory
+  $exe=".exe"
+  $pathsep=";"
+} else {
+  $new_node_path="/mnt/e/project/template/vite-cli/node_modules/.pnpm/eslint@9.39.2_jiti@2.6.1/node_modules/eslint/bin/node_modules:/mnt/e/project/template/vite-cli/node_modules/.pnpm/eslint@9.39.2_jiti@2.6.1/node_modules/eslint/node_modules:/mnt/e/project/template/vite-cli/node_modules/.pnpm/eslint@9.39.2_jiti@2.6.1/node_modules:/mnt/e/project/template/vite-cli/node_modules/.pnpm/node_modules"
+}
+if ([string]::IsNullOrEmpty($env_node_path)) {
+  $env:NODE_PATH=$new_node_path
+} else {
+  $env:NODE_PATH="$new_node_path$pathsep$env_node_path"
+}
+
+$ret=0
+if (Test-Path "$basedir/node$exe") {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "$basedir/node$exe"  "$basedir/../eslint/bin/eslint.js" $args
+  } else {
+    & "$basedir/node$exe"  "$basedir/../eslint/bin/eslint.js" $args
+  }
+  $ret=$LASTEXITCODE
+} else {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "node$exe"  "$basedir/../eslint/bin/eslint.js" $args
+  } else {
+    & "node$exe"  "$basedir/../eslint/bin/eslint.js" $args
+  }
+  $ret=$LASTEXITCODE
+}
+$env:NODE_PATH=$env_node_path
+exit $ret

package/templates/react/features/eslint/package.json

@@ -1,7 +1,7 @@
 {
   "devDependencies": {
-    "@moluoxixi/eslint-config": "catalog:dev",
-    "eslint": "catalog:dev",
-    "eslint-plugin-format": "catalog:dev"
+    "@moluoxixi/eslint-config": "latest",
+    "eslint": "^9.22.0",
+    "eslint-plugin-format": "^1.0.1"
   }
 }

package/templates/react/features/i18n/package.json

@@ -1,7 +1,6 @@
-{
-  "dependencies": {
-    "i18next": "catalog:build",
-    "react-i18next": "catalog:build"
-  }
-}
-
+{
+  "dependencies": {
+    "i18next": "^24.0.0",
+    "react-i18next": "^15.1.0"
+  }
+}

package/templates/react/features/i18n/src/locales/index.ts

@@ -1,13 +1,20 @@
+/**
+ * 国际化配置
+ * 基于 i18next 和 react-i18next
+ */
+
 import i18n from 'i18next'
 import { initReactI18next } from 'react-i18next'
 
 import en from './lang/en'
+import es from './lang/es'
 import zh from './lang/zh'
 
 i18n.use(initReactI18next).init({
   resources: {
     zh: { translation: zh },
     en: { translation: en },
+    es: { translation: es },
   },
   lng: localStorage.getItem('locale') || 'zh',
   fallbackLng: 'zh',

package/templates/{common/base → react/features/i18n}/src/locales/lang/en.ts

@@ -1,30 +1,30 @@
-/**
- * English Language Pack
- */
-
-export default {
-  common: {
-    confirm: 'Confirm',
-    cancel: 'Cancel',
-    save: 'Save',
-    delete: 'Delete',
-    edit: 'Edit',
-    add: 'Add',
-    search: 'Search',
-    reset: 'Reset',
-    loading: 'Loading...',
-    success: 'Success',
-    error: 'Error',
-  },
-  menu: {
-    home: 'Home',
-    about: 'About',
-  },
-  user: {
-    login: 'Login',
-    logout: 'Logout',
-    username: 'Username',
-    password: 'Password',
-  },
-};
-
+/**
+ * English Language Pack
+ */
+
+export default {
+  common: {
+    confirm: 'Confirm',
+    cancel: 'Cancel',
+    save: 'Save',
+    delete: 'Delete',
+    edit: 'Edit',
+    add: 'Add',
+    search: 'Search',
+    reset: 'Reset',
+    loading: 'Loading...',
+    success: 'Success',
+    error: 'Error',
+  },
+  menu: {
+    home: 'Home',
+    about: 'About',
+  },
+  user: {
+    login: 'Login',
+    logout: 'Logout',
+    username: 'Username',
+    password: 'Password',
+  },
+};
+

package/templates/{common/base → react/features/i18n}/src/locales/lang/es.ts

@@ -1,30 +1,30 @@
-/**
- * Spanish Language Pack
- */
-
-export default {
-  common: {
-    confirm: 'Confirmar',
-    cancel: 'Cancelar',
-    save: 'Guardar',
-    delete: 'Eliminar',
-    edit: 'Editar',
-    add: 'Agregar',
-    search: 'Buscar',
-    reset: 'Restablecer',
-    loading: 'Cargando...',
-    success: 'Éxito',
-    error: 'Error',
-  },
-  menu: {
-    home: 'Inicio',
-    about: 'Acerca de',
-  },
-  user: {
-    login: 'Iniciar sesión',
-    logout: 'Cerrar sesión',
-    username: 'Nombre de usuario',
-    password: 'Contraseña',
-  },
-};
-
+/**
+ * Spanish Language Pack
+ */
+
+export default {
+  common: {
+    confirm: 'Confirmar',
+    cancel: 'Cancelar',
+    save: 'Guardar',
+    delete: 'Eliminar',
+    edit: 'Editar',
+    add: 'Agregar',
+    search: 'Buscar',
+    reset: 'Restablecer',
+    loading: 'Cargando...',
+    success: 'Éxito',
+    error: 'Error',
+  },
+  menu: {
+    home: 'Inicio',
+    about: 'Acerca de',
+  },
+  user: {
+    login: 'Iniciar sesión',
+    logout: 'Cerrar sesión',
+    username: 'Nombre de usuario',
+    password: 'Contraseña',
+  },
+};
+

package/templates/{common/base → react/features/i18n}/src/locales/lang/zh.ts

@@ -1,30 +1,30 @@
-/**
- * 中文语言包
- */
-
-export default {
-  common: {
-    confirm: '确认',
-    cancel: '取消',
-    save: '保存',
-    delete: '删除',
-    edit: '编辑',
-    add: '新增',
-    search: '搜索',
-    reset: '重置',
-    loading: '加载中...',
-    success: '操作成功',
-    error: '操作失败',
-  },
-  menu: {
-    home: '首页',
-    about: '关于',
-  },
-  user: {
-    login: '登录',
-    logout: '退出登录',
-    username: '用户名',
-    password: '密码',
-  },
-};
-
+/**
+ * 中文语言包
+ */
+
+export default {
+  common: {
+    confirm: '确认',
+    cancel: '取消',
+    save: '保存',
+    delete: '删除',
+    edit: '编辑',
+    add: '新增',
+    search: '搜索',
+    reset: '重置',
+    loading: '加载中...',
+    success: '操作成功',
+    error: '操作失败',
+  },
+  menu: {
+    home: '首页',
+    about: '关于',
+  },
+  user: {
+    login: '登录',
+    logout: '退出登录',
+    username: '用户名',
+    password: '密码',
+  },
+};
+