@variousjs/create 2.0.1 → 3.0.0

package/src/components/card/index.tsx

@@ -0,0 +1,42 @@
+import React from 'react'
+import { ComponentNode } from '@variousjs/various'
+import { useParams } from 'react-router-dom'
+import { Button } from 'shadcn-ui'
+import { Store } from '../../types'
+
+const H = ((props) => {
+  const { id } = useParams<{ id: string }>()
+
+  return (
+    <>
+      <h3>Card</h3>
+      <p>Route params: {id || 'empty'}</p>
+      <div className="flex justify-between">
+        <Button
+          onClick={() => props.$dispatch('next', 'setValue', 1)}
+          variant="secondary"
+        >
+          Value
+        </Button>
+        <Button
+          variant="outline"
+          onClick={() => props.$dispatch('app', 'setLocale', props.$store.locale === 'zh' ? 'en' : 'zh')}
+        >
+          Locale
+        </Button>
+        <Button
+          onClick={async () => {
+            const a = `${Math.random().toFixed(2)}`
+            await props.$dispatch('app', 'setName', a)
+          }}
+        >
+          Store
+        </Button>
+      </div>
+    </>
+  )
+}) as ComponentNode<Store>
+
+H.logName = () => alert('Card')
+
+export default H

package/src/components/next/index.tsx

@@ -0,0 +1,54 @@
+import React, { Component } from 'react'
+import { ComponentProps, Nycticorax, Invoker, I18n } from '@variousjs/various'
+import { Button } from 'shadcn-ui'
+import { Store } from '../../types'
+import zh from './i18n/zh.json'
+import en from './i18n/en.json'
+
+type S = { value: number }
+
+const {
+  createStore,
+  connect,
+  emit,
+  getStore,
+} = new Nycticorax<S>()
+
+createStore({ value: 0 })
+
+class X extends Component<S & ComponentProps<Store>> {
+  static setValue: Invoker = async (value) => {
+    const store = getStore()
+    emit({ value: value + store.value }, true)
+  }
+
+  static $i18n: I18n = () => ({
+    localeKey: 'locale',
+    resources: { zh, en },
+  })
+
+  render() {
+    const { user } = this.props.$store
+    const { value, $t, $dispatch } = this.props
+
+    return (
+      <>
+        <h3>Next</h3>
+        <div>
+          <ul className="list-disc">
+            <li>Store: {user.name}</li>
+            <li>Value: {value}</li>
+            <li>Locale: {$t('title', { name: 'various' })}</li>
+          </ul>
+          <Button
+            onClick={() => $dispatch('card', 'logName')}
+          >
+            Name
+          </Button>
+        </div>
+      </>
+    )
+  }
+}
+
+export default connect('value')(X)

package/src/components/top/index.tsx

@@ -0,0 +1,29 @@
+import React, { FC } from 'react'
+import { ComponentProps, getConfig, ComponentNode } from '@variousjs/various'
+import { useNavigate } from 'react-router-dom'
+import { Config, Store } from '../../types'
+
+export const H: FC<ComponentProps<Store>> = () => {
+  const $config = getConfig() as Config
+  const navigate = useNavigate()
+
+  const onRouterChange = (p: string) => {
+    navigate(p)
+  }
+
+  return (
+    <div className="flex justify-between gap-10">
+      {$config.links.map(({ path, name }) => (
+        <div className="border-solid cursor-pointer rounded py-0.5 px-2 border-2 border-sky-500" onClick={() => onRouterChange(path)} key={path}>
+          {name}
+        </div>
+      ))}
+    </div>
+  )
+}
+
+export const S = ((props) => {
+  return (
+    <div>Srore: {props.$store.user.name}</div>
+  )
+}) as ComponentNode<Store>

package/src/declaration.d.ts

