force clear GATSBY_EXPERIMENTAL_QUERY_ON_DEMAND flag for commands oth…

…er than develop
gatsbyjs · Nov 17, 2020 · 91313e6 · 91313e6
1 parent ae1f55d
commit 91313e6
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/packages/gatsby/src/services/initialize.ts b/packages/gatsby/src/services/initialize.ts
@@ -162,11 +162,12 @@ export async function initialize({
 
   activity.end()
 
-  if (
-    process.env.gatsby_executing_command === `develop` &&
-    process.env.GATSBY_EXPERIMENTAL_QUERY_ON_DEMAND
-  ) {
-    if (isCI()) {
+  if (process.env.GATSBY_EXPERIMENTAL_QUERY_ON_DEMAND) {
+    if (process.env.gatsby_executing_command !== `develop`) {
+      // we don't want to ever have this flag enabled for anything than develop
+      // in case someone have this env var globally set
+      process.env.GATSBY_EXPERIMENTAL_QUERY_ON_DEMAND = undefined
+    } else if (isCI()) {
       process.env.GATSBY_EXPERIMENTAL_QUERY_ON_DEMAND = undefined
       reporter.warn(
         `Experimental Query on Demand feature is not available in CI environment. Continuing with regular mode.`