feat: begin adding asset path functionality

.eslintrc.json

@@ -26,7 +26,8 @@
   "globals": {
     "before": true,
     "spyOn": true,
-    "__PATH_PREFIX__": true
+    "__PATH_PREFIX__": true,
+    "__ASSET_PREFIX__": true
   },
   "rules": {
     "arrow-body-style": [

packages/gatsby-link/src/index.js

@@ -1,4 +1,3 @@
-/*global __PATH_PREFIX__ */
 import PropTypes from "prop-types"
 import React from "react"
 import { Link } from "@reach/router"

packages/gatsby-plugin-catch-links/src/__tests__/catch-links.js

@@ -4,7 +4,7 @@ import { navigate } from "gatsby"
 import * as catchLinks from "../catch-links"
 
 beforeAll(() => {
-  global.__PATH_PREFIX__ = ``
+  global.__BASE_PATH__ = ``
   // Set the base URL we will be testing against to http://localhost:8000/blog
   window.history.pushState({}, `APP Url`, `${pathPrefix}`)
 })

packages/gatsby-plugin-feed/src/__tests__/__snapshots__/gatsby-ssr.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Adds <Link> for feed to head creates Link href with path prefix when __PATH_PREFIX__ sets 1`] = `
+exports[`Adds <Link> for feed to head creates Link href with asset prefix when __BASE_PATH__ is set 1`] = `
 [MockFunction] {
   "calls": Array [
     Array [

packages/gatsby-plugin-feed/src/__tests__/gatsby-ssr.js

@@ -1,14 +1,14 @@
 const { onRenderBody } = require(`../gatsby-ssr`)
 
-const defaultPathPrefix = global.__PATH_PREFIX__
+const defaultPathPrefix = global.__BASE_PATH__
 
 describe(`Adds <Link> for feed to head`, () => {
   beforeEach(() => {
-    global.__PATH_PREFIX__ = ``
+    global.__BASE_PATH__ = ``
   })
 
   afterEach(() => {
-    global.__PATH_PREFIX__ = defaultPathPrefix
+    global.__BASE_PATH__ = defaultPathPrefix
   })
 
   it(`creates Link if feeds does exist`, async () => {
@@ -54,8 +54,8 @@ describe(`Adds <Link> for feed to head`, () => {
     expect(setHeadComponents).toMatchSnapshot()
     expect(setHeadComponents).toHaveBeenCalledTimes(1)
   })
-  it(`creates Link href with path prefix when __PATH_PREFIX__ sets`, async () => {
-    global.__PATH_PREFIX__ = `/hogwarts`
+  it(`creates Link href with asset prefix when __BASE_PATH__ is set`, async () => {
+    global.__BASE_PATH__ = `/hogwarts`
 
     const pluginOptions = {
       feeds: [

packages/gatsby-plugin-manifest/src/__tests__/gatsby-ssr.js

@@ -19,6 +19,7 @@ const ssrArgs = {
 
 describe(`gatsby-plugin-manifest`, () => {
   beforeEach(() => {
+    global.__BASE_PATH__ = ``
     global.__PATH_PREFIX__ = ``
     headComponents = []
   })

packages/gatsby/cache-dir/__tests__/static-entry.js

@@ -237,6 +237,7 @@ describe(`static-entry sanity checks`, () => {
 describe(`static-entry`, () => {
   beforeEach(() => {
     global.__PATH_PREFIX__ = ``
+    global.__ASSET_PREFIX__ = ``
   })
 
   test(`onPreRenderHTML can be used to replace headComponents`, done => {

packages/gatsby/cache-dir/loader.js

@@ -64,10 +64,11 @@ const fetchPageResourceMap = () => {
   return fetchingPageResourceMapPromise
 }
 
-const createJsonURL = jsonName => `${__PATH_PREFIX__}/static/d/${jsonName}.json`
+const createJsonURL = jsonName =>
+  `${__ASSET_PREFIX__}/static/d/${jsonName}.json`
 const createComponentUrls = componentChunkName =>
   window.___chunkMapping[componentChunkName].map(
-    chunk => __PATH_PREFIX__ + chunk
+    chunk => __ASSET_PREFIX__ + chunk
   )
 
 const fetchResource = resourceName => {

packages/gatsby/cache-dir/static-entry.js

@@ -270,6 +270,7 @@ export default (pagePath, callback) => {
     scripts,
     styles,
     pathPrefix: __PATH_PREFIX__,
+    assetPrefix: __ASSET_PREFIX__,
   })
 
   scripts
@@ -282,13 +283,13 @@ export default (pagePath, callback) => {
           as="script"
           rel={script.rel}
           key={script.name}
-          href={`${__PATH_PREFIX__}/${script.name}`}
+          href={`${__ASSET_PREFIX__}/${script.name}`}
         />
       )
     })
 
   if (page.jsonName in dataPaths) {
-    const dataPath = `${__PATH_PREFIX__}/static/d/${
+    const dataPath = `${__ASSET_PREFIX__}/static/d/${
       dataPaths[page.jsonName]
     }.json`
     headComponents.push(
@@ -315,13 +316,13 @@ export default (pagePath, callback) => {
             as="style"
             rel={style.rel}
             key={style.name}
-            href={`${__PATH_PREFIX__}/${style.name}`}
+            href={`${__ASSET_PREFIX__}/${style.name}`}
           />
         )
       } else {
         headComponents.unshift(
           <style
-            data-href={`${__PATH_PREFIX__}/${style.name}`}
+            data-href={`${__ASSET_PREFIX__}/${style.name}`}
             dangerouslySetInnerHTML={{
               __html: fs.readFileSync(
                 join(process.cwd(), `public`, style.name),
@@ -370,7 +371,7 @@ export default (pagePath, callback) => {
   const bodyScripts = scripts
     .filter(s => s.rel !== `prefetch`)
     .map(s => {
-      const scriptPath = `${__PATH_PREFIX__}/${JSON.stringify(s.name).slice(
+      const scriptPath = `${__ASSET_PREFIX__}/${JSON.stringify(s.name).slice(
         1,
         -1
       )}`
@@ -388,6 +389,7 @@ export default (pagePath, callback) => {
     replacePostBodyComponents,
     pathname: pagePath,
     pathPrefix: __PATH_PREFIX__,
+    assetPrefix: __ASSET_PREFIX__,
   })
 
   const html = `<!DOCTYPE html>${renderToStaticMarkup(

packages/gatsby/src/commands/build.js

@@ -7,6 +7,7 @@ const bootstrap = require(`../bootstrap`)
 const apiRunnerNode = require(`../utils/api-runner-node`)
 const { copyStaticDirs } = require(`../utils/get-static-dir`)
 const { initTracer, stopTracer } = require(`../utils/tracer`)
+const { getAssets } = require(`../utils/asset-path-registry`)
 const db = require(`../db`)
 const chalk = require(`chalk`)
 const tracer = require(`opentracing`).globalTracer()
@@ -92,9 +93,12 @@ module.exports = async function build(program: BuildArgs) {
   }
   activity.end()
 
+  const assets = await getAssets(program.directory)
+
   await apiRunnerNode(`onPostBuild`, {
     graphql: graphqlRunner,
     parentSpan: buildSpan,
+    assets: Array.from(assets),
   })
 
   report.info(`Done building in ${process.uptime()} sec`)

packages/gatsby/src/joi-schemas/joi.js

@@ -5,13 +5,16 @@ const stripTrailingSlash = chain => chain.replace(/(\w)\/+$/, `$1`)
 export const gatsbyConfigSchema = Joi.object().keys({
   __experimentalThemes: Joi.array(),
   polyfill: Joi.boolean(),
+  assetPrefix: stripTrailingSlash(Joi.string().uri()),
   siteMetadata: Joi.object({
     siteUrl: stripTrailingSlash(Joi.string()).uri(),
   }).unknown(),
-  pathPrefix: Joi.string().uri({
-    allowRelative: true,
-    relativeOnly: true,
-  }),
+  pathPrefix: stripTrailingSlash(
+    Joi.string().uri({
+      allowRelative: true,
+      relativeOnly: true,
+    })
+  ),
   mapping: Joi.object(),
   plugins: Joi.array(),
   proxy: Joi.object().keys({

packages/gatsby/src/query/query-runner.js

@@ -9,6 +9,7 @@ const { store } = require(`../redux`)
 const withResolverContext = require(`../schema/context`)
 const { generatePathChunkName } = require(`../utils/js-chunk-names`)
 const { formatErrorDetails } = require(`./utils`)
+const { register } = require(`../utils/asset-path-registry`)
 const mod = require(`hash-mod`)(999)
 const { boundActionCreators } = require(`../redux/actions`)
 
@@ -114,14 +115,10 @@ ${formatErrorDetails(errorDetails)}`)
     }
 
     // Always write file to public/static/d/ folder.
-    const resultPath = path.join(
-      program.directory,
-      `public`,
-      `static`,
-      `d`,
-      modInt,
-      `${dataPath}.json`
-    )
+    const filePath = path.join(`static`, `d`, modInt, `${dataPath}.json`)
+    const resultPath = path.join(program.directory, `public`, filePath)
+
+    register(filePath)
 
     if (queryJob.isPage) {
       dataPath = `${modInt}/${dataPath}`

packages/gatsby/src/redux/reducers/__tests__/__snapshots__/config.js.snap

@@ -4,13 +4,15 @@ exports[`config reducer Validates configs with unsupported options 1`] = `"The s
 
 exports[`config reducer handles empty configs 1`] = `
 Object {
+  "assetPrefix": "",
   "pathPrefix": "",
   "polyfill": true,
 }
 `;
 
 exports[`config reducer let's you add a config 1`] = `
 Object {
+  "assetPrefix": "",
   "pathPrefix": "",
   "polyfill": true,
   "siteMetadata": Object {

packages/gatsby/src/redux/reducers/config.js

@@ -40,6 +40,12 @@ module.exports = (state = {}, action) => {
         action = _.set(action, [`payload`, `pathPrefix`], ``)
       }
 
+      // If pathPrefix isn't set, set it to an empty string
+      // to avoid it showing up as undefined elsewhere.
+      if (!_.has(action, [`payload`, `assetPrefix`])) {
+        action = _.set(action, [`payload`, `assetPrefix`], ``)
+      }
+
       // Default polyfill to true.
       if (!_.has(action, [`payload`, `polyfill`])) {
         action = _.set(action, [`payload`, `polyfill`], true)

packages/gatsby/src/utils/__tests__/__snapshots__/asset-path-registry.js.snap

@@ -0,0 +1,95 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`getAssets returns webpack assets 1`] = `
+Array [
+  "webpack-runtime-f08922a061a7e09baa26.js",
+  "webpack-runtime-f08922a061a7e09baa26.js.map",
+  "app-4b433d29b46598f0ecd3.js",
+  "app-4b433d29b46598f0ecd3.js.map",
+  "component---node-modules-gatsby-plugin-offline-app-shell-js-b1a75793f38b5d3df59f.js",
+  "component---node-modules-gatsby-plugin-offline-app-shell-js-b1a75793f38b5d3df59f.js.map",
+  "0.2b5955a752ed0afe77ce.css",
+  "0-fecec88f7d9d61b9013a.js",
+  "0-fecec88f7d9d61b9013a.js.map",
+  "1-b047c021df576f0acceb.js",
+  "1-b047c021df576f0acceb.js.map",
+  "2.fd4497ec960200ce8103.css",
+  "2-5ce6e769c43c7185e581.js",
+  "2-5ce6e769c43c7185e581.js.map",
+  "3-acdb3c000e2ba39d41ef.js",
+  "3-acdb3c000e2ba39d41ef.js.map",
+  "component---src-templates-template-blog-list-js-e53084eb5bee3f6f7f3e.js",
+  "component---src-templates-template-blog-list-js-e53084eb5bee3f6f7f3e.js.map",
+  "40-cfb9271892b3c6f32cb7.js",
+  "40-cfb9271892b3c6f32cb7.js.map",
+  "component---src-templates-template-blog-post-js-7b76cbf47a3d2298e372.js",
+  "component---src-templates-template-blog-post-js-7b76cbf47a3d2298e372.js.map",
+  "component---src-templates-tags-js-596abb26f29b385da04f.js",
+  "component---src-templates-tags-js-596abb26f29b385da04f.js.map",
+  "component---src-templates-template-starter-page-js-3ffff961577834cf4023.js",
+  "component---src-templates-template-starter-page-js-3ffff961577834cf4023.js.map",
+  "component---src-templates-template-contributor-page-js-f9404cf60eca8d73fa02.js",
+  "component---src-templates-template-contributor-page-js-f9404cf60eca8d73fa02.js.map",
+  "component---src-templates-template-creator-details-js-88ef970e91e0b78c2f36.js",
+  "component---src-templates-template-creator-details-js-88ef970e91e0b78c2f36.js.map",
+  "43-53d7dbdaf8c4c4002036.js",
+  "43-53d7dbdaf8c4c4002036.js.map",
+  "component---src-templates-template-showcase-details-js-f5e8e7b262e87f30a837.js",
+  "component---src-templates-template-showcase-details-js-f5e8e7b262e87f30a837.js.map",
+  "component---src-templates-template-docs-markdown-js-beed50a1f7dd4d27b797.js",
+  "component---src-templates-template-docs-markdown-js-beed50a1f7dd4d27b797.js.map",
+  "4-a765cc45c3be4b896d6f.js",
+  "4-a765cc45c3be4b896d6f.js.map",
+  "6-877482b381b70a3e1930.js",
+  "6-877482b381b70a3e1930.js.map",
+  "component---src-templates-template-docs-local-packages-js.fd4497ec960200ce8103.css",
+  "component---src-templates-template-docs-local-packages-js-c53e4baf78ad21580235.js",
+  "component---src-templates-template-docs-local-packages-js-c53e4baf78ad21580235.js.map",
+  "component---src-templates-template-docs-remote-packages-js.fd4497ec960200ce8103.css",
+  "component---src-templates-template-docs-remote-packages-js-68b7685d85bd50607d49.js",
+  "component---src-templates-template-docs-remote-packages-js-68b7685d85bd50607d49.js.map",
+  "component---src-pages-404-js-c31dd87a2028cf26b810.js",
+  "component---src-pages-404-js-c31dd87a2028cf26b810.js.map",
+  "component---src-pages-blog-tags-js-46843cd191f6d9a81483.js",
+  "component---src-pages-blog-tags-js-46843cd191f6d9a81483.js.map",
+  "5-5f0403c3cf66cc31c4fb.js",
+  "5-5f0403c3cf66cc31c4fb.js.map",
+  "component---src-pages-community-agencies-js-442a248e84f48ec18e11.js",
+  "component---src-pages-community-agencies-js-442a248e84f48ec18e11.js.map",
+  "component---src-pages-community-companies-js-4a9bb59d522d16bc0cd5.js",
+  "component---src-pages-community-companies-js-4a9bb59d522d16bc0cd5.js.map",
+  "component---src-pages-community-index-js-3c9cc70d04f424db3ffa.js",
+  "component---src-pages-community-index-js-3c9cc70d04f424db3ffa.js.map",
+  "component---src-pages-community-people-js-26220872f1564524ef20.js",
+  "component---src-pages-community-people-js-26220872f1564524ef20.js.map",
+  "component---src-pages-docs-actions-js-af5b12753a00718765fd.js",
+  "component---src-pages-docs-actions-js-af5b12753a00718765fd.js.map",
+  "component---src-pages-docs-browser-apis-js-f9529c1875808d214471.js",
+  "component---src-pages-docs-browser-apis-js-f9529c1875808d214471.js.map",
+  "component---src-pages-docs-index-js-c7323417d5798f1bcd94.js",
+  "component---src-pages-docs-index-js-c7323417d5798f1bcd94.js.map",
+  "component---src-pages-docs-node-apis-js-18a7ea5c808fce0d9402.js",
+  "component---src-pages-docs-node-apis-js-18a7ea5c808fce0d9402.js.map",
+  "component---src-pages-docs-ssr-apis-js-c4b332ac75f8093bdf42.js",
+  "component---src-pages-docs-ssr-apis-js-c4b332ac75f8093bdf42.js.map",
+  "component---src-pages-features-js-4a4a3f05f2ed8a3afa03.js",
+  "component---src-pages-features-js-4a4a3f05f2ed8a3afa03.js.map",
+  "component---src-pages-newsletter-js-b823f6af0f63d49f5bef.js",
+  "component---src-pages-newsletter-js-b823f6af0f63d49f5bef.js.map",
+  "component---src-pages-plugins-js.fd4497ec960200ce8103.css",
+  "component---src-pages-plugins-js-259ea07a4bf263d315c7.js",
+  "component---src-pages-plugins-js-259ea07a4bf263d315c7.js.map",
+  "42-d5c0588bf92953044654.js",
+  "42-d5c0588bf92953044654.js.map",
+  "component---src-pages-showcase-js-710ac9cbe8f04ccc5629.js",
+  "component---src-pages-showcase-js-710ac9cbe8f04ccc5629.js.map",
+  "39-72be356c49b30af6ec24.js",
+  "39-72be356c49b30af6ec24.js.map",
+  "component---src-pages-starters-js-5cea20767c8766bdcda4.js",
+  "component---src-pages-starters-js-5cea20767c8766bdcda4.js.map",
+  "component---src-pages-ecosystem-js-633f4f4caa8ef50afcbe.js",
+  "component---src-pages-ecosystem-js-633f4f4caa8ef50afcbe.js.map",
+  "component---src-pages-index-js-0a2a452fc816778a6329.js",
+  "component---src-pages-index-js-0a2a452fc816778a6329.js.map",
+]
+`;