From 66bedd5825a12ce76647869bf1c359e29d81a3ed Mon Sep 17 00:00:00 2001
From: jiangmin <7548764@qq.com>
Date: Sun, 2 Jun 2024 03:26:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20fixi=20Cannot=20find=20module=20'prettie?=
 =?UTF-8?q?r-eslint'=EF=BC=88#216=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json     |  2 +-
 src/extension.js |  4 ----
 src/worker.mjs   | 20 ++++++++------------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 7ae7eb4..8f8eb1f 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "build:dev": "yarn build:extension && yarn build:worker",
     "build": "yarn build:extension --minify && yarn build:worker --minify",
     "build:extension": "esbuild ./src/extension.js --bundle --sourcemap --platform=node --target=node16 --external:vscode --external:./worker.mjs --outfile=./dist/extension.js",
-    "build:worker": "esbuild ./src/worker.mjs --bundle --sourcemap --platform=node --format=esm --target=node16 --outfile=./dist/worker.mjs",
+    "build:worker": "esbuild ./src/worker.mjs --bundle --sourcemap --platform=node --format=esm --external:prettier-eslint --target=node16 --outfile=./dist/worker.mjs",
     "package:dev": "yarn build:dev && vsce package",
     "package": "yarn build && vsce package",
     "contributors:add": "all-contributors add",
diff --git a/src/extension.js b/src/extension.js
index 2246edb..f18a752 100644
--- a/src/extension.js
+++ b/src/extension.js
@@ -60,7 +60,6 @@ function formatter(document) {
 
     const formatted = formatText({
       text,
-      prettierEslintPath: getModulePath(document.fileName, 'prettier-eslint'),
       filePath: document.fileName,
       extensionConfig: { prettierLast },
     });
@@ -121,11 +120,8 @@ function waitForActiveSupportedDocument() {
  * by 'prettier-eslint' to resolve its internal dependencies (eslint and prettier).
  */
 async function warmUpWorker(document) {
-  const prettierEslintPath = getModulePath(document.fileName, 'prettier-eslint');
-
   formatText({
     text: '',
-    prettierEslintPath,
     filePath: document.fileName,
   });
 }
diff --git a/src/worker.mjs b/src/worker.mjs
index 4a23536..087e9e4 100644
--- a/src/worker.mjs
+++ b/src/worker.mjs
@@ -1,6 +1,7 @@
 import { isAbsolute } from 'path';
 import { runAsWorker } from 'synckit';
 import { pathToFileURL } from 'url';
+import format from 'prettier-eslint';
 
 runAsWorker(
   /**
@@ -14,16 +15,11 @@ runAsWorker(
    * }}
    */
   async ({
-    text, prettierEslintPath, filePath, extensionConfig,
-  }) => {
-    const format = /** @type {typeof import('prettier-eslint')} */ (
-      (await import(isAbsolute(prettierEslintPath) ? pathToFileURL(prettierEslintPath) : prettierEslintPath)).default
-    );
-    return format({
-      text,
-      filePath,
-      logLevel: 'info',
-      prettierLast: extensionConfig?.prettierLast,
-    });
-  },
+    text, filePath, extensionConfig,
+  }) => format({
+    text,
+    filePath,
+    logLevel: 'info',
+    prettierLast: extensionConfig?.prettierLast,
+  }),
 );