@vueless/storybook 1.2.7-beta.1 → 1.2.7-beta.2

package/.storybook-js/main.js

@@ -3,8 +3,12 @@ import { defineConfigWithVueless } from "@vueless/storybook";
 
 export default defineConfigWithVueless({
   stories: [
-    /* Define a path to your own component stories. */
-    // "../src/**/stories.{js,jsx,ts,tsx}",
+    /* Path to the project component stories. */
+    // "../src/**/stories.js",
     // "../src/**/docs.mdx",
+    //
+    /* Path to the custom vueless component stories. */
+    // "../.vueless/components/**/stories.js",
+    // "../.vueless/components/**/docs.mdx",
   ],
 });

package/.storybook-ts/main.ts

@@ -3,8 +3,12 @@ import { defineConfigWithVueless } from "@vueless/storybook";
 
 export default defineConfigWithVueless({
   stories: [
-    /* Define a path to your own component stories. */
-    // "../src/**/stories.{js,jsx,ts,tsx}",
+    /* Path to the project component stories. */
+    // "../src/**/stories.ts",
     // "../src/**/docs.mdx",
+    //
+    /* Path to the custom vueless component stories. */
+    // "../.vueless/components/**/stories.ts",
+    // "../.vueless/components/**/docs.mdx",
   ],
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vueless/storybook",
-  "version": "1.2.7-beta.1",
+  "version": "1.2.7-beta.2",
   "description": "Simplifies Storybook configuration for Vueless UI library.",
   "author": "Johnny Grid <hello@vueless.com> (https://vueless.com)",
   "homepage": "https://vueless.com",
@@ -54,7 +54,7 @@
     "vue": "latest",
     "vue-router": "latest",
     "vue-tsc": "^3.0.6",
-    "vueless": "^1.2.2"
+    "vueless": "^1.2.5"
   },
   "type": "module",
   "main": "index.js",

package/webTypes/lib/build.js

@@ -6,6 +6,7 @@ import chokidar from "chokidar";
 import { globbySync } from "globby";
 import { parse } from "vue-docgen-api";
 import _ from "lodash-es";
+import { VUELESS_USER_COMPONENTS_DIR, VUELESS_LIBRARY } from "vueless/constants.js";
 
 export default async function build(config, vuelessConfig, srcDir) {
   config.outFile = path.resolve(config.cwd, config.outFile);
@@ -138,7 +139,11 @@ function getType(prop) {
 async function extractInformation(absolutePath, config, vuelessConfig) {
   const doc = await parse(config.cwd + "/" + absolutePath, {
     /* Allow to parse vueless components from node_modules. */
-    validExtends: (filePath) => filePath.replace(/\\/g, "/").includes(config.srcDir),
+    validExtends: (filePath) => {
+      const path = filePath.replace(/\\/g, "/");
+
+      return path.includes(config.srcDir) || path.includes(VUELESS_USER_COMPONENTS_DIR);
+    },
     ...config.apiOptions,
   });
   const name = doc.name || doc.displayName;
@@ -175,7 +180,7 @@ async function extractInformation(absolutePath, config, vuelessConfig) {
 
   const componentPath = ensureRelative(path.relative(config.cwd, absolutePath));
   // Prevent "Chose declaration" duplication issue in Intellij
-  const source = !componentPath.includes("vueless")
+  const source = !componentPath.includes(VUELESS_LIBRARY)
     ? { source: { module: componentPath, symbol: doc.exportName } }
     : {};
 

package/webTypes/lib/config.js

@@ -4,8 +4,14 @@ import { cwd } from "node:process";
 import { readFile } from "fs/promises";
 import { pathToFileURL } from "node:url";
 import esbuild from "esbuild";
+import {
+  VUELESS_CACHE_DIR,
+  VUELESS_LOCAL_DIR,
+  VUELESS_PACKAGE_DIR,
+  SRC_USER_COMPONENTS_DIR,
+  VUELESS_USER_COMPONENTS_DIR,
+} from "vueless/constants.js";
 
-const CACHE_PATH = "./node_modules/.cache/vueless";
 const WEB_TYPES_CONFIG_FILE_NAME = "web-types.config";
 
 export async function extractConfig() {
@@ -15,13 +21,17 @@ export async function extractConfig() {
   const config = await getConfig();
 
   const components = config?.isVuelessEnv
-    ? ["src/**/*.vue"]
-    : ["node_modules/vueless/**/*.vue", "src/components/**/*.vue", ".vueless/components/**/*.vue"];
+    ? [`${VUELESS_LOCAL_DIR}/**/*.vue`]
+    : [
+        `${VUELESS_PACKAGE_DIR}/**/*.vue`,
+        `${SRC_USER_COMPONENTS_DIR}/**/*.vue`,
+        `${VUELESS_USER_COMPONENTS_DIR}/**/*.vue`,
+      ];
 
   return {
     cwd: cwd(),
     components,
-    outFile: `${CACHE_PATH}/web-types.json`,
+    outFile: `./${VUELESS_CACHE_DIR}/web-types.json`,
     packageName: packageJson["name"],
     packageVersion: packageJson["version"],
     descriptionMarkup: "markdown",
@@ -33,7 +43,7 @@ export async function extractConfig() {
 async function getConfig() {
   const configPathJs = path.resolve(cwd(), `${WEB_TYPES_CONFIG_FILE_NAME}.js`);
   const configPathTs = path.resolve(cwd(), `${WEB_TYPES_CONFIG_FILE_NAME}.ts`);
-  const configOutPath = path.join(cwd(), `${CACHE_PATH}/${WEB_TYPES_CONFIG_FILE_NAME}.mjs`);
+  const configOutPath = path.join(cwd(), `${VUELESS_CACHE_DIR}/${WEB_TYPES_CONFIG_FILE_NAME}.mjs`);
 
   let config = {};