From db2415aad47e8bd73a221ddec647fa79da0fed36 Mon Sep 17 00:00:00 2001 From: Alisson Date: Thu, 7 May 2020 10:34:40 -0300 Subject: [PATCH 01/12] Change file extension from JS to TS --- packages/gatsby/src/redux/reducers/{index.js => index.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/gatsby/src/redux/reducers/{index.js => index.ts} (100%) diff --git a/packages/gatsby/src/redux/reducers/index.js b/packages/gatsby/src/redux/reducers/index.ts similarity index 100% rename from packages/gatsby/src/redux/reducers/index.js rename to packages/gatsby/src/redux/reducers/index.ts From b8e8b5275cab09340e590a7f2e2ef0f1da575762 Mon Sep 17 00:00:00 2001 From: Alisson Date: Thu, 7 May 2020 13:43:29 -0300 Subject: [PATCH 02/12] Change reducer config export to ES6 module --- packages/gatsby/src/redux/reducers/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gatsby/src/redux/reducers/config.ts b/packages/gatsby/src/redux/reducers/config.ts index 10e7c9557b9a3..24f0d595d3277 100644 --- a/packages/gatsby/src/redux/reducers/config.ts +++ b/packages/gatsby/src/redux/reducers/config.ts @@ -1,6 +1,6 @@ import { IGatsbyConfig, ISetSiteConfig } from "../types" -module.exports = ( +export const configReducer = ( state: IGatsbyConfig = {}, action: ISetSiteConfig ): IGatsbyConfig => { From 17a39751a381416636bce475ae44f0f2a1c076c6 Mon Sep 17 00:00:00 2001 From: Alisson Date: Thu, 7 May 2020 13:47:31 -0300 Subject: [PATCH 03/12] Change imports and exports to ES6 modules --- packages/gatsby/src/redux/reducers/index.ts | 56 +++++++++++++-------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/packages/gatsby/src/redux/reducers/index.ts b/packages/gatsby/src/redux/reducers/index.ts index db80119a10f52..59059238bf786 100644 --- a/packages/gatsby/src/redux/reducers/index.ts +++ b/packages/gatsby/src/redux/reducers/index.ts @@ -1,5 +1,6 @@ const reduxNodes = require(`./nodes`) const lokiNodes = require(`../../db/loki/nodes`).reducer +import { reducer as logReducer } from "gatsby-cli/lib/reporter/redux/reducer" import { pagesReducer } from "./pages" import { redirectsReducer } from "./redirects" import { schemaReducer } from "./schema" @@ -9,12 +10,27 @@ import { webpackReducer } from "./webpack" import { pageDataReducer } from "./page-data" import { themesReducer } from "./themes" import { webpackCompilationHashReducer } from "./webpack-compilation-hash" -import { reducer as logReducer } from "gatsby-cli/lib/reporter/redux/reducer" +import { configReducer } from "./config" +import nodesByTypeReducer from "./nodes-by-type" +import programReducer from "./program" +import resolvedNodesReducer from "./resolved-nodes" +import nodesTouchedReducer from "./nodes-touched" +import lastActionReducer from "./last-action" +import flattenedPluginsReducer from "./flattened-plugins" +import componentDataDependenciesReducer from "./component-data-dependencies" +import componentsReducer from "./components" +import jobsReducer from "./jobs" +import jobsv2Reducer from "./jobsv2" +import babelrcReducer from "./babelrc" +import schemaCustomizationReducer from "./schema-customization" +import inferenceMetadataReducer from "./inference-metadata" +import pageDataStatsReducer from "./page-data-stats" +import { IGatsbyState } from "../types" // const backend = process.env.GATSBY_DB_NODES || `redux` const backend = `redux` -function getNodesReducer() { +function getNodesReducer(): IGatsbyState["nodes"] { let nodesReducer switch (backend) { case `redux`: @@ -31,14 +47,14 @@ function getNodesReducer() { return nodesReducer } -function getNodesByTypeReducer() { +function getNodesByTypeReducer(): IGatsbyState["nodesByType"] { let nodesReducer switch (backend) { case `redux`: - nodesReducer = require(`./nodes-by-type`) + nodesReducer = nodesByTypeReducer break case `loki`: - nodesReducer = (state = null) => null + nodesReducer = (state = null): null => null break default: throw new Error( @@ -51,31 +67,31 @@ function getNodesByTypeReducer() { /** * @property exports.nodesTouched Set */ -module.exports = { - program: require(`./program`), +export const reducers = { + program: programReducer, nodes: getNodesReducer(), nodesByType: getNodesByTypeReducer(), - resolvedNodesCache: require(`./resolved-nodes`), - nodesTouched: require(`./nodes-touched`), - lastAction: require(`./last-action`), - flattenedPlugins: require(`./flattened-plugins`), - config: require(`./config`), + resolvedNodesCache: resolvedNodesReducer, + nodesTouched: nodesTouchedReducer, + lastAction: lastActionReducer, + flattenedPlugins: flattenedPluginsReducer, + config: configReducer, schema: schemaReducer, pages: pagesReducer, status: statusReducer, - componentDataDependencies: require(`./component-data-dependencies`), - components: require(`./components`), + componentDataDependencies: componentDataDependenciesReducer, + components: componentsReducer, staticQueryComponents: staticQueryComponentsReducer, - jobs: require(`./jobs`), - jobsV2: require(`./jobsv2`), + jobs: jobsReducer, + jobsV2: jobsv2Reducer, webpack: webpackReducer, webpackCompilationHash: webpackCompilationHashReducer, redirects: redirectsReducer, - babelrc: require(`./babelrc`), - schemaCustomization: require(`./schema-customization`), + babelrc: babelrcReducer, + schemaCustomization: schemaCustomizationReducer, themes: themesReducer, logs: logReducer, - inferenceMetadata: require(`./inference-metadata`), - pageDataStats: require(`./page-data-stats`), + inferenceMetadata: inferenceMetadataReducer, + pageDataStats: pageDataStatsReducer, pageData: pageDataReducer, } From ab2e67b5560240fab4776334b472685e5710f0fc Mon Sep 17 00:00:00 2001 From: Alisson Date: Thu, 7 May 2020 14:28:26 -0300 Subject: [PATCH 04/12] Change reducers import on redux index to use ES6 modules --- packages/gatsby/src/redux/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gatsby/src/redux/index.ts b/packages/gatsby/src/redux/index.ts index e617d7710ab61..541da46ea490d 100644 --- a/packages/gatsby/src/redux/index.ts +++ b/packages/gatsby/src/redux/index.ts @@ -9,7 +9,7 @@ import _ from "lodash" import mitt from "mitt" import thunk from "redux-thunk" -import reducers from "./reducers" +import { reducers } from "./reducers" import { writeToCache, readFromCache } from "./persist" import { IGatsbyState, ActionsUnion } from "./types" From 17128922f6c2898d439a90a15d1f8a82c7e7b179 Mon Sep 17 00:00:00 2001 From: Alisson Date: Fri, 8 May 2020 10:07:08 -0300 Subject: [PATCH 05/12] Update reducers imports and exports --- packages/gatsby/src/redux/index.ts | 2 +- packages/gatsby/src/redux/reducers/index.ts | 60 ++++++++++----------- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/packages/gatsby/src/redux/index.ts b/packages/gatsby/src/redux/index.ts index 541da46ea490d..9750e73c7b611 100644 --- a/packages/gatsby/src/redux/index.ts +++ b/packages/gatsby/src/redux/index.ts @@ -9,7 +9,7 @@ import _ from "lodash" import mitt from "mitt" import thunk from "redux-thunk" -import { reducers } from "./reducers" +import * as reducers from "./reducers" import { writeToCache, readFromCache } from "./persist" import { IGatsbyState, ActionsUnion } from "./types" diff --git a/packages/gatsby/src/redux/reducers/index.ts b/packages/gatsby/src/redux/reducers/index.ts index 59059238bf786..806e5a222ddd3 100644 --- a/packages/gatsby/src/redux/reducers/index.ts +++ b/packages/gatsby/src/redux/reducers/index.ts @@ -1,5 +1,3 @@ -const reduxNodes = require(`./nodes`) -const lokiNodes = require(`../../db/loki/nodes`).reducer import { reducer as logReducer } from "gatsby-cli/lib/reporter/redux/reducer" import { pagesReducer } from "./pages" import { redirectsReducer } from "./redirects" @@ -11,6 +9,7 @@ import { pageDataReducer } from "./page-data" import { themesReducer } from "./themes" import { webpackCompilationHashReducer } from "./webpack-compilation-hash" import { configReducer } from "./config" +import nodeReducer from "./nodes" import nodesByTypeReducer from "./nodes-by-type" import programReducer from "./program" import resolvedNodesReducer from "./resolved-nodes" @@ -26,11 +25,12 @@ import schemaCustomizationReducer from "./schema-customization" import inferenceMetadataReducer from "./inference-metadata" import pageDataStatsReducer from "./page-data-stats" import { IGatsbyState } from "../types" +// const lokiNodes = require(`../../db/loki/nodes`).reducer // const backend = process.env.GATSBY_DB_NODES || `redux` const backend = `redux` -function getNodesReducer(): IGatsbyState["nodes"] { +export function getNodesReducer(): IGatsbyState["nodes"] { let nodesReducer switch (backend) { case `redux`: @@ -47,7 +47,7 @@ function getNodesReducer(): IGatsbyState["nodes"] { return nodesReducer } -function getNodesByTypeReducer(): IGatsbyState["nodesByType"] { +export function getNodesByTypeReducer(): IGatsbyState["nodesByType"] { let nodesReducer switch (backend) { case `redux`: @@ -67,31 +67,29 @@ function getNodesByTypeReducer(): IGatsbyState["nodesByType"] { /** * @property exports.nodesTouched Set */ -export const reducers = { - program: programReducer, - nodes: getNodesReducer(), - nodesByType: getNodesByTypeReducer(), - resolvedNodesCache: resolvedNodesReducer, - nodesTouched: nodesTouchedReducer, - lastAction: lastActionReducer, - flattenedPlugins: flattenedPluginsReducer, - config: configReducer, - schema: schemaReducer, - pages: pagesReducer, - status: statusReducer, - componentDataDependencies: componentDataDependenciesReducer, - components: componentsReducer, - staticQueryComponents: staticQueryComponentsReducer, - jobs: jobsReducer, - jobsV2: jobsv2Reducer, - webpack: webpackReducer, - webpackCompilationHash: webpackCompilationHashReducer, - redirects: redirectsReducer, - babelrc: babelrcReducer, - schemaCustomization: schemaCustomizationReducer, - themes: themesReducer, - logs: logReducer, - inferenceMetadata: inferenceMetadataReducer, - pageDataStats: pageDataStatsReducer, - pageData: pageDataReducer, +export { + programReducer as program, + resolvedNodesReducer as resolvedNodesCache, + nodesTouchedReducer as nodesTouched, + lastActionReducer as lastAction, + flattenedPluginsReducer as flattenedPlugins, + configReducer as config, + schemaReducer as schema, + pagesReducer as pages, + statusReducer as status, + componentDataDependenciesReducer as componentDataDependencies, + componentsReducer as components, + staticQueryComponentsReducer as staticQueryComponents, + jobsReducer as jobs, + jobsv2Reducer as jobsV2, + webpackReducer as webpack, + webpackCompilationHashReducer as webpackCompilationHash, + redirectsReducer as redirects, + babelrcReducer as babelrc, + schemaCustomizationReducer as schemaCustomization, + themesReducer as themes, + logReducer as logs, + inferenceMetadataReducer as inferenceMetadata, + pageDataStatsReducer as pageDataStats, + pageDataReducer as pageData, } From 88b43b827cab8cfbad5e525bd981ee4a01cf996e Mon Sep 17 00:00:00 2001 From: Alisson Date: Fri, 8 May 2020 10:08:12 -0300 Subject: [PATCH 06/12] Comment unused codes --- packages/gatsby/src/redux/reducers/index.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/gatsby/src/redux/reducers/index.ts b/packages/gatsby/src/redux/reducers/index.ts index 806e5a222ddd3..a096cd38a85d6 100644 --- a/packages/gatsby/src/redux/reducers/index.ts +++ b/packages/gatsby/src/redux/reducers/index.ts @@ -34,11 +34,11 @@ export function getNodesReducer(): IGatsbyState["nodes"] { let nodesReducer switch (backend) { case `redux`: - nodesReducer = reduxNodes - break - case `loki`: - nodesReducer = lokiNodes + nodesReducer = nodeReducer break + // case `loki`: + // nodesReducer = lokiNodes + // break default: throw new Error( `Unsupported DB nodes backend (value of env var GATSBY_DB_NODES)` @@ -53,9 +53,9 @@ export function getNodesByTypeReducer(): IGatsbyState["nodesByType"] { case `redux`: nodesReducer = nodesByTypeReducer break - case `loki`: - nodesReducer = (state = null): null => null - break + // case `loki`: + // nodesReducer = (state = null): null => null + // break default: throw new Error( `Unsupported DB nodes backend (value of env var GATSBY_DB_NODES)` From 810e5d03755674c8ff95cd17edeebdc5b52253df Mon Sep 17 00:00:00 2001 From: Alisson Date: Fri, 8 May 2020 11:13:40 -0300 Subject: [PATCH 07/12] Update merge conflicts --- packages/gatsby/src/redux/reducers/index.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/gatsby/src/redux/reducers/index.ts b/packages/gatsby/src/redux/reducers/index.ts index dd000af448c6a..c87d43b3d2fc3 100644 --- a/packages/gatsby/src/redux/reducers/index.ts +++ b/packages/gatsby/src/redux/reducers/index.ts @@ -1,5 +1,4 @@ import { nodesReducer } from "./nodes" -import { staticQueryComponentsReducer } from "./static-query-components" import { reducer as logReducer } from "gatsby-cli/lib/reporter/redux/reducer" import { pagesReducer } from "./pages" import { redirectsReducer } from "./redirects" @@ -31,8 +30,8 @@ import pageDataStatsReducer from "./page-data-stats" */ export { programReducer as program, - nodeReducer as nodes, - nodesByType as nodesByType, + nodesReducer as nodes, + nodesByTypeReducer as nodesByType, resolvedNodesReducer as resolvedNodesCache, nodesTouchedReducer as nodesTouched, lastActionReducer as lastAction, From 5afbebb1197bde78bf9b729df631322c7a5d8c5d Mon Sep 17 00:00:00 2001 From: Alisson Date: Sat, 9 May 2020 16:10:11 -0300 Subject: [PATCH 08/12] Update nodesReducer module name --- packages/gatsby/src/redux/__tests__/nodes.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/gatsby/src/redux/__tests__/nodes.ts b/packages/gatsby/src/redux/__tests__/nodes.ts index 80f73686f3044..7672a01adf116 100644 --- a/packages/gatsby/src/redux/__tests__/nodes.ts +++ b/packages/gatsby/src/redux/__tests__/nodes.ts @@ -1,5 +1,5 @@ import { actions } from "../actions" -import { nodeReducer } from "../reducers/nodes" +import { nodesReducer } from "../reducers/nodes" import nodeTouchedReducer from "../reducers/nodes-touched" import { IGatsbyNode } from "../types" @@ -43,7 +43,7 @@ describe(`Create and update nodes`, (): void => { expect(action).toMatchSnapshot({ payload: { internal: { counter: expect.any(Number) } }, }) - expect(fromMapToObject(nodeReducer(undefined, action))).toMatchSnapshot({ + expect(fromMapToObject(nodesReducer(undefined, action))).toMatchSnapshot({ hi: { internal: { counter: expect.any(Number) } }, }) }) @@ -98,8 +98,8 @@ describe(`Create and update nodes`, (): void => { )(dispatch) const updateAction = dispatch.mock.calls[1][0] - let state = nodeReducer(undefined, action) - state = nodeReducer(state, updateAction) + let state = nodesReducer(undefined, action) + state = nodesReducer(state, updateAction) expect(state.get(`hi`)!.pickle).toEqual(false) expect((state.get(`hi`)!.deep as any).array![0]).toEqual(1) @@ -148,7 +148,7 @@ describe(`Create and update nodes`, (): void => { } )(dispatch) const action = dispatch.mock.calls[0][0] - let state = nodeReducer(undefined, action) + let state = nodesReducer(undefined, action) const addFieldAction = actions.createNodeField( { @@ -161,7 +161,7 @@ describe(`Create and update nodes`, (): void => { } ) - state = nodeReducer(state, addFieldAction) + state = nodesReducer(state, addFieldAction) expect(fromMapToObject(state)).toMatchSnapshot({ hi: { internal: { counter: expect.any(Number) } }, }) @@ -184,7 +184,7 @@ describe(`Create and update nodes`, (): void => { } )(dispatch) const action = dispatch.mock.calls[0][0] - let state = nodeReducer(undefined, action) + let state = nodesReducer(undefined, action) const addFieldAction = actions.createNodeField( { @@ -196,7 +196,7 @@ describe(`Create and update nodes`, (): void => { name: `test`, } ) - state = nodeReducer(state, addFieldAction) + state = nodesReducer(state, addFieldAction) function callActionCreator(): void { actions.createNodeField( From ca8480291463ca822ca184267a54c2c1991909da Mon Sep 17 00:00:00 2001 From: Alisson Date: Sat, 9 May 2020 16:11:17 -0300 Subject: [PATCH 09/12] Update last-action state type --- packages/gatsby/src/redux/reducers/last-action.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gatsby/src/redux/reducers/last-action.ts b/packages/gatsby/src/redux/reducers/last-action.ts index e22f2ce68187b..87ac11ced3775 100644 --- a/packages/gatsby/src/redux/reducers/last-action.ts +++ b/packages/gatsby/src/redux/reducers/last-action.ts @@ -1,6 +1,6 @@ import { IGatsbyState, ActionsUnion } from "../types" export const lastActionReducer = ( - _state: IGatsbyState["lastAction"], + _state: unknown, action: ActionsUnion ): IGatsbyState["lastAction"] => action From d092a5c2312ba8ff94380d11f49d34a59df35917 Mon Sep 17 00:00:00 2001 From: Alisson Suzigan Date: Tue, 12 May 2020 15:17:53 -0300 Subject: [PATCH 10/12] Fix merge conflicts --- packages/gatsby/src/redux/reducers/index.js | 46 --------------------- 1 file changed, 46 deletions(-) delete mode 100644 packages/gatsby/src/redux/reducers/index.js diff --git a/packages/gatsby/src/redux/reducers/index.js b/packages/gatsby/src/redux/reducers/index.js deleted file mode 100644 index 14371d6d81158..0000000000000 --- a/packages/gatsby/src/redux/reducers/index.js +++ /dev/null @@ -1,46 +0,0 @@ -import { nodeReducer } from "./nodes" -const nodesByType = require(`./nodes-by-type`) -import { pagesReducer } from "./pages" -import { redirectsReducer } from "./redirects" -import { schemaReducer } from "./schema" -import { staticQueryComponentsReducer } from "./static-query-components" -import { statusReducer } from "./status" -import { webpackReducer } from "./webpack" -import { pageDataReducer } from "./page-data" -import { themesReducer } from "./themes" -import { webpackCompilationHashReducer } from "./webpack-compilation-hash" -import { reducer as logReducer } from "gatsby-cli/lib/reporter/redux/reducer" -import { lastAction } from "./last-action" -import { jobsV2Reducer } from "./jobsv2" - -/** - * @property exports.nodesTouched Set - */ -module.exports = { - program: require(`./program`), - nodes: nodeReducer, - nodesByType: nodesByType, - resolvedNodesCache: require(`./resolved-nodes`), - nodesTouched: require(`./nodes-touched`), - lastAction: lastAction, - flattenedPlugins: require(`./flattened-plugins`), - config: require(`./config`), - schema: schemaReducer, - pages: pagesReducer, - status: statusReducer, - componentDataDependencies: require(`./component-data-dependencies`), - components: require(`./components`), - staticQueryComponents: staticQueryComponentsReducer, - jobs: require(`./jobs`), - jobsV2: jobsV2Reducer, - webpack: webpackReducer, - webpackCompilationHash: webpackCompilationHashReducer, - redirects: redirectsReducer, - babelrc: require(`./babelrc`), - schemaCustomization: require(`./schema-customization`), - themes: themesReducer, - logs: logReducer, - inferenceMetadata: require(`./inference-metadata`), - pageDataStats: require(`./page-data-stats`), - pageData: pageDataReducer, -} From 9bab5348e0b7ae3b43c395146f8f5e5168029c83 Mon Sep 17 00:00:00 2001 From: Alisson Suzigan Date: Wed, 20 May 2020 11:35:38 -0300 Subject: [PATCH 11/12] Revert api test snapshot --- packages/gatsby/scripts/__tests__/api.js | 51 +++++++++++++++++++++++- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/packages/gatsby/scripts/__tests__/api.js b/packages/gatsby/scripts/__tests__/api.js index 99354d01f7a71..54658229d0183 100644 --- a/packages/gatsby/scripts/__tests__/api.js +++ b/packages/gatsby/scripts/__tests__/api.js @@ -10,8 +10,55 @@ it("generates the expected api output", done => { expect(json).toMatchInlineSnapshot(` Object { - "browser": Object {}, - "node": Object {}, + "browser": Object { + "disableCorePrefetching": Object {}, + "onClientEntry": Object {}, + "onInitialClientRender": Object {}, + "onPostPrefetchPathname": Object {}, + "onPreRouteUpdate": Object {}, + "onPrefetchPathname": Object {}, + "onRouteUpdate": Object {}, + "onRouteUpdateDelayed": Object {}, + "onServiceWorkerActive": Object {}, + "onServiceWorkerInstalled": Object {}, + "onServiceWorkerRedundant": Object {}, + "onServiceWorkerUpdateFound": Object {}, + "onServiceWorkerUpdateReady": Object {}, + "registerServiceWorker": Object {}, + "replaceComponentRenderer": Object { + "deprecated": true, + }, + "replaceHydrateFunction": Object {}, + "shouldUpdateScroll": Object {}, + "wrapPageElement": Object {}, + "wrapRootElement": Object {}, + }, + "node": Object { + "createPages": Object {}, + "createPagesStatefully": Object {}, + "createResolvers": Object { + "version": "2.2.0", + }, + "createSchemaCustomization": Object { + "version": "2.12.0", + }, + "generateSideEffects": Object {}, + "onCreateBabelConfig": Object {}, + "onCreateDevServer": Object {}, + "onCreateNode": Object {}, + "onCreatePage": Object {}, + "onCreateWebpackConfig": Object {}, + "onPostBootstrap": Object {}, + "onPostBuild": Object {}, + "onPreBootstrap": Object {}, + "onPreBuild": Object {}, + "onPreExtractQueries": Object {}, + "onPreInit": Object {}, + "preprocessSource": Object {}, + "resolvableExtensions": Object {}, + "setFieldsOnGraphQLNodeType": Object {}, + "sourceNodes": Object {}, + }, "ssr": Object { "onPreRenderHTML": Object {}, "onRenderBody": Object {}, From 11d8d07f69d931f99b6602d42734754d928bfa44 Mon Sep 17 00:00:00 2001 From: Michal Piechowiak Date: Tue, 2 Jun 2020 11:47:17 +0200 Subject: [PATCH 12/12] ops, actually fix merge conflicts --- packages/gatsby/src/redux/reducers/index.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/gatsby/src/redux/reducers/index.ts b/packages/gatsby/src/redux/reducers/index.ts index 059f4e744000f..af293f8397f92 100644 --- a/packages/gatsby/src/redux/reducers/index.ts +++ b/packages/gatsby/src/redux/reducers/index.ts @@ -17,11 +17,11 @@ import { componentsReducer } from "./components" import { componentDataDependenciesReducer } from "./component-data-dependencies" import { babelrcReducer } from "./babelrc" import { jobsReducer } from "./jobs" -import nodesByTypeReducer from "./nodes-by-type" +import { nodesByTypeReducer } from "./nodes-by-type" import programReducer from "./program" -import resolvedNodesReducer from "./resolved-nodes" +import { resolvedNodesCacheReducer } from "./resolved-nodes" import { nodesTouchedReducer } from "./nodes-touched" -import flattenedPluginsReducer from "./flattened-plugins" +import { flattenedPluginsReducer } from "./flattened-plugins" import schemaCustomizationReducer from "./schema-customization" import inferenceMetadataReducer from "./inference-metadata" @@ -32,7 +32,7 @@ export { programReducer as program, nodesReducer as nodes, nodesByTypeReducer as nodesByType, - resolvedNodesReducer as resolvedNodesCache, + resolvedNodesCacheReducer as resolvedNodesCache, nodesTouchedReducer as nodesTouched, lastActionReducer as lastAction, flattenedPluginsReducer as flattenedPlugins,