@@ -1,29 +1,3 @@
-// 这里直接配置 antd 依赖库，因为 antd 是 amd 依赖进来并不参与打包
-// 不过也可以直接安装 antd 依赖，但只是用了 typescript 提示
-declare module 'antd' {
-  import { ComponentType, Component } from 'react'
-
-  export const Spin: ComponentType<any>
-  export const Badge: ComponentType<any>
-  export const Alert: ComponentType<any>
-  export const Button: ComponentType<any>
-  export class Radio extends Component<any> {
-    static Group: ComponentType<any>
-    static Button: ComponentType<any>
-  }
-  export class Card extends Component<any> {
-    static Meta: ComponentType<any>
-  }
-
-  export class Descriptions extends Component<any> {
-    static Item: ComponentType<any>
-  }
-
-  export const message: {
-    info: (i: string) => void
-  }
-}
-
 declare module '*.less' {
   const resource: Record<string, string>
   export = resource

package/src/index.html

@@ -0,0 +1,15 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="UTF-8" />
+<title> VariousJS </title>
+<link rel="stylesheet" href="./globals.css" />
+<script>
+var VARIOUS_CONFIG = <%= htmlWebpackPlugin.options.config %>
+</script>
+</head>
+<body>
+<div id="root"></div>
+<script src="https://cdn.jsdelivr.net/npm/@variousjs/various@4.0.0/dist/loader.js"></script>
+</body>
+</html>

package/src/shadcn-ui/components/ui/button.tsx

@@ -0,0 +1,57 @@
+import * as React from "react"
+import { Slot } from "@radix-ui/react-slot"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "@/lib/utils"
+
+const buttonVariants = cva(
+  "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
+  {
+    variants: {
+      variant: {
+        default:
+          "bg-primary text-primary-foreground shadow hover:bg-primary/90",
+        destructive:
+          "bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",
+        outline:
+          "border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground",
+        secondary:
+          "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
+        ghost: "hover:bg-accent hover:text-accent-foreground",
+        link: "text-primary underline-offset-4 hover:underline",
+      },
+      size: {
+        default: "h-9 px-4 py-2",
+        sm: "h-8 rounded-md px-3 text-xs",
+        lg: "h-10 rounded-md px-8",
+        icon: "h-9 w-9",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  }
+)
+
+export interface ButtonProps
+  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
+    VariantProps<typeof buttonVariants> {
+  asChild?: boolean
+}
+
+const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
+  ({ className, variant, size, asChild = false, ...props }, ref) => {
+    const Comp = asChild ? Slot : "button"
+    return (
+      <Comp
+        className={cn(buttonVariants({ variant, size, className }))}
+        ref={ref}
+        {...props}
+      />
+    )
+  }
+)
+Button.displayName = "Button"
+
+export { Button, buttonVariants }

package/src/shadcn-ui/globals.css

@@ -0,0 +1,76 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+ 
+@layer base {
+  :root {
+    --background: 0 0% 100%;
+    --foreground: 222.2 84% 4.9%;
+
+    --card: 0 0% 100%;
+    --card-foreground: 222.2 84% 4.9%;
+ 
+    --popover: 0 0% 100%;
+    --popover-foreground: 222.2 84% 4.9%;
+ 
+    --primary: 222.2 47.4% 11.2%;
+    --primary-foreground: 210 40% 98%;
+ 
+    --secondary: 210 40% 96.1%;
+    --secondary-foreground: 222.2 47.4% 11.2%;
+ 
+    --muted: 210 40% 96.1%;
+    --muted-foreground: 215.4 16.3% 46.9%;
+ 
+    --accent: 210 40% 96.1%;
+    --accent-foreground: 222.2 47.4% 11.2%;
+ 
+    --destructive: 0 84.2% 60.2%;
+    --destructive-foreground: 210 40% 98%;
+
+    --border: 214.3 31.8% 91.4%;
+    --input: 214.3 31.8% 91.4%;
+    --ring: 222.2 84% 4.9%;
+ 
+    --radius: 0.5rem;
+  }
+ 
+  .dark {
+    --background: 222.2 84% 4.9%;
+    --foreground: 210 40% 98%;
+ 
+    --card: 222.2 84% 4.9%;
+    --card-foreground: 210 40% 98%;
+ 
+    --popover: 222.2 84% 4.9%;
+    --popover-foreground: 210 40% 98%;
+ 
+    --primary: 210 40% 98%;
+    --primary-foreground: 222.2 47.4% 11.2%;
+ 
+    --secondary: 217.2 32.6% 17.5%;
+    --secondary-foreground: 210 40% 98%;
+ 
+    --muted: 217.2 32.6% 17.5%;
+    --muted-foreground: 215 20.2% 65.1%;
+ 
+    --accent: 217.2 32.6% 17.5%;
+    --accent-foreground: 210 40% 98%;
+ 
+    --destructive: 0 62.8% 30.6%;
+    --destructive-foreground: 210 40% 98%;
+ 
+    --border: 217.2 32.6% 17.5%;
+    --input: 217.2 32.6% 17.5%;
+    --ring: 212.7 26.8% 83.9%;
+  }
+}
+ 
+@layer base {
+  * {
+    @apply border-border;
+  }
+  body {
+    @apply bg-background text-foreground;
+  }
+}

package/src/shadcn-ui/index.ts

@@ -0,0 +1 @@
+export { Button } from '@/components/ui/button'

package/src/shadcn-ui/lib/utils.ts

@@ -0,0 +1,6 @@
+import { type ClassValue, clsx } from "clsx"
+import { twMerge } from "tailwind-merge"
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs))
+}

