@vueless/storybook 0.0.56 → 0.0.58

package/index.js

@@ -2,6 +2,7 @@
 /* eslint-disable no-console */
 
 import fs, { promises } from "fs";
+import { cwd } from "node:process";
 import path from "path";
 
 // Get the command-line arguments
@@ -10,7 +11,7 @@ const parsedArgs = parseArgs(args);
 
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
 const source = path.join(__dirname, ".storybook");
-const target = path.join(process.cwd(), ".storybook");
+const target = path.join(cwd(), ".storybook");
 
 copyStorybookPreset(source, target);
 
@@ -53,7 +54,7 @@ async function addStorybookCommands() {
       "sb:preview": "vite preview --host --outDir=storybook-static",
     };
 
-    const packageJsonPath = path.resolve(process.cwd(), "package.json");
+    const packageJsonPath = path.resolve(cwd(), "package.json");
     const data = await promises.readFile(packageJsonPath, "utf8");
     const packageJson = JSON.parse(data);
 
@@ -72,7 +73,7 @@ async function createNpmrc() {
     "public-hoist-pattern[] = prettier2",
   ];
 
-  const npmrcPath = path.join(process.cwd(), ".npmrc");
+  const npmrcPath = path.join(cwd(), ".npmrc");
 
   try {
     await promises.writeFile(npmrcPath, npmrcContent.join("\n"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vueless/storybook",
-  "version": "0.0.56",
+  "version": "0.0.58",
   "description": "Simplifies Storybook configuration for Vueless UI library.",
   "homepage": "https://vueless.com",
   "author": "Johnny Grid",
@@ -38,7 +38,6 @@
     "chokidar": "^4.0.3",
     "esbuild": "^0.24.2",
     "globby": "^14.0.2",
-    "minimist": "^1.2.8",
     "mkdirp": "^3.0.1",
     "prettier2": "npm:prettier@2.8.8",
     "storybook": "^8.4.7",

package/webTypes/index.js

@@ -1,19 +1,9 @@
 #!/usr/bin/env node
-import minimist from "minimist";
 import { extractConfig } from "./lib/config.js";
 import build from "./lib/build.js";
 
-const {
-  _: pathArray,
-  configFile,
-  watch,
-  cwd,
-} = minimist(process.argv.slice(2), {
-  alias: { c: "configFile", w: "watch" },
-});
-
 export default async function buildWebTypes(vuelessConfig) {
-  const conf = await extractConfig(cwd || process.cwd(), watch, configFile, pathArray);
+  const config = await extractConfig();
 
-  build(conf, vuelessConfig);
+  build(config, vuelessConfig);
 }

package/webTypes/lib/build.js

@@ -8,10 +8,9 @@ import { parse } from "vue-docgen-api";
 import _ from "lodash-es";
 
 export default async function build(config, vuelessConfig) {
-  config.componentsRoot = path.resolve(config.cwd, config.componentsRoot);
   config.outFile = path.resolve(config.cwd, config.outFile);
 
-  const { watcher, componentFiles } = getSources(config.components, config.componentsRoot);
+  const { watcher, componentFiles } = getSources(config.components, config.cwd);
 
   const cache = {};
   const buildWebTypesBound = rebuild.bind(null, config, componentFiles, cache, vuelessConfig);
@@ -26,20 +25,7 @@ export default async function build(config, vuelessConfig) {
     return;
   }
 
-  if (config.watch) {
-    watcher
-      .on("add", buildWebTypesBound)
-      .on("change", buildWebTypesBound)
-      .on("unlink", async (filePath) => {
-        // eslint-disable-next-line no-console
-        console.log("Rebuilding on file removal " + filePath);
-
-        delete cache[filePath];
-        await writeDownWebTypesFile(config, Object.values(cache), config.outFile);
-      });
-  } else {
-    await watcher.close();
-  }
+  await watcher.close();
 }
 
 function getSources(components, cwd) {

package/webTypes/lib/config.js

@@ -1,29 +1,25 @@
 import fs from "fs";
 import path from "path";
+import { cwd } from "node:process";
 import { readFile } from "fs/promises";
 import esbuild from "esbuild";
 
 const CACHE_PATH = "./node_modules/.cache/vueless";
 const WEB_TYPES_CONFIG_FILE_NAME = "web-types.config";
 
-export async function extractConfig(cwd, watch = false, configFileFromCmd) {
-  const fileContent = await readFile(path.join(cwd, "package.json"), "utf-8");
+export async function extractConfig() {
+  const fileContent = await readFile(path.join(cwd(), "package.json"), "utf-8");
   const packageJson = JSON.parse(fileContent);
 
-  const config = await getConfig(configFileFromCmd);
+  const config = await getConfig();
 
   const components = config?.isVuelessEnv
-    ? [`${process.cwd()}/src/**/*.vue`]
-    : [
-        `${process.cwd()}/node_modules/vueless/**/*.vue`,
-        `${process.cwd()}/src/components/**/*.vue`,
-      ];
+    ? ["src/**/*.vue"]
+    : ["node_modules/vueless/**/*.vue", "src/components/**/*.vue"];
 
   return {
-    cwd,
-    watch,
+    cwd: cwd(),
     components,
-    componentsRoot: cwd,
     outFile: `${CACHE_PATH}/web-types.json`,
     packageName: packageJson["name"],
     packageVersion: packageJson["version"],
@@ -33,11 +29,10 @@ export async function extractConfig(cwd, watch = false, configFileFromCmd) {
   };
 }
 
-async function getConfig(configFromCmd) {
-  const configPathFromCmd = configFromCmd && path.resolve(process.cwd(), configFromCmd);
-  const configPathJs = path.resolve(process.cwd(), `${WEB_TYPES_CONFIG_FILE_NAME}.js`);
-  const configPathTs = path.resolve(process.cwd(), `${WEB_TYPES_CONFIG_FILE_NAME}.ts`);
-  const configOutPath = path.join(process.cwd(), `${CACHE_PATH}/${WEB_TYPES_CONFIG_FILE_NAME}.mjs`);
+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`);
 
   let config = {};
 
@@ -47,7 +42,6 @@ async function getConfig(configFromCmd) {
 
   fs.existsSync(configPathJs) && (await buildConfig(configPathJs, configOutPath));
   fs.existsSync(configPathTs) && (await buildConfig(configPathTs, configOutPath));
-  fs.existsSync(configPathFromCmd) && (await buildConfig(configPathFromCmd, configPathFromCmd));
 
   if (fs.existsSync(configOutPath)) {
     config = (await import(configOutPath)).default;