@farris/cli 2.0.0-beta.7 → 2.0.1

package/templates/mobile/farris.config.mjs

@@ -1,24 +1,24 @@
-import { fileURLToPath, URL } from 'node:url';
-
-export default {
-  format: "<%= format %>",
-  // 输出目录  App模式默认值 './dist' Lib模式 './lib'
-  // outDir: fileURLToPath(new URL('./dist', import.meta.url)),
-  // 最小化 默认值 true
-  minify: true,
-  // 外部依赖排除项 默认值 { include: [], exclude: [] }
-  // externals: {
-  //   include: [],
-  //   exclude: []
-  // },
-  // 是否排除 package.json 中 dependencies和 peerDependencies 依赖的包; App模式默认值 false Lib模式默认值 true
-  externalDependencies: false,
-  // 路径别名 默认值 null
-  alias: [
-    { find: '@', replacement: fileURLToPath(new URL('./src', import.meta.url)) }
-  ],
-  // 插件 默认值 [vue(), vueJsx()] 不要重复添加
-  // plugins: [],
-  // viteConfig 配置项
-  viteConfig: {}
+import { fileURLToPath, URL } from 'node:url';
+
+export default {
+  format: "<%= format %>",
+  // 输出目录  App模式默认值 './dist' Lib模式 './lib'
+  // outDir: fileURLToPath(new URL('./dist', import.meta.url)),
+  // 最小化 默认值 true
+  minify: true,
+  // 外部依赖排除项 默认值 { include: [], exclude: [] }
+  // externals: {
+  //   include: [],
+  //   exclude: []
+  // },
+  // 是否排除 package.json 中 dependencies和 peerDependencies 依赖的包; App模式默认值 false Lib模式默认值 true
+  externalDependencies: false,
+  // 路径别名 默认值 null
+  alias: [
+    { find: '@', replacement: fileURLToPath(new URL('./src', import.meta.url)) }
+  ],
+  // 插件 默认值 [vue(), vueJsx()] 不要重复添加
+  // plugins: [],
+  // viteConfig 配置项
+  viteConfig: {}
 }

package/templates/{lib → web}/farris.config.mjs

@@ -1,35 +1,24 @@
-import { fileURLToPath, URL } from 'node:url';
-
-export default {
-  // 库模式配置
-  lib: {
-    // 入口 默认值 './src/main.ts'
-    entry: './packages/index.ts', 
-    // 库名称
-    name: "<%= name %>",
-    // 输出文件名
-    fileName: "index",
-    // 输出文件格式 默认值 ["es", 'systemjs']
-    formats: <%= formats %>, 
-  },
-  // 输出目录  App模式默认值 './dist' Lib模式 './lib'
-  // outDir: fileURLToPath(new URL('./dist', import.meta.url)),
-  // 最小化 默认值 true
-  minify: true,
-  // 外部依赖排除项 默认值 { include: [], exclude: [] }
-  // externals: {
-  //   include: [],
-  //   exclude: []
-  // },
-  // 是否排除 package.json 中 dependencies和 peerDependencies 依赖的包; App模式默认值 false Lib模式默认值 true
-  externalDependencies: true,
-  // 路径别名 默认值 null
-  alias: [
-    { find: '@', replacement: fileURLToPath(new URL('./src', import.meta.url)) },
-    { find: '@packages', replacement: fileURLToPath(new URL('./packages', import.meta.url)) },
-  ],
-  // 插件 默认值 [vue(), vueJsx()] 不要重复添加
-  // plugins: [],
-  // viteConfig 配置项
-  viteConfig: {}
+import { fileURLToPath, URL } from 'node:url';
+
+export default {
+  format: "<%= format %>",
+  // 输出目录  App模式默认值 './dist' Lib模式 './lib'
+  // outDir: fileURLToPath(new URL('./dist', import.meta.url)),
+  // 最小化 默认值 true
+  minify: true,
+  // 外部依赖排除项 默认值 { include: [], exclude: [] }
+  // externals: {
+  //   include: [],
+  //   exclude: []
+  // },
+  // 是否排除 package.json 中 dependencies和 peerDependencies 依赖的包; App模式默认值 false Lib模式默认值 true
+  externalDependencies: false,
+  // 路径别名 默认值 null
+  alias: [
+    { find: '@', replacement: fileURLToPath(new URL('./src', import.meta.url)) }
+  ],
+  // 插件 默认值 [vue(), vueJsx()] 不要重复添加
+  // plugins: [],
+  // viteConfig 配置项
+  viteConfig: {}
 }

package/templates/{lib → web}/package.json

@@ -3,17 +3,17 @@
   "version": "0.0.0",
   "private": true,
   "type": "module",
-  "main": "./dist/index.umd.js",
-  "module": "./dist/index.js",
   "scripts": {
     "dev": "farris-cli dev",
-    "build": "farris-cli build-lib",
+    "build": "farris-cli build",
     "preview": "farris-cli preview",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "vue": "^3.4.29"
+    "@farris/ui-vue": "latest",
+    "vue": "^3.4.29",
+    "vue-router": "^4.3.0"
   },
   "devDependencies": {
     "@farris/cli": "<%= cliVersion %>",

package/templates/web/src/App.vue

@@ -0,0 +1,80 @@
+<script setup lang="ts">
+import { RouterLink, RouterView } from 'vue-router'
+</script>
+
+<template>
+  <header>
+    <div class="wrapper">
+      <nav>
+        <RouterLink to="/">Home</RouterLink>
+        <RouterLink to="/about">About</RouterLink>
+      </nav>
+    </div>
+  </header>
+
+  <RouterView />
+</template>
+
+<style scoped>
+header {
+  line-height: 1.5;
+  max-height: 100vh;
+}
+
+.logo {
+  display: block;
+  margin: 0 auto 2rem;
+}
+
+nav {
+  width: 100%;
+  font-size: 12px;
+  text-align: center;
+  margin-top: 2rem;
+}
+
+nav a.router-link-exact-active {
+  color: var(--color-text);
+}
+
+nav a.router-link-exact-active:hover {
+  background-color: transparent;
+}
+
+nav a {
+  display: inline-block;
+  padding: 0 1rem;
+  border-left: 1px solid var(--color-border);
+}
+
+nav a:first-of-type {
+  border: 0;
+}
+
+@media (min-width: 1024px) {
+  header {
+    display: flex;
+    place-items: center;
+    padding-right: calc(var(--section-gap) / 2);
+  }
+
+  .logo {
+    margin: 0 2rem 0 0;
+  }
+
+  header .wrapper {
+    display: flex;
+    place-items: flex-start;
+    flex-wrap: wrap;
+  }
+
+  nav {
+    text-align: left;
+    margin-left: -1rem;
+    font-size: 1rem;
+
+    padding: 1rem 0;
+    margin-top: 1rem;
+  }
+}
+</style>

package/templates/web/src/components/TheButton.vue

@@ -0,0 +1,3 @@
+<template>
+  <f-button>按钮</f-button>
+</template>

package/templates/{lib → web}/src/main.ts

@@ -1,9 +1,10 @@
 import { createApp } from 'vue'
+import FarrisVue from '@farris/ui-vue'
 import App from './App.vue'
-import componentsLib from "@packages/index";
+import router from './router'
 
 const app = createApp(App)
 
-app.use(componentsLib)
+app.use(router).use(FarrisVue)
 
 app.mount('#app')

package/templates/web/src/router/index.ts

@@ -0,0 +1,23 @@
+import { createRouter, createWebHistory } from 'vue-router'
+import HomeView from '../views/HomeView.vue'
+
+const router = createRouter({
+  history: createWebHistory(import.meta.env.BASE_URL),
+  routes: [
+    {
+      path: '/',
+      name: 'home',
+      component: HomeView
+    },
+    {
+      path: '/about',
+      name: 'about',
+      // route level code-splitting
+      // this generates a separate chunk (About.[hash].js) for this route
+      // which is lazy-loaded when the route is visited.
+      component: () => import('../views/AboutView.vue')
+    }
+  ]
+})
+
+export default router

package/templates/web/src/views/AboutView.vue

@@ -0,0 +1,15 @@
+<template>
+  <div class="about">
+    <h1>This is an about page</h1>
+  </div>
+</template>
+
+<style>
+@media (min-width: 1024px) {
+  .about {
+    min-height: 100vh;
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

package/templates/web/src/views/HomeView.vue

@@ -0,0 +1,9 @@
+<script setup lang="ts">
+import TheButton from '../components/TheButton.vue'
+</script>
+
+<template>
+  <main>
+    <TheButton />
+  </main>
+</template>

package/templates/{lib → web}/tsconfig.json

@@ -1,18 +1,18 @@
 {
   "extends": "@vue/tsconfig/tsconfig.dom.json",
   "include": [
+    "env.d.ts",
     "src/**/*",
-    "src/**/*.vue",
-    "packages/**/*",
-    "packages/**/*.vue",
+    "src/**/*.vue"
   ],
   "compilerOptions": {
     "composite": true,
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
     "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*"],
-      "@packages/*": ["packages/*"],
+      "@/*": [
+        "./src/*"
+      ]
     }
   }
 }

package/templates/lib/packages/button/src/index.vue

@@ -1,4 +0,0 @@
-<template>
-  <div>button</div>
-</template>
-

package/templates/lib/packages/index.ts

@@ -1,7 +0,0 @@
-import Button from './button/src/index.vue'
-
-export default {
-  install: (app) => {
-    app.component('AppButton', Button)
-  }
-}

package/templates/lib/src/App.vue

@@ -1,5 +0,0 @@
-<template>
-  <div>App</div>
-  <app-button></app-button>
-</template>
-