package/src/types.ts

@@ -1,9 +1,9 @@
-import store from './entry/store'
+import store from './components/app/store'
 
 export type Store = typeof store
 export type Config = {
   pages: {
-    path: string[] | string,
+    path: string,
     components: string[],
   }[],
   links: {

package/tailwind.config.js

@@ -0,0 +1,134 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  darkMode: ["class"],
+  content: [
+    './src/**/*.{ts,tsx}',
+  ],
+  prefix: "",
+  theme: {
+    container: {
+      center: true,
+      padding: "2rem",
+      screens: {
+        "2xl": "1400px",
+      },
+    },
+    fontSize: {
+      xs: '12px',
+      sm: '14px',
+      base: '16px',
+      lg: '18px',
+      xl: '20px',
+      '2xl': '24px',
+      '3xl': '30px',
+      '4xl': '36px',
+      '5xl': '48px',
+      '6xl': '60px',
+      '7xl': '72px',
+    },
+    spacing: {
+      px: '1px',
+      0: '0',
+      0.5: '2px',
+      1: '4px',
+      1.5: '6px',
+      2: '8px',
+      2.5: '10px',
+      3: '12px',
+      3.5: '14px',
+      4: '16px',
+      5: '20px',
+      6: '24px',
+      7: '28px',
+      8: '32px',
+      9: '36px',
+      10: '40px',
+      11: '44px',
+      12: '48px',
+      14: '56px',
+      16: '64px',
+      20: '80px',
+      24: '96px',
+      28: '112px',
+      32: '128px',
+      36: '144px',
+      40: '160px',
+      44: '176px',
+      48: '192px',
+      52: '208px',
+      56: '224px',
+      60: '240px',
+      64: '256px',
+      72: '288px',
+      80: '320px',
+      96: '384px',
+    },
+    extend: {
+      lineHeight: {
+        3: '12px',
+        4: '16px',
+        5: '20px',
+        6: '24px',
+        7: '28px',
+        8: '32px',
+        9: '36px',
+        10: '40px',
+      },
+      colors: {
+        border: "hsl(var(--border))",
+        input: "hsl(var(--input))",
+        ring: "hsl(var(--ring))",
+        background: "hsl(var(--background))",
+        foreground: "hsl(var(--foreground))",
+        primary: {
+          DEFAULT: "hsl(var(--primary))",
+          foreground: "hsl(var(--primary-foreground))",
+        },
+        secondary: {
+          DEFAULT: "hsl(var(--secondary))",
+          foreground: "hsl(var(--secondary-foreground))",
+        },
+        destructive: {
+          DEFAULT: "hsl(var(--destructive))",
+          foreground: "hsl(var(--destructive-foreground))",
+        },
+        muted: {
+          DEFAULT: "hsl(var(--muted))",
+          foreground: "hsl(var(--muted-foreground))",
+        },
+        accent: {
+          DEFAULT: "hsl(var(--accent))",
+          foreground: "hsl(var(--accent-foreground))",
+        },
+        popover: {
+          DEFAULT: "hsl(var(--popover))",
+          foreground: "hsl(var(--popover-foreground))",
+        },
+        card: {
+          DEFAULT: "hsl(var(--card))",
+          foreground: "hsl(var(--card-foreground))",
+        },
+      },
+      borderRadius: {
+        lg: "var(--radius)",
+        md: "calc(var(--radius) - 2px)",
+        sm: "calc(var(--radius) - 4px)",
+      },
+      keyframes: {
+        "accordion-down": {
+          from: { height: "0" },
+          to: { height: "var(--radix-accordion-content-height)" },
+        },
+        "accordion-up": {
+          from: { height: "var(--radix-accordion-content-height)" },
+          to: { height: "0" },
+        },
+      },
+      animation: {
+        "accordion-down": "accordion-down 0.2s ease-out",
+        "accordion-up": "accordion-up 0.2s ease-out",
+      },
+    },
+  },
+  plugins: [require("tailwindcss-animate")],
+}

package/tsconfig.json

@@ -16,7 +16,11 @@
     "removeComments": true,
     "stripInternal": true,
     "resolveJsonModule": true,
-    "strictPropertyInitialization": false
+    "strictPropertyInitialization": false,
+    "paths": {
+      "@/*": ["./src/shadcn-ui/*"],
+      "shadcn-ui": ["./src/shadcn-ui/index.ts"]
+    }
   },
