packages/gatsby-admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-admin",
-  "version": "0.24.3",
+  "version": "0.24.4",
   "main": "index.js",
   "author": "Max Stoiber",
   "license": "MIT",
@@ -29,7 +29,7 @@
     "@typescript-eslint/parser": "^4.29.3",
     "csstype": "^2.6.17",
     "formik": "^2.2.9",
-    "gatsby": "^3.14.3",
+    "gatsby": "^3.14.4",
     "gatsby-interface": "^0.0.244",
     "gatsby-plugin-typescript": "^3.14.0",
     "gatsby-plugin-webfonts": "^1.1.4",

packages/gatsby-dev-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby-dev-cli",
   "description": "CLI helpers for contributors working on Gatsby",
-  "version": "3.14.0",
+  "version": "3.14.1",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bin": {
     "gatsby-dev": "./dist/index.js"

packages/gatsby-dev-cli/src/utils/check-deps-changes.js

@@ -60,16 +60,16 @@ exports.checkDepsChanges = async ({
     // this allow us to not publish to local repository
     // and save some time/work
     try {
-      const response = await got(
-        `https://unpkg.com/${packageName}/package.json`
-      )
+      const version = getPackageVersion(packageName)
+      const url = `https://unpkg.com/${packageName}@${version}/package.json`
+      const response = await got(url)
       if (response?.statusCode !== 200) {
-        throw new Error(`No response or non 200 code`)
+        throw new Error(`No response or non 200 code for ${url}`)
       }
       localPKGjson = JSON.parse(response.body)
-    } catch {
+    } catch (e) {
       console.log(
-        `'${packageName}' doesn't seem to be installed and is not published on NPM.`
+        `'${packageName}' doesn't seem to be installed and is not published on NPM. Error: ${e.message}`
       )
       return {
         didDepsChanged: true,
@@ -182,3 +182,12 @@ exports.checkDepsChanges = async ({
     packageNotInstalled,
   }
 }
+
+function getPackageVersion(packageName) {
+  const projectPackageJson = JSON.parse(
+    fs.readFileSync(`./package.json`, `utf-8`)
+  )
+  const { dependencies = {}, devDependencies = {} } = projectPackageJson
+  const version = dependencies[packageName] || devDependencies[packageName]
+  return version || `latest`
+}

packages/gatsby/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby",
   "description": "Blazing fast modern site generator for React",
-  "version": "3.14.3",
+  "version": "3.14.4",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bin": {
     "gatsby": "./cli.js"

packages/gatsby/src/datastore/lmdb/lmdb-datastore.ts

@@ -1,4 +1,4 @@
-import { RootDatabase, open } from "lmdb-store"
+import { RootDatabase, open, ArrayLikeIterable } from "lmdb-store"
 // import { performance } from "perf_hooks"
 import { ActionsUnion, IGatsbyNode } from "../../redux/types"
 import { updateNodes } from "./updates/nodes"
@@ -27,6 +27,8 @@ const lmdbDatastore = {
   getNodesByType,
 }
 
+const preSyncDeletedNodeIdsCache = new Set()
+
 function getDefaultDbPath(): string {
   const dbFileName =
     process.env.NODE_ENV === `test`
@@ -122,10 +124,8 @@ function iterateNodes(): GatsbyIterable<IGatsbyNode> {
   return new GatsbyIterable(
     nodesDb
       .getKeys({ snapshot: false })
-      .map(
-        nodeId => (typeof nodeId === `string` ? getNode(nodeId) : undefined)!
-      )
-      .filter(Boolean)
+      .map(nodeId => (typeof nodeId === `string` ? getNode(nodeId) : undefined))
+      .filter(Boolean) as ArrayLikeIterable<IGatsbyNode>
   )
 }
 
@@ -134,13 +134,16 @@ function iterateNodesByType(type: string): GatsbyIterable<IGatsbyNode> {
   return new GatsbyIterable(
     nodesByType
       .getValues(type)
-      .map(nodeId => getNode(nodeId)!)
-      .filter(Boolean)
+      .map(nodeId => getNode(nodeId))
+      .filter(Boolean) as ArrayLikeIterable<IGatsbyNode>
   )
 }
 
 function getNode(id: string): IGatsbyNode | undefined {
-  if (!id) return undefined
+  if (!id || preSyncDeletedNodeIdsCache.has(id)) {
+    return undefined
+  }
+
   const { nodes } = getDatabases()
   return nodes.get(id)
 }
@@ -151,9 +154,11 @@ function getTypes(): Array<string> {
 
 function countNodes(typeName?: string): number {
   if (!typeName) {
-    const stats = getDatabases().nodes.getStats()
-    // @ts-ignore
-    return Number(stats.entryCount || 0) // FIXME: add -1 when restoring shared structures key
+    const stats = getDatabases().nodes.getStats() as { entryCount: number }
+    return Math.max(
+      Number(stats.entryCount) - preSyncDeletedNodeIdsCache.size,
+      0
+    ) // FIXME: add -1 when restoring shared structures key
   }
 
   const { nodesByType } = getDatabases()
@@ -192,14 +197,30 @@ function updateDataStore(action: ActionsUnion): void {
       break
     }
     case `CREATE_NODE`:
+    case `DELETE_NODE`:
     case `ADD_FIELD_TO_NODE`:
-    case `ADD_CHILD_NODE_TO_PARENT_NODE`:
-    case `DELETE_NODE`: {
+    case `ADD_CHILD_NODE_TO_PARENT_NODE`: {
       const dbs = getDatabases()
-      lastOperationPromise = Promise.all([
+      const operationPromise = Promise.all([
         updateNodes(dbs.nodes, action),
         updateNodesByType(dbs.nodesByType, action),
       ])
+      lastOperationPromise = operationPromise
+
+      // if create is used in the same transaction as delete we should remove it from cache
+      if (action.type === `CREATE_NODE`) {
+        preSyncDeletedNodeIdsCache.delete(action.payload.id)
+      }
+
+      if (action.type === `DELETE_NODE` && action.payload?.id) {
+        preSyncDeletedNodeIdsCache.add(action.payload.id)
+        operationPromise.then(() => {
+          // only clear if no other operations have been done in the meantime
+          if (lastOperationPromise === operationPromise) {
+            preSyncDeletedNodeIdsCache.clear()
+          }
+        })
+      }
     }
   }
 }

packages/gatsby/src/datastore/lmdb/updates/nodes.ts

@@ -17,6 +17,7 @@ export function updateNodes(
       if (action.payload) {
         return nodesDb.remove(action.payload.id)
       }
+
       return false
     }
   }