e2e-tests/production-runtime/__tests__/env-vars.js

@@ -1,10 +1,10 @@
 const { exec } = require(`child_process`)
 
-const grepJSFilesFor = str =>
+const grepJSFilesFor = (str, pathToGrep) =>
   new Promise(resolve => {
-    const grep = exec(`grep -r "${str}" ./public/*.js`)
+    const grep = exec(`grep -r "${str}" ${pathToGrep}`)
 
-    grep.stdout.on(`data`, () => {
+    grep.stdout.on(`data`, data => {
       resolve(true)
       return
     })
@@ -17,8 +17,10 @@ const grepJSFilesFor = str =>
 
 const checkLeakedEnvVar = async () => {
   const isLeaked =
-    (await grepJSFilesFor(`VERY_SECRET_VAR`)) ||
-    (await grepJSFilesFor(`it's a secret`))
+    // we want to make sure unused VERY_SECRET_VAR doesn't end up in js bundles
+    (await grepJSFilesFor(`VERY_SECRET_VAR`, `./public/*.js`)) ||
+    // additionally we want to verify that its value don't end up anywhere in public dir
+    (await grepJSFilesFor(`it's a secret`, `./public`))
 
   if (isLeaked) {
     console.error(`Error: VERY_SECRET_VAR found in bundle`)

e2e-tests/production-runtime/cypress/integration/env-vars.js

@@ -0,0 +1,45 @@
+describe(`Uses env vars correctly`, () => {
+  it(`SSG page gets right env vars`, () => {
+    cy.visit(`/env-vars`).waitForRouteChange()
+
+    cy.getTestElement(`process.env`).contains(`{}`)
+    cy.getTestElement(`process.env.EXISTING_VAR`).contains(`"foo bar"`)
+    cy.getTestElement(`process.env.NOT_EXISTING_VAR`).should(`be.empty`)
+  })
+
+  it(`SSR page gets right env vars`, () => {
+    cy.visit(`/ssr/static-path`).waitForRouteChange()
+
+    cy.getTestElement(`process.env`).contains(`{}`)
+
+    // EXISTING_VAR is provided by `.env.production`
+    // so despite not being prefixed with `GATSBY_` it is
+    // available to use in react template as well as in getServerData
+    cy.getTestElement(`process.env.EXISTING_VAR`).contains(`"foo bar"`)
+    cy.getTestElement(`serverData.envVars.EXISTING_VAR`).contains(`"foo bar"`)
+
+    // VERY_SECRET_VAR is not used by browser bundle, but it's used by getServerData
+    // we want to verify that it's available to getServerData and at the same time check
+    // if it doesn't leak to browser bundle (we do so by running `test-env-vars` script)
+    // We do use alias "VERY_SECRET_ALIAS_VAR" so that "VERY_SECRET_VAR" doesn't end up
+    // in public dir and mess with our test scanning public directory
+    cy.getTestElement(`serverData.envVars.VERY_SECRET_ALIAS_VAR`).contains(
+      `"it's a secret"`
+    )
+
+    // NOT_EXISTING_VAR is not defined at all so we expect it to be blank
+    // both in react template and in getServerData
+    cy.getTestElement(`process.env.NOT_EXISTING_VAR`).should(`be.empty`)
+    cy.getTestElement(`serverData.envVars.NOT_EXISTING_VAR`).should(`be.empty`)
+
+    // FROM_COMMAND_LINE is just in `process.env.`, but it's not prefixed with
+    // `GATSBY_` so it's not available for react template (process.env.FROM_COMMAND_LINE)
+    // but it is available to getServerData
+    cy.getTestElement(`process.env.FROM_COMMAND_LINE`).should(`be.empty`)
+    cy.getTestElement(`serverData.envVars.FROM_COMMAND_LINE`).contains(`"YES"`)
+
+    //prefix env should be available in `process.env` and getServerData
+    cy.getTestElement(`process.env.GATSBY_PREFIXED_FROM_COMMAND_LINE`).contains(`"YES"`)
+    cy.getTestElement(`serverData.envVars.GATSBY_PREFIXED_FROM_COMMAND_LINE`).contains(`"YES"`)
+  })
+})

e2e-tests/production-runtime/package.json

@@ -30,8 +30,8 @@
   ],
   "license": "MIT",
   "scripts": {
-    "build": "cross-env CYPRESS_SUPPORT=y gatsby build",
-    "build:offline": "cross-env TEST_PLUGIN_OFFLINE=y CYPRESS_SUPPORT=y gatsby build",
+    "build": "cross-env GATSBY_PREFIXED_FROM_COMMAND_LINE=YES FROM_COMMAND_LINE=YES CYPRESS_SUPPORT=y gatsby build",
+    "build:offline": "cross-env GATSBY_PREFIXED_FROM_COMMAND_LINE=YES FROM_COMMAND_LINE=YES TEST_PLUGIN_OFFLINE=y CYPRESS_SUPPORT=y gatsby build",
     "develop": "cross-env CYPRESS_SUPPORT=y gatsby develop",
     "format": "prettier --write '**/*.js' --ignore-path .gitignore",
     "serve": "gatsby serve",

e2e-tests/production-runtime/src/pages/ssr/error-path.js

@@ -8,6 +8,6 @@ export default function ErrorPath({ serverData }) {
   )
 }
 
-export function getServerData() {
+export async function getServerData() {
   throw new Error(`Some runtime error`)
 }

e2e-tests/production-runtime/src/pages/ssr/param-path/[param].js

@@ -13,7 +13,7 @@ export default function Params({ serverData }) {
   )
 }
 
-export function getServerData(arg) {
+export async function getServerData(arg) {
   return {
     props: {
       arg,

e2e-tests/production-runtime/src/pages/ssr/path-ranking/[...].js

@@ -13,7 +13,7 @@ export default function StaticPath({ serverData }) {
   )
 }
 
-export function getServerData(arg) {
+export async function getServerData(arg) {
   return {
     props: {
       arg,

e2e-tests/production-runtime/src/pages/ssr/path-ranking/[p1]/[p2].js

@@ -13,7 +13,7 @@ export default function StaticPath({ serverData }) {
   )
 }
 
-export function getServerData(arg) {
+export async function getServerData(arg) {
   return {
     props: {
       arg,

e2e-tests/production-runtime/src/pages/ssr/path-ranking/[p1]/page.js

@@ -13,7 +13,7 @@ export default function StaticPath({ serverData }) {
   )
 }
 
-export function getServerData(arg) {
+export async function getServerData(arg) {
   return {
     props: {
       arg,

e2e-tests/production-runtime/src/pages/ssr/static-path.js

@@ -1,22 +1,82 @@
 import React from "react"
 
+const UseEnv = ({ heading, envVar }) => (
+  <React.Fragment>
+    <h3>{heading}</h3>
+    <pre>
+      <code data-testid={heading}>{JSON.stringify(envVar)}</code>
+    </pre>
+  </React.Fragment>
+)
+
 export default function StaticPath({ serverData }) {
   return (
     <div>
       <h2>Query</h2>
       <pre data-testid="query">{JSON.stringify(serverData?.arg?.query)}</pre>
       <h2>Params</h2>
       <pre data-testid="params">{JSON.stringify(serverData?.arg?.params)}</pre>
-      <h2>Debug</h2>
-      <pre>{JSON.stringify({ serverData }, null, 2)}</pre>
+      <h2>Using env vars (react template)</h2>
+      <UseEnv heading="process.env" envVar={process.env} />
+      <UseEnv
+        heading="process.env.EXISTING_VAR"
+        envVar={process.env.EXISTING_VAR}
+      />
+      <UseEnv
+        heading="process.env.NOT_EXISTING_VAR"
+        envVar={process.env.NOT_EXISTING_VAR}
+      />
+      <UseEnv
+        heading="process.env.FROM_COMMAND_LINE"
+        envVar={process.env.FROM_COMMAND_LINE}
+      />
+       <UseEnv
+        heading="process.env.GATSBY_PREFIXED_FROM_COMMAND_LINE"
+        envVar={process.env.GATSBY_PREFIXED_FROM_COMMAND_LINE}
+      />
+
+      <h2>Using env vars (getServerData)</h2>
+      <UseEnv
+        heading="serverData.envVars.VERY_SECRET_ALIAS_VAR"
+        envVar={serverData?.envVars?.VERY_SECRET_ALIAS_VAR}
+      />
+      <UseEnv
+        heading="serverData.envVars.EXISTING_VAR"
+        envVar={serverData?.envVars?.EXISTING_VAR}
+      />
+      <UseEnv
+        heading="serverData.envVars.NOT_EXISTING_VAR"
+        envVar={serverData?.envVars?.NOT_EXISTING_VAR}
+      />
+      <UseEnv
+        heading="serverData.envVars.FROM_COMMAND_LINE"
+        envVar={serverData?.envVars.FROM_COMMAND_LINE}
+      />
+
+       <UseEnv
+        heading="serverData.envVars.GATSBY_PREFIXED_FROM_COMMAND_LINE"
+        envVar={serverData?.envVars.GATSBY_PREFIXED_FROM_COMMAND_LINE}
+      />
+
     </div>
   )
 }
 
-export function getServerData(arg) {
+export async function getServerData(arg) {
+  const VERY_SECRET_ALIAS_VAR = process.env.VERY_SECRET_VAR
+  const EXISTING_VAR = process.env.EXISTING_VAR
+  const FROM_COMMAND_LINE = process.env.FROM_COMMAND_LINE
+  const GATSBY_PREFIXED_FROM_COMMAND_LINE = process.env.GATSBY_PREFIXED_FROM_COMMAND_LINE
+
   return {
     props: {
       arg,
+      envVars: {
+        VERY_SECRET_ALIAS_VAR,
+        EXISTING_VAR,
+        FROM_COMMAND_LINE,
+        GATSBY_PREFIXED_FROM_COMMAND_LINE
+      },
     },
   }
 }

e2e-tests/production-runtime/src/pages/ssr/wildcard-path/[...wildcard].js

@@ -13,7 +13,7 @@ export default function Wildcard({ serverData }) {
   )
 }
 
-export function getServerData(arg) {
+export async function getServerData(arg) {
   return {
     props: {
       arg,

packages/babel-plugin-remove-graphql-queries/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-remove-graphql-queries",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "author": "Jason Quense <monastic.panic@gmail.com>",
   "repository": {
     "type": "git",
@@ -10,7 +10,7 @@
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/babel-plugin-remove-graphql-queries#readme",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "gatsby-core-utils": "^3.5.1"
+    "gatsby-core-utils": "^3.5.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",

packages/babel-preset-gatsby/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-gatsby",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "author": "Philipp Spiess <hello@philippspiess.com>",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-macros": "^2.8.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "gatsby-core-utils": "^3.5.1",
+    "gatsby-core-utils": "^3.5.2",
     "gatsby-legacy-polyfills": "^2.5.0"
   },
   "peerDependencies": {

packages/create-gatsby/README.md

@@ -62,5 +62,5 @@ Open another terminal window and go to a folder where you can easily delete the
 cd <path-to-playground>
 
 # Run the create-gatsby script
-node <some-path/packages/create-gatsby/cli.js
+node <some-path>/packages/create-gatsby/cli.js
 ```

packages/create-gatsby/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-gatsby",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "main": "lib/index.js",
   "bin": "cli.js",
   "license": "MIT",

packages/create-gatsby/src/__tests__/tracking.ts

@@ -0,0 +1,61 @@
+let isTrackingEnabled: () => boolean
+
+const get = jest.fn()
+const set = jest.fn()
+
+jest.doMock(`../get-config-store`, () => {
+  return {
+    getConfigStore: (): unknown => {
+      return {
+        get,
+        set,
+      }
+    },
+  }
+})
+
+describe(`isTrackingEnabled`, () => {
+  beforeEach(() => {
+    jest.resetModules()
+    isTrackingEnabled = require(`../tracking`).isTrackingEnabled
+  })
+
+  it(`is enabled by default`, () => {
+    const enabled = isTrackingEnabled()
+    expect(enabled).toBeTrue()
+  })
+
+  it(`respects the setting of the config store`, () => {
+    get.mockImplementationOnce(key => {
+      if (key === `telemetry.enabled`) {
+        return false
+      } else {
+        return true
+      }
+    })
+
+    const enabled = isTrackingEnabled()
+    expect(enabled).toBeFalse()
+
+    const cachedEnabled = isTrackingEnabled()
+    expect(cachedEnabled).toBeFalse()
+  })
+
+  describe(`process.env.GATSBY_TELEMETRY_DISABLED`, () => {
+    beforeAll(() => {
+      process.env.GATSBY_TELEMETRY_DISABLED = `true`
+    })
+
+    it(`respects the setting of the environment variable`, () => {
+      const enabled = isTrackingEnabled()
+      expect(enabled).toBeFalse()
+
+      const cachedEnabled = isTrackingEnabled()
+      expect(cachedEnabled).toBeFalse()
+    })
+
+    afterAll(() => {
+      process.env.GATSBY_TELEMETRY_DISABLED = undefined
+    })
+  })
+})

packages/create-gatsby/src/is-truthy.ts

@@ -0,0 +1,23 @@
+// Copied from gatsby-core-utils to avoid depending on it, similar to get-config-store
+//
+// Returns true for `true`, true, positive numbers
+// Returns false for `false`, false, 0, negative integers and anything else
+export function isTruthy(value: any): boolean {
+  // Return if Boolean
+  if (typeof value === `boolean`) return value
+
+  // Return false if null or undefined
+  if (value === undefined || value === null) return false
+
+  // If the String is true or false
+  if (value.toLowerCase() === `true`) return true
+  if (value.toLowerCase() === `false`) return false
+
+  // Now check if it's a number
+  const number = parseInt(value, 10)
+  if (isNaN(number)) return false
+  if (number > 0) return true
+
+  // Default to false
+  return false
+}