@farris/cli 2.1.8 → 2.2.0-beta.1

package/lib/plugins/create-package-json.js

@@ -1,34 +1,49 @@
-import { readFileSync } from "node:fs";
-import { resolve } from "node:path";
-import { CWD } from "../common/constant.js";
-export const createPackageJson = () => {
-    return {
-        name: 'create-package-json',
-        generateBundle() {
-            const pkg = readFileSync(resolve(CWD, 'package.json'), 'utf-8');
-            const packageJson = JSON.parse(pkg);
-            const result = {
-                name: '',
-                version: '',
-                private: false,
-                main: './index.umd.js',
-                module: './index.esm.js',
-                types: './types/index.d.ts',
-                style: './index.css',
-            };
-            const exclude = ['scripts', 'devDependencies', 'private'];
-            Object.keys(packageJson).forEach(key => {
-                if (exclude.includes(key)) {
-                    return;
-                }
-                result[key] = packageJson[key];
-            });
-            this.emitFile({
-                type: 'asset',
-                fileName: 'package.json',
-                source: JSON.stringify(result, null, 2)
-            });
-        }
-    };
-};
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { CWD } from '../common/constant.js';
+import { listLibComponents } from '../common/list-lib-components.js';
+import { buildLibPackageExports } from '../common/lib-package-exports.js';
+export const createPackageJson = () => {
+    const seen = new Set();
+    return {
+        name: 'create-package-json',
+        generateBundle(outputOptions) {
+            if (outputOptions.format) {
+                seen.add(outputOptions.format === 'es' ? 'es' : outputOptions.format);
+            }
+            const pkg = JSON.parse(readFileSync(resolve(CWD, 'package.json'), 'utf-8'));
+            const result = {
+                name: '',
+                version: '',
+                private: false,
+                types: './types/index.d.ts',
+                style: './index.css'
+            };
+            if (seen.has('es')) {
+                result.module = './index.esm.js';
+                if (!seen.has('umd')) {
+                    result.main = './index.esm.js';
+                }
+            }
+            if (seen.has('umd')) {
+                result.main = './index.umd.js';
+            }
+            const exclude = ['scripts', 'devDependencies', 'private'];
+            Object.keys(pkg).forEach((key) => {
+                if (exclude.includes(key)) {
+                    return;
+                }
+                result[key] = pkg[key];
+            });
+            const extra = buildLibPackageExports(listLibComponents(process.cwd()), seen);
+            result.sideEffects = extra.sideEffects;
+            result.exports = extra.exports;
+            this.emitFile({
+                type: 'asset',
+                fileName: 'package.json',
+                source: JSON.stringify(result, null, 2)
+            });
+        }
+    };
+};
 //# sourceMappingURL=create-package-json.js.map