-  "exclude": ["dist", "docs"],
+  "exclude": ["dist", "docs"]
 }

package/various.config.js

@@ -0,0 +1,86 @@
+const path = require('path')
+const fs = require('fs')
+/** @type {import('@variousjs/registry').Packages} */
+const registry = require('@variousjs/registry')
+
+const components = fs
+  .readdirSync(path.resolve(__dirname, './src/components'))
+  .reduce((prev, cur) => {
+    return {
+      ...prev,
+      [cur]: path.join(__dirname, `./src/components/${cur}`),
+    }
+  }, {})
+
+const depsComponents = Object.keys(components).reduce((prev, cur) => {
+  return {
+    ...prev,
+    [cur]: `./dist/${cur}.js`,
+  }
+}, {})
+
+const externals = ['shadcn-ui']
+
+/**
+ * @param {keyof typeof registry} name
+ */
+const getPackageSrc = (name) => {
+  const package = registry[name]
+  const version = package['dist-tags'].latest
+  const { dist, dependencies } = package.versions[version]
+
+  if (dependencies) {
+    return {
+      ...Object.keys(dependencies)
+        .reduce((prev, cur) => ({ ...prev, ...getPackageSrc(cur) }), {}),
+      [name]: dist,
+    }
+  }
+  return { [name]: dist }
+}
+
+/** @type {import('@variousjs/various').Config} */
+const config = {
+  env: 'development',
+  dependencies: {
+    ...getPackageSrc('react'),
+    ...getPackageSrc('react-dom'),
+    ...getPackageSrc('react-router-dom'),
+    'shadcn-ui': './dist/shadcn-ui.js',
+    ...depsComponents,
+  },
+  pages: [
+    {
+      path: '/',
+      components: ['card', 'next']
+    },
+    {
+      path: '/next/:id',
+      components: ['card', 'next']
+    },
+    {
+      path: '/error',
+      components: ['error'],
+    },
+  ],
+  links: [
+    {
+      name: 'Home',
+      path: '/',
+    },
+    {
+      name: 'Next',
+      path: '/next/5',
+    },
+    {
+      name: 'Error',
+      path: '/error',
+    },
+  ],
+}
+
+module.exports = {
+  config,
+  components: { ...components, 'shadcn-ui': path.resolve('./src/shadcn-ui/index.ts') },
+  externals,
+}

