Additional tests, test all config types

Author: ntotten

README.md

@@ -55,7 +55,7 @@
 </p>
 
 > [!IMPORTANT]
-> **Extension Migration:** This extension is being moved from `esbenp.prettier-vscode` to [`prettier.prettier-vscode`](https://marketplace.visualstudio.com/items?itemName=prettier.prettier-vscode). Version 12+ is only published to the new for now as it is a major change. Once it is stable, we will publish v12 to both extensions and deprecate the `esbenp.prettier-vscode` extension. **Version 12.x is currently not stable, use with caution in production environments.** 
+> **Extension Migration:** This extension is being moved from `esbenp.prettier-vscode` to [`prettier.prettier-vscode`](https://marketplace.visualstudio.com/items?itemName=prettier.prettier-vscode). Version 12+ is only published to the new for now as it is a major change. Once it is stable, we will publish v12 to both extensions and deprecate the `esbenp.prettier-vscode` extension. **Version 12.x is currently not stable, use with caution in production environments.**
 
 ## Installation
 

package-lock.json

@@ -113,7 +113,7 @@
   },
   "dependencies": {
     "find-up": "5.0.0",
-    "prettier": "3.7.1",
+    "prettier": "3.7.3",
     "resolve": "1.22.11",
     "semver": "7.7.3",
     "vscode-nls": "5.2.0"

package.json

@@ -22,47 +22,152 @@ describe("Test configurations", () => {
   before(() => moveRootPrettierRC());
   after(() => putBackPrettierRC());
 
+  // .prettierrc (JSON without extension)
   it(
     "it uses config from .prettierrc file and does not inherit VS Code settings ",
-    /* cspell: disable-next-line */
     // Use retry for first test as extension may need time after root .prettierrc is moved
     testConfig("rcfile/test.js", "rcfile/test.result.js", true),
   );
+
+  // .prettierrc.json
   it(
-    "it uses config from prettier.config.js file ",
-    /* cspell: disable-next-line */
-    testConfig("jsconfigfile/test.js", "jsconfigfile/test.result.js"),
+    "it uses config from .prettierrc.json file",
+    testConfig("jsonfile/test.js", "jsonfile/test.result.js"),
+  );
+
+  // .prettierrc.json5
+  it(
+    "it uses config from .prettierrc.json5 file",
+    testConfig("json5file/test.js", "json5file/test.result.js"),
+  );
+
+  // .prettierrc.yaml
+  it(
+    "it uses config from .prettierrc.yaml file",
+    testConfig("yamlfile/test.js", "yamlfile/test.result.js"),
   );
+
+  // .prettierrc.yml
+  it(
+    "it uses config from .prettierrc.yml file",
+    testConfig("ymlfile/test.js", "ymlfile/test.result.js"),
+  );
+
+  // .prettierrc.toml
+  it(
+    "it uses config from .prettierrc.toml file",
+    testConfig("tomlfile/test.js", "tomlfile/test.result.js"),
+  );
+
+  // .prettierrc.js (CommonJS)
   it(
-    "it uses config from .prettierrc.js file ",
-    /* cspell: disable-next-line */
+    "it uses config from .prettierrc.js file",
     testConfig("jsfile/test.js", "jsfile/test.result.js"),
   );
+
+  // .prettierrc.cjs (CommonJS explicit)
+  it(
+    "it uses config from .prettierrc.cjs file",
+    testConfig("cjsfile/test.js", "cjsfile/test.result.js"),
+  );
+
+  // .prettierrc.mjs (ESM)
+  it(
+    "it uses config from .prettierrc.mjs file",
+    testConfig("mjsfile/test.js", "mjsfile/test.result.js"),
+  );
+
+  // prettier.config.js (CommonJS)
+  it(
+    "it uses config from prettier.config.js file",
+    testConfig("jsconfigfile/test.js", "jsconfigfile/test.result.js"),
+  );
+
+  // prettier.config.cjs (CommonJS explicit)
+  it(
+    "it uses config from prettier.config.cjs file",
+    testConfig("cjsconfigfile/test.js", "cjsconfigfile/test.result.js"),
+  );
+
+  // prettier.config.mjs (ESM)
+  it(
+    "it uses config from prettier.config.mjs file",
+    testConfig("mjsconfigfile/test.js", "mjsconfigfile/test.result.js"),
+  );
+
+  // package.json with "prettier" key
+  it(
+    "it uses config from package.json prettier key",
+    testConfig("pkgjson/test.js", "pkgjson/test.result.js"),
+  );
+
+  // .prettierrc.js for handlebars files
   it(
     "it uses config from .prettierrc.js file for hbs files",
-    /* cspell: disable-next-line */
     testConfig("hbsfile/test.hbs", "hbsfile/test.result.hbs"),
   );
+
+  // .editorconfig
   it(
-    "it uses config from .editorconfig file ",
+    "it uses config from .editorconfig file",
     testConfig("editorconfig/test.js", "editorconfig/test.result.js"),
   );
+
+  // VS Code settings
   it(
-    "it uses config from vscode settings ",
-    /* cspell: disable-next-line */
+    "it uses config from vscode settings",
     testConfig("vscodeconfig/test.js", "vscodeconfig/test.result.js"),
   );
+
+  // VS Code settings with language overridables
   it(
-    "it uses config from vscode settings with language overridables ",
-    /* cspell: disable-next-line */
+    "it uses config from vscode settings with language overridables",
     testConfig(
       "vscodeconfig-language-overridable/test.ts",
       "vscodeconfig-language-overridable/test.result.ts",
     ),
   );
+
+  // Custom file extension
   it(
-    "it formats custom file extension ",
-    /* cspell: disable-next-line */
+    "it formats custom file extension",
     testConfig("customextension/test.abc", "customextension/test.result.abc"),
   );
+
+  // prettier.config.ts (TypeScript) - requires Prettier >= 3.5.0
+  // This fixture has its own package.json with local Prettier for TS config support
+  it(
+    "it uses config from prettier.config.ts file",
+    testConfig("tsconfigfile/test.js", "tsconfigfile/test.result.js"),
+  );
+
+  // .prettierrc.ts (TypeScript ESM) - requires Prettier >= 3.5.0
+  it(
+    "it uses config from .prettierrc.ts file",
+    testConfig("prettierrctsfile/test.js", "prettierrctsfile/test.result.js"),
+  );
+
+  // .prettierrc.cts (TypeScript CommonJS) - requires Prettier >= 3.5.0
+  it(
+    "it uses config from .prettierrc.cts file",
+    testConfig("prettierrccts/test.js", "prettierrccts/test.result.js"),
+  );
+
+  // .prettierrc.mts (TypeScript ESM explicit) - requires Prettier >= 3.5.0
+  it(
+    "it uses config from .prettierrc.mts file",
+    testConfig("prettierrcmts/test.js", "prettierrcmts/test.result.js"),
+  );
+
+  // prettier.config.cts (TypeScript CommonJS) - requires Prettier >= 3.5.0
+  it(
+    "it uses config from prettier.config.cts file",
+    testConfig("configcts/test.js", "configcts/test.result.js"),
+  );
+
+  // prettier.config.mts (TypeScript ESM explicit) - requires Prettier >= 3.5.0
+  it(
+    "it uses config from prettier.config.mts file",
+    testConfig("configmts/test.js", "configmts/test.result.js"),
+  );
 });

src/test/suite/config.test.ts

@@ -0,0 +1,40 @@
+import * as assert from "node:assert";
+import { format, getText } from "./format.test";
+
+/**
+ * Test for GitHub issue https://github.com/prettier/prettier/issues/18353
+ *
+ * This tests that when a monorepo subfolder has its own Prettier installation
+ * and plugins, the plugin resolution works correctly. In Prettier 3.7.0+,
+ * there was a regression where plugins would be resolved from the wrong
+ * directory, causing errors like:
+ *
+ * "Cannot find package 'prettier-plugin-xxx' imported from /path/to/root/noop.js"
+ */
+describe("Test monorepo subfolder plugin resolution (issue #18353)", () => {
+  // This test verifies the subfolder works when opened as its own workspace
+  it("formats with plugins in a monorepo subfolder (opened directly)", async () => {
+    const { actual } = await format(
+      "subfolder",
+      "index.xml",
+      /* shouldRetry */ true,
+    );
+    const expected = await getText("subfolder", "index.result.xml");
+    assert.equal(actual, expected);
+  });
+
+  // This test reproduces the actual issue - when the parent folder is opened
+  // and we try to format a file in a nested subfolder that has its own Prettier
+  it("formats with plugins when opened from parent folder", async () => {
+    const { actual } = await format(
+      "monorepo-subfolder",
+      "subfolder/index.xml",
+      /* shouldRetry */ true,
+    );
+    const expected = await getText(
+      "monorepo-subfolder",
+      "subfolder/index.result.xml",
+    );
+    assert.equal(actual, expected);
+  });
+});

src/test/suite/monorepo-subfolder.test.ts

@@ -0,0 +1,4 @@
+// CommonJS config file
+module.exports = {
+    tabWidth: 5
+};

src/test/suite/ts-config.test.ts

@@ -0,0 +1,3 @@
+function foo() {
+          console.log("test")
+}

test-fixtures/config/cjsconfigfile/prettier.config.cjs

@@ -0,0 +1,3 @@
+function foo() {
+     console.log("test");
+}

test-fixtures/config/cjsconfigfile/test.js

@@ -0,0 +1,4 @@
+// CommonJS config file
+module.exports = {
+    tabWidth: 5
+};