Merge pull request #976 from godaddy/cherry-picks

Cherry picks from lts
godaddy · Nov 20, 2024 · bf3dbe7 · bf3dbe7
2 parents 8b73429 + d940d5e
commit bf3dbe7
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 138 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/gasket-plugin-express/CHANGELOG.md b/packages/gasket-plugin-express/CHANGELOG.md
@@ -1,5 +1,9 @@
 # `@gasket/plugin-express`
 
+### 7.0.14
+
+- Switch to `http2-express` to address vulnerabilities ([#959])
+
 ### 7.0.12
 
 - remove tsconfig.test from fastify, tune glob ignores ([#969])
@@ -127,7 +131,9 @@
 [#695]: https://github.com/godaddy/gasket/pull/695
 [#708]: https://github.com/godaddy/gasket/pull/708
 [#736]: https://github.com/godaddy/gasket/pull/736
+[#892]: https://github.com/godaddy/gasket/pull/892
 [#958]: https://github.com/godaddy/gasket/pull/958
 [#966]: https://github.com/godaddy/gasket/pull/966
 [#967]: https://github.com/godaddy/gasket/pull/967
+[#959]: https://github.com/godaddy/gasket/pull/959
 [#969]: https://github.com/godaddy/gasket/pull/969
diff --git a/packages/gasket-plugin-express/lib/index.js b/packages/gasket-plugin-express/lib/index.js
@@ -17,7 +17,7 @@ const plugin = {
     getExpressApp(gasket) {
       const express = require('express');
       const { http2 } = gasket.config;
-      app ??= http2 ? require('http2-express-bridge')(express) : express();
+      app ??= http2 ? require('http2-express')(express) : express();
 
       return app;
     }

diff --git a/packages/gasket-plugin-express/package.json b/packages/gasket-plugin-express/package.json
@@ -44,7 +44,7 @@
     "cookie-parser": "^1.4.6",
     "diagnostics": "^2.0.2",
     "glob": "^8.1.0",
-    "http2-express-bridge": "^1.0.7"
+    "http2-express": "^1.0.0"
   },
   "devDependencies": {
     "@gasket/core": "^7.0.9",

diff --git a/packages/gasket-plugin-express/test/plugin.test.js b/packages/gasket-plugin-express/test/plugin.test.js
@@ -11,7 +11,7 @@ const compressionMiddleware = jest.fn();
 const mockCompression = jest.fn().mockReturnValue(compressionMiddleware);
 
 jest.mock('express', () => mockExpress);
-jest.mock('http2-express-bridge', () => mockExpressBridge);
+jest.mock('http2-express', () => mockExpressBridge);
 jest.mock('cookie-parser', () => mockCookieParser);
 jest.mock('compression', () => mockCompression);
 

diff --git a/packages/gasket-redux/CHANGELOG.md b/packages/gasket-redux/CHANGELOG.md
@@ -1,5 +1,9 @@
 # `@gasket/redux`
 
+### 7.0.14
+
+- Add configureMakeStore options callback to allow for per-request configuration ([#974])
+
 ### 7.0.0
 
 - See [Version 7 Upgrade Guide] for overall changes
@@ -95,3 +99,4 @@
 [#457]: https://github.com/godaddy/gasket/pull/457
 [#670]: https://github.com/godaddy/gasket/pull/670
 [#693]: https://github.com/godaddy/gasket/pull/693
+[#974]: https://github.com/godaddy/gasket/pull/974
diff --git a/packages/gasket-redux/README.md b/packages/gasket-redux/README.md
@@ -17,6 +17,7 @@ Set up Redux store configuration and return a `makeStore` function
 **Signature**
 
 - `configureMakeStore(options, [postCreate]): makeStore`
+- `configureMakeStore(optionsFn, [postCreate]): makeStore`
 
 **Props**
 
@@ -30,8 +31,10 @@ Set up Redux store configuration and return a `makeStore` function
   - `enhancers` - (function[]) Any other redux store enhancers
   - `logging` - (boolean) set to true if you want to enable redux logger.
     (default: false)
+- `optionsFn` - (function) function that returns the options object.
 - `postCreate` - (function) Executed after the store is create the resulting
   store as the argument
+- 
 
 **Return Value**
 

diff --git a/packages/gasket-redux/src/configure-make-store.js b/packages/gasket-redux/src/configure-make-store.js
@@ -31,23 +31,23 @@ export function prepareReducer(allReducers, rootReducer) {
  * @type {import('./index').configureMakeStore}
  */
 export default function configureMakeStore(makeStoreOptions = {}, postCreate) {
-  const {
-    thunkMiddleware = thunk,
-    middleware = [],
-    logging = false,
-    enhancers = [(f) => f],
-    reducers = {},
-    rootReducer,
-    initialState = {}
-  } = makeStoreOptions;
-
   /**
    * Wrapper for store create to create instance with SSR and to hydrate in
    * browser.
    * @type {import('./index').MakeStoreFn}
    */
+  // eslint-disable-next-line max-statements
   function makeStore(state = {}, options = {}) {
     const { req, logger = console } = options;
+    const {
+      thunkMiddleware = thunk,
+      middleware = [],
+      logging = false,
+      enhancers = [(f) => f],
+      reducers = {},
+      rootReducer,
+      initialState = {}
+    } = typeof makeStoreOptions === 'function' ? makeStoreOptions(options) : makeStoreOptions;
 
     // Use existing redux store if it has been already been instantiated by
     // redux-plugin

diff --git a/packages/gasket-redux/src/index.d.ts b/packages/gasket-redux/src/index.d.ts
@@ -8,6 +8,11 @@ declare module 'http' {
   }
 }
 
+export type MakeStoreFnOptions = {
+  logger?: Console | Logger;
+  req?: IncomingMessage;
+}
+
 /**
  * Wrapper for store create to create instance with SSR and to hydrate in
  * browser.
@@ -16,10 +21,7 @@ export type MakeStoreFn = {
   (
     /** The initial redux state */
     state: any,
-    options: {
-      logger?: Console | Logger;
-      req?: IncomingMessage;
-    }
+    options: MakeStoreFnOptions
   ): Store;
 };
 
@@ -53,7 +55,7 @@ export function prepareReducer(
  * Set up redux store configuration and return a makeStore function
  */
 export function configureMakeStore(
-  options?: ConfigureMakeStoreOptions,
+  options?: ConfigureMakeStoreOptions | ((options: MakeStoreFnOptions) => ConfigureMakeStoreOptions),
   postCreate?: Function
 ): MakeStoreFn;
 

diff --git a/packages/gasket-redux/test/configure-make-store.spec.js b/packages/gasket-redux/test/configure-make-store.spec.js
@@ -15,6 +15,7 @@ const mockEnhancer = jest.fn(createStore => (reducer, initialState, enhancer) =>
 const mockPostCreate = jest.fn();
 
 
+// eslint-disable-next-line max-statements
 describe('configureMakeStore', () => {
   const mockReducers = {
     reducer1: f => f || {}
@@ -47,6 +48,18 @@ describe('configureMakeStore', () => {
     expect(result).toBeInstanceOf(Function);
   });
 
+  it('accepts callback optionsFn', () => {
+    result = configureMakeStore(() => {});
+    expect(result).toBeInstanceOf(Function);
+  });
+
+  it('accepts callback optionsFn called with makeStoreOptions', () => {
+    const mockMakeOptions = { logger: {}, req: {} };
+    const mockOptionsFn = jest.fn().mockReturnValue({});
+    configureMakeStore(mockOptionsFn)({}, mockMakeOptions);
+    expect(mockOptionsFn).toHaveBeenCalledWith(mockMakeOptions);
+  });
+
   it('allows custom initial state', () => {
     store = configureMakeStore({ initialState: mockInitialState })();
     const state = store.getState();
@@ -56,11 +69,25 @@ describe('configureMakeStore', () => {
     }
   });
 
+  it('allows custom initial state from callback optionsFn', () => {
+    store = configureMakeStore(() => ({ initialState: mockInitialState }))();
+    const state = store.getState();
+
+    for (const [key, value] of Object.entries(mockInitialState)) {
+      expect(state).toHaveProperty(key, value);
+    }
+  });
+
   it('allows custom middleware', () => {
     configureMakeStore({ middleware: [mockMiddleware] })();
     expect(applyMiddlewareSpy.mock.calls[0][1]).toBe(mockMiddleware);
   });
 
+  it('allows custom middleware from callback optionsFn', () => {
+    configureMakeStore(() => ({ middleware: [mockMiddleware] }))();
+    expect(applyMiddlewareSpy.mock.calls[0][1]).toBe(mockMiddleware);
+  });
+
   it('adds thunk and logger middleware if enabled', () => {
     configureMakeStore({ logging: true })();
     expect(applyMiddlewareSpy.mock.calls[0]).toHaveLength(2);