package/webpack/{entry.js → app.js}

@@ -1,9 +1,9 @@
 const base = require('./base')
 
-const { entry } = base.entry
+const { app } = base.entry
 const config = {
   ...base,
-  entry: { entry },
+  entry: { app },
 }
 
 module.exports = config

package/webpack/base.js

@@ -1,62 +1,51 @@
 const path = require('path')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const variousConfig = require('../various.config')
+
+const { NODE_ENV } = process.env
 
 const config = {
+  plugins: [new HtmlWebpackPlugin({
+    template: path.resolve(__dirname, '../src/index.html'),
+    filename: path.resolve(__dirname, '../public/index.html'),
+    config: JSON.stringify(variousConfig.config, null, 2),
+    inject: false,
+  })],
   stats: 'minimal',
-  entry: {
-    entry: path.join(__dirname, '../src/entry'),
-
-    // 组件入口定义
-    card: path.join(__dirname, '../src/components/card.tsx'),
-    next: path.join(__dirname, '../src/components/next.tsx'),
-    top: path.join(__dirname, '../src/components/top.tsx'),
-  },
+  entry: variousConfig.components,
   output: {
-    path: path.resolve(__dirname, '../demo/dist'),
+    path: path.resolve(__dirname, '../public/dist'),
     publicPath: '/dist/',
     filename: '[name].js',
     libraryTarget: 'amd',
   },
   target: ['web', 'es5'],
-  externals: {
-    // 通用排除
-    react: {
-      root: 'React',
-      amd: 'react',
-    },
-    'react-dom/client': {
-      root: 'ReactDOM',
-      amd: 'react-dom',
-    },
-    'react-router-dom': {
-      root: 'ReactRouterDOM',
-      amd: 'react-router-dom',
-    },
-    '@variousjs/various': {
-      root: 'various',
-      amd: '@variousjs/various',
-    },
-
-    // 自定义
-    antd: {
-      root: 'antd',
-      amd: 'antd',
-    },
-  },
-  mode: 'production',
+  externals: [
+    'react',
+    'react-dom',
+    'react-dom/client',
+    'react-router-dom',
+    '@variousjs/various',
+    ...variousConfig.externals,
+  ],
+  mode: NODE_ENV || 'production',
   devtool: 'source-map',
   resolve: {
     // 必须加上 .js，不然 webpack dev server 会报错找不到模块
     extensions: ['.js', '.ts', '.tsx'],
+    alias: {
+      '@': path.resolve(__dirname, '../src/shadcn-ui'),
+    },
   },
   devServer: {
     allowedHosts: 'all',
     port: 2333,
     host: '0.0.0.0',
     static: {
-      directory: path.join(__dirname, '../demo'),
+      directory: path.join(__dirname, '../public'),
     },
     // 监听文件构建后重新刷新页面，包括 html 文件
-    watchFiles: ['demo'],
+    watchFiles: ['public'],
   },
   module: {
     rules: [
@@ -74,7 +63,7 @@ const config = {
           {
             loader: 'css-loader',
             options: {
-              sourceMap: true,
+              sourceMap: NODE_ENV === 'development',
               modules: {
                 localIdentName: '[local]_[hash:base64:5]',
               },
@@ -83,7 +72,7 @@ const config = {
           {
             loader: 'less-loader',
             options: {
-              sourceMap: true,
+              sourceMap: NODE_ENV === 'development',
               lessOptions: {
                 javascriptEnabled: true,
               },