fr-- -> slice--

gatsbyjs · Oct 6, 2022 · 32765cf · 32765cf
1 parent 1eb295c
commit 32765cf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/packages/gatsby/src/query/index.ts b/packages/gatsby/src/query/index.ts
@@ -59,10 +59,9 @@ export { calcDirtyQueryIds as calcInitialDirtyQueryIds }
  */
 export function groupQueryIds(queryIds: Array<string>): IGroupedQueryIds {
   const grouped = _.groupBy(queryIds, p => {
-    const prefix = p.slice(0, 4)
-    if (prefix === `sq--`) {
+    if (p.startsWith(`sq--`)) {
       return `static`
-    } else if (prefix === `fr--`) {
+    } else if (p.startsWith(`slice--`)) {
       return `slice`
     } else {
       return `page`
@@ -203,7 +202,7 @@ function createSliceQueryJob(
   state: IGatsbyState,
   queryId: string
 ): IQueryJob | undefined {
-  const sliceName = queryId.substring(4)
+  const sliceName = queryId.substring(7) // remove "slice--" prefix
 
   const sliceDef = state.slices.get(sliceName)
   if (!sliceDef) {

diff --git a/packages/gatsby/src/query/query-runner.ts b/packages/gatsby/src/query/query-runner.ts
@@ -205,7 +205,7 @@ export async function queryRunner(
         store.dispatch({
           type: `ADD_PENDING_SLICE_DATA_WRITE`,
           payload: {
-            name: queryJob.id.substring(4),
+            name: queryJob.id.substring(7), // remove "slice--" prefix
           },
         })
       }

diff --git a/packages/gatsby/src/redux/reducers/queries.ts b/packages/gatsby/src/redux/reducers/queries.ts
@@ -82,7 +82,7 @@ export function queriesReducer(
     }
     case `CREATE_SLICE`: {
       const { name, componentPath } = action.payload
-      const path = `fr--${name}`
+      const path = `slice--${name}`
       let query = state.trackedQueries.get(path)
       if (!query || action.contextModified) {
         query = registerQuery(state, path)
@@ -108,7 +108,7 @@ export function queriesReducer(
     }
     case `DELETE_SLICE`: {
       const { name } = action.payload
-      const path = `fr--${name}`
+      const path = `slice--${name}`
       state.deletedQueries.add(path)
       return state
     }

diff --git a/packages/gatsby/src/services/calculate-dirty-queries.ts b/packages/gatsby/src/services/calculate-dirty-queries.ts
@@ -44,7 +44,7 @@ export async function calculateDirtyQueries({
     queriesToRun = queryIds.filter(
       queryId =>
         queryId.startsWith(`sq--`) ||
-        queryId.startsWith(`fr--`) ||
+        queryId.startsWith(`slice--`) ||
         pagePathFilter.has(queryId)
     )
   }

diff --git a/packages/gatsby/src/utils/page-data.ts b/packages/gatsby/src/utils/page-data.ts
@@ -157,7 +157,7 @@ export async function writeSliceData(
   staticQueryHashes: Array<string>
 ): Promise<string> {
   const result = JSON.parse(
-    (await readPageQueryResult(publicDir, `fr--${name}`)).toString()
+    (await readPageQueryResult(publicDir, `slice--${name}`)).toString()
   )
 
   const outputFilePath = path.join(publicDir, `slice-data`, `${name}.json`)