feat: Avoid dirname for built-in configs.

Load eslint:recommended and eslint:all configs via import instead file paths. Fixes: eslint/eslint#15575
daidodo · Feb 18, 2022 · b4803f0 · b4803f0
2 parents 32470f6 + 7ed74f7
commit b4803f0
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 11 deletions.
diff --git a/lib/config-array-factory.js b/lib/config-array-factory.js
@@ -817,6 +817,9 @@ class ConfigArrayFactory {
             const name = `${ctx.name} » ${extendName}`;
 
             if (getEslintRecommendedConfig) {
+                if (typeof getEslintRecommendedConfig !== "function") {
+                    throw new Error(`getEslintRecommendedConfig must be a function instead of '${getEslintRecommendedConfig}'`);
+                }
                 return this._normalizeConfigData(getEslintRecommendedConfig(), { ...ctx, name, filePath: "" });
             }
             return this._loadConfigData({
@@ -829,6 +832,9 @@ class ConfigArrayFactory {
             const name = `${ctx.name} » ${extendName}`;
 
             if (getEslintAllConfig) {
+                if (typeof getEslintAllConfig !== "function") {
+                    throw new Error(`getEslintAllConfig must be a function instead of '${getEslintAllConfig}'`);
+                }
                 return this._normalizeConfigData(getEslintAllConfig(), { ...ctx, name, filePath: "" });
             }
             return this._loadConfigData({

diff --git a/tests/lib/config-array-factory.js b/tests/lib/config-array-factory.js
@@ -2143,17 +2143,6 @@ describe("ConfigArrayFactory", () => {
         describe("with eslint built-in config callbacks", () => {
             let factory;
 
-            beforeEach(async () => {
-                await prepare();
-                factory = new ConfigArrayFactory({
-                    cwd: getPath(),
-                    getEslintAllConfig,
-                    getEslintRecommendedConfig
-                });
-            });
-
-            afterEach(cleanup);
-
             /**
              * Apply `extends` property.
              * @param {Object} configData The config that has `extends` property.
@@ -2167,6 +2156,42 @@ describe("ConfigArrayFactory", () => {
                     .toCompatibleObjectAsConfigFileContent();
             }
 
+            describe("with incorrect getConfig callbacks", () => {
+                beforeEach(async () => {
+                    await prepare();
+                    factory = new ConfigArrayFactory({
+                        cwd: getPath(),
+                        getEslintAllConfig: true,
+                        getEslintRecommendedConfig: 12345
+                    });
+                });
+
+                afterEach(cleanup);
+
+                it("should throw error when extends config includes 'eslint:all'", () => {
+                    assert.throws(() => {
+                        applyExtends({ extends: "eslint:all" });
+                    }, /getEslintAllConfig must be a function instead of .*/u);
+                });
+
+                it("should throw error when extends config includes 'eslint:recommended'", () => {
+                    assert.throws(() => {
+                        applyExtends({ extends: "eslint:recommended" });
+                    }, /getEslintRecommendedConfig must be a function instead of .*/u);
+                });
+            });
+
+            beforeEach(async () => {
+                await prepare();
+                factory = new ConfigArrayFactory({
+                    cwd: getPath(),
+                    getEslintAllConfig,
+                    getEslintRecommendedConfig
+                });
+            });
+
+            afterEach(cleanup);
+
             it("should apply extension 'foo' when specified from root directory config", () => {
                 const config = applyExtends({
                     extends: "foo",