Merge branch 'v4' of https://github.com/jdf2e/nutui into v4

jd/generate-unplugin-deps.cjs

@@ -48,7 +48,7 @@ export { ${element.name} };`;
   });
 });
 outputFileEntry += components.map(name => `import { ${name} } from "./packages/${name.toLowerCase()}/index.mjs";`).join('\n');
-outputFileEntry += `\nimport { Locale } from "./packages/locale/lang/index.js";
+outputFileEntry += `\nimport { Locale } from "./packages/locale/lang";
 function install(app) {
   const packages = [${components.join(',')}];
   packages.forEach((item) => {
@@ -112,24 +112,12 @@ styleMap.forEach((value, key) => {
     return component !== key;
   });
   // gen style
-  const outputStyleCJs = `${deps
-    .map((component) => {
-      return `require('../${component.toLowerCase()}/index.scss');\n`;
-    })
-    .reverse()
-    .join('')}require('./index.scss');\n`;
   const outputStyleMjs = `${deps
     .map((component) => {
       return `import '../${component.toLowerCase()}/index.scss';\n`;
     })
     .reverse()
     .join('')}import './index.scss';\n`;
-
-  tasks.push(
-    fs.outputFile(path.resolve(__dirname, `../dist/packages/${name}/style.cjs`), outputStyleCJs, 'utf8', () => {
-      // console.log('')
-    })
-  );
   tasks.push(
     fs.outputFile(path.resolve(__dirname, `../dist/packages/${name}/style.mjs`), outputStyleMjs, 'utf8', () => {
       // console.log('')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "4.0.0-beta.11",
+  "version": "4.0.0-beta.12",
   "description": "京东风格的轻量级移动端 Vue2、Vue3 组件库（支持小程序开发）",
   "main": "dist/nutui.umd.cjs",
   "module": "dist/nutui.es.js",

publish/nutui-taro/package.json

@@ -1,15 +1,14 @@
 {
   "name": "@nutui/nutui-taro",
-  "version": "4.0.0-beta.11",
+  "version": "4.0.0-beta.12",
   "description": "京东风格的轻量级移动端 Vue2、Vue3 组件库（支持小程序开发）",
   "main": "dist/nutui.umd.cjs",
   "module": "dist/nutui.es.js",
   "style": "dist/style.css",
-  "type": "module",
   "typings": "dist/types/index.d.ts",
   "sideEffects": [
-    "dist/packages/_es/*",
-    "dist/packages/**/style*",
+    "dist/packages/**/*",
+    "dist/styles/**",
     "dist/style.css"
   ],
   "web-types": "dist/smartips/web-types.json",

publish/nutui/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@nutui/nutui",
-  "version": "4.0.0-beta.11",
+  "version": "4.0.0-beta.12",
   "description": "京东风格的轻量级移动端 Vue2、Vue3 组件库（支持小程序开发）",
   "main": "dist/nutui.umd.cjs",
   "module": "dist/nutui.es.js",
   "style": "dist/style.css",
-  "type": "module",
   "typings": "dist/types/index.d.ts",
   "sideEffects": [
-    "dist/packages/_es/*",
-    "dist/packages/**/style*"
+    "dist/packages/**/*",
+    "dist/styles/**",
+    "dist/style.css"
   ],
   "web-types": "dist/smartips/web-types.json",
   "keywords": [

src/config.json

@@ -15,21 +15,21 @@
         "show": true
       },
       {
-        "name": "starttaro",
-        "cName": "小程序开发",
-        "eName": "WeChat",
+        "name": "theme",
+        "cName": "定制主题",
+        "eName": "Customize Theme",
         "show": true
       },
       {
-        "name": "theme",
-        "cName": "主题定制",
-        "eName": "Customize Theme",
+        "name": "version",
+        "cName": "4.0版本说明",
+        "eName": "Version Instruction",
         "show": true
       },
       {
-        "name": "theme-variable",
-        "cName": "动态主题",
-        "eName": "Variable Theme",
+        "name": "migrate-from-v3",
+        "cName": "从 v3 升级到 v4",
+        "eName": "migrate-from-v3",
         "show": true
       },
       {
@@ -51,30 +51,13 @@
         "path": "#/contributing",
         "show": true
       },
-      {
-        "name": "migrate-from-v3",
-        "cName": "从 v3 升级到 v4",
-        "eName": "migrate-from-v3",
-        "show": true
-      },
+      
       {
         "name": "https://github.com/jdf2e/nutui/releases",
         "cName": "更新日志",
         "eName": "Changelog",
         "show": true,
         "isLink": true
-      },
-      {
-        "name": "resource",
-        "cName": "资源",
-        "eName": "Resources",
-        "show": true
-      },
-      {
-        "name": "notice",
-        "cName": "常见问题",
-        "eName": "FAQ",
-        "show": true
       }
     ]
   },

src/packages/__VUE/README.md

@@ -1 +0,0 @@
-# vue-packages

src/packages/__VUE/layout/doc.en-US.md

@@ -235,7 +235,7 @@ The Layout component provides a 24-column grid, by adding the span attribute on
 | Field | Description | Type | Default
 |----- | ----- | ----- | -----
 | type | layout method, optional value is `flex` | string | `-`
-| gutter | spacing between column elements (in `px`) | string \| number | `-`
+| gutter | spacing between column elements (`px`) | string \| number | `-`
 | justify | Flex main axis alignment, optional values are `start` `end` `center` `space-around` `space-between` `space-evenly` | string | `start`
 | align | Flex cross axis alignment, optional values are `flex-start` `center` `flex-end` | string | `flex-start`
 | flex-wrap | Whether flex wraps, optional values are `nowrap` `wrap` `reverse` | string | `nowrap`

src/packages/__VUE/price/demo.vue

@@ -21,7 +21,7 @@
     </nut-cell>
     <h2>{{ translate('title4') }}</h2>
     <nut-cell>
-      <nut-price :price="8888.01" position="after" symbol="元" />
+      <nut-price :price="8888.01" position="after" :symbol="translate('symbol')" />
     </nut-cell>
     <h2>{{ translate('title5') }}</h2>
     <nut-cell>
@@ -41,14 +41,16 @@ const initTranslate = () =>
       title2: '不保留小数',
       title3: '货币符号',
       title4: '货币符号位置',
-      title5: '千位分隔'
+      title5: '千位分隔',
+      symbol: '元'
     },
     'en-US': {
       title1: 'Support three sizes：small、normal、large',
       title2: 'No decimals',
       title3: 'Currency symbol',
       title4: 'Currency symbol position',
-      title5: 'Separated by thousands'
+      title5: 'Separated by thousands',
+      symbol: 'RMB'
     }
   });
 export default createDemo({

src/packages/__VUE/price/doc.en-US.md

@@ -67,7 +67,7 @@ Three sizes are supported: small, normal, and large, and the default is normal.
 
 ``` html
 <template>
