Merge remote-tracking branch 'origin/save-read-state-slices' into pqr…

…-worker-inf-metadata
gatsbyjs · Jun 10, 2021 · 871b4c1 · 871b4c1
2 parents 342b306 + af20d74
commit 871b4c1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/packages/gatsby/src/redux/index.ts b/packages/gatsby/src/redux/index.ts
@@ -13,7 +13,7 @@ import { mett } from "../utils/mett"
 import thunk, { ThunkMiddleware } from "redux-thunk"
 import * as reducers from "./reducers"
 import { writeToCache, readFromCache } from "./persist"
-import { IGatsbyState, ActionsUnion, GatsbyStateSlices } from "./types"
+import { IGatsbyState, ActionsUnion, GatsbyStateKeys } from "./types"
 
 // Create event emitter for actions
 export const emitter = mett()
@@ -126,15 +126,15 @@ export const saveState = (): void => {
   })
 }
 
-export const saveStateForWorkers = (slices: Array<GatsbyStateSlices>): void => {
+export const saveStateForWorkers = (slices: Array<GatsbyStateKeys>): void => {
   const state = store.getState()
   const contents = _.pick(state, slices)
 
   return writeToCache(contents, slices)
 }
 
 export const loadStateInWorker = (
-  slices: Array<GatsbyStateSlices>
+  slices: Array<GatsbyStateKeys>
 ): DeepPartial<IGatsbyState> => {
   try {
     return readFromCache(slices) as DeepPartial<IGatsbyState>

diff --git a/packages/gatsby/src/redux/persist.ts b/packages/gatsby/src/redux/persist.ts
@@ -13,7 +13,7 @@ import {
   ICachedReduxState,
   IGatsbyNode,
   IGatsbyPage,
-  GatsbyStateSlices,
+  GatsbyStateKeys,
 } from "./types"
 import { sync as globSync } from "glob"
 import { createContentDigest } from "gatsby-core-utils"
@@ -38,7 +38,7 @@ function reduxWorkerSlicesPrefix(dir: string): string {
 }
 
 export function readFromCache(
-  slices?: Array<GatsbyStateSlices>
+  slices?: Array<GatsbyStateKeys>
 ): DeepPartial<ICachedReduxState> {
   // The cache is stored in two steps; the nodes and pages in chunks and the rest
   // First we revive the rest, then we inject the nodes and pages into that obj (if any)
@@ -123,7 +123,7 @@ export function guessSafeChunkSize(
 function prepareCacheFolder(
   targetDir: string,
   contents: DeepPartial<ICachedReduxState>,
-  slices?: Array<GatsbyStateSlices>
+  slices?: Array<GatsbyStateKeys>
 ): void {
   if (slices) {
     writeFileSync(
@@ -215,7 +215,7 @@ function safelyRenameToBak(reduxCacheFolder: string): string {
 
 export function writeToCache(
   contents: DeepPartial<ICachedReduxState>,
-  slices?: Array<GatsbyStateSlices>
+  slices?: Array<GatsbyStateKeys>
 ): void {
   // Note: this should be a transactional operation. So work in a tmp dir and
   // make sure the cache cannot be left in a corruptable state due to errors.

diff --git a/packages/gatsby/src/redux/types.ts b/packages/gatsby/src/redux/types.ts
@@ -320,7 +320,7 @@ export interface IGatsbyState {
   }
 }
 
-export type GatsbyStateSlices = keyof IGatsbyState
+export type GatsbyStateKeys = keyof IGatsbyState
 
 export interface ICachedReduxState {
   nodes?: IGatsbyState["nodes"]

diff --git a/packages/gatsby/src/utils/worker/__tests__/share-state.ts b/packages/gatsby/src/utils/worker/__tests__/share-state.ts
@@ -5,7 +5,7 @@ import {
   saveStateForWorkers,
   loadStateInWorker,
 } from "../../../redux"
-import { GatsbyStateSlices } from "../../../redux/types"
+import { GatsbyStateKeys } from "../../../redux/types"
 
 let worker: GatsbyTestWorkerPool | undefined
 
@@ -75,8 +75,8 @@ describe(`worker (share-state)`, () => {
       },
     })
 
-    const slicesOne: Array<GatsbyStateSlices> = [`components`]
-    const slicesTwo: Array<GatsbyStateSlices> = [
+    const slicesOne: Array<GatsbyStateKeys> = [`components`]
+    const slicesTwo: Array<GatsbyStateKeys> = [
       `components`,
       `staticQueryComponents`,
     ]
@@ -139,7 +139,7 @@ describe(`worker (share-state)`, () => {
       },
     })
 
-    const slices: Array<GatsbyStateSlices> = []
+    const slices: Array<GatsbyStateKeys> = []
 
     saveStateForWorkers(slices)
     const result = loadStateInWorker(slices)
@@ -156,7 +156,7 @@ describe(`worker (share-state)`, () => {
       },
     })
 
-    const slices: Array<GatsbyStateSlices> = [`staticQueryComponents`]
+    const slices: Array<GatsbyStateKeys> = [`staticQueryComponents`]
 
     saveStateForWorkers(slices)
     const result = loadStateInWorker(slices)

diff --git a/packages/gatsby/src/utils/worker/__tests__/test-helpers/wrapper-for-tests.js b/packages/gatsby/src/utils/worker/__tests__/test-helpers/wrapper-for-tests.js
@@ -2,6 +2,7 @@
 require(`@babel/register`)({
   extensions: [`.js`, `.ts`],
   configFile: require.resolve(`../../../../../babel.config.js`),
+  ignore: [/node_modules/],
 })
 
 module.exports = require(`./child-for-tests`)
diff --git a/packages/gatsby/src/utils/worker/child/state.ts b/packages/gatsby/src/utils/worker/child/state.ts
@@ -1,8 +1,8 @@
 // Calls loadStateInWorker(slices) and mutates the redux store with the results
-import { GatsbyStateSlices } from "../../../redux/types"
+import { GatsbyStateKeys } from "../../../redux/types"
 import { loadStateInWorker, store } from "../../../redux"
 
-export function setState(slices: Array<GatsbyStateSlices>): void {
+export function setState(slices: Array<GatsbyStateKeys>): void {
   const res = loadStateInWorker(slices)
 
   Object.entries(res).forEach(([key, val]) => {