released v7.1.2 (kkt)

kktjs · Feb 23, 2022 · 5f9106a · 5f9106a
1 parent d7f446a
commit 5f9106a
Show file tree

Hide file tree

Showing 30 changed files with 186 additions and 115 deletions.
diff --git a/core/package.json b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kkt",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "description": "Create React apps with no build configuration, Cli tool for creating react apps.",
   "author": "Kenny Wong <wowohoo@qq.com> (https://github.com/jaywcjlove)",
   "main": "lib/index.js",

diff --git a/example/basic-entry/package.json b/example/basic-entry/package.json
@@ -19,7 +19,7 @@
     "react-dom": "17.0.2"
   },
   "devDependencies": {
-    "kkt": "7.1.1"
+    "kkt": "7.1.2"
   },
   "eslintConfig": {
     "extends": [

diff --git a/example/basic/package.json b/example/basic/package.json
@@ -22,7 +22,7 @@
     "web-vitals": "^2.1.2"
   },
   "devDependencies": {
-    "kkt": "7.1.1"
+    "kkt": "7.1.2"
   },
   "browserslist": {
     "production": [

diff --git a/example/bundle-node/package.json b/example/bundle-node/package.json
@@ -20,7 +20,7 @@
     "@types/hapi__hapi": "20.0.10"
   },
   "devDependencies": {
-    "@kkt/ncc": "1.0.0"
+    "@kkt/ncc": "1.0.1"
   },
   "eslintConfig": {
     "extends": [

diff --git a/example/bundle/.kktrc.js b/example/bundle/.kktrc.js
@@ -1,14 +1,9 @@
-import reactLibrary from '@kkt/react-library';
 import lessModules from '@kkt/less-modules';
-import pkg from './package.json';
 
 export default (conf, env, options) => {
   conf = lessModules(conf, env, options);
-  conf = reactLibrary(conf, env, {
-    ...options,
-    ...pkg,
-    // webpack externals options
-    dependencies: {
+  if (options.bundle) {
+    conf.externals = {
       react: {
         root: 'React',
         commonjs2: 'react',
@@ -21,8 +16,8 @@ export default (conf, env, options) => {
         commonjs: 'react-dom',
         amd: 'react-dom',
       },
-      'react-refresh': '0',
-    },
-  });
+    };
+  }
+  console.log('conf:', env, conf);
   return conf;
 };
diff --git a/example/bundle/package.json b/example/bundle/package.json
@@ -6,11 +6,11 @@
   "description": "",
   "private": true,
   "scripts": {
-    "start": "kkt start",
+    "start": "FAST_REFRESH=false kkt start",
     "build": "kkt build",
     "released": "npm run bundle && npm run bundle:min",
-    "bundle": "kkt build --bundle",
-    "bundle:min": "GENERATE_SOURCEMAP=false kkt build --bundle --mini"
+    "bundle": "ncc build src/components/button/index.jsx --target web --library Button",
+    "bundle:min": "ncc build src/components/button/index.jsx --target web --library Button -m"
   },
   "repository": {
     "type": "git",
@@ -24,8 +24,8 @@
   },
   "devDependencies": {
     "@kkt/less-modules": "7.1.1",
-    "@kkt/react-library": "7.1.1",
-    "kkt": "7.1.1"
+    "@kkt/ncc": "1.0.1",
+    "kkt": "7.1.2"
   },
   "eslintConfig": {
     "extends": [

diff --git a/example/bundle/public/umd.html b/example/bundle/public/umd.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <script src="https://unpkg.com/@babel/standalone@7.17.5/babel.min.js" crossorigin></script>
+  <script src="https://unpkg.com/react@16.x/umd/react.development.js" crossorigin></script>
+  <script src="https://unpkg.com/react-dom@16.x/umd/react-dom.development.js" crossorigin></script>
+  <script src="../dist/index.js"></script>
+  <link href="../dist/index.css" rel="stylesheet" />
+  <title>Demo</title>
+</head>
+<body>
+  <div id="container" style="padding: 24px"></div>
+  <script type="text/babel">
+    const Demo = () => {
+      const ButtonCom = Button.default;
+      return (
+        <div>
+          <ButtonCom type="primary">主要按钮</ButtonCom>
+          <ButtonCom type="success">成功按钮</ButtonCom>
+          <ButtonCom type="warning">警告按钮</ButtonCom>
+          <ButtonCom type="danger">错误按钮</ButtonCom>
+          <ButtonCom type="light">亮按钮</ButtonCom>
+          <ButtonCom type="dark">暗按钮</ButtonCom>
+        </div>
+      );
+    }
+    ReactDOM.render(<Demo />, document.getElementById("container"));
+  </script>
+</body>
+</html>
diff --git a/example/bundle/src/app/App.js → example/bundle/src/app/App.jsx b/example/bundle/src/app/App.js → example/bundle/src/app/App.jsx
diff --git a/example/bundle/src/components/button/index.js b/example/bundle/src/components/button/index.js
diff --git a/example/bundle/src/components/button/index.jsx b/example/bundle/src/components/button/index.jsx
@@ -0,0 +1,109 @@
+import React from 'react';
+import './style/index.less';
+import './style/btn.less';
+
+export default function Button(props) {
+  const {
+    prefixCls = 'w-btn',
+    type = 'light',
+    size = 'default',
+    active = false,
+    disabled = false,
+    block = false,
+    basic = false,
+    className,
+    loading = false,
+    children,
+    htmlType = 'button',
+    ...others
+  } = props;
+
+  const cls = [
+    className,
+    prefixCls,
+    size ? `${prefixCls}-${size}` : false,
+    type ? `${prefixCls}-${type}` : false,
+    basic ? `${prefixCls}-basic` : false,
+    loading ? `${prefixCls}-loading` : false,
+    disabled || loading ? 'disabled' : false,
+    active ? 'active' : false,
+    block ? 'block' : false,
+  ]
+    .filter(Boolean)
+    .join(' ');
+  return (
+    <button {...others} disabled={disabled || loading} type={htmlType} className={cls}>
+      {children &&
+        React.Children.map(children, (child) => {
+          if (React.isValidElement(child)) return child;
+          return <span> {child} </span>;
+        })}
+    </button>
+  );
+}
+
+Button.defaultProps = {
+  prefixCls: 'w-btn',
+  disabled: false,
+  active: false,
+  loading: false,
+  block: false,
+  basic: false,
+  htmlType: 'button',
+  type: 'light',
+  size: 'default',
+};
+// Button.propTypes = {
+//   prefixCls: PropTypes.string,
+//   loading: PropTypes.bool,
+//   disabled: PropTypes.bool,
+//   block: PropTypes.bool,
+//   active: PropTypes.bool,
+//   basic: PropTypes.bool,
+//   htmlType: PropTypes.string,
+//   type: PropTypes.oneOf(['primary', 'success', 'warning', 'danger', 'light', 'dark', 'link']),
+//   size: PropTypes.oneOf(['large', 'default', 'small']),
+// };
+
+// export default class Button extends React.Component {
+//   render() {
+//     const {
+//       prefixCls,
+//       type,
+//       size,
+//       active,
+//       disabled,
+//       block,
+//       basic,
+//       intent,
+//       className,
+//       loading,
+//       children,
+//       htmlType,
+//       ...others
+//     } = this.props;
+
+//     const cls = [
+//       className,
+//       prefixCls,
+//       size ? `${prefixCls}-${size}` : false,
+//       type ? `${prefixCls}-${type}` : false,
+//       basic ? `${prefixCls}-basic` : false,
+//       loading ? `${prefixCls}-loading` : false,
+//       disabled || loading ? 'disabled' : false,
+//       active ? 'active' : false,
+//       block ? 'block' : false,
+//     ]
+//       .filter(Boolean)
+//       .join(' ');
+//     return (
+//       <button {...others} disabled={disabled || loading} type={htmlType} className={cls}>
+//         {children &&
+//           React.Children.map(children, (child) => {
+//             if (React.isValidElement(child)) return child;
+//             return <span> {child} </span>;
+//           })}
+//       </button>
+//     );
+//   }
+// }
diff --git a/example/bundle/src/index.js b/example/bundle/src/index.js
diff --git a/example/bundle/src/index.jsx b/example/bundle/src/index.jsx
@@ -0,0 +1,7 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+// import App from './app/App';
+import './index.css';
+
+ReactDOM.render(<div>test app</div>, document.getElementById('root'));
+// ReactDOM.render(<App />, document.getElementById('root'));
diff --git a/example/chrome-plugin/package.json b/example/chrome-plugin/package.json
@@ -22,7 +22,7 @@
   "devDependencies": {
     "clean-webpack-plugin": "4.0.0",
     "filemanager-webpack-plugin": "6.1.7",
-    "kkt": "7.1.1"
+    "kkt": "7.1.2"
   },
   "eslintConfig": {
     "extends": [

diff --git a/example/electron/package.json b/example/electron/package.json
@@ -26,7 +26,7 @@
     "@types/react": "17.0.38",
     "@types/react-dom": "17.0.11",
     "electron": "16.0.6",
-    "kkt": "7.1.1",
+    "kkt": "7.1.2",
     "tsbb": "3.5.4"
   },
   "dependencies": {

diff --git a/example/less/package.json b/example/less/package.json
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@kkt/less-modules": "7.1.1",
-    "kkt": "7.1.1"
+    "kkt": "7.1.2"
   },
   "browserslist": {
     "production": [

diff --git a/example/markdown/package.json b/example/markdown/package.json
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@kkt/less-modules": "7.1.1",
     "@kkt/raw-modules": "7.1.1",
-    "kkt": "7.1.1"
+    "kkt": "7.1.2"
   },
   "browserslist": {
     "production": [

diff --git a/example/react-component-tsx/package.json b/example/react-component-tsx/package.json
@@ -58,7 +58,7 @@
     "@types/react-test-renderer": "17.0.1",
     "compile-less-cli": "1.8.11",
     "husky": "7.0.4",
-    "kkt": "7.1.1",
+    "kkt": "7.1.2",
     "lint-staged": "12.3.3",
     "prettier": "2.5.1",
     "react-test-renderer": "17.0.2",

diff --git a/example/react-router/package.json b/example/react-router/package.json
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@kkt/less-modules": "7.1.1",
-    "kkt": "7.1.1"
+    "kkt": "7.1.2"
   },
   "eslintConfig": {
     "extends": [

diff --git a/example/rematch-tsx/package.json b/example/rematch-tsx/package.json
@@ -31,7 +31,7 @@
     "@types/react": "17.0.38",
     "@types/react-dom": "17.0.11",
     "@types/react-redux": "7.1.21",
-    "kkt": "7.1.1"
+    "kkt": "7.1.2"
   },
   "eslintConfig": {
     "extends": [

diff --git a/example/scss/package.json b/example/scss/package.json
@@ -18,7 +18,7 @@
     "react-dom": "17.0.2"
   },
   "devDependencies": {
-    "kkt": "7.1.1"
+    "kkt": "7.1.2"
   },
   "browserslist": {
     "production": [