From 35984c018008ace51f526046b5f0a8f9c276cf94 Mon Sep 17 00:00:00 2001
From: Eiinu <eiinu@qq.com>
Date: Fri, 29 Mar 2024 18:07:47 +0800
Subject: [PATCH] chore: add type module in taro demo (#3002)

---
 .../{babel.config.js => babel.config.cjs}      |  0
 .../nutui-taro-demo/config/{dev.js => dev.ts}  |  2 +-
 .../config/{index.js => index.ts}              | 13 ++++++++-----
 packages/nutui-taro-demo/config/prod.js        | 18 ------------------
 packages/nutui-taro-demo/config/prod.ts        | 10 ++++++++++
 packages/nutui-taro-demo/package.json          |  1 +
 packages/nutui-taro-demo/project.config.json   |  4 ++--
 packages/nutui-taro-demo/tsconfig.json         |  1 -
 8 files changed, 22 insertions(+), 27 deletions(-)
 rename packages/nutui-taro-demo/{babel.config.js => babel.config.cjs} (100%)
 rename packages/nutui-taro-demo/config/{dev.js => dev.ts} (82%)
 rename packages/nutui-taro-demo/config/{index.js => index.ts} (89%)
 delete mode 100644 packages/nutui-taro-demo/config/prod.js
 create mode 100644 packages/nutui-taro-demo/config/prod.ts

diff --git a/packages/nutui-taro-demo/babel.config.js b/packages/nutui-taro-demo/babel.config.cjs
similarity index 100%
rename from packages/nutui-taro-demo/babel.config.js
rename to packages/nutui-taro-demo/babel.config.cjs
diff --git a/packages/nutui-taro-demo/config/dev.js b/packages/nutui-taro-demo/config/dev.ts
similarity index 82%
rename from packages/nutui-taro-demo/config/dev.js
rename to packages/nutui-taro-demo/config/dev.ts
index 75ad98aeeb..88d6564258 100644
--- a/packages/nutui-taro-demo/config/dev.js
+++ b/packages/nutui-taro-demo/config/dev.ts
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   env: {
     NODE_ENV: '"development"'
   },
diff --git a/packages/nutui-taro-demo/config/index.js b/packages/nutui-taro-demo/config/index.ts
similarity index 89%
rename from packages/nutui-taro-demo/config/index.js
rename to packages/nutui-taro-demo/config/index.ts
index 7743468a48..474ad93858 100644
--- a/packages/nutui-taro-demo/config/index.js
+++ b/packages/nutui-taro-demo/config/index.ts
@@ -1,4 +1,7 @@
-const path = require('path')
+import path from 'path'
+import dev from './dev'
+import prod from './prod'
+
 const config = {
   projectName: '@nutui/nutui-taro-demo',
   date: '2021-5-29',
@@ -10,7 +13,7 @@ const config = {
     375: 2 / 1
   },
   sourceRoot: 'src',
-  outputRoot: 'dist',
+  outputRoot: `dist/${process.env.TARO_ENV === 'h5' ? 'h5' : process.env.TARO_ENV}`,
   plugins: [
     '@tarojs/plugin-html',
     [
@@ -99,9 +102,9 @@ const config = {
   }
 }
 
-module.exports = function (merge) {
+export default function (merge) {
   if (process.env.NODE_ENV === 'development') {
-    return merge({}, config, require('./dev'))
+    return merge({}, config, dev)
   }
-  return merge({}, config, require('./prod'))
+  return merge({}, config, prod)
 }
diff --git a/packages/nutui-taro-demo/config/prod.js b/packages/nutui-taro-demo/config/prod.js
deleted file mode 100644
index cb74dc3cb9..0000000000
--- a/packages/nutui-taro-demo/config/prod.js
+++ /dev/null
@@ -1,18 +0,0 @@
-module.exports = {
-  env: {
-    NODE_ENV: '"production"'
-  },
-  defineConstants: {},
-  mini: {},
-  h5: {
-    publicPath: '/taro/vue/4x/demo/'
-    /**
-     * 如果h5端编译后体积过大，可以使用webpack-bundle-analyzer插件对打包体积进行分析。
-     * 参考代码如下：
-     * webpackChain (chain) {
-     *   chain.plugin('analyzer')
-     *     .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, [])
-     * }
-     */
-  }
-}
diff --git a/packages/nutui-taro-demo/config/prod.ts b/packages/nutui-taro-demo/config/prod.ts
new file mode 100644
index 0000000000..b95ecb0f50
--- /dev/null
+++ b/packages/nutui-taro-demo/config/prod.ts
@@ -0,0 +1,10 @@
+export default {
+  env: {
+    NODE_ENV: '"production"'
+  },
+  defineConstants: {},
+  mini: {},
+  h5: {
+    publicPath: '/taro/vue/4x/demo/'
+  }
+}
diff --git a/packages/nutui-taro-demo/package.json b/packages/nutui-taro-demo/package.json
index 9b36c7c113..0d71449978 100644
--- a/packages/nutui-taro-demo/package.json
+++ b/packages/nutui-taro-demo/package.json
@@ -2,6 +2,7 @@
   "name": "@nutui/nutui-taro-demo",
   "version": "1.0.0",
   "private": true,
+  "type": "module",
   "description": "nutui-taro-demo",
   "templateInfo": {
     "name": "default",
diff --git a/packages/nutui-taro-demo/project.config.json b/packages/nutui-taro-demo/project.config.json
index d2af87e994..19066857de 100644
--- a/packages/nutui-taro-demo/project.config.json
+++ b/packages/nutui-taro-demo/project.config.json
@@ -1,6 +1,6 @@
 {
-  "miniprogramRoot": "dist/",
-  "projectname": "%40nutui%2Fnutui-taro-demo",
+  "miniprogramRoot": "dist/weapp",
+  "projectname": "@nutui/nutui-taro-demo",
   "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "appid": "wxf2b976b67dab3882",
   "setting": {
diff --git a/packages/nutui-taro-demo/tsconfig.json b/packages/nutui-taro-demo/tsconfig.json
index 63bed20801..b025ad5f20 100644
--- a/packages/nutui-taro-demo/tsconfig.json
+++ b/packages/nutui-taro-demo/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
     "target": "es2017",
-    "module": "commonjs",
     "removeComments": false,
     "preserveConstEnums": true,
     "moduleResolution": "node",