Merge pull request #37 from curveball/update-deps-plus-rel

Updating all dependencies

.eslintrc.json

@@ -2,7 +2,8 @@
   "env": {
       "browser": true,
       "node": true,
-      "es6": true
+      "es6": true,
+      "mocha": true
   },
   "extends": [
       "eslint:recommended",
@@ -61,7 +62,6 @@
         "args": "none"
       }],
       "@typescript-eslint/prefer-for-of": ["error"],
-      "@typescript-eslint/prefer-optional-chain": ["error"],
       "@typescript-eslint/prefer-ts-expect-error": ["error"]
   }
 }

.github/workflows/node.yml

@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [16.x, 18.x, 20.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -27,13 +27,10 @@ jobs:
       uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
-    - name: Setup Redis
-      uses: shogo82148/actions-setup-redis@v1
     - run: npm ci
     - run: npm run build --if-present
     - run: npm test
 
-
   cjs-test:
     name: Node.js tests (CommonJS)
 
@@ -42,7 +39,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [16.x, 18.x, 20.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -51,8 +48,6 @@ jobs:
       uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
-    - name: Setup Redis
-      uses: shogo82148/actions-setup-redis@v1
     - run: npm ci
     - run: npm run build --if-present
     - run: make test-cjs

.github/workflows/npm-publish.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
       - run: npm ci
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
           registry-url: https://registry.npmjs.org/
@@ -37,11 +37,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
       - run: npm ci
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
           registry-url: 'https://npm.pkg.github.com'

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2020 Evert Pot
+Copyright (c) 2019-2023 Evert Pot
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -15,7 +15,7 @@ test-cjs:
 	mkdir -p cjs-test
 	cd test; npx tsc --module commonjs --outdir ../cjs-test
 	echo '{"type": "commonjs"}' > cjs-test/package.json
-	cd cjs-test; npx mocha --exit --no-package
+	cd cjs-test; npx mocha --no-package
 
 .PHONY:lint
 lint:

README.md

@@ -39,9 +39,7 @@ app.use(session({
   store: new RedisStore({
     prefix: 'mysess',
     clientOptions: {
-      host: 'myhost.redis',
-      port: 1234,
-      ...
+      url: 'redis://username:password@host:port/',
     },
   }),
   cookieName: 'MY_SESSION',
@@ -60,12 +58,9 @@ re-used by a different part of your application:
 ```typescript
 import session from '@curveball/session';
 import RedisStore from '@curveball/session-redis';
-import { RedisClient } from 'redis';
+import { createClient } from 'redis';
 
-const redis = new RedisClient({
-  host: 'myhost.redis',
-  port: 1234,
-});
+const redis = createClient('redis://localhost');
 
 app.use(session({
   store: new RedisStore({
@@ -77,4 +72,4 @@ app.use(session({
 });
 ```
 
-[1]: https://github.com/NodeRedis/node_redis#options-object-properties
+[1]: https://github.com/redis/node-redis/blob/master/docs/client-configuration.md

changelog.md

@@ -1,12 +1,19 @@
 Changelog
 =========
 
-0.6.0 (2023-02-14)
+0.6.0 (2023-11-09)
 ------------------
 
+Note that this package upgraded the internal Redis package from 2 to 4. The
+Redis package had some BC breaks, which means that as a user of this package
+you may also need to make changes to how you configured or passed the Redis
+instance.
+
 * This package now supports ESM and CommonJS modules.
 * No longer supports Node 14. Please use Node 16 or higher.
 * Removed the cookie dependency, it wasn't used
+* Updated to NPM Redis version 4.
+* Removed debug console.log output
 
 
 0.5.0 (2022-09-03)