fix: support Vite+ pnpm workspaces

Author: lisonge

package.json

@@ -26,6 +26,7 @@
     "acorn": "catalog:",
     "acorn-walk": "catalog:",
     "element-plus": "catalog:",
+    "esbuild": "catalog:",
     "eslint": "catalog:",
     "eslint-config-prettier": "catalog:",
     "eslint-plugin-unused-imports": "catalog:",
@@ -47,7 +48,6 @@
     "solid-js": "catalog:",
     "terser": "catalog:",
     "tsdown": "catalog:",
-    "tsx": "catalog:",
     "typescript": "catalog:",
     "typescript-eslint": "catalog:",
     "unimport": "catalog:",

packages/create-monkey/scripts/update.ps1

@@ -1,4 +1,4 @@
-pnpm exec tsx "./scripts/update_template_dependency.ts"
+node "./scripts/update_template_dependency.ts"
 
 foreach ($file in Get-ChildItem){
   if($file.name -like 'template-*'){

packages/vite-plugin-monkey/CHANGELOG.md

@@ -1,3 +1,6 @@
 # What's Changed
 
-- feat: support web workers in dev (#291)
+## v8.1.1
+
+- fix: resolve project paths from the Vite root for Vite+ pnpm workspaces
+- chore: run maintainer TypeScript scripts with native Node.js

packages/vite-plugin-monkey/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-monkey",
-  "version": "8.1.0",
+  "version": "8.1.1",
   "description": "A vite plugin server and build your.user.js for userscript engine like Tampermonkey and Violentmonkey and Greasemonkey",
   "main": "src/node/index.ts",
   "type": "module",
@@ -17,9 +17,10 @@
     "types": "dist/node/index.d.mts"
   },
   "scripts": {
+    "test": "node --test test/workspace-root.test.ts",
     "prebuild": "tsc",
     "build": "tsdown",
-    "postbuild": "tsx ./scripts/postbuild.ts",
+    "postbuild": "node ./scripts/postbuild.ts",
     "postpublish": "curl -X PUT https://registry-direct.npmmirror.com/vite-plugin-monkey/sync"
   },
   "keywords": [

packages/vite-plugin-monkey/scripts/transform_context.ts

@@ -54,7 +54,7 @@ const getNodeLeadingComment = (node: ts.Node) => {
 
 const targetCode = [
   `// The current code file is automatically generated using the following command
-// pnpm -F vite-plugin-monkey exec tsx ./scripts/transform_context.ts
+// pnpm -F vite-plugin-monkey exec node ./scripts/transform_context.ts
 // This command is used to avoid the tedious process of manually copying the code`,
   `export {}`,
   `import { monkeyWindow as w } from './window.ts';`,

packages/vite-plugin-monkey/src/client/context.ts

@@ -1,5 +1,5 @@
 // The current code file is automatically generated using the following command
-// pnpm -F vite-plugin-monkey exec tsx ./scripts/transform_context.ts
+// pnpm -F vite-plugin-monkey exec node ./scripts/transform_context.ts
 // This command is used to avoid the tedious process of manually copying the code
 
 export {};

packages/vite-plugin-monkey/src/node/index.ts

@@ -1,4 +1,5 @@
 import type { Plugin } from 'vite';
+import path from 'node:path';
 import factorys from './plugins/index.ts';
 import { resolvedOption } from './utils/option.ts';
 import type { MonkeyOption, ResolvedMonkeyOption } from './utils/types.ts';
@@ -10,13 +11,33 @@ export type * from './types.ts';
 export * as cdn from './cdn.ts';
 
 export default (pluginOption: MonkeyOption): Plugin[] => {
-  let option: Promise<ResolvedMonkeyOption>;
-  const getOption = () => {
-    return (option ??= resolvedOption(pluginOption));
+  let option: Promise<ResolvedMonkeyOption> | undefined;
+  let root = '';
+  const getOption = (configRoot = root) => {
+    if (!option) {
+      root = path.resolve(configRoot);
+      option = resolvedOption(pluginOption, root);
+    }
+    return option;
   };
-  return factorys
-    .map((f) => f(getOption, pluginOption))
-    .filter(Boolean) as Plugin[];
+  const rootPlugin: Plugin = {
+    name: 'monkey:root',
+    config: {
+      order: 'pre',
+      handler(config) {
+        // Vite+ may use the pnpm workspace root as cwd, so prefer the Vite root
+        // to resolve the actual workspace package and its relative entry.
+        root = path.resolve(config.root ?? '');
+        option = undefined;
+      },
+    },
+  };
+  return [
+    rootPlugin,
+    ...(factorys
+      .map((f) => f(getOption, pluginOption))
+      .filter(Boolean) as Plugin[]),
+  ];
 };
 
 /**

packages/vite-plugin-monkey/src/node/plugins/buildBundle.ts

@@ -27,16 +27,19 @@ const polyfillId = '\0vite/legacy-polyfills';
 const systemJsImportMapPrefix = `user`;
 
 export const buildBundleFactory = (
-  getOption: () => Promise<ResolvedMonkeyOption>,
+  getOption: (root?: string) => Promise<ResolvedMonkeyOption>,
 ): Plugin => {
   let option: ResolvedMonkeyOption;
   let viteConfig: ResolvedConfig;
   return {
     name: 'monkey:buildBundle',
     apply: 'build',
     enforce: 'post',
-    async config() {
-      option = await getOption();
+    config: {
+      order: 'post',
+      async handler(config) {
+        option = await getOption(config.root);
+      },
     },
     async configResolved(resolvedConfig) {
       viteConfig = resolvedConfig;

packages/vite-plugin-monkey/src/node/plugins/config.ts

@@ -2,47 +2,50 @@ import type { Plugin } from 'vite';
 import type { ResolvedMonkeyOption } from '../utils/types.ts';
 
 export const configFactory = (
-  getOption: () => Promise<ResolvedMonkeyOption>,
+  getOption: (root?: string) => Promise<ResolvedMonkeyOption>,
 ): Plugin => {
   let option: ResolvedMonkeyOption;
   return {
     name: 'monkey:config',
-    async config(userConfig) {
-      option = await getOption();
-      return {
-        resolve: {
-          alias: {
-            [option.clientAlias]: 'vite-plugin-monkey/dist/client',
-          },
-        },
-        build: {
-          assetsInlineLimit: Number.MAX_SAFE_INTEGER,
-          chunkSizeWarningLimit: Number.MAX_SAFE_INTEGER,
-          assetsDir: './',
-          cssCodeSplit: false,
-          minify: userConfig.build?.minify ?? false,
-          cssMinify: userConfig.build?.cssMinify ?? true,
-          sourcemap: false,
-          rolldownOptions: {
-            input: option.entry,
-            onLog(level, log, defaultHandler) {
-              // ignore top-level await warning
-              if (
-                level === 'warn' &&
-                log.code === 'TOLERATED_TRANSFORM' &&
-                log.message.includes('Top-level await is not available')
-              ) {
-                return;
-              }
-              defaultHandler(level, log);
+    config: {
+      order: 'post',
+      async handler(userConfig) {
+        option = await getOption(userConfig.root);
+        return {
+          resolve: {
+            alias: {
+              [option.clientAlias]: 'vite-plugin-monkey/dist/client',
             },
-            experimental: {
-              // https://github.com/rolldown/rolldown/issues/9006
-              attachDebugInfo: 'none',
+          },
+          build: {
+            assetsInlineLimit: Number.MAX_SAFE_INTEGER,
+            chunkSizeWarningLimit: Number.MAX_SAFE_INTEGER,
+            assetsDir: './',
+            cssCodeSplit: false,
+            minify: userConfig.build?.minify ?? false,
+            cssMinify: userConfig.build?.cssMinify ?? true,
+            sourcemap: false,
+            rolldownOptions: {
+              input: option.entry,
+              onLog(level, log, defaultHandler) {
+                // ignore top-level await warning
+                if (
+                  level === 'warn' &&
+                  log.code === 'TOLERATED_TRANSFORM' &&
+                  log.message.includes('Top-level await is not available')
+                ) {
+                  return;
+                }
+                defaultHandler(level, log);
+              },
+              experimental: {
+                // https://github.com/rolldown/rolldown/issues/9006
+                attachDebugInfo: 'none',
+              },
             },
           },
-        },
-      };
+        };
+      },
     },
   };
 };

packages/vite-plugin-monkey/src/node/plugins/css.ts

@@ -53,7 +53,7 @@ export default undefined;
 `.trimStart();
 
 export const cssFactory = (
-  getOption: () => Promise<ResolvedMonkeyOption>,
+  getOption: (root?: string) => Promise<ResolvedMonkeyOption>,
 ): Plugin => {
   let option: ResolvedMonkeyOption;
   const isCssImport = async (
@@ -83,15 +83,18 @@ export const cssFactory = (
     name: 'monkey:css',
     apply: 'build',
     enforce: 'post',
-    async config() {
-      option = await getOption();
-      return {
-        build: {
-          rolldownOptions: {
-            external: [cssModuleId],
+    config: {
+      order: 'post',
+      async handler(config) {
+        option = await getOption(config.root);
+        return {
+          build: {
+            rolldownOptions: {
+              external: [cssModuleId],
+            },
           },
-        },
-      };
+        };
+      },
     },
     resolveId(source) {
       if (source.endsWith(staticCssIdSuffix)) return source;