chore: update scripts.

jaywcjlove · jaywcjlove · commit 596d71892665 · 2023-06-10T11:32:37.000+08:00
diff --git a/example/base/.pkgresolverc.json b/example/base/.pkgresolverc.json
@@ -0,0 +1,4 @@
+{
+  "@uiw/react-native": "../../packages/core/lib/index.js",
+  "@uiw/react-native-image-picker": "../../packages/react-native-image-picker/lib/index.js"
+}
diff --git a/example/base/metro.config.js b/example/base/metro.config.js
@@ -1,28 +1,2 @@
-/**
- * Metro configuration for React Native
- * https://github.com/facebook/react-native
- *
- */
-
-const path = require('path');
-
-module.exports = {
-  resolver: {
-    extraNodeModules: {
-      '@uiw/react-native': path.resolve(`${__dirname}/lib/`),
-      '@uiw/react-native-image-picker': path.resolve(`${__dirname}/lib2/`),
-      // '@uiw/react-native': path.resolve(`${__dirname}/../../packages/core/`),
-      // 'react-native-svg': path.resolve(
-      //   `${__dirname}/../../node_modules/react-native-svg/`,
-      // ),
-    },
-  },
-  transformer: {
-    getTransformOptions: async () => ({
-      transform: {
-        experimentalImportSupport: false,
-        inlineRequires: true,
-      },
-    }),
-  },
-};
+const conf = require('@uimjs/metro-config');
+module.exports = conf.default();
diff --git a/example/base/package.json b/example/base/package.json
@@ -25,6 +25,7 @@
     "@babel/core": "~7.20.7",
     "@babel/runtime": "~7.20.7",
     "@react-native-community/eslint-config": "^2.0.0",
+    "@uimjs/metro-config": "^1.0.2",
     "babel-jest": "^26.6.3",
     "eslint": "^7.32.0",
     "jest": "^26.6.3",