-    <nut-price :price="8888.01" position="after" symbol="元" />
+    <nut-price :price="8888.01" position="after" symbol="RMB" />
 </template>
 ```
 

src/packages/vscode-extension/package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"displayName": "nutui-vscode-extension",
 	"description": "nutui extension for vscode",
-	"version": "0.0.3",
+	"version": "1.0.0",
 	"icon": "src/nutui.png",
 	"engines": {
 		"vscode": "^1.66.0"

src/packages/vscode-extension/scripts/createComponentMap.js

@@ -23,7 +23,7 @@ const getCompName = (name) => {
     });
   }
   const packageName = packages.find((item) => item.name.toLowerCase() === name.toLowerCase());
-  return packageName.name;
+  return packageName ? packageName.name : '';
 };
 
 const getSubSources = (sources) => {
@@ -41,13 +41,19 @@ const genaratorComponentMap = () => {
 
   for (let componentDir of componentDirs) {
     let stat = fs.lstatSync(`${basePath}/${componentDir}`);
+    let compoName = kebabCase(getCompName(componentDir));
     if (stat.isDirectory()) {
       const absolutePath = path.join(`${basePath}/${componentDir}`, 'doc.md');
-      if (!fs.existsSync(absolutePath)) continue;
+      if (!fs.existsSync(absolutePath)) {
+        componentMap[compoName] = {
+          site: ``,
+          props: ['']
+        };
+        continue;
+      }
       const data = fs.readFileSync(absolutePath, 'utf8');
       let sources = MarkdownIt.parse(data, {});
       sources = getSubSources(sources);
-      let compoName = kebabCase(getCompName(componentDir));
       componentMap[compoName] = {
         site: `/zh-CN/component/${componentDir}`,
         props: sources.filter((source) => source.type === 'inline').length

src/packages/vscode-extension/src/componentMap.ts

@@ -29,6 +29,10 @@ export const componentMap: Record<string, ComponentDesc> = {
     site: '/zh-CN/component/avatar',
     props: ["size=''"]
   },
+  'avatar-group': {
+    site: '',
+    props: ['']
+  },
   backtop: {
     site: '/zh-CN/component/backtop',
     props: ["el-id=''"]
@@ -49,6 +53,10 @@ export const componentMap: Record<string, ComponentDesc> = {
     site: '/zh-CN/component/calendar',
     props: ["v-model:visible=''"]
   },
+  'calendar-item': {
+    site: '',
+    props: ['']
+  },
   card: {
     site: '/zh-CN/component/card',
     props: ["img-url=''"]
@@ -61,22 +69,42 @@ export const componentMap: Record<string, ComponentDesc> = {
     site: '/zh-CN/component/category',
     props: ["type=''"]
   },
+  'category-pane': {
+    site: '',
+    props: ['']
+  },
   cell: {
     site: '/zh-CN/component/cell',
     props: ["title=''"]
   },
+  'cell-group': {
+    site: '',
+    props: ['']
+  },
   checkbox: {
     site: '/zh-CN/component/checkbox',
     props: ["v-model=''"]
   },
+  'checkbox-group': {
+    site: '',
+    props: ['']
+  },
   'circle-progress': {
     site: '/zh-CN/component/circleprogress',
     props: ["progress=''"]
   },
+  col: {
+    site: '',
+    props: ['']
+  },
   collapse: {
     site: '/zh-CN/component/collapse',
     props: ["v-model=''"]
   },
+  'collapse-item': {
+    site: '',
+    props: ['']
+  },
   comment: {
     site: '/zh-CN/component/comment',
     props: ["header-type=''"]
@@ -133,10 +161,18 @@ export const componentMap: Record<string, ComponentDesc> = {
     site: '/zh-CN/component/form',
     props: ["model-value=''"]
   },
+  'form-item': {
+    site: '',
+    props: ['']
+  },
   grid: {
     site: '/zh-CN/component/grid',
     props: ["column-num=''"]
   },
+  'grid-item': {
+    site: '',
+    props: ['']
+  },
   icon: {
     site: '/zh-CN/component/icon',
     props: ["name=''"]
@@ -181,6 +217,10 @@ export const componentMap: Record<string, ComponentDesc> = {
     site: '/zh-CN/component/menu',
     props: ["active-color=''"]
   },
+  'menu-item': {
+    site: '',
+    props: ['']
+  },
   navbar: {
     site: '/zh-CN/component/navbar',
     props: ["title=''"]
@@ -233,6 +273,10 @@ export const componentMap: Record<string, ComponentDesc> = {
     site: '/zh-CN/component/radio',
     props: ["disabled=''"]
   },
+  'radio-group': {
+    site: '',
+    props: ['']
+  },
   range: {
     site: '/zh-CN/component/range',
     props: ["v-model=''"]
@@ -241,6 +285,14 @@ export const componentMap: Record<string, ComponentDesc> = {
     site: '/zh-CN/component/rate',
     props: ["v-model=''"]
   },
+  row: {
+    site: '',
+    props: ['']
+  },
+  '': {
+    site: '',
+    props: ['']
+  },
   searchbar: {
     site: '/zh-CN/component/searchbar',
     props: ["v-model=''"]
@@ -253,6 +305,10 @@ export const componentMap: Record<string, ComponentDesc> = {
     site: '/zh-CN/component/sidenavbar',
     props: ["offset=''"]
   },
+  'side-navbar-item': {
+    site: '',
+    props: ['']
+  },
   signature: {
     site: '/zh-CN/component/signature',
     props: ["custom-class=''"]
@@ -265,6 +321,10 @@ export const componentMap: Record<string, ComponentDesc> = {
     site: '/zh-CN/component/sku',
     props: ["v-model:visible=''"]
   },
+  step: {
+    site: '',
+    props: ['']
+  },
   steps: {
     site: '/zh-CN/component/steps',
     props: ["direction=''"]
@@ -273,6 +333,10 @@ export const componentMap: Record<string, ComponentDesc> = {
     site: '/zh-CN/component/sticky',
     props: ["position=''"]
   },
+  'sub-side-navbar': {
+    site: '',
+    props: ['']
+  },
   swipe: {
     site: '/zh-CN/component/swipe',
     props: ["name=''"]
@@ -293,10 +357,18 @@ export const componentMap: Record<string, ComponentDesc> = {
     site: '/zh-CN/component/tabbar',
     props: ["v-model=''"]
   },
+  'tabbar-item': {
+    site: '',
+    props: ['']
+  },
   table: {
     site: '/zh-CN/component/table',
     props: ["bordered=''"]
   },
+  'tab-pane': {
+    site: '',
+    props: ['']
+  },
   tabs: {
     site: '/zh-CN/component/tabs',
     props: ["v-model=''"]

vite.config.build.taro.vue.disperse.ts

@@ -62,7 +62,7 @@ export default defineConfig({
       input,
       output: {
         paths: {
-          '@/packages/locale': '../locale/lang/index.js'
+          '@/packages/locale': '../locale/lang'
         },
         dir: path.resolve(__dirname, './dist/packages/_es'),
         entryFileNames: '[name].js',