Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update globby requirement from ^9.2.0 to ^10.0.1 #4254

Merged
merged 24 commits into from Jan 3, 2020
Merged

Update globby requirement from ^9.2.0 to ^10.0.1 #4254

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e1442b4
Update globby requirement from ^9.2.0 to ^10.0.1
dependabot-preview[bot] Sep 5, 2019
c5dc10d
test that replacing backslashes works
vankop Sep 9, 2019
6ea214c
fix standalone-cache tests
vankop Sep 9, 2019
41e186d
Revert "fix standalone-cache tests"
vankop Sep 9, 2019
357773b
Revert "test that replacing backslashes works"
vankop Sep 9, 2019
76ae067
apply string replacement in stylelint instead of test cases
vankop Sep 9, 2019
6eb31ba
fix errors
vankop Sep 9, 2019
884cda9
feat: add convertToGlobbyPath
vankop Sep 10, 2019
c1dd181
Revert "feat: add convertToGlobbyPath"
vankop Sep 10, 2019
c96e7bc
Revert "fix errors"
vankop Sep 10, 2019
8035923
Revert "apply string replacement in stylelint instead of test cases"
vankop Sep 10, 2019
4e36ae6
Revert "Revert "test that replacing backslashes works""
vankop Sep 10, 2019
1fec4fe
Revert "Revert "fix standalone-cache tests""
vankop Sep 10, 2019
54ff817
fix: tests
vankop Sep 10, 2019
6b1d61e
fix: tests
vankop Sep 10, 2019
4934cef
Merge #4181
vankop Sep 10, 2019
95c8c0b
Merge master
vankop Sep 10, 2019
1dc83dd
fix tests again
vankop Sep 10, 2019
6c2c2cb
Merge master
vankop Sep 16, 2019
a12d3dc
fix lint
vankop Sep 16, 2019
149db43
Merge branch 'master' into dependabot/npm_and_yarn/globby-tw-10.0.1
vankop Jan 2, 2020
6f2682d
Merge branch 'master' into dependabot/npm_and_yarn/globby-tw-10.0.1
vankop Jan 2, 2020
f38d182
update lock file with globby@10.0.1
vankop Jan 2, 2020
fbe29ce
fix test
vankop Jan 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/printConfig.js
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ module.exports = function(

const filePath = files[0];

if (globby.hasMagic(filePath)) {
if (globby.hasMagic(filePath.replace(/\\/g, "/"))) {
return Promise.reject(
new Error("The --print-config option does not support globs.")
);
Expand Down
6 changes: 1 addition & 5 deletions lib/standalone.js
View file
Open in desktop
Expand Up @@ -170,11 +170,7 @@ module.exports = function(
});
}

let fileList = files;

if (typeof fileList === "string") {
fileList = [fileList];
}
let fileList = [].concat(files).map(file => file.replace(/\\/g, "/"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can potentially output linux paths on windows, we need test this

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not understand what you exactly mean =(
If you mean that stylelint can try to output fixed code to wrong (linux-like) file path, than we have such tests, see https://github.com/stylelint/stylelint/blob/master/system-tests/fix/fix.test.js#L60

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I found only one workaround for

There is no way to pass \ in file name

and

no ability to use backslashes for escaping characters

allow users escape with double backslashes only 🙀


if (!options.disableDefaultIgnores) {
fileList = fileList.concat(ALWAYS_IGNORED_GLOBS.map(glob => "!" + glob));
Expand Down
7 changes: 6 additions & 1 deletion lib/utils/noFilesFoundError.js
View file
Open in desktop
@@ -1,5 +1,7 @@
"use strict";

const isWin = process.platform === "win32";

class NoFilesFoundError extends Error {
constructor(fileList) {
super();
Expand All @@ -8,7 +10,10 @@ class NoFilesFoundError extends Error {
fileList = [fileList];
}

const pattern = fileList.filter(i => !i.startsWith("!")).join(", ");
const pattern = fileList
.filter(i => !i.startsWith("!"))
.map(file => (isWin ? file.replace(/\//g, "\\") : file))
.join(", ");

this.message = `No files matching the pattern "${pattern}" were found.`;
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@
"file-entry-cache": "^5.0.1",
"get-stdin": "^7.0.0",
"global-modules": "^2.0.0",
"globby": "^9.2.0",
"globby": "^10.0.1",
"globjoin": "^0.1.4",
"html-tags": "^3.0.0",
"ignore": "^5.0.6",
Expand Down