rsbuild-plugin-workspace-dev 0.1.0 → 0.1.1

package/dist/constant.d.ts

@@ -1,5 +1,4 @@
 export declare const PACKAGE_JSON = "package.json";
 export declare const PLUGIN_LOG_TITLE = "[Rsbuild Workspace Dev Plugin]: ";
 export declare const RSLIB_READY_MESSAGE = "build complete, watching for changes";
-export declare const MODERN_MODULE_READY_MESSAGE = "Watching for file changes";
 export declare const TSUP_READY_MESSAGE = "Watching for changes in";

package/dist/index.cjs

@@ -41,7 +41,6 @@ var external_chalk_default = /*#__PURE__*/ __webpack_require__.n(external_chalk_
 const PACKAGE_JSON = 'package.json';
 const PLUGIN_LOG_TITLE = '[Rsbuild Workspace Dev Plugin]: ';
 const RSLIB_READY_MESSAGE = 'build complete, watching for changes';
-const MODERN_MODULE_READY_MESSAGE = 'Watching for file changes';
 const TSUP_READY_MESSAGE = 'Watching for changes in';
 const external_fs_namespaceObject = require("fs");
 var external_fs_default = /*#__PURE__*/ __webpack_require__.n(external_fs_namespaceObject);
@@ -118,7 +117,6 @@ const external_child_process_namespaceObject = require("child_process");
 const external_graphlib_namespaceObject = require("graphlib");
 var external_graphlib_default = /*#__PURE__*/ __webpack_require__.n(external_graphlib_namespaceObject);
 const external_path_namespaceObject = require("path");
-var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 function workspace_dev_define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -131,7 +129,7 @@ function workspace_dev_define_property(obj, key, value) {
 }
 class WorkspaceDevRunner {
     async init() {
-        this.metaData = await readPackageJson(external_path_default().join(this.cwd, PACKAGE_JSON));
+        this.metaData = await readPackageJson((0, external_path_namespaceObject.join)(this.cwd, PACKAGE_JSON));
         this.buildDependencyGraph();
         debugLog(`Dependency graph:\nnodes: ${this.getNodes().join(', ')}\nedges: ${this.getEdges().map((edge)=>`${edge.v} -> ${edge.w}`).join(', ')}\n`);
     }
@@ -205,12 +203,14 @@ class WorkspaceDevRunner {
     }
     visitNodes(node) {
         return new Promise((resolve)=>{
-            const { name, path } = this.getNode(node);
+            const { name, path, packageJson } = this.getNode(node);
             const logger = new Logger({
                 name
             });
             const config = this.options?.projects?.[name];
-            if (config?.skip) {
+            const command = config?.command ? config.command : 'dev';
+            const scripts = packageJson.scripts || {};
+            if (config?.skip || !scripts[command]) {
                 this.visited[node] = true;
                 this.visiting[node] = false;
                 debugLog(`Skip visit node: ${node}`);
@@ -220,7 +220,7 @@ class WorkspaceDevRunner {
             this.visiting[node] = true;
             const child = (0, external_child_process_namespaceObject.spawn)('npm', [
                 'run',
-                config?.command ? config.command : 'dev'
+                command
             ], {
                 cwd: path,
                 env: {
@@ -236,7 +236,7 @@ class WorkspaceDevRunner {
                 debugLog(content, `${name}: `);
                 logger.appendLog('stdout', stdout);
                 const match = config?.match;
-                const matchResult = match ? match(stdout) : stdout.match(RSLIB_READY_MESSAGE) || stdout.match(MODERN_MODULE_READY_MESSAGE) || stdout.match(TSUP_READY_MESSAGE);
+                const matchResult = match ? match(stdout) : stdout.match(RSLIB_READY_MESSAGE) || stdout.match(TSUP_READY_MESSAGE);
                 if (matchResult) {
                     logger.flushStdout();
                     this.matched[node] = true;

package/dist/index.js

@@ -4,11 +4,10 @@ import json5 from "json5";
 import { getPackagesSync } from "@manypkg/get-packages";
 import { spawn } from "child_process";
 import graphlib, { Graph } from "graphlib";
-import path_0 from "path";
+import { join } from "path";
 const PACKAGE_JSON = 'package.json';
 const PLUGIN_LOG_TITLE = '[Rsbuild Workspace Dev Plugin]: ';
 const RSLIB_READY_MESSAGE = 'build complete, watching for changes';
-const MODERN_MODULE_READY_MESSAGE = 'Watching for file changes';
 const TSUP_READY_MESSAGE = 'Watching for changes in';
 async function pathExists(path) {
     return fs.promises.access(path).then(()=>true).catch(()=>false);
@@ -88,7 +87,7 @@ function workspace_dev_define_property(obj, key, value) {
 }
 class WorkspaceDevRunner {
     async init() {
-        this.metaData = await readPackageJson(path_0.join(this.cwd, PACKAGE_JSON));
+        this.metaData = await readPackageJson(join(this.cwd, PACKAGE_JSON));
         this.buildDependencyGraph();
         debugLog(`Dependency graph:\nnodes: ${this.getNodes().join(', ')}\nedges: ${this.getEdges().map((edge)=>`${edge.v} -> ${edge.w}`).join(', ')}\n`);
     }
@@ -162,12 +161,14 @@ class WorkspaceDevRunner {
     }
     visitNodes(node) {
         return new Promise((resolve)=>{
-            const { name, path } = this.getNode(node);
+            const { name, path, packageJson } = this.getNode(node);
             const logger = new Logger({
                 name
             });
             const config = this.options?.projects?.[name];
-            if (config?.skip) {
+            const command = config?.command ? config.command : 'dev';
+            const scripts = packageJson.scripts || {};
+            if (config?.skip || !scripts[command]) {
                 this.visited[node] = true;
                 this.visiting[node] = false;
                 debugLog(`Skip visit node: ${node}`);
@@ -177,7 +178,7 @@ class WorkspaceDevRunner {
             this.visiting[node] = true;
             const child = spawn('npm', [
                 'run',
-                config?.command ? config.command : 'dev'
+                command
             ], {
                 cwd: path,
                 env: {
@@ -193,7 +194,7 @@ class WorkspaceDevRunner {
                 debugLog(content, `${name}: `);
                 logger.appendLog('stdout', stdout);
                 const match = config?.match;
-                const matchResult = match ? match(stdout) : stdout.match(RSLIB_READY_MESSAGE) || stdout.match(MODERN_MODULE_READY_MESSAGE) || stdout.match(TSUP_READY_MESSAGE);
+                const matchResult = match ? match(stdout) : stdout.match(RSLIB_READY_MESSAGE) || stdout.match(TSUP_READY_MESSAGE);
                 if (matchResult) {
                     logger.flushStdout();
                     this.matched[node] = true;

package/dist/types.d.ts

@@ -0,0 +1,6 @@
+import type { Package } from '@manypkg/get-packages';
+export interface PackageWithScripts extends Package {
+    packageJson: Package['packageJson'] & {
+        scripts?: Record<string, string>;
+    };
+}

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-import type { Package } from '@manypkg/get-packages';
+import type { PackageWithScripts } from './types.js';
 export declare const readJson: <T>(jsonFileAbsPath: string) => Promise<T>;
-export declare const readPackageJson: (pkgJsonFilePath: string) => Promise<Package["packageJson"]>;
+export declare const readPackageJson: (pkgJsonFilePath: string) => Promise<PackageWithScripts["packageJson"]>;
 export declare const isDebug: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsbuild-plugin-workspace-dev",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "An Rsbuild plugin to provides workspace recursive dev functionality for Monorepo topologies.",
   "repository": "https://github.com/rspack-contrib/rsbuild-plugin-workspace-dev",
   "license": "MIT",