Fixes some Git installs (yarnpkg#1405)

* Various fixes * Version * Refactors the configuration workflow * Updates versions * Updates versions * Fixes * Trimming escape codes doesnt actually work * Upgrades clipanion * Fixes yarn config * Fixes searchbox enter * Versions
7rulnik · May 29, 2020 · f7371b7 · f7371b7
1 parent a5b0620
commit f7371b7
Show file tree

Hide file tree

Showing 33 changed files with 274 additions and 169 deletions.
diff --git a/.pnp.js b/.pnp.js
diff --git a/.yarn/cache/clipanion-npm-2.1.5-aef0ebbd62-70279d4cb7.zip b/.yarn/cache/clipanion-npm-2.1.5-aef0ebbd62-70279d4cb7.zip
diff --git a/.yarn/cache/clipanion-npm-2.4.0-631d1a56dc-43030bb880.zip b/.yarn/cache/clipanion-npm-2.4.0-631d1a56dc-43030bb880.zip
diff --git a/.yarn/versions/7fb81f28.yml b/.yarn/versions/7fb81f28.yml
@@ -0,0 +1,32 @@
+releases:
+  "@yarnpkg/builder": prerelease
+  "@yarnpkg/cli": prerelease
+  "@yarnpkg/core": prerelease
+  "@yarnpkg/doctor": prerelease
+  "@yarnpkg/plugin-constraints": prerelease
+  "@yarnpkg/plugin-dlx": prerelease
+  "@yarnpkg/plugin-essentials": prerelease
+  "@yarnpkg/plugin-github": prerelease
+  "@yarnpkg/plugin-init": prerelease
+  "@yarnpkg/plugin-interactive-tools": prerelease
+  "@yarnpkg/plugin-node-modules": prerelease
+  "@yarnpkg/plugin-npm-cli": prerelease
+  "@yarnpkg/plugin-pack": prerelease
+  "@yarnpkg/plugin-patch": prerelease
+  "@yarnpkg/plugin-pnp": prerelease
+  "@yarnpkg/plugin-stage": prerelease
+  "@yarnpkg/plugin-version": prerelease
+  "@yarnpkg/plugin-workspace-tools": prerelease
+  "@yarnpkg/pnp": prerelease
+  "@yarnpkg/shell": prerelease
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-exec"
+  - "@yarnpkg/plugin-file"
+  - "@yarnpkg/plugin-git"
+  - "@yarnpkg/plugin-http"
+  - "@yarnpkg/plugin-link"
+  - "@yarnpkg/plugin-npm"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/pnpify"
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "@yarnpkg/eslint-config": "workspace:^0.0.0",
     "@yarnpkg/pnpify": "workspace:^2.0.0-rc.22",
     "babel-jest": "^24.5.0",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "eslint": "^6.8.0",
     "eslint-plugin-arca": "^0.9.0",
     "eslint-plugin-react": "^7.14.3",
@@ -44,6 +44,9 @@
     "core-js": {
       "built": false
     },
+    "core-js-pure": {
+      "built": false
+    },
     "date-fns": {
       "built": false
     },

diff --git a/packages/gatsby/src/components/search/SearchBox.js b/packages/gatsby/src/components/search/SearchBox.js
@@ -83,7 +83,7 @@ const RawSearchBox = ({currentRefinement, refine, autoFocus}) => {
     e.preventDefault();
     e.stopPropagation();
 
-    navigate(`/package?${currentRefinement}`);
+    navigate(`/package/${currentRefinement}`);
   };
 
   return (
@@ -106,7 +106,7 @@ const RawSearchBox = ({currentRefinement, refine, autoFocus}) => {
         size="1"
       />
       <SubmitButton type="submit" title="Submit your search query."><IoIosSearch/></SubmitButton>
-      <ResetButton type="reset" title="Clear the search query." onClick={() => refine('')}><IoIosClose/></ResetButton>
+      <ResetButton type="reset" title="Clear the search query." onClick={() => refine(``)}><IoIosClose/></ResetButton>
     </SearchForm>
   );
 };

diff --git a/packages/plugin-constraints/package.json b/packages/plugin-constraints/package.json
@@ -9,7 +9,7 @@
   "main": "./sources/index.ts",
   "dependencies": {
     "@yarnpkg/fslib": "workspace:^2.0.0-rc.20",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "inquirer": "^6.2.0",
     "lodash": "^4.17.15",
     "node-emoji": "^1.8.1",

diff --git a/packages/plugin-dlx/package.json b/packages/plugin-dlx/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "@yarnpkg/fslib": "workspace:^2.0.0-rc.20",
     "@yarnpkg/json-proxy": "workspace:^2.0.0-rc.7",
-    "clipanion": "^2.1.5"
+    "clipanion": "^2.4.0"
   },
   "peerDependencies": {
     "@yarnpkg/cli": "^2.0.0-rc.33",

diff --git a/packages/plugin-essentials/package.json b/packages/plugin-essentials/package.json
@@ -7,7 +7,7 @@
     "@yarnpkg/fslib": "workspace:^2.0.0-rc.20",
     "@yarnpkg/json-proxy": "workspace:^2.0.0-rc.7",
     "@yarnpkg/parsers": "workspace:^2.0.0-rc.11",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "inquirer": "^6.2.0",
     "lodash": "^4.17.15",
     "semver": "^7.1.2",

diff --git a/packages/plugin-github/sources/index.ts b/packages/plugin-github/sources/index.ts
@@ -16,7 +16,6 @@ const plugin: Plugin<GitHooks> = {
       try {
         return await fetcher.fetch(locator, opts);
       } catch (error) {
-        console.log(error);
         return null;
       }
     },

diff --git a/packages/plugin-init/package.json b/packages/plugin-init/package.json
@@ -5,7 +5,7 @@
   "main": "./sources/index.ts",
   "dependencies": {
     "@yarnpkg/fslib": "workspace:^2.0.0-rc.20",
-    "clipanion": "^2.1.5"
+    "clipanion": "^2.4.0"
   },
   "peerDependencies": {
     "@yarnpkg/cli": "^2.0.0-rc.33",

diff --git a/packages/plugin-interactive-tools/package.json b/packages/plugin-interactive-tools/package.json
@@ -5,7 +5,7 @@
   "main": "./sources/index.ts",
   "dependencies": {
     "@yarnpkg/libui": "workspace:^2.0.0-rc.7",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "diff": "^4.0.1",
     "ink": "^2.3.0",
     "react": "^16.13.1",

diff --git a/packages/plugin-node-modules/package.json b/packages/plugin-node-modules/package.json
@@ -10,7 +10,7 @@
     "@yarnpkg/pnp": "workspace:^2.0.0-rc.20",
     "@yarnpkg/pnpify": "workspace:^2.0.0-rc.22",
     "@zkochan/cmd-shim": "^4.3.0",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "micromatch": "^4.0.2"
   },
   "peerDependencies": {

diff --git a/packages/plugin-npm-cli/package.json b/packages/plugin-npm-cli/package.json
@@ -5,7 +5,7 @@
   "main": "./sources/index.ts",
   "dependencies": {
     "@yarnpkg/fslib": "workspace:^2.0.0-rc.20",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "inquirer": "^6.2.0",
     "semver": "^7.1.2",
     "ssri": "^6.0.1",

diff --git a/packages/plugin-pack/package.json b/packages/plugin-pack/package.json
@@ -5,7 +5,7 @@
   "main": "./sources/index.ts",
   "dependencies": {
     "@yarnpkg/fslib": "workspace:^2.0.0-rc.20",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "micromatch": "^4.0.2",
     "tar-stream": "^2.0.1"
   },

diff --git a/packages/plugin-patch/package.json b/packages/plugin-patch/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "@yarnpkg/fslib": "workspace:^2.0.0-rc.20",
     "@yarnpkg/libzip": "workspace:^2.0.0-rc.11",
-    "clipanion": "^2.1.5"
+    "clipanion": "^2.4.0"
   },
   "peerDependencies": {
     "@yarnpkg/cli": "^2.0.0-rc.33",

diff --git a/packages/plugin-pnp/package.json b/packages/plugin-pnp/package.json
@@ -8,7 +8,7 @@
     "@yarnpkg/fslib": "workspace:^2.0.0-rc.20",
     "@yarnpkg/plugin-stage": "workspace:^2.0.0-rc.15",
     "@yarnpkg/pnp": "workspace:^2.0.0-rc.20",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "semver": "^7.1.2"
   },
   "peerDependencies": {

diff --git a/packages/plugin-stage/package.json b/packages/plugin-stage/package.json
@@ -5,7 +5,7 @@
   "main": "./sources/index.ts",
   "dependencies": {
     "@yarnpkg/fslib": "workspace:^2.0.0-rc.20",
-    "clipanion": "^2.1.5"
+    "clipanion": "^2.4.0"
   },
   "peerDependencies": {
     "@yarnpkg/cli": "^2.0.0-rc.33",

diff --git a/packages/plugin-version/package.json b/packages/plugin-version/package.json
@@ -7,7 +7,7 @@
     "@yarnpkg/fslib": "workspace:^2.0.0-rc.20",
     "@yarnpkg/libui": "workspace:^2.0.0-rc.7",
     "@yarnpkg/parsers": "workspace:^2.0.0-rc.11",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "ink": "^2.3.0",
     "react": "^16.13.1",
     "semver": "^7.1.2",

diff --git a/packages/plugin-version/sources/commands/version/check.tsx b/packages/plugin-version/sources/commands/version/check.tsx
@@ -114,9 +114,9 @@ export default class VersionApplyCommand extends Command<CommandContext> {
         <Box>
           {strategies.map(strategy => {
             if (strategy === decision) {
-              return <Box key={strategy} paddingLeft={2}><Color green>◉</Color> {strategy}</Box>;
+              return <Box key={strategy} paddingLeft={2}><Color green>◉ </Color> {strategy} </Box>;
             } else {
-              return <Box key={strategy} paddingLeft={2}><Color yellow>◯</Color> {strategy}</Box>;
+              return <Box key={strategy} paddingLeft={2}><Color yellow>◯ </Color> {strategy} </Box>;
             }
           })}
         </Box>

diff --git a/packages/plugin-workspace-tools/package.json b/packages/plugin-workspace-tools/package.json
@@ -5,7 +5,7 @@
   "main": "./sources/index.ts",
   "dependencies": {
     "@yarnpkg/fslib": "workspace:^2.0.0-rc.20",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "p-limit": "^2.2.0",
     "yup": "^0.27.0"
   },

diff --git a/packages/yarnpkg-builder/package.json b/packages/yarnpkg-builder/package.json
@@ -14,7 +14,7 @@
     "babel-loader": "^8.0.6",
     "babel-plugin-lazy-import": "arcanis/babel-plugin-lazy-import",
     "chalk": "^3.0.0",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "filesize": "^4.1.2",
     "pnp-webpack-plugin": "^1.4.3",
     "semver": "^7.1.2",

diff --git a/packages/yarnpkg-builder/sources/commands/build/bundle.ts b/packages/yarnpkg-builder/sources/commands/build/bundle.ts
@@ -51,7 +51,8 @@ export default class BuildBundleCommand extends Command {
   async execute() {
     const basedir = process.cwd();
     const portableBaseDir = npath.toPortablePath(basedir);
-    const configuration = new Configuration(portableBaseDir, portableBaseDir, new Map());
+
+    const configuration = Configuration.create(portableBaseDir);
 
     const plugins = findPlugins({basedir, profile: this.profile, plugins: this.plugins.map(plugin => path.resolve(plugin))});
     const modules = [...getDynamicLibs().keys()].concat(plugins);

diff --git a/packages/yarnpkg-builder/sources/commands/build/plugin.ts b/packages/yarnpkg-builder/sources/commands/build/plugin.ts
@@ -36,7 +36,7 @@ export default class BuildPluginCommand extends Command {
   async execute() {
     const basedir = process.cwd();
     const portableBaseDir = npath.toPortablePath(basedir);
-    const configuration = new Configuration(portableBaseDir, portableBaseDir, new Map());
+    const configuration = Configuration.create(portableBaseDir);
 
     const {name: rawName} = require(`${basedir}/package.json`);
     const name = getNormalizedName(rawName);

diff --git a/packages/yarnpkg-cli/package.json b/packages/yarnpkg-cli/package.json
@@ -25,7 +25,7 @@
     "@yarnpkg/plugin-pnp": "workspace:^2.0.0-rc.21",
     "@yarnpkg/shell": "workspace:^2.0.0-rc.11",
     "chalk": "^3.0.0",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "fromentries": "^1.2.0",
     "semver": "^7.1.2",
     "yup": "^0.27.0"

diff --git a/packages/yarnpkg-cli/sources/main.ts b/packages/yarnpkg-cli/sources/main.ts
@@ -57,6 +57,7 @@ export async function main({binaryVersion, pluginConfiguration}: {binaryVersion:
     // Since we only care about a few very specific settings (yarn-path and ignore-path) we tolerate extra configuration key.
     // If we didn't, we wouldn't even be able to run `yarn config` (which is recommended in the invalid config error message)
     const configuration = await Configuration.find(npath.toPortablePath(process.cwd()), pluginConfiguration, {
+      usePath: true,
       strict: false,
     });
 

diff --git a/packages/yarnpkg-core/package.json b/packages/yarnpkg-core/package.json
@@ -13,7 +13,7 @@
     "@yarnpkg/shell": "workspace:^2.0.0-rc.11",
     "camelcase": "^5.3.1",
     "chalk": "^3.0.0",
-    "clipanion": "^2.1.5",
+    "clipanion": "^2.4.0",
     "cross-spawn": "7.0.3",
     "diff": "^4.0.1",
     "globby": "^10.0.1",