chore(gatsby): convert components to typescript (#24045)

* Convert componenets to TS * Fix import * Add missing interface * Address all feedback * Improve reducer name
gatsbyjs · May 18, 2020 · 6450af2 · 6450af2
1 parent a322ef4
commit 6450af2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/...s/gatsby/src/redux/reducers/components.js → ...s/gatsby/src/redux/reducers/components.ts b/...s/gatsby/src/redux/reducers/components.js → ...s/gatsby/src/redux/reducers/components.ts
@@ -1,12 +1,16 @@
-const normalize = require(`normalize-path`)
-const { interpret } = require(`xstate`)
+import normalize from "normalize-path"
+import { interpret } from "xstate"
 
 import { componentMachine } from "../machines/page-component"
+import { IGatsbyState, ActionsUnion } from "../types"
 
 const services = new Map()
 let programStatus = `BOOTSTRAPPING`
 
-module.exports = (state = new Map(), action) => {
+export const componentsReducer = (
+  state: IGatsbyState["components"] = new Map(),
+  action: ActionsUnion
+): IGatsbyState["components"] => {
   switch (action.type) {
     case `DELETE_CACHE`:
       return new Map()

diff --git a/packages/gatsby/src/redux/reducers/index.js b/packages/gatsby/src/redux/reducers/index.js
@@ -12,6 +12,7 @@ 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"
+import { componentsReducer } from "./components"
 import { componentDataDependenciesReducer } from "./component-data-dependencies"
 
 /**
@@ -30,7 +31,7 @@ module.exports = {
   pages: pagesReducer,
   status: statusReducer,
   componentDataDependencies: componentDataDependenciesReducer,
-  components: require(`./components`),
+  components: componentsReducer,
   staticQueryComponents: staticQueryComponentsReducer,
   jobs: require(`./jobs`),
   jobsV2: jobsV2Reducer,

diff --git a/packages/gatsby/src/redux/types.ts b/packages/gatsby/src/redux/types.ts
@@ -257,6 +257,7 @@ export type ActionsUnion =
   | ICreateJobV2Action
   | IEndJobV2Action
   | IRemoveStaleJobV2Action
+  | IRemoveTemplateComponentAction
 
 export interface ICreateJobV2Action {
   type: `CREATE_JOB_V2`
@@ -419,6 +420,7 @@ export interface ICreatePageAction {
   type: `CREATE_PAGE`
   payload: IGatsbyPage
   plugin?: IGatsbyPlugin
+  contextModified?: boolean
 }
 
 export interface ICreateRedirectAction {
@@ -450,6 +452,13 @@ export interface ISetPageDataAction {
   }
 }
 
+export interface IRemoveTemplateComponentAction {
+  type: `REMOVE_TEMPLATE_COMPONENT`
+  payload: {
+    componentPath: string
+  }
+}
+
 export interface IDeletePageAction {
   type: `DELETE_PAGE`
   payload: IGatsbyPage