Upgrade dependencies

README.md

@@ -86,7 +86,7 @@ See [Throwback](https://github.com/serviejs/throwback#usage) for more informatio
 ```ts
 type Plugin = (
   req: Request,
-  next: () => Promise<Response>
+  next: () => Promise<Response>,
 ) => Promise<Response>;
 ```
 

package.json

@@ -2,29 +2,6 @@
   "name": "popsicle",
   "version": "12.1.0",
   "description": "Advanced HTTP requests in node.js and browsers",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist/",
-    "logo.svg"
-  ],
-  "browser": {
-    "./dist/node.js": "./dist/browser.js"
-  },
-  "scripts": {
-    "prettier": "prettier --write",
-    "lint": "tslint \"{.,src/**}/*.{js,jsx,ts,tsx}\" --project tsconfig.json",
-    "format": "npm run prettier -- \"{.,src/**}/*.{js,jsx,ts,tsx,md,yml,yaml}\"",
-    "build": "rimraf dist && tsc",
-    "specs": "jest --coverage",
-    "test": "npm run -s lint && npm run -s build && npm run -s specs && npm run -s size",
-    "prepare": "npm run build",
-    "size": "size-limit"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/serviejs/popsicle.git"
-  },
   "keywords": [
     "request",
     "http",
@@ -34,74 +11,67 @@
     "browser",
     "promise"
   ],
+  "homepage": "https://github.com/serviejs/popsicle",
+  "bugs": {
+    "url": "https://github.com/serviejs/popsicle/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/serviejs/popsicle.git"
+  },
+  "license": "MIT",
   "author": {
     "name": "Blake Embrey",
     "email": "[email protected]",
     "url": "http://blakeembrey.me"
   },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/serviejs/popsicle/issues"
-  },
-  "homepage": "https://github.com/serviejs/popsicle",
-  "jest": {
-    "roots": [
-      "<rootDir>/src/"
-    ],
-    "transform": {
-      "\\.tsx?$": "ts-jest"
-    },
-    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(tsx?|jsx?)$",
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js",
-      "jsx",
-      "json",
-      "node"
-    ]
+  "main": "dist/index.js",
+  "browser": {
+    "./dist/node.js": "./dist/browser.js"
   },
-  "size-limit": [
-    {
-      "path": "./dist/index.js",
-      "limit": "3.1 kB"
-    }
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist/",
+    "logo.svg"
   ],
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.{js,jsx,ts,tsx,json,css,md,yml,yaml}": "npm run prettier"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "devDependencies": {
-    "@size-limit/preset-small-lib": "^4.6.0",
-    "@types/jest": "^26.0.14",
-    "@types/node": "^14.11.5",
-    "husky": "^4.3.0",
-    "jest": "^26.5.2",
-    "lint-staged": "^10.4.0",
-    "prettier": "^2.1.2",
-    "rimraf": "^3.0.0",
-    "size-limit": "^4.6.0",
-    "ts-jest": "^26.4.1",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0",
-    "tslint-config-standard": "^9.0.0",
-    "typescript": "^4.0.3"
+  "scripts": {
+    "build": "ts-scripts build",
+    "format": "ts-scripts format",
+    "prepare": "ts-scripts install",
+    "prepublishOnly": "npm run build",
+    "size": "size-limit",
+    "specs": "ts-scripts specs",
+    "test": "ts-scripts test && npm run size"
   },
   "dependencies": {
     "popsicle-content-encoding": "^1.0.0",
-    "popsicle-cookie-jar": "^1.0.0",
     "popsicle-redirects": "^1.1.0",
     "popsicle-transport-http": "^1.1.0",
     "popsicle-transport-xhr": "^2.0.0",
     "popsicle-user-agent": "^1.0.0",
     "servie": "^4.3.3",
     "throwback": "^4.1.0"
-  }
-}
+  },
+  "devDependencies": {
+    "@borderless/ts-scripts": "^0.15.0",
+    "@size-limit/preset-small-lib": "^11.0.0",
+    "@types/node": "^20.9.3",
+    "@vitest/coverage-v8": "^0.34.6",
+    "popsicle-cookie-jar": "^1.0.1",
+    "size-limit": "^11.0.0",
+    "typescript": "^5.3.2",
+    "vitest": "^0.34.6"
+  },
+  "engines": {
+    "node": ">=8"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "size-limit": [
+    {
+      "path": "./dist/index.js",
+      "limit": "3.3 kB"
+    }
+  ]
+}

src/common.ts

@@ -7,7 +7,7 @@ import { CommonRequest, CommonResponse } from "servie/dist/common";
 export function toFetch<
   T extends CommonRequest,
   U extends CommonResponse,
-  A extends any[]
+  A extends any[],
 >(middleware: Composed<T, U>, Request: new (...args: A) => T) {
   function done(): never {
     throw new TypeError("Invalid middleware stack, missing transport function");

src/index.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from "vitest";
 import { fetch, middleware } from "./index";
 
 describe("popsicle", () => {

src/index.ts

@@ -1,12 +1,12 @@
 import {
   middleware as nodeMiddleware,
   fetch as nodeFetch,
-  HttpResponse
+  HttpResponse,
 } from "./node";
 import {
   middleware as browserMiddleware,
   fetch as browserFetch,
-  XhrResponse
+  XhrResponse,
 } from "./browser";
 
 export * from "./common";
@@ -17,6 +17,5 @@ export const fetch: (
   ...args: Parameters<typeof nodeFetch> & Parameters<typeof browserFetch>
 ) => Promise<XhrResponse | HttpResponse> = nodeFetch;
 
-export const middleware:
-  | typeof nodeMiddleware
-  | typeof browserMiddleware = nodeMiddleware;
+export const middleware: typeof nodeMiddleware | typeof browserMiddleware =
+  nodeMiddleware;

src/node.ts

@@ -21,7 +21,7 @@ export {
   redirects,
   Request,
   transport,
-  userAgent
+  userAgent,
 };
 
 /**
@@ -31,7 +31,7 @@ export const middleware = compose<Request, HttpResponse>([
   userAgent(),
   contentEncoding(),
   // Redirects must happen around cookie support.
-  redirects(compose([cookies(), transport()]))
+  redirects(compose([cookies(), transport()])),
 ]);
 
 /**

tsconfig.json

@@ -1,14 +1,11 @@
 {
+  "extends": "@borderless/ts-scripts/configs/tsconfig.json",
   "compilerOptions": {
     "target": "es2015",
     "lib": ["es2015", "dom"],
     "rootDir": "src",
     "outDir": "dist",
     "module": "commonjs",
-    "moduleResolution": "node",
-    "strict": true,
-    "declaration": true,
-    "sourceMap": true,
-    "inlineSources": true
+    "moduleResolution": "node"
   }
 }