diff --git a/example/examples/.pkgresolverc.json b/example/examples/.pkgresolverc.json
@@ -0,0 +1,4 @@
+{
+  "@uiw/react-native": "../../packages/core/lib/index.js",
+  "@uiw/react-native-image-picker": "../../packages/react-native-image-picker/lib/index.js"
+}
diff --git a/example/examples/metro.config.js b/example/examples/metro.config.js
@@ -1,28 +1,2 @@
-/**
- * Metro configuration for React Native
- * https://github.com/facebook/react-native
- *
- * @format
- */
-const path = require('path');
-
-module.exports = {
-  resolver: {
-    extraNodeModules: {
-      '@uiw/react-native': path.resolve(`${__dirname}/lib/`),
-      '@uiw/react-native-image-picker': path.resolve(`${__dirname}/lib2/`),
-      // '@uiw/react-native': path.resolve(`${__dirname}/../../packages/core/`),
-      // 'react-native-svg': path.resolve(
-      //   `${__dirname}/../../node_modules/react-native-svg/`,
-      // ),
-    },
-  },
-  transformer: {
-    getTransformOptions: async () => ({
-      transform: {
-        experimentalImportSupport: false,
-        inlineRequires: true,
-      },
-    }),
-  },
-};
+const conf = require('@uimjs/metro-config');
+module.exports = conf.default();
diff --git a/package.json b/package.json
@@ -3,37 +3,11 @@
   "private": true,
   "scripts": {
     "prepare": "husky install && cd ./test-ci && yarn install",
-    "⬇️⬇️⬇️⬇️⬇️ example::examples ⬇️⬇️⬇️⬇️⬇️": "▼▼▼▼▼ example::examples ▼▼▼▼▼",
-    "lib:build:examples": "lerna exec --scope @uiw/react-native -- tsbb build --disable-babel-option --no-esm --cjs ../../example/examples/lib",
-    "lib:watch:examples": "lerna exec --scope @uiw/react-native -- tsbb watch --disable-babel-option --no-esm --cjs ../../example/examples/lib",
-    "⬆️⬆️⬆️⬆️⬆️ example::examples ⬆️⬆️⬆️⬆️⬆️": "▲▲▲▲▲ example::examples ▲▲▲▲▲",
-    "⬇️⬇️⬇️⬇️⬇️ doc ⬇️⬇️⬇️⬇️⬇️": "▼▼▼▼▼ example::examples ▼▼▼▼▼",
-    "build:doc": "lerna exec --scope @uiw/react-native -- tsbb build --disable-babel-option --no-esm --cjs ../../website/src/react-native/lib",
-    "watch:doc": "lerna exec --scope @uiw/react-native -- tsbb watch --disable-babel-option --no-esm --cjs ../../website/src/react-native/lib",
-    "watch:doc1": "lerna exec --scope @uiw/react-native -- tsbb watch --disable-babel-option --no-esm --cjs ../../website/lib",
-    "⬆️⬆️⬆️⬆️⬆️ doc ⬆️⬆️⬆️⬆️⬆️": "▲▲▲▲▲ example::examples ▲▲▲▲▲",
-    "⬇️⬇️⬇️⬇️⬇️ example::base ⬇️⬇️⬇️⬇️⬇️": "▼▼▼▼▼ example::base ▼▼▼▼▼",
-    "lib:build:base": "lerna exec --scope @uiw/react-native -- tsbb build --disable-babel-option --no-esm --cjs ../../example/base/lib",
-    "lib:watch:base": "lerna exec --scope @uiw/react-native -- tsbb watch --disable-babel-option --no-esm --cjs ../../example/base/lib",
-    "⬆️⬆️⬆️⬆️⬆️ example::base ⬆️⬆️⬆️⬆️⬆️": "▲▲▲▲▲ example::base ▲▲▲▲▲",
     "⬇️⬇️⬇️⬇️⬇️ test-ci ⬇️⬇️⬇️⬇️⬇️": "▼▼▼▼▼ example::base ▼▼▼▼▼",
-    "lib:build:test": "lerna exec --scope @uiw/react-native -- tsbb build --disable-babel-option --no-esm --cjs ../../test-ci/src/lib",
-    "lib:watch:test": "lerna exec --scope @uiw/react-native -- tsbb watch --disable-babel-option --no-esm --cjs ../../test-ci/src/lib",
     "test": "cd ./test-ci && npm run test",
     "⬆️⬆️⬆️⬆️⬆️ test-ci ⬆️⬆️⬆️⬆️⬆️": "▲▲▲▲▲ example::base ▲▲▲▲▲",
-    "watch": "npm run lib:watch & npm run lib:watch:base & npm run lib:watch:examples & npm run lib:watch:test & npm run watch:doc  & npm run lib:watch:image-picker & npm run lib:watch:examples:image-picker & npm run lib:watch:base:image-picker",
-    "build": "npm run lib:build && npm run lib:build:base && npm run lib:build:examples && npm run lib:build:test && npm run build:doc && npm run lib:build:image-picker && npm run lib:build:examples:image-picker && npm run lib:build:base:image-picker",
     ">>>>>>>": ">>>>>>>",
-    "lib:build": "lerna exec --scope @uiw/react-native -- tsbb build --disable-babel-option --no-esm",
-    "lib:watch": "lerna exec --scope @uiw/react-native  -- tsbb watch --disable-babel-option --no-esm",
-    "⬇️⬇️⬇️⬇️⬇️ image-picker ⬇️⬇️⬇️⬇️⬇️": "▼▼▼▼▼ example::base ▼▼▼▼▼",
-    "lib:build:image-picker": "lerna exec --scope @uiw/react-native-image-picker -- tsbb build --disable-babel-option --no-esm",
-    "lib:watch:image-picker": "lerna exec --scope @uiw/react-native-image-picker -- tsbb watch --disable-babel-option --no-esm",
-    "lib:build:examples:image-picker": "lerna exec --scope @uiw/react-native-image-picker -- tsbb build --disable-babel-option --no-esm --cjs ../../example/examples/lib2",
-    "lib:watch:examples:image-picker": "lerna exec --scope @uiw/react-native-image-picker -- tsbb watch --disable-babel-option --no-esm --cjs ../../example/examples/lib2",
-    "lib:build:base:image-picker": "lerna exec --scope @uiw/react-native-image-picker -- tsbb build --disable-babel-option --no-esm --cjs ../../example/base/lib2",
-    "lib:watch:base:image-picker": "lerna exec --scope @uiw/react-native-image-picker -- tsbb watch --disable-babel-option --no-esm --cjs ../../example/base/lib2",
-    "⬆️⬆️⬆️⬆️⬆️ image-picker ⬆️⬆️⬆️⬆️⬆️": "▲▲▲▲▲ example::base ▲▲▲▲▲",
+    "build": "lerna exec --scope @uiw/react-native --scope @uiw/react-native-image-picker -- npm run build",
     "start": "lerna exec --scope website -- npm run start",
     "doc": "lerna exec --scope website -- npm run build",
     "<<<<<<<": "<<<<<<<",
@@ -61,7 +35,7 @@
     "lerna": "^7.0.0",
     "prettier": "^2.7.1",
     "pretty-quick": "^3.1.3",
-    "tsbb": "3.7.6",
+    "tsbb": "^4.1.7",
     "typescript": "^4.7.4"
   },
   "resolutions": {
diff --git a/packages/core/.babelrc b/packages/core/.babelrc
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -5,7 +5,13 @@
   "homepage": "https://uiwjs.github.io/react-native-uiw/",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
-  "scripts": {},
+  "scripts": {
+    "watch": "npm run start",
+    "start": "tsbb watch src/*.tsx & npm run copy:watch",
+    "copy": "tsbb copy \"lib/**/*.{js,md,d.ts,png}\" --output ../../website/src/react-native",
+    "copy:watch": "tsbb copy \"lib/**/*.{js,md,d.ts,png}\" --output ../../website/src/react-native --watch",
+    "build": "tsbb build src/*.tsx && npm run copy"
+  },
   "keywords": [
     "uiw",
     "react-native",
diff --git a/packages/core/src/Button/README.md b/packages/core/src/Button/README.md
@@ -218,7 +218,7 @@ export default Demo
 
 | 属性 | 说明 | 类型 | 默认值 |
 | --- | --- | --- | --- |
-| color | 自定义颜色 | `string` | -｜
+| color | 自定义颜色 | `string` | - |
 | disabled | 是否禁用 | `boolean` | `false` |
 | bordered | 设置是否显示边框 | `boolean` | `true` |
 | loading | 加载状态 | `boolean` | `false` |
diff --git a/packages/react-native-image-picker/.babelrc b/packages/react-native-image-picker/.babelrc
diff --git a/packages/react-native-image-picker/package.json b/packages/react-native-image-picker/package.json
@@ -5,7 +5,11 @@
   "homepage": "https://uiwjs.github.io/react-native-uiw/",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
-  "scripts": {},
+  "scripts": {
+    "watch": "npm run start",
+    "start": "tsbb watch src/*.tsx",
+    "build": "tsbb build src/*.tsx"
+  },
   "keywords": [
     "uiw",
     "react-native",
diff --git a/test-ci/.pkgresolverc.json b/test-ci/.pkgresolverc.json
@@ -0,0 +1,3 @@
+{
+  "@uiw/react-native": "../packages/core/lib/index.js"
+}
diff --git a/test-ci/metro.config.js b/test-ci/metro.config.js
@@ -1,17 +1,2 @@
-/**
- * Metro configuration for React Native
- * https://github.com/facebook/react-native
- *
- * @format
- */
-
-module.exports = {
-  transformer: {
-    getTransformOptions: async () => ({
-      transform: {
-        experimentalImportSupport: false,
-        inlineRequires: true,
-      },
-    }),
-  },
-};
+const conf = require('@uimjs/metro-config');
+module.exports = conf.default();
diff --git a/test-ci/package.json b/test-ci/package.json
@@ -25,6 +25,8 @@
     "@types/react-test-renderer": "^18.0.0",
     "@typescript-eslint/eslint-plugin": "^5.37.0",
     "@typescript-eslint/parser": "^5.37.0",
+    "@uiw/react-native": "4.0.10",
+    "@uimjs/metro-config": "^1.0.2",
     "babel-jest": "^29.3.1",
     "eslint": "^7.32.0",
     "jest": "^29.3.1",
diff --git a/website/.kktrc.ts b/website/.kktrc.ts
@@ -8,12 +8,14 @@ import pkg from './package.json';
 import { mdCodeModulesLoader } from 'markdown-react-code-preview-loader';
 // @ts-ignore
 import MDS from 'babel-transform-import-plugin';
+
 export default (conf: Configuration, env: 'development' | 'production', options: LoaderConfOptions) => {
   conf = lessModules(conf, env, options);
   // conf = rawModules(conf, env, { ...options });
   conf = scopePluginOptions(conf, env, {
     ...options,
     allowedFiles: [path.resolve(process.cwd(), 'README.md')],
+    allowedPaths: [path.resolve(process.cwd(), '../packages/core')],
   });
 
   conf.module!.exprContextCritical = false;
@@ -35,7 +37,6 @@ export default (conf: Configuration, env: 'development' | 'production', options:
       ],
     ],
   });
-
   conf.resolve = {
     ...(conf.resolve || {}),
     alias: {
@@ -44,6 +45,25 @@ export default (conf: Configuration, env: 'development' | 'production', options:
       '@uiw/react-native': path.join(process.cwd(), './src/react-native'),
     },
   };
+
+  // conf.module!.rules = conf.module?.rules?.map((rules) => {
+  //   if (typeof rules === 'object' && 'oneOf' in rules && rules.oneOf) {
+  //     rules.oneOf = rules.oneOf.map((rule) => {
+  //       if (rule.loader?.includes('babel-loader') && rule.test && rule.test.toString() === /\.(js|mjs|jsx|ts|tsx)$/.toString()) {
+  //         // @ts-ignore
+  //         console.log('rule:', rule);
+  //         rule.include = [
+  //           // path.resolve(process.cwd(), '../packages/core/lib'),
+  //           // path.resolve(process.cwd(), 'node_modules'),
+  //           path.resolve(process.cwd(), 'src')
+  //         ]
+  //       }
+  //       return rule;
+  //     })
+  //   }
+  //   return rules;
+  // });
+
   if (env === 'production') {
     conf.output = { ...conf.output, publicPath: './' };
   }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "@uiw/react-native": "../../packages/core/lib/index.js",
 +  "@uiw/react-native-image-picker": "../../packages/react-native-image-picker/lib/index.js"
 +}