From 04ec577c280edd660201da420ada37ae20751bbb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2020 11:41:58 +0000 Subject: [PATCH 1/3] Bump globby from 10.0.1 to 11.0.0 Bumps [globby](https://github.com/sindresorhus/globby) from 10.0.1 to 11.0.0. - [Release notes](https://github.com/sindresorhus/globby/releases) - [Commits](https://github.com/sindresorhus/globby/compare/v10.0.1...v11.0.0) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 37 +++++++++++++++++++++++++++---------- package.json | 2 +- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3fb032e6a6..45c35386cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -823,12 +823,14 @@ "@types/events": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", - "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==" + "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", + "dev": true }, "@types/glob": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "dev": true, "requires": { "@types/events": "*", "@types/minimatch": "*", @@ -911,7 +913,8 @@ "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "dev": true }, "@types/minimist": { "version": "1.2.0", @@ -2575,6 +2578,22 @@ "slash": "^3.0.0" }, "dependencies": { + "globby": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", + "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "dev": true, + "requires": { + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" + } + }, "rimraf": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz", @@ -4076,17 +4095,15 @@ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, "globby": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", - "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz", + "integrity": "sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==", "requires": { - "@types/glob": "^7.1.1", "array-union": "^2.1.0", "dir-glob": "^3.0.1", - "fast-glob": "^3.0.3", - "glob": "^7.1.3", - "ignore": "^5.1.1", - "merge2": "^1.2.3", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", "slash": "^3.0.0" } }, diff --git a/package.json b/package.json index 2035e82669..4761307694 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "file-entry-cache": "^5.0.1", "get-stdin": "^7.0.0", "global-modules": "^2.0.0", - "globby": "^10.0.2", + "globby": "^11.0.0", "globjoin": "^0.1.4", "html-tags": "^3.1.0", "ignore": "^5.1.4", From 644b7135b6847784c57a2f64598ede4fe8266c11 Mon Sep 17 00:00:00 2001 From: Aleks Hudochenkov Date: Fri, 10 Jan 2020 17:22:48 +0100 Subject: [PATCH 2/3] Fix Windows path problem --- lib/__tests__/printConfig.test.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/__tests__/printConfig.test.js b/lib/__tests__/printConfig.test.js index 9da1dc0037..534fb737a4 100644 --- a/lib/__tests__/printConfig.test.js +++ b/lib/__tests__/printConfig.test.js @@ -3,15 +3,18 @@ const path = require('path'); const pluginWarnAboutFoo = require('./fixtures/plugin-warn-about-foo'); const printConfig = require('../printConfig'); +const replaceBackslashes = require('./replaceBackslashes'); it('printConfig uses getConfigForFile to retrieve the config', () => { - const filepath = path.join(__dirname, 'fixtures/getConfigForFile/a/b/foo.css'); + const filepath = replaceBackslashes( + path.join(__dirname, 'fixtures/getConfigForFile/a/b/foo.css'), + ); return printConfig({ files: [filepath], }).then((result) => { expect(result).toEqual({ - plugins: [path.join(__dirname, '/fixtures/plugin-warn-about-foo.js')], + plugins: [replaceBackslashes(path.join(__dirname, '/fixtures/plugin-warn-about-foo.js'))], rules: { 'block-no-empty': [true], 'plugin/warn-about-foo': ['always'], From 6a2ffbd73fd95438e6c0ed65c37c98088bf97f07 Mon Sep 17 00:00:00 2001 From: Aleks Hudochenkov Date: Fri, 10 Jan 2020 17:46:57 +0100 Subject: [PATCH 3/3] Fix plugin path --- lib/__tests__/printConfig.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/__tests__/printConfig.test.js b/lib/__tests__/printConfig.test.js index 534fb737a4..3d527c3094 100644 --- a/lib/__tests__/printConfig.test.js +++ b/lib/__tests__/printConfig.test.js @@ -14,7 +14,7 @@ it('printConfig uses getConfigForFile to retrieve the config', () => { files: [filepath], }).then((result) => { expect(result).toEqual({ - plugins: [replaceBackslashes(path.join(__dirname, '/fixtures/plugin-warn-about-foo.js'))], + plugins: [path.join(__dirname, '/fixtures/plugin-warn-about-foo.js')], rules: { 'block-no-empty': [true], 'plugin/warn-about-foo': ['always'],