package/lib/plugins/create-package-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-package-json.js","sourceRoot":"","sources":["../../src/plugins/create-package-json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAQ,EAAE;IACzC,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,cAAc;YACZ,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC;YAChE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,MAAM,GAAwB;gBAClC,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,EAAE;gBACX,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,gBAAgB;gBACtB,MAAM,EAAE,gBAAgB;gBACxB,KAAK,EAAE,oBAAoB;gBAC3B,KAAK,EAAE,aAAa;aACrB,CAAC;YACF,MAAM,OAAO,GAAG,CAAC,SAAS,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC;YAC1D,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACrC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC1B,OAAO;gBACT,CAAC;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC;gBACZ,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,cAAc;gBACxB,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;aACxC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"create-package-json.js","sourceRoot":"","sources":["../../src/plugins/create-package-json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE1E,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAQ,EAAE;IACzC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,cAAc,CAAC,aAAkC;YAC/C,IAAI,aAAa,CAAC,MAAM,EAAE;gBACxB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;aACvE;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;YAC5E,MAAM,MAAM,GAAwB;gBAClC,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,EAAE;gBACX,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,oBAAoB;gBAC3B,KAAK,EAAE,aAAa;aACrB,CAAC;YACF,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAClB,MAAM,CAAC,MAAM,GAAG,gBAAgB,CAAC;gBACjC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;oBACpB,MAAM,CAAC,IAAI,GAAG,gBAAgB,CAAC;iBAChC;aACF;YACD,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBACnB,MAAM,CAAC,IAAI,GAAG,gBAAgB,CAAC;aAChC;YACD,MAAM,OAAO,GAAG,CAAC,SAAS,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC;YAC1D,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC/B,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACzB,OAAO;iBACR;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YACH,MAAM,KAAK,GAAG,sBAAsB,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YAC7E,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;YACvC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC/B,IAAI,CAAC,QAAQ,CAAC;gBACZ,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,cAAc;gBACxB,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;aACxC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}

package/lib/plugins/dts.js

@@ -1,9 +1,9 @@
-import dts from "vite-plugin-dts";
-export function generateTypes(entry, outDir) {
-    return dts({
-        entryRoot: entry,
-        outDir
-    });
-}
-;
+import dts from "vite-plugin-dts";
+export function generateTypes(entry, outDir) {
+    return dts({
+        entryRoot: entry,
+        outDir
+    });
+}
+;
 //# sourceMappingURL=dts.js.map

package/lib/plugins/html-system.js

@@ -1,12 +1,12 @@
-export const htmlSystemPlugin = () => {
-    return {
-        name: 'html-transform-system',
-        transformIndexHtml(html) {
-            const regexp = /<script.*type="module".*src="(.*?)"><\/script>/;
+export const htmlSystemPlugin = () => {
+    return {
+        name: 'html-transform-system',
+        transformIndexHtml(html) {
+            const regexp = /<script.*type="module".*src="(.*?)"><\/script>/;
             return html.replace(regexp, (str, p1) => `
     <script src="https://cdn.bootcdn.net/ajax/libs/systemjs/6.15.1/system.js"></script>
-    <script >System.import("${p1}");</script>`);
-        }
-    };
-};
+    <script >System.import("${p1}");</script>`);
+        }
+    };
+};
 //# sourceMappingURL=html-system.js.map

package/lib/plugins/replace.js

@@ -1,18 +1,18 @@
-import { getPackageName } from '../common/constant.js';
-export function replace(path) {
-    return {
-        name: 'farris-replace-path',
-        renderChunk(code, chunk) {
-            const fileNames = chunk.fileName.split('.');
-            const format = fileNames[fileNames.length - 2];
-            // const regExpress = new RegExp(/@farris\/mobile-ui-vue\/([\w-]+)/g);
-            const dynamicRegExp = new RegExp(`${getPackageName().replace(/\//g, '\\/')}\\/([\\w-]+)`, // 自动转义斜杠
-            'g');
-            return code.replace(dynamicRegExp, (match, captureGroup) => {
-                return path(format, [captureGroup]);
-            });
-        }
-    };
-}
-;
+import { getPackageName } from '../common/constant.js';
+export function replace(path) {
+    return {
+        name: 'farris-replace-path',
+        renderChunk(code, chunk) {
+            const fileNames = chunk.fileName.split('.');
+            const format = fileNames[fileNames.length - 2];
+            // const regExpress = new RegExp(/@farris\/mobile-ui-vue\/([\w-]+)/g);
+            const dynamicRegExp = new RegExp(`${getPackageName().replace(/\//g, '\\/')}\\/([\\w-]+)`, // 自动转义斜杠
+            'g');
+            return code.replace(dynamicRegExp, (match, captureGroup) => {
+                return path(format, [captureGroup]);
+            });
+        }
+    };
+}
+;
 //# sourceMappingURL=replace.js.map

package/lib/plugins/systemjs-bundle.js

@@ -1,16 +1,16 @@
-export function systemjsBundle() {
-    return {
-        name: 'systemjs-bundle',
-        outputOptions(options) {
-            if (options.format === 'systemjs') {
-                return {
-                    ...options,
-                    name: undefined
-                };
-            }
-            return options;
-        }
-    };
-}
-;
+export function systemjsBundle() {
+    return {
+        name: 'systemjs-bundle',
+        outputOptions(options) {
+            if (options.format === 'systemjs') {
+                return {
+                    ...options,
+                    name: undefined
+                };
+            }
+            return options;
+        }
+    };
+}
+;
 //# sourceMappingURL=systemjs-bundle.js.map

package/lib/plugins/systemjs-bundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"systemjs-bundle.js","sourceRoot":"","sources":["../../src/plugins/systemjs-bundle.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc;IAC5B,OAAO;QACL,IAAI,EAAE,iBAAiB;QACvB,aAAa,CAAC,OAAY;YACxB,IAAG,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;gBACjC,OAAO;oBACL,GAAG,OAAO;oBACV,IAAI,EAAE,SAAS;iBAChB,CAAC;YACJ,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;KACF,CAAC;AACJ,CAAC;AAAA,CAAC"}
+{"version":3,"file":"systemjs-bundle.js","sourceRoot":"","sources":["../../src/plugins/systemjs-bundle.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc;IAC5B,OAAO;QACL,IAAI,EAAE,iBAAiB;QACvB,aAAa,CAAC,OAAY;YACxB,IAAG,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE;gBAChC,OAAO;oBACL,GAAG,OAAO;oBACV,IAAI,EAAE,SAAS;iBAChB,CAAC;aACH;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;KACF,CAAC;AACJ,CAAC;AAAA,CAAC"}

package/package.json

@@ -1,19 +1,18 @@
 {
     "name": "@farris/cli",
     "private": false,
-    "version": "2.1.8",
+    "version": "2.2.0-beta.1",
     "type": "module",
     "typings": "lib/index.d.ts",
     "bin": {
         "farris-cli": "./bin/index.js"
     },
     "engines": {
-        "node": "^18.0.0 || >=20.0.0",
-        "pnpm": ">=9.0.0"
+        "node": ">=18.0.0"
     },
     "scripts": {
         "build": "rimraf ./lib && tsc",
-        "test": "vitest run --config vitest.config.ts"
+        "test": "vitest run"
     },
     "files": [
         "lib",
@@ -28,19 +27,18 @@
         "commander": "^9.4.0",
         "esbuild": "^0.23.0",
         "esbuild-sass-plugin": "^3.3.1",
-        "fs-extra": "^11.2.0",
-        "glob": "^10.4.5",
         "inquirer": "^9.3.0",
         "ora": "^8.0.1",
-        "typescript": "^5.7.3",
-        "vite": "^5.4.19",
+        "typescript": "^4.6.4",
+        "vite": "^4.5.10",
         "vite-plugin-css-injected-by-js": "^3.5.2",
-        "vite-plugin-dts": "^3.9.1"
+        "vite-plugin-dts": "^3.9.1",
+        "glob": "11.0.3"
     },
     "devDependencies": {
-        "@types/fs-extra": "^11.0.4",
         "@types/inquirer": "^9.0.7",
         "rimraf": "^5.0.7",
-        "vue": "^3.5.13"
+        "vitest": "^1.6.1",
+        "vue": "^3.2.37"
     }
 }

package/templates/lib/.changeset/README.md

@@ -0,0 +1 @@
+Use `npm run changeset` then `npm run version`.

package/templates/lib/.changeset/config.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://unpkg.com/@changesets/config@3.0.2/schema.json",
+  "changelog": "@changesets/cli/changelog",
+  "commit": false,
+  "fixed": [],
+  "linked": [],
+  "access": "public",
+  "baseBranch": "main",
+  "updateInternalDependencies": "patch",
+  "ignore": []
+}

package/templates/lib/README.md

@@ -0,0 +1,17 @@
+# <%= name %>
+
+## Scripts
+
+- `npm run build` — `build-lib` then `build-css` (css after lib so Vite does not wipe `index.css`)
+- `npm run changeset` — record a change
+- `npm run version` — bump version and changelog
+
+If the default branch is not `main`, edit `.changeset/config.json` `baseBranch`.
+
+## Output
+
+Artifacts go to `lib/` (`index.esm.js` / `index.umd.js` / `index.systemjs.js` depending on formats, plus `types/` and `index.css`).
+
+## Add a component
+
+Copy `components/button` to a new folder and re-export it from `components/index.ts`.

package/templates/lib/components/button/index.ts

@@ -0,0 +1,7 @@
+import Button from './src/button.vue';
+import { withInstall } from '../common/with-install';
+
+const FButton = withInstall(Button);
+
+export { FButton as Button };
+export default FButton;

package/templates/lib/components/button/src/button.scss

@@ -0,0 +1,10 @@
+.f-button {
+  display: inline-flex;
+  align-items: center;
+  padding: 4px 12px;
+}
+
+.f-button--primary {
+  color: #fff;
+  background: #2e77e5;
+}

package/templates/lib/components/button/src/button.vue

@@ -0,0 +1,12 @@
+<script setup lang="ts">
+defineOptions({ name: 'Button' });
+defineProps<{
+  type?: 'primary' | 'default';
+}>();
+</script>
+
+<template>
+  <button class="f-button" :class="{ 'f-button--primary': type === 'primary' }">
+    <slot />
+  </button>
+</template>

package/templates/lib/components/common/with-install.ts

@@ -0,0 +1,9 @@
+import type { App, Component } from 'vue';
+
+export function withInstall<T extends Component>(component: T) {
+  const c = component as T & { install(app: App): void };
+  c.install = function (app: App) {
+    app.component(c.name as string, component);
+  };
+  return c;
+}

package/templates/lib/components/index.ts

@@ -0,0 +1,10 @@
+import type { App } from 'vue';
+import { Button } from './button';
+
+export { Button };
+
+export default {
+  install(app: App) {
+    app.use(Button);
+  }
+};

package/templates/lib/farris.config.mjs

@@ -0,0 +1,13 @@
+export default {
+  packageName: '<%= name %>',
+  lib: {
+    entry: './components/index.ts',
+    name: '<%= libName %>',
+    formats: <%= formats %>,
+    fileName: (format) => (format === 'es' ? 'index.esm.js' : `index.${format}.js`)
+  },
+  outDir: './lib',
+  componentOutDir: './lib/components',
+  externalDependencies: true,
+  minify: true
+};

package/templates/lib/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "<%= name %>",
+  "version": "0.0.0",
+  "private": false,
+  "type": "module",
+  "scripts": {
+    "build": "farris-cli build-lib -ep && farris-cli build-components",
+    "changeset": "changeset",
+    "version": "changeset version"
+  },
+  "peerDependencies": {
+    "vue": "^3.4.29"
+  },
+  "devDependencies": {
+    "@changesets/cli": "^2.29.5",
+    "@farris/cli": "<%= cliVersion %>",
+    "@vue/tsconfig": "^0.5.1",
+    "typescript": "~5.4.0",
+    "vue": "^3.4.29"
+  }
+}

package/templates/lib/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
+  "include": ["components/**/*"],
+  "compilerOptions": {
+    "strict": true
+  }
+}

