From 24d50b8b542fd80462cc473b092b1a095b9f27b5 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 25 Apr 2023 16:42:26 +0200 Subject: [PATCH 1/5] move instrumenter to devDependency to get it bundled in. --- package.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 5909df5..41d810e 100644 --- a/package.json +++ b/package.json @@ -6,38 +6,38 @@ "type": "git", "url": "https://github.com/storybookjs/jest.git" }, - "scripts": { - "build": "tsup ./src/index.ts --format cjs,esm --dts", - "prerelease": "yarn build", - "release": "auto shipit" - }, + "license": "MIT", + "author": "yannbf@gmail.com", "main": "./dist/index.js", "module": "./dist/index.,js", - "license": "MIT", + "types": "./dist/index.d.ts", "files": [ "dist/**/*" ], - "types": "./dist/index.d.ts", - "publishConfig": { - "access": "public" + "scripts": { + "build": "tsup ./src/index.ts --format cjs,esm --dts", + "prerelease": "yarn build", + "release": "auto shipit" }, "dependencies": { "@storybook/expect": "storybook-jest", - "@storybook/instrumenter": "future", "@testing-library/jest-dom": "^5.16.2", "jest-mock": "^27.3.0" }, "devDependencies": { "@auto-it/first-time-contributor": "^10.37.6", - "tsup": "^5.12.0", "@auto-it/released": "^10.37.6", + "@storybook/instrumenter": "future", "@storybook/linter-config": "^3.1.2", "@types/react": "*", "auto": "^10.37.6", "expect": "^27.3.1", + "tsup": "^5.12.0", "typescript": "^5.0.4" }, - "author": "yannbf@gmail.com", + "publishConfig": { + "access": "public" + }, "auto": { "prereleaseBranches": [ "next", From bab4fd4338b646476ed34555c018c81a779f3007 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 28 Apr 2023 10:15:13 +0200 Subject: [PATCH 2/5] make improvements to bundling --- package.json | 6 +++++- tsup.config.ts | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 tsup.config.ts diff --git a/package.json b/package.json index 41d810e..2f1c994 100644 --- a/package.json +++ b/package.json @@ -15,10 +15,11 @@ "dist/**/*" ], "scripts": { - "build": "tsup ./src/index.ts --format cjs,esm --dts", + "build": "tsup", "prerelease": "yarn build", "release": "auto shipit" }, + "sideEffects": false, "dependencies": { "@storybook/expect": "storybook-jest", "@testing-library/jest-dom": "^5.16.2", @@ -31,6 +32,9 @@ "@storybook/linter-config": "^3.1.2", "@types/react": "*", "auto": "^10.37.6", + "url": "^0.11.0", + "path": "^0.12.7", + "util": "^0.12.5", "expect": "^27.3.1", "tsup": "^5.12.0", "typescript": "^5.0.4" diff --git a/tsup.config.ts b/tsup.config.ts new file mode 100644 index 0000000..3dc1351 --- /dev/null +++ b/tsup.config.ts @@ -0,0 +1,39 @@ +import { defineConfig } from 'tsup'; + +export default defineConfig([ + { + entry: ['./src/index.ts'], + format: ['cjs'], + esbuildOptions(options, context) { + Object.assign(options, { + platform: 'browser', + logLevel: 'error', + legalComments: 'none', + minifyWhitespace: false, + minifyIdentifiers: false, + minifySyntax: true, + }) + }, + shims: false, + + }, + { + entry: ['./src/index.ts'], + format: ['esm'], + dts: { + entry: ['./src/index.ts'], + resolve: true, + }, + esbuildOptions(options, context) { + Object.assign(options, { + platform: 'browser', + logLevel: 'error', + legalComments: 'none', + minifyWhitespace: false, + minifyIdentifiers: false, + minifySyntax: true, + }) + }, + shims: false, + }, +]); From e23754efeed2ddb99b7c55883a7b34cb796b09d3 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 28 Apr 2023 10:28:01 +0200 Subject: [PATCH 3/5] cleanup --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index 6894a0d..85a1b24 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,6 @@ "@storybook/linter-config": "^3.1.2", "@types/react": "*", "auto": "^10.37.6", - "url": "^0.11.0", - "path": "^0.12.7", "util": "^0.12.5", "expect": "^27.3.1", "tsup": "^5.12.0", From 86f25691c954b9c50c08e5c4470de7f7fa9626a4 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 28 Apr 2023 10:43:34 +0200 Subject: [PATCH 4/5] cleanup ts config some more --- tsup.config.ts | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/tsup.config.ts b/tsup.config.ts index 3dc1351..d46ebef 100644 --- a/tsup.config.ts +++ b/tsup.config.ts @@ -1,9 +1,9 @@ import { defineConfig } from 'tsup'; -export default defineConfig([ +export default defineConfig( { entry: ['./src/index.ts'], - format: ['cjs'], + format: ['cjs', 'esm'], esbuildOptions(options, context) { Object.assign(options, { platform: 'browser', @@ -15,25 +15,9 @@ export default defineConfig([ }) }, shims: false, - - }, - { - entry: ['./src/index.ts'], - format: ['esm'], dts: { entry: ['./src/index.ts'], resolve: true, }, - esbuildOptions(options, context) { - Object.assign(options, { - platform: 'browser', - logLevel: 'error', - legalComments: 'none', - minifyWhitespace: false, - minifyIdentifiers: false, - minifySyntax: true, - }) - }, - shims: false, - }, -]); + } +); From 32edae4ca0481fbe67546c2b7a28e28f4000e549 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 28 Apr 2023 10:45:23 +0200 Subject: [PATCH 5/5] cleanup --- .github/workflows/linear-export.yml | 27 --------------------------- .github/workflows/release.yml | 4 ++-- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 .github/workflows/linear-export.yml diff --git a/.github/workflows/linear-export.yml b/.github/workflows/linear-export.yml deleted file mode 100644 index eb3efd3..0000000 --- a/.github/workflows/linear-export.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Export to linear - -on: - issues: - types: [labeled] - pull_request: - types: [labeled] - -jobs: - trigger: - if: github.event.label.name == 'linear' - name: Export to linear - runs-on: ubuntu-latest - steps: - # - uses: hmarr/debug-action@v2 - - name: Linear action - uses: shilman/linear-action@v1 - with: - ghIssueNumber: ${{ github.event.number || github.event.issue.number }} - ghRepoOwner: ${{ github.event.repository.owner.login }} - ghRepoName: ${{ github.event.repository.name }} - ghToken: ${{ secrets.LINEAR_GH_TOKEN }} - linearIssuePrefix: Jest - linearLabel: Storybook - linearPRLabel: PR - linearTeam: SB - linearApiKey: ${{ secrets.LINEAR_API_KEY }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd8a6d3..979ea42 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,10 +12,10 @@ jobs: - name: Prepare repository run: git fetch --unshallow --tags - - name: Use Node.js 14.x + - name: Use Node.js 16.x uses: actions/setup-node@v1 with: - node-version: 14.x + node-version: 16.x - name: Install dependencies run: yarn