From ff49ddf560bd9513993ade12d824d88f46b56a26 Mon Sep 17 00:00:00 2001 From: merceyz Date: Sat, 15 Jan 2022 22:16:30 +0100 Subject: [PATCH 1/2] ci: fix the `create-react-app` e2e test --- .github/workflows/e2e-cra-workflow.yml | 13 +++++++++++-- .github/workflows/e2e-storybook-workflow.yml | 8 +++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-cra-workflow.yml b/.github/workflows/e2e-cra-workflow.yml index ce44471eed5c..176dbfb0b070 100644 --- a/.github/workflows/e2e-cra-workflow.yml +++ b/.github/workflows/e2e-cra-workflow.yml @@ -25,14 +25,23 @@ jobs: run: | source scripts/e2e-setup-ci.sh yarn dlx create-react-app my-cra && cd my-cra - yarn add -D eslint-config-react-app + + # TODO: Remove when create-react-app fixes their ESLint setup + yarn add -D eslint-config-react-app eslint + yarn build - name: 'Running the TypeScript integration test' run: | source scripts/e2e-setup-ci.sh yarn dlx create-react-app my-cra-ts --template typescript && cd my-cra-ts - yarn add -D eslint-config-react-app + + # TODO: Remove when create-react-app fixes their ESLint setup + yarn add -D eslint-config-react-app eslint + + # TODO: Remove when https://github.com/facebook/create-react-app/pull/11751 is released + yarn add -D @types/testing-library__jest-dom + yarn build if: | always() diff --git a/.github/workflows/e2e-storybook-workflow.yml b/.github/workflows/e2e-storybook-workflow.yml index 36a2177bd252..61879a1de7dc 100644 --- a/.github/workflows/e2e-storybook-workflow.yml +++ b/.github/workflows/e2e-storybook-workflow.yml @@ -26,7 +26,13 @@ jobs: run: | source scripts/e2e-setup-ci.sh yarn dlx create-react-app my-cra && cd my-cra - yarn add -D eslint-config-react-app + + # TODO: Remove when https://github.com/webpack-contrib/mini-css-extract-plugin/issues/896 is fixed + yarn set resolution mini-css-extract-plugin@npm:^2.4.5 2.4.5 + + # TODO: Remove when create-react-app fixes their ESLint setup + yarn add -D eslint-config-react-app eslint + yarn dlx -p @storybook/cli@next sb init --yes yarn build-storybook From a6586d8556326d967249ffb8ca5170dce5eca488 Mon Sep 17 00:00:00 2001 From: merceyz Date: Thu, 20 Jan 2022 12:06:15 +0100 Subject: [PATCH 2/2] chore: remove resolution from storybook e2e --- .github/workflows/e2e-storybook-workflow.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/e2e-storybook-workflow.yml b/.github/workflows/e2e-storybook-workflow.yml index 61879a1de7dc..08536de05d9b 100644 --- a/.github/workflows/e2e-storybook-workflow.yml +++ b/.github/workflows/e2e-storybook-workflow.yml @@ -27,9 +27,6 @@ jobs: source scripts/e2e-setup-ci.sh yarn dlx create-react-app my-cra && cd my-cra - # TODO: Remove when https://github.com/webpack-contrib/mini-css-extract-plugin/issues/896 is fixed - yarn set resolution mini-css-extract-plugin@npm:^2.4.5 2.4.5 - # TODO: Remove when create-react-app fixes their ESLint setup yarn add -D eslint-config-react-app eslint