package/templates/mobile/.changeset/README.md

@@ -0,0 +1,4 @@
+Use `npm run changeset` then `npm run version` to write CHANGELOG.md.
+
+This app template is `private` and is not meant for `npm publish`.
+If the default branch is not `main`, edit `baseBranch` in `config.json`.

package/templates/mobile/.changeset/config.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://unpkg.com/@changesets/config@3.0.2/schema.json",
+  "changelog": "@changesets/cli/changelog",
+  "commit": false,
+  "fixed": [],
+  "linked": [],
+  "access": "restricted",
+  "baseBranch": "main",
+  "updateInternalDependencies": "patch",
+  "ignore": []
+}

package/templates/mobile/package.json

@@ -8,7 +8,9 @@
     "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/"
+    "format": "prettier --write src/",
+    "changeset": "changeset",
+    "version": "changeset version"
   },
   "dependencies": {
     "@farris/mobile-ui-vue": "latest",
@@ -16,6 +18,7 @@
     "vue-router": "^4.3.0"
   },
   "devDependencies": {
+    "@changesets/cli": "^2.29.5",
     "@farris/cli": "<%= cliVersion %>",
     "@rushstack/eslint-patch": "^1.8.0",
     "@vue/eslint-config-prettier": "^9.0.0",

package/templates/web/.changeset/README.md

@@ -0,0 +1,4 @@
+Use `npm run changeset` then `npm run version` to write CHANGELOG.md.
+
+This app template is `private` and is not meant for `npm publish`.
+If the default branch is not `main`, edit `baseBranch` in `config.json`.

package/templates/web/.changeset/config.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://unpkg.com/@changesets/config@3.0.2/schema.json",
+  "changelog": "@changesets/cli/changelog",
+  "commit": false,
+  "fixed": [],
+  "linked": [],
+  "access": "restricted",
+  "baseBranch": "main",
+  "updateInternalDependencies": "patch",
+  "ignore": []
+}

package/templates/web/package.json

@@ -8,7 +8,9 @@
     "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/"
+    "format": "prettier --write src/",
+    "changeset": "changeset",
+    "version": "changeset version"
   },
   "dependencies": {
     "@farris/ui-vue": "latest",
@@ -16,6 +18,7 @@
     "vue-router": "^4.3.0"
   },
   "devDependencies": {
+    "@changesets/cli": "^2.29.5",
     "@farris/cli": "<%= cliVersion %>",
     "@rushstack/eslint-patch": "^1.8.0",
     "@vue/eslint-config-prettier": "^9.0.0",