From 9ec5ba64314dac448fb47a8b72f7631a867c8ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Maisse?= Date: Mon, 15 Feb 2021 21:19:03 +0100 Subject: [PATCH 1/2] fix(component): add missing `regenerator-runtime` dependency --- lib/components/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/components/package.json b/lib/components/package.json index b4fea16b1eba..8d9cbd6d8464 100644 --- a/lib/components/package.json +++ b/lib/components/package.json @@ -55,6 +55,7 @@ "react-popper-tooltip": "^3.1.1", "react-syntax-highlighter": "^13.5.3", "react-textarea-autosize": "^8.3.0", + "regenerator-runtime": "^0.13.7", "ts-dedent": "^2.0.0" }, "devDependencies": { From 9a5933b49a76a249f1bc21f58fb2c1ffb594f53a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Maisse?= Date: Mon, 15 Feb 2021 21:20:09 +0100 Subject: [PATCH 2/2] e2e: fix a typo currently preventing us to run Yarn 2 PnP test in the CI --- scripts/run-e2e.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/run-e2e.ts b/scripts/run-e2e.ts index 307d5bc25144..29e4f1c225ff 100644 --- a/scripts/run-e2e.ts +++ b/scripts/run-e2e.ts @@ -71,7 +71,7 @@ const cleanDirectory = async ({ cwd }: Options): Promise => { await remove(cwd); await remove(path.join(siblingDir, 'node_modules')); - if (useYarn2PnP) { + if (useYarn2Pnp) { await shell.rm('-rf', [path.join(siblingDir, '.yarn'), path.join(siblingDir, '.yarnrc.yml')]); } }; @@ -103,7 +103,7 @@ const configureYarn2PnP = async ({ cwd }: Options) => { const generate = async ({ cwd, name, version, generator }: Options) => { let command = generator.replace(/{{name}}/g, name).replace(/{{version}}/g, version); - if (useYarn2PnP) { + if (useYarn2Pnp) { command = command.replace(/npx/g, `yarn dlx`); } @@ -226,7 +226,7 @@ const runTests = async ({ name, version, ...rest }: Parameters) => { logger.log(); if (!(await prepareDirectory(options))) { - if (useYarn2PnP) { + if (useYarn2Pnp) { await configureYarn2PnP({ ...options, cwd: siblingDir }); } @@ -322,7 +322,7 @@ program.option( program.parse(process.argv); const { - useYarn2PnP, + useYarn2Pnp, useLocalSbCli, clean: startWithCleanSlate, args: frameworkArgs,