Skip to content

Commit 4033a1b

Browse files
authored
ci: enable PnP ESM loader in all e2e tests (#4088)
1 parent 0574a11 commit 4033a1b

File tree

5 files changed

+2
-25
lines changed

5 files changed

+2
-25
lines changed

.github/actions/prepare/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ runs:
33
steps:
44
- uses: actions/setup-node@master
55
with:
6-
node-version: 14.x
6+
node-version: 16.x
7+
check-latest: true
78

89
#region Build the standard bundle
910
- uses: actions/cache@v2

.github/workflows/e2e-docusaurus-workflow.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,12 @@ jobs:
2424
- name: 'Running the integration test'
2525
run: |
2626
source scripts/e2e-setup-ci.sh
27-
28-
# TODO: Remove once https://github.com/yarnpkg/berry/blob/bd146ccddf95aae9c99c0c48d86b1d8997f1dccf/scripts/e2e-setup-ci.sh#L31-L38 is fixed
29-
YARN_PNP_ENABLE_ESM_LOADER=true
30-
3127
yarn dlx create-docusaurus@latest my-website classic && cd my-website
3228
yarn build
3329
3430
- name: 'Running the TypeScript integration test'
3531
run: |
3632
source scripts/e2e-setup-ci.sh
37-
38-
# TODO: Remove once https://github.com/yarnpkg/berry/blob/bd146ccddf95aae9c99c0c48d86b1d8997f1dccf/scripts/e2e-setup-ci.sh#L31-L38 is fixed
39-
YARN_PNP_ENABLE_ESM_LOADER=true
40-
4133
yarn dlx create-docusaurus@latest my-website-ts classic --typescript && cd my-website-ts
4234
yarn build
4335
if: |

.github/workflows/e2e-pnp-angular-workflow.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ jobs:
2525
run: |
2626
source scripts/e2e-setup-ci.sh
2727
28-
# TODO: Remove once https://github.com/yarnpkg/berry/blob/bd146ccddf95aae9c99c0c48d86b1d8997f1dccf/scripts/e2e-setup-ci.sh#L31-L38 is fixed
29-
YARN_PNP_ENABLE_ESM_LOADER=true
30-
3128
# TODO: Angular should be fixed to detect the correct package manager to install with
3229
# but for now we need to specify it
3330
yarn dlx -p @angular/cli@next ng new berry-angular --interactive=false --package-manager yarn

.github/workflows/e2e-svelte-kit-workflow.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ jobs:
2424
- name: 'Running the integration test'
2525
run: |
2626
source scripts/e2e-setup-ci.sh
27-
28-
# TODO: Remove once https://github.com/yarnpkg/berry/blob/bd146ccddf95aae9c99c0c48d86b1d8997f1dccf/scripts/e2e-setup-ci.sh#L31-L38 is fixed
29-
YARN_PNP_ENABLE_ESM_LOADER=true
30-
3127
yes | yarn create svelte@next my-app && cd my-app
3228
yarn
3329
yarn build

scripts/e2e-setup-ci.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,6 @@ export YARN_ENABLE_IMMUTABLE_INSTALLS=0
2828
# We want to make sure the projects work in a monorepo
2929
export YARN_PNP_FALLBACK_MODE=none
3030

31-
# TODO: Remove when either of these issues are fixed
32-
# - https://github.com/nodejs/node/issues/39140
33-
# - https://github.com/nodejs/node/issues/37782
34-
# - https://github.com/facebook/jest/issues/12060
35-
# Due to a bug in `jest-worker` and/or Node.js adding a loader
36-
# causes our e2e tests to time out so require the tests that needs it
37-
# to explicitly enable it
38-
export YARN_PNP_ENABLE_ESM_LOADER=false
39-
4031
# Otherwise git commit doesn't work, and some tools require it
4132
git config --global user.email "you@example.com"
4233
git config --global user.name "John Doe"

0 commit comments

Comments
 (0)