DX-1264: Unify exports (#1290)

ytkimirti · CahidArda · web-flow · commit 45ed7249a954 · 2024-10-04T11:13:51.000+03:00
* chore: move to new build pipeline

* fix: turn all example versions to "latest"

* fix: remove unneccesary install step before doing bun add

* fix: add 10s sleep after workflow publish

* fix: use copying into dist folder instead

* fix: ci

* fix: ci

* fix: change canary release tag from next to canary

* fix: update redis dependency as latest

* chore: remove export fields that are not required

We can remove these two because the files they were referencing did not
exist in the older versions. So this is not a breaking change

* fix: husky warning

* fix: revert deleting prepare script before publishing

---------

Co-authored-by: CahidArda &lt;cahidardaooz@hotmail.com&gt;
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -54,4 +54,4 @@ jobs:
         working-directory: ./dist
         run: |
           npm pkg delete scripts.prepare
-          npm publish --access public --tag=next
+          npm publish --access public --tag=canary
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -58,9 +58,7 @@ jobs:
         run: bun run build
 
       - name: Install example
-        run: |
-          bun install
-          bun add @upstash/redis@../../dist
+        run: bun add @upstash/redis@../../dist
         working-directory: ./examples/vercel-functions-app-router
 
       - name: Build example
@@ -100,9 +98,7 @@ jobs:
         run: bun run build
 
       - name: Install example
-        run: |
-          bun install
-          bun add @upstash/redis@../../dist
+        run: bun add @upstash/redis@../../dist
         working-directory: ./examples/vercel-functions-pages-router
 
       - name: Build example
@@ -255,7 +251,6 @@ jobs:
 
       - name: Install example
         run: |
-          bun install
           bun add @upstash/redis@../../dist
           npm install -g wrangler
         working-directory: examples/cloudflare-workers
@@ -348,7 +343,6 @@ jobs:
 
       - name: Install example
         run: |
-          bun install
           bun add @upstash/redis@../../dist
           npm install -g wrangler
 
@@ -449,7 +443,6 @@ jobs:
       - name: Install example
         working-directory: ./examples/fastly
         run: |
-          bun install
           bun add @upstash/redis@../../dist
           curl -L https://github.com/fastly/cli/releases/download/v1.7.0/fastly_v1.7.0_linux-amd64.tar.gz > fastly.tar.gz
           tar -xf ./fastly.tar.gz
@@ -613,3 +606,7 @@ jobs:
         run: |
           npm pkg delete scripts.prepare
           npm publish --tag=ci --verbose
+
+      - name: Sleep for 10s
+        run: sleep 10s
+        shell: bash
diff --git a/examples/auto-pipeline/package.json b/examples/auto-pipeline/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@upstash/redis": "^1.30.1",
+    "@upstash/redis": "latest",
     "next": "14.2.3",
     "react": "^18",
     "react-dom": "^18"
diff --git a/examples/aws-cdk-typescript/package-lock.json b/examples/aws-cdk-typescript/package-lock.json
diff --git a/examples/aws-cdk-typescript/package.json b/examples/aws-cdk-typescript/package.json
@@ -20,7 +20,7 @@
     "typescript": "~5.4.5"
   },
   "dependencies": {
-    "@upstash/redis": "^1.33.0",
+    "@upstash/redis": "latest",
     "aws-cdk-lib": "2.147.2",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"
diff --git a/examples/aws-lambda/package-lock.json b/examples/aws-lambda/package-lock.json
diff --git a/examples/aws-lambda/package.json b/examples/aws-lambda/package.json
@@ -1,6 +1,6 @@
 {
     "dependencies": {
-      "@upstash/redis": "^1.31.6"
+      "@upstash/redis": "latest"
     }
   }
   
diff --git a/examples/azure-functions/package-lock.json b/examples/azure-functions/package-lock.json
diff --git a/examples/azure-functions/package.json b/examples/azure-functions/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@azure/functions": "^4.0.0",
-    "@upstash/redis": "^1.34.0"
+    "@upstash/redis": "latest"
   },
   "devDependencies": {
     "@types/node": "18.x",
diff --git a/examples/cloudflare-workers-with-typescript/package.json b/examples/cloudflare-workers-with-typescript/package.json
@@ -12,6 +12,6 @@
     "publish": "wrangler publish"
   },
   "dependencies": {
-    "@upstash/redis": "../../dist"
+    "@upstash/redis": "latest"
   }
 }
diff --git a/examples/cloudflare-workers/bun.lockb b/examples/cloudflare-workers/bun.lockb
diff --git a/examples/fastly/package.json b/examples/fastly/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@fastly/js-compute": "^0.5.5",
-    "@upstash/redis": "../../dist",
+    "@upstash/redis": "latest",
     "flight-path": "^1.0.10"
   },
   "scripts": {
diff --git a/examples/google-cloud-functions/package.json b/examples/google-cloud-functions/package.json
@@ -1,7 +1,7 @@
 {
     "dependencies": {
       "@google-cloud/functions-framework": "^3.0.0",
-      "@upstash/redis": "^1.31.6"
+      "@upstash/redis": "latest"
     }
   }
   
diff --git a/examples/ion/package-lock.json b/examples/ion/package-lock.json
diff --git a/examples/ion/package.json b/examples/ion/package.json
@@ -9,7 +9,7 @@
     "start": "next start"
   },
   "dependencies": {
-    "@upstash/redis": "^1.34.0",
+    "@upstash/redis": "latest",
     "next": "14.2.5",
     "react": "^18",
     "react-dom": "^18",
diff --git a/examples/nextjs-app-router/package.json b/examples/nextjs-app-router/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@upstash/redis": "^1.33.0",
+    "@upstash/redis": "latest",
     "next": "14.2.5",
     "react": "^18",
     "react-dom": "^18"
diff --git a/examples/nextjs-pages-router/package.json b/examples/nextjs-pages-router/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@upstash/redis": "^1.33.0",
+    "@upstash/redis": "latest",
     "next": "14.2.5",
     "react": "^18",
     "react-dom": "^18"
diff --git a/examples/nodejs/package.json b/examples/nodejs/package.json
@@ -5,6 +5,6 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@upstash/redis": "^1.33.0"
+    "@upstash/redis": "latest"
   }
 }
diff --git a/examples/serverless-framework/counter/package-lock.json b/examples/serverless-framework/counter/package-lock.json
diff --git a/examples/serverless-framework/counter/package.json b/examples/serverless-framework/counter/package.json
@@ -1,6 +1,6 @@
 {
     "dependencies": {
-      "@upstash/redis": "^1.31.6"
+      "@upstash/redis": "latest"
     }
   }
   
diff --git a/examples/sst-v2/package.json b/examples/sst-v2/package.json
@@ -22,6 +22,6 @@
     "packages/*"
   ],
   "dependencies": {
-    "@upstash/redis": "^1.34.0"
+    "@upstash/redis": "latest"
   }
 }
diff --git a/examples/terraform/counter/package.json b/examples/terraform/counter/package.json
@@ -1,6 +1,6 @@
 {
     "dependencies": {
-      "@upstash/redis": "^1.31.6"
+      "@upstash/redis": "latest"
     }
   }
   
diff --git a/examples/vercel-functions-app-router/package.json b/examples/vercel-functions-app-router/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@upstash/redis": "^1.33.0",
+    "@upstash/redis": "latest",
     "next": "14.2.5",
     "react": "^18",
     "react-dom": "^18"
diff --git a/examples/vercel-functions-pages-router/package.json b/examples/vercel-functions-pages-router/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@upstash/redis": "^1.33.0",
+    "@upstash/redis": "latest",
     "next": "14.2.5",
     "react": "^18",
     "react-dom": "^18"
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "1.30.2",
   "main": "./nodejs.js",
   "module": "./nodejs.mjs",
+  "types": "./nodejs.d.ts",
   "exports": {
     ".": {
       "import": "./nodejs.mjs",
@@ -12,22 +13,31 @@
       "import": "./nodejs.mjs",
       "require": "./nodejs.js"
     },
-    "./node.js": "./node.js",
-    "./node.mjs": "./node.mjs",
     "./cloudflare": {
       "import": "./cloudflare.mjs",
       "require": "./cloudflare.js"
     },
-    "./cloudflare.js": "./cloudflare.js",
-    "./cloudflare.mjs": "./cloudflare.mjs",
+    "./cloudflare.js": {
+      "import": "./cloudflare.mjs",
+      "require": "./cloudflare.js"
+    },
+    "./cloudflare.mjs": {
+      "import": "./cloudflare.mjs",
+      "require": "./cloudflare.js"
+    },
     "./fastly": {
       "import": "./fastly.mjs",
       "require": "./fastly.js"
     },
-    "./fastly.js": "./fastly.js",
-    "./fastly.mjs": "./fastly.mjs"
+    "./fastly.js": {
+      "import": "./fastly.mjs",
+      "require": "./fastly.js"
+    },
+    "./fastly.mjs": {
+      "import": "./fastly.mjs",
+      "require": "./fastly.js"
+    }
   },
-  "types": "./nodejs.d.ts",
   "description": "An HTTP/REST based Redis client built on top of Upstash REST API.",
   "repository": {
     "type": "git",
@@ -41,39 +51,27 @@
     "upstash"
   ],
   "files": [
-    "./**"
+    "./*"
   ],
   "scripts": {
-    "build": "tsup && cp README.md ./dist/ && cp package.json ./dist/ && cp LICENSE ./dist/",
+    "build": "tsup && cp package.json README.md LICENSE dist/",
     "test": "bun test pkg",
     "fmt": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"",
-    "prepare": "husky install",
+    "prepare": "husky",
     "lint": "eslint \"**/*.{js,ts,tsx}\" --quiet --fix",
     "format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"",
     "format:check": "prettier --check \"**/*.{ts,tsx,js,jsx,json,md}\"",
     "lint:fix": "eslint . -c .ts,.tsx,.js,.jsx --fix",
     "commit": "cz",
-    "lint:format": "bun run lint:fix && bun run format"
+    "lint:format": "bun run lint:fix && bun run format",
+    "check-exports": "bun run build && cd dist && attw -P"
   },
   "author": "Andreas Thomas <dev@chronark.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/upstash/upstash-redis/issues"
   },
   "homepage": "https://github.com/upstash/upstash-redis#readme",
-  "typesVersions": {
-    "*": {
-      "nodejs": [
-        "./nodejs.d.ts"
-      ],
-      "cloudflare": [
-        "./cloudflare.d.ts"
-      ],
-      "fastly": [
-        "./fastly.d.ts"
-      ]
-    }
-  },
   "devDependencies": {
     "@biomejs/biome": "latest",
     "@commitlint/cli": "^19.3.0",
diff --git a/tsup.config.ts b/tsup.config.ts
@@ -3,11 +3,6 @@ import { defineConfig } from "tsup";
 export default defineConfig({
   entry: ["platforms/nodejs.ts", "platforms/cloudflare.ts", "platforms/fastly.ts"],
   format: ["cjs", "esm"],
-  splitting: true,
-  sourcemap: false,
   clean: true,
-  bundle: true,
   dts: true,
-  minify: true,
-  minifyWhitespace: true,
 });

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`		`- "@upstash/redis": "^1.31.6"`
	`3`	`+ "@upstash/redis": "latest"`
`4`	`4`	`}`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@`
`12`	`12`	`"publish": "wrangler publish"`
`13`	`13`	`},`
`14`	`14`	`"dependencies": {`
`15`		`- "@upstash/redis": "../../dist"`
	`15`	`+ "@upstash/redis": "latest"`
`16`	`16`	`}`
`17`	`17`	`}`