From 73ce4998630fb63fd1d4459b5b3f13bba99888d3 Mon Sep 17 00:00:00 2001 From: Laura Ceconi Date: Tue, 28 Feb 2023 18:53:03 +0100 Subject: [PATCH 1/3] Fix: add require entry in package.json --- packages/mermaid/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json index b20a8e6eb..64eff3f09 100644 --- a/packages/mermaid/package.json +++ b/packages/mermaid/package.json @@ -7,6 +7,7 @@ "types": "./dist/mermaid.d.ts", "exports": { ".": { + "require": "./dist/mermaid.esm.mjs", "types": "./dist/mermaid.d.ts", "import": "./dist/mermaid.core.mjs" }, From 8f0cb695e7c700c64b922f675fdfc77635896058 Mon Sep 17 00:00:00 2001 From: Laura Ceconi Date: Mon, 6 Mar 2023 12:15:22 +0100 Subject: [PATCH 2/3] chore: add default entry to exports --- packages/mermaid/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json index 64eff3f09..65bc49615 100644 --- a/packages/mermaid/package.json +++ b/packages/mermaid/package.json @@ -7,9 +7,9 @@ "types": "./dist/mermaid.d.ts", "exports": { ".": { - "require": "./dist/mermaid.esm.mjs", "types": "./dist/mermaid.d.ts", - "import": "./dist/mermaid.core.mjs" + "import": "./dist/mermaid.core.mjs", + "default": "./dist/mermaid.core.mjs" }, "./*": "./*" }, From f0a73696f532c193627c2d207c5177e641fb2e28 Mon Sep 17 00:00:00 2001 From: Alois Klink Date: Mon, 6 Mar 2023 22:57:22 +0000 Subject: [PATCH 3/3] ci(e2e): skip caching in actions/setup-node Skip caching `pnpm` in `actions/setup-node`, because the `cypress-io/github-action` natively supports caching `pnpm`, as of [cypress-io/github-action@v4.2.0][1]. [1]: https://github.com/cypress-io/github-action/releases/tag/v4.2.0 --- .github/workflows/e2e.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index aff5852db..f877ca265 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -21,11 +21,7 @@ jobs: - name: Setup Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 - # Need to skip setup if Cypress run is skipped, otherwise an error - # is thrown since the pnpm cache step fails - if: ${{ ( env.CYPRESS_RECORD_KEY != '' ) || ( matrix.containers == 1 ) }} with: - cache: pnpm node-version: ${{ matrix.node-version }} # Install NPM dependencies, cache them correctly