Skip to content

Commit

Permalink
Replace placeholder.js with __placeholder.js__
Browse files Browse the repository at this point in the history
  • Loading branch information
@not-an-aardvark
not-an-aardvark committed Feb 19, 2019
1 parent cac06a9 commit 3c129e3
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion lib/cli-engine.js
View file
Expand Up @@ -793,7 +793,7 @@ class CLIEngine {
try {
const npmFormat = naming.normalizePackageName(normalizedFormatName, "eslint-formatter");

formatterPath = relativeModuleResolver(npmFormat, path.join(cwd, "placeholder.js"));
formatterPath = relativeModuleResolver(npmFormat, path.join(cwd, "__placeholder__.js"));
} catch (e) {
formatterPath = path.resolve(__dirname, "formatters", normalizedFormatName);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/config.js
View file
Expand Up @@ -81,7 +81,7 @@ class Config {
this.parserOptions = options.parserOptions || {};

this.configCache = new ConfigCache();
this._rootConfigReferencePath = path.join(this.options.cwd, "placeholder.js");
this._rootConfigReferencePath = path.join(this.options.cwd, "__placeholder__.js");

this.baseConfig = options.baseConfig
? ConfigFile.loadObject(options.baseConfig, this, this._rootConfigReferencePath, "(Provided base config)")
Expand Down
2 changes: 1 addition & 1 deletion lib/config/config-file.js
View file
Expand Up @@ -432,7 +432,7 @@ function resolve(extendedConfigReference, referencedFromPath, pluginRootPath) {
const normalizedPluginName = naming.normalizePackageName(pluginName, "eslint-plugin");

return {
filePath: relativeModuleResolver(normalizedPluginName, path.join(pluginRootPath, "placeholder.js")),
filePath: relativeModuleResolver(normalizedPluginName, path.join(pluginRootPath, "__placeholder__.js")),
configName,
configFullName
};
Expand Down
2 changes: 1 addition & 1 deletion lib/config/plugins.js
View file
Expand Up @@ -97,7 +97,7 @@ class Plugins {
}

if (!this._plugins[shortName]) {
const resolveRelativeToPath = path.join(this._pluginRootPath, "placeholder.js");
const resolveRelativeToPath = path.join(this._pluginRootPath, "__placeholder__.js");
let pluginPath;

try {
Expand Down
76 changes: 38 additions & 38 deletions tests/lib/config/config-file.js
View file
Expand Up @@ -281,7 +281,7 @@ describe("ConfigFile", () => {

it("should load information from a legacy file", () => {
const configFilePath = getFixturePath("legacy/.eslintrc");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
parserOptions: {},
Expand All @@ -295,7 +295,7 @@ describe("ConfigFile", () => {

it("should load information from a JavaScript file", () => {
const configFilePath = getFixturePath("js/.eslintrc.js");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
parserOptions: {},
Expand All @@ -309,13 +309,13 @@ describe("ConfigFile", () => {

it("should throw error when loading invalid JavaScript file", () => {
assert.throws(() => {
ConfigFile.load(getFixturePath("js/.eslintrc.broken.js"), configContext, getFixturePath("placeholder.js"));
ConfigFile.load(getFixturePath("js/.eslintrc.broken.js"), configContext, getFixturePath("__placeholder__.js"));
}, /Cannot read config file/);
});

it("should interpret parser module name when present in a JavaScript file", () => {
const configFilePath = getFixturePath("js/.eslintrc.parser.js");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
parser: path.resolve(getFixturePath("js/node_modules/foo/index.js")),
Expand All @@ -330,7 +330,7 @@ describe("ConfigFile", () => {

it("should interpret parser path when present in a JavaScript file", () => {
const configFilePath = getFixturePath("js/.eslintrc.parser2.js");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
parser: path.resolve(getFixturePath("js/not-a-config.js")),
Expand All @@ -345,7 +345,7 @@ describe("ConfigFile", () => {

it("should interpret parser module name or path when parser is set to default parser in a JavaScript file", () => {
const configFilePath = getFixturePath("js/.eslintrc.parser3.js");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
parser: require.resolve("espree"),
Expand All @@ -360,7 +360,7 @@ describe("ConfigFile", () => {

it("should load information from a JSON file", () => {
const configFilePath = getFixturePath("json/.eslintrc.json");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
parserOptions: {},
Expand Down Expand Up @@ -391,18 +391,18 @@ describe("ConfigFile", () => {
},
tmpFilename = "fresh-test.json",
tmpFilePath = writeTempConfigFile(initialConfig, tmpFilename);
let config = ConfigFile.load(tmpFilePath, configContext, getFixturePath("placeholder.js"));
let config = ConfigFile.load(tmpFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, initialConfig);
writeTempConfigFile(updatedConfig, tmpFilename, path.dirname(tmpFilePath));
configContext = new Config({ cwd: getFixturePath(".") }, new Linter());
config = ConfigFile.load(tmpFilePath, configContext, getFixturePath("placeholder.js"));
config = ConfigFile.load(tmpFilePath, configContext, getFixturePath("__placeholder__.js"));
assert.deepStrictEqual(config, updatedConfig);
});

it("should load information from a package.json file", () => {
const configFilePath = getFixturePath("package-json/package.json");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
parserOptions: {},
Expand All @@ -415,7 +415,7 @@ describe("ConfigFile", () => {
it("should throw error when loading invalid package.json file", () => {
assert.throws(() => {
try {
ConfigFile.load(getFixturePath("broken-package-json/package.json"), configContext, getFixturePath("placeholder.js"));
ConfigFile.load(getFixturePath("broken-package-json/package.json"), configContext, getFixturePath("__placeholder__.js"));
} catch (error) {
assert.strictEqual(error.messageTemplate, "failed-to-read-json");
throw error;
Expand Down Expand Up @@ -446,12 +446,12 @@ describe("ConfigFile", () => {
},
tmpFilename = "package.json",
tmpFilePath = writeTempConfigFile(initialConfig, tmpFilename);
let config = ConfigFile.load(tmpFilePath, configContext, getFixturePath("placeholder.js"));
let config = ConfigFile.load(tmpFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, initialConfig.eslintConfig);
writeTempConfigFile(updatedConfig, tmpFilename, path.dirname(tmpFilePath));
configContext = new Config({ cwd: getFixturePath(".") }, new Linter());
config = ConfigFile.load(tmpFilePath, configContext, getFixturePath("placeholder.js"));
config = ConfigFile.load(tmpFilePath, configContext, getFixturePath("__placeholder__.js"));
assert.deepStrictEqual(config, updatedConfig.eslintConfig);
});

Expand All @@ -474,18 +474,18 @@ describe("ConfigFile", () => {
},
tmpFilename = ".eslintrc.js",
tmpFilePath = writeTempJsConfigFile(initialConfig, tmpFilename);
let config = ConfigFile.load(tmpFilePath, configContext, getFixturePath("placeholder.js"));
let config = ConfigFile.load(tmpFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, initialConfig);
writeTempJsConfigFile(updatedConfig, tmpFilename, path.dirname(tmpFilePath));
configContext = new Config({ cwd: getFixturePath(".") }, new Linter());
config = ConfigFile.load(tmpFilePath, configContext, getFixturePath("placeholder.js"));
config = ConfigFile.load(tmpFilePath, configContext, getFixturePath("__placeholder__.js"));
assert.deepStrictEqual(config, updatedConfig);
});

it("should load information from a YAML file", () => {
const configFilePath = getFixturePath("yaml/.eslintrc.yaml");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
parserOptions: {},
Expand All @@ -497,7 +497,7 @@ describe("ConfigFile", () => {

it("should load information from an empty YAML file", () => {
const configFilePath = getFixturePath("yaml/.eslintrc.empty.yaml");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
parserOptions: {},
Expand All @@ -509,7 +509,7 @@ describe("ConfigFile", () => {

it("should load information from a YML file", () => {
const configFilePath = getFixturePath("yml/.eslintrc.yml");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
parserOptions: {},
Expand All @@ -521,7 +521,7 @@ describe("ConfigFile", () => {

it("should load information from a YML file and apply extensions", () => {
const configFilePath = getFixturePath("extends/.eslintrc.yml");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
env: { es6: true },
Expand All @@ -533,7 +533,7 @@ describe("ConfigFile", () => {

it("should load information from `extends` chain.", () => {
const configFilePath = getFixturePath("extends-chain/.eslintrc.json");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
env: {},
Expand All @@ -549,7 +549,7 @@ describe("ConfigFile", () => {

it("should load information from `extends` chain with relative path.", () => {
const configFilePath = getFixturePath("extends-chain-2/.eslintrc.json");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
env: {},
Expand All @@ -564,7 +564,7 @@ describe("ConfigFile", () => {

it("should load information from `extends` chain in .eslintrc with relative path.", () => {
const configFilePath = getFixturePath("extends-chain-2/relative.eslintrc.json");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
env: {},
Expand All @@ -579,7 +579,7 @@ describe("ConfigFile", () => {

it("should load information from `parser` in .eslintrc with relative path.", () => {
const configFilePath = getFixturePath("extends-chain-2/parser.eslintrc.json");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));
const parserPath = getFixturePath("extends-chain-2/parser.js");

assert.deepStrictEqual(config, {
Expand Down Expand Up @@ -608,7 +608,7 @@ describe("ConfigFile", () => {

it("should load information from `extends` chain in .eslintrc with relative path.", () => {
const configFilePath = path.join(fixturePath, "relative.eslintrc.json");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
env: {},
Expand All @@ -623,7 +623,7 @@ describe("ConfigFile", () => {

it("should load information from `parser` in .eslintrc with relative path.", () => {
const configFilePath = path.join(fixturePath, "parser.eslintrc.json");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));
const parserPath = fs.realpathSync(path.join(fixturePath, "parser.js"));

assert.deepStrictEqual(config, {
Expand All @@ -639,7 +639,7 @@ describe("ConfigFile", () => {
describe("Plugins", () => {
it("should load information from a YML file and load plugins", () => {
const configFilePath = getFixturePath("plugins/.eslintrc.yml");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
parserOptions: {},
Expand All @@ -654,7 +654,7 @@ describe("ConfigFile", () => {

it("should load two separate configs from a plugin", () => {
const configFilePath = getFixturePath("plugins/.eslintrc2.yml");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
parserOptions: {},
Expand All @@ -672,7 +672,7 @@ describe("ConfigFile", () => {
describe("even if config files have Unicode BOM,", () => {
it("should read the JSON config file correctly.", () => {
const configFilePath = getFixturePath("bom/.eslintrc.json");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
env: {},
Expand All @@ -686,7 +686,7 @@ describe("ConfigFile", () => {

it("should read the YAML config file correctly.", () => {
const configFilePath = getFixturePath("bom/.eslintrc.yaml");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
env: {},
Expand All @@ -700,7 +700,7 @@ describe("ConfigFile", () => {

it("should read the config in package.json correctly.", () => {
const configFilePath = getFixturePath("bom/package.json");
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
const config = ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));

assert.deepStrictEqual(config, {
env: {},
Expand All @@ -717,7 +717,7 @@ describe("ConfigFile", () => {
const configFilePath = getFixturePath("invalid/invalid-top-level-property.yml");

try {
ConfigFile.load(configFilePath, configContext, getFixturePath("placeholder.js"));
ConfigFile.load(configFilePath, configContext, getFixturePath("__placeholder__.js"));
} catch (err) {
assert.include(err.message, `ESLint configuration in ${configFilePath} is invalid`);
return;
Expand All @@ -729,15 +729,15 @@ describe("ConfigFile", () => {
describe("resolve() relative to config file", () => {
leche.withData([
[".eslintrc", getFixturePath("subdir/.eslintrc")],
["eslint-config-foo", relativeModuleResolver("eslint-config-foo", getFixturePath("subdir/placeholder.js"))],
["foo", relativeModuleResolver("eslint-config-foo", getFixturePath("subdir/placeholder.js"))],
["eslint-configfoo", relativeModuleResolver("eslint-config-eslint-configfoo", getFixturePath("subdir/placeholder.js"))],
["@foo/eslint-config", relativeModuleResolver("@foo/eslint-config", getFixturePath("subdir/placeholder.js"))],
["@foo/bar", relativeModuleResolver("@foo/eslint-config-bar", getFixturePath("subdir/placeholder.js"))],
["plugin:foo/bar", relativeModuleResolver("eslint-plugin-foo", getFixturePath("placeholder.js"))]
["eslint-config-foo", relativeModuleResolver("eslint-config-foo", getFixturePath("subdir/__placeholder__.js"))],
["foo", relativeModuleResolver("eslint-config-foo", getFixturePath("subdir/__placeholder__.js"))],
["eslint-configfoo", relativeModuleResolver("eslint-config-eslint-configfoo", getFixturePath("subdir/__placeholder__.js"))],
["@foo/eslint-config", relativeModuleResolver("@foo/eslint-config", getFixturePath("subdir/__placeholder__.js"))],
["@foo/bar", relativeModuleResolver("@foo/eslint-config-bar", getFixturePath("subdir/__placeholder__.js"))],
["plugin:foo/bar", relativeModuleResolver("eslint-plugin-foo", getFixturePath("__placeholder__.js"))]
], (input, expected) => {
it(`should return ${expected} when passed ${input}`, () => {
const result = ConfigFile.resolve(input, getFixturePath("subdir/placeholder.js"), getFixturePath("."));
const result = ConfigFile.resolve(input, getFixturePath("subdir/__placeholder__.js"), getFixturePath("."));

assert.strictEqual(result.filePath, expected);
});
Expand Down

0 comments on commit 3c129e3

Please sign in to comment.