From afd8335ac13308bb5d8cf4856ce1160c9dd83d25 Mon Sep 17 00:00:00 2001 From: merceyz Date: Fri, 16 Jul 2021 12:12:24 +0200 Subject: [PATCH 1/6] chore: `consolidate` --- packages/plugin-compat/sources/extensions.ts | 113 +++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts index e56b2665d2c5..9a8a1e6b3af5 100644 --- a/packages/plugin-compat/sources/extensions.ts +++ b/packages/plugin-compat/sources/extensions.ts @@ -384,4 +384,117 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ 'js-git': optionalPeerDep, }, }], + // https://github.com/tj/consolidate.js/pull/339 + [`consolidate@*`, { + peerDependencies: { + velocityjs: `^2.0.1`, + tinyliquid: `^0.2.34`, + 'liquid-node': `^3.0.1`, + jade: `^1.11.0`, + 'then-jade': `*`, + dust: `^0.3.0`, + 'dustjs-helpers': `^1.7.4`, + 'dustjs-linkedin': `^2.7.5`, + swig: `^1.4.2`, + 'swig-templates': `^2.0.3`, + 'razor-tmpl': `^1.3.1`, + atpl: `>=0.7.6`, + liquor: `^0.0.5`, + twig: `^1.15.2`, + ejs: `^3.1.5`, + eco: `^1.1.0-rc-3`, + jazz: `^0.0.18`, + jqtpl: `~1.1.0`, + hamljs: `^0.6.2`, + hamlet: `^0.3.3`, + whiskers: `^0.4.0`, + 'haml-coffee': `^1.14.1`, + 'hogan.js': `^3.0.2`, + templayed: `>=0.2.3`, + handlebars: `^4.7.6`, + underscore: `^1.11.0`, + lodash: `^4.17.20`, + pug: `^3.0.0`, + 'then-pug': `*`, + qejs: `^3.0.5`, + walrus: `^0.10.1`, + mustache: `^4.0.1`, + just: `^0.1.8`, + ect: `^0.5.9`, + mote: `^0.2.0`, + toffee: `^0.3.6`, + dot: `^1.1.3`, + 'bracket-template': `^1.1.5`, + ractive: `^1.3.12`, + nunjucks: `^3.2.2`, + htmling: `^0.0.8`, + 'babel-core': `^6.26.3`, + plates: `~0.4.11`, + 'react-dom': `^16.13.1`, + react: `^16.13.1`, + 'arc-templates': `^0.5.3`, + vash: `^0.13.0`, + slm: `^2.0.0`, + marko: `^3.14.4`, + teacup: `^2.0.0`, + 'coffee-script': `^1.12.7`, + squirrelly: `^5.1.0`, + twing: `^5.0.2`, + }, + peerDependenciesMeta: { + velocityjs: optionalPeerDep, + tinyliquid: optionalPeerDep, + 'liquid-node': optionalPeerDep, + jade: optionalPeerDep, + 'then-jade': optionalPeerDep, + dust: optionalPeerDep, + 'dustjs-helpers': optionalPeerDep, + 'dustjs-linkedin': optionalPeerDep, + swig: optionalPeerDep, + 'swig-templates': optionalPeerDep, + 'razor-tmpl': optionalPeerDep, + atpl: optionalPeerDep, + liquor: optionalPeerDep, + twig: optionalPeerDep, + ejs: optionalPeerDep, + eco: optionalPeerDep, + jazz: optionalPeerDep, + jqtpl: optionalPeerDep, + hamljs: optionalPeerDep, + hamlet: optionalPeerDep, + whiskers: optionalPeerDep, + 'haml-coffee': optionalPeerDep, + 'hogan.js': optionalPeerDep, + templayed: optionalPeerDep, + handlebars: optionalPeerDep, + underscore: optionalPeerDep, + lodash: optionalPeerDep, + pug: optionalPeerDep, + 'then-pug': optionalPeerDep, + qejs: optionalPeerDep, + walrus: optionalPeerDep, + mustache: optionalPeerDep, + just: optionalPeerDep, + ect: optionalPeerDep, + mote: optionalPeerDep, + toffee: optionalPeerDep, + dot: optionalPeerDep, + 'bracket-template': optionalPeerDep, + ractive: optionalPeerDep, + nunjucks: optionalPeerDep, + htmling: optionalPeerDep, + 'babel-core': optionalPeerDep, + plates: optionalPeerDep, + 'react-dom': optionalPeerDep, + react: optionalPeerDep, + 'arc-templates': optionalPeerDep, + vash: optionalPeerDep, + slm: optionalPeerDep, + marko: optionalPeerDep, + teacup: optionalPeerDep, + 'coffee-script': optionalPeerDep, + squirrelly: optionalPeerDep, + twing: optionalPeerDep, + }, + }], ]; From 24a5d5f963b5b9f1bc02f81ff6df77e18ed81157 Mon Sep 17 00:00:00 2001 From: merceyz Date: Fri, 16 Jul 2021 12:44:23 +0200 Subject: [PATCH 2/6] chore: `vue-loader` --- packages/plugin-compat/sources/extensions.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts index 9a8a1e6b3af5..f427bdf23bcc 100644 --- a/packages/plugin-compat/sources/extensions.ts +++ b/packages/plugin-compat/sources/extensions.ts @@ -497,4 +497,11 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ twing: optionalPeerDep, }, }], + // https://github.com/vuejs/vue-loader/pull/1853 + [`vue-loader@<=16.3.1`, { + peerDependencies: { + '@vue/compiler-sfc': `^3.0.8`, + webpack: `^4.1.0 || ^5.0.0-0`, + }, + }], ]; From 1dc90e08c1529c467ab69c598ddd62f939fbfaef Mon Sep 17 00:00:00 2001 From: merceyz Date: Sat, 17 Jul 2021 13:27:18 +0200 Subject: [PATCH 3/6] chore: `scss-parser` --- packages/plugin-compat/sources/extensions.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts index f427bdf23bcc..fa40c696ba90 100644 --- a/packages/plugin-compat/sources/extensions.ts +++ b/packages/plugin-compat/sources/extensions.ts @@ -504,4 +504,10 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ webpack: `^4.1.0 || ^5.0.0-0`, }, }], + // https://github.com/salesforce-ux/scss-parser/pull/43 + [`scss-parser@*`, { + dependencies: { + lodash: `^4.17.21`, + }, + }], ]; From 437e66b06477f73755d73c1587753f998d0af4a5 Mon Sep 17 00:00:00 2001 From: merceyz Date: Sat, 17 Jul 2021 13:27:34 +0200 Subject: [PATCH 4/6] chore: `query-ast` --- packages/plugin-compat/sources/extensions.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts index fa40c696ba90..7e3e0c94eb04 100644 --- a/packages/plugin-compat/sources/extensions.ts +++ b/packages/plugin-compat/sources/extensions.ts @@ -510,4 +510,10 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ lodash: `^4.17.21`, }, }], + // https://github.com/salesforce-ux/query-ast/pull/25 + [`query-ast@*`, { + dependencies: { + lodash: `^4.17.21`, + }, + }], ]; From 4c588cdf4229306c05592f2d1bb5aaeb8a25011f Mon Sep 17 00:00:00 2001 From: merceyz Date: Wed, 21 Jul 2021 18:58:41 +0200 Subject: [PATCH 5/6] chore: `redux-thunk` --- .pnp.cjs | 15 ++++++++++++++- packages/plugin-compat/sources/extensions.ts | 6 ++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.pnp.cjs b/.pnp.cjs index c864686ebf47..f39ee134d555 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -22774,7 +22774,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react-dom", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:16.13.1"], ["react-refresh", "npm:0.9.0"], ["redux", "npm:4.0.5"], - ["redux-thunk", "npm:2.3.0"], + ["redux-thunk", "virtual:78f3bf7278f4bac65cbd3baf644c2df17790df54e299132162a4a0a2ae9c7adf085da011de2975cd7cd97fb7740d36c9e15ad529bceb0dbcce00d8be63c20e21#npm:2.3.0"], ["resolve-from", "npm:5.0.0"], ["semver", "npm:7.3.5"], ["shallow-compare", "npm:1.2.2"], @@ -34363,6 +34363,19 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [ ["redux-thunk", "npm:2.3.0"] ], + "linkType": "SOFT", + }], + ["virtual:78f3bf7278f4bac65cbd3baf644c2df17790df54e299132162a4a0a2ae9c7adf085da011de2975cd7cd97fb7740d36c9e15ad529bceb0dbcce00d8be63c20e21#npm:2.3.0", { + "packageLocation": "./.yarn/__virtual__/redux-thunk-virtual-9b794780ca/0/cache/redux-thunk-npm-2.3.0-a5eb89e35e-d13f442ffc.zip/node_modules/redux-thunk/", + "packageDependencies": [ + ["redux-thunk", "virtual:78f3bf7278f4bac65cbd3baf644c2df17790df54e299132162a4a0a2ae9c7adf085da011de2975cd7cd97fb7740d36c9e15ad529bceb0dbcce00d8be63c20e21#npm:2.3.0"], + ["@types/redux", null], + ["redux", "npm:4.0.5"] + ], + "packagePeers": [ + "@types/redux", + "redux" + ], "linkType": "HARD", }] ]], diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts index 7e3e0c94eb04..f5712018c507 100644 --- a/packages/plugin-compat/sources/extensions.ts +++ b/packages/plugin-compat/sources/extensions.ts @@ -516,4 +516,10 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ lodash: `^4.17.21`, }, }], + // https://github.com/reduxjs/redux-thunk/pull/251 + [`redux-thunk@<=2.3.0`, { + peerDependencies: { + redux: `^4.0.0`, + }, + }], ]; From 502ad9f9d769eaa6ebf36ee6945a9ece35f4c7ab Mon Sep 17 00:00:00 2001 From: merceyz Date: Wed, 21 Jul 2021 19:04:41 +0200 Subject: [PATCH 6/6] chore: versions --- .yarn/versions/d4876b7b.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .yarn/versions/d4876b7b.yml diff --git a/.yarn/versions/d4876b7b.yml b/.yarn/versions/d4876b7b.yml new file mode 100644 index 000000000000..89b7f1c8abe7 --- /dev/null +++ b/.yarn/versions/d4876b7b.yml @@ -0,0 +1,22 @@ +releases: + "@yarnpkg/cli": patch + "@yarnpkg/plugin-compat": patch + +declined: + - "@yarnpkg/plugin-constraints" + - "@yarnpkg/plugin-dlx" + - "@yarnpkg/plugin-essentials" + - "@yarnpkg/plugin-init" + - "@yarnpkg/plugin-interactive-tools" + - "@yarnpkg/plugin-nm" + - "@yarnpkg/plugin-npm-cli" + - "@yarnpkg/plugin-pack" + - "@yarnpkg/plugin-patch" + - "@yarnpkg/plugin-pnp" + - "@yarnpkg/plugin-stage" + - "@yarnpkg/plugin-typescript" + - "@yarnpkg/plugin-version" + - "@yarnpkg/plugin-workspace-tools" + - "@yarnpkg/builder" + - "@yarnpkg/core" + - "@yarnpkg/doctor"