Move default pages back into the gatsby generator package

.gitignore

@@ -24,6 +24,8 @@ scratchings.js
 /packages/gatsby-generator/static/favicon.ico
 /packages/gatsby-generator/typings
 
+/packages/pipeline-stages/data
+
 /packages/**/bundles
 /packages/gatsby-generator/public
 /packages/**/**/yarn.lock

packages/file-viewer/package.json

@@ -10,7 +10,9 @@
   ],
   "author": "Peter Yu",
   "license": "MIT",
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "peerDependencies": {
     "react": "16.10.2",
     "react-dom": "^16.8.4"

packages/gatsby-generator/src/pipeline/buildPagesPipeline.ts

@@ -7,9 +7,14 @@ import {
 import allPaths from './getAllPaths';
 
 const buildPipeline = async (configPath?: string) => {
-  const { rootPath, wrappersPath, pagesPath, pkgRoot, config } = await allPaths(
-    configPath,
-  );
+  const {
+    rootPath,
+    wrappersPath,
+    pagesPath,
+    pkgRoot,
+    config,
+    defaultPagesPath,
+  } = await allPaths(configPath);
 
   return scanMetadataStage({
     rootPath,
@@ -23,6 +28,7 @@ const buildPipeline = async (configPath?: string) => {
       generatePagesStage({
         wrappersPath,
         pagesPath,
+        defaultPagesPath,
         packageRoot: pkgRoot,
         ...websiteInfo,
         ...config,

packages/gatsby-generator/src/pipeline/buildPipeline.ts

@@ -13,9 +13,14 @@ const buildPipeline = async (
   configPath?: string,
   gatsbyOptions: string[] = [],
 ) => {
-  const { rootPath, wrappersPath, pagesPath, pkgRoot, config } = await allPaths(
-    configPath,
-  );
+  const {
+    rootPath,
+    wrappersPath,
+    pagesPath,
+    pkgRoot,
+    config,
+    defaultPagesPath,
+  } = await allPaths(configPath);
 
   return scanMetadataStage({
     rootPath,
@@ -29,6 +34,7 @@ const buildPipeline = async (
       generatePagesStage({
         wrappersPath,
         pagesPath,
+        defaultPagesPath,
         packageRoot: pkgRoot,
         ...websiteInfo,
         ...config,

packages/gatsby-generator/src/pipeline/devPipeline.ts

@@ -7,9 +7,14 @@ import runGatsby from './stages/run-gatsby';
 import allPaths from './getAllPaths';
 
 const devPipeline = async (configPath?: string, gatsbyOptions?: string[]) => {
-  const { rootPath, wrappersPath, pagesPath, pkgRoot, config } = await allPaths(
-    configPath,
-  );
+  const {
+    rootPath,
+    wrappersPath,
+    pagesPath,
+    pkgRoot,
+    config,
+    defaultPagesPath,
+  } = await allPaths(configPath);
 
   return scanMetadataStage({
     rootPath,
@@ -23,6 +28,7 @@ const devPipeline = async (configPath?: string, gatsbyOptions?: string[]) => {
       generatePagesStage({
         wrappersPath,
         pagesPath,
+        defaultPagesPath,
         packageRoot: pkgRoot,
         ...websiteInfo,
         ...config,

packages/gatsby-generator/src/pipeline/getAllPaths.ts

@@ -13,13 +13,15 @@ const getPathData = async (configPath?: string) => {
     `./un-src/components/page-templates`,
   );
   const pagesPath = path.resolve(pkgRoot, `./pages`);
+  const defaultPagesPath = path.join(pkgRoot, 'default-pages');
 
   return {
     rootPath: cwd,
     wrappersPath,
     pagesPath,
     pkgRoot,
     config,
+    defaultPagesPath,
   };
 };
 export default getPathData;

packages/pipeline-stages/package.json

@@ -22,6 +22,7 @@
   },
   "peerDependencies": {},
   "devDependencies": {
-    "jest-fixtures": "^0.6.0"
+    "jest-fixtures": "^0.6.0",
+    "mock-fs": "^4.10.1"
   }
 }

packages/pipeline-stages/src/generate-pages/index.ts

@@ -4,7 +4,6 @@ import { BriskConfiguration } from '../common/configuration-options';
 import { StageOutput as WebsiteInfoSpec } from '../generate-website-info';
 
 import * as pageWriters from './page-writers';
-import getDefaultPagesPath from './get-default-pages-path';
 
 const {
   generatePackageDocPage,
@@ -27,6 +26,8 @@ export type StageInput = {
   pagesPath: string;
   // The absolute path to the root of the package.
   packageRoot: string;
+  // The absolute path to the directory containing default pages
+  defaultPagesPath: string;
 } & WebsiteInfoSpec &
   BriskConfiguration;
 
@@ -48,9 +49,8 @@ const generateGenericPage = (
 export default createStage(
   'generate-pages',
   async (input: StageInput): Promise<StageOutput> => {
-    const { pagesPath, wrappersPath } = input;
+    const { pagesPath, wrappersPath, defaultPagesPath } = input;
     await cleanPages(pagesPath);
-    const defaultPagesPath = await getDefaultPagesPath();
     await addBasePages(defaultPagesPath, pagesPath);
 
     const generatorConfig = { pagesPath, wrappersPath };

packages/pipeline-stages/src/generate-pages/integration.test.ts

@@ -1,14 +1,16 @@
-import { createTempDir } from 'jest-fixtures';
+import { createTempDir, copyFixtureIntoTempDir } from 'jest-fixtures';
 import path from 'path';
 import fs from 'fs-extra';
 import generatePagesStage, { StageInput } from './index';
 
 describe('Generate pages build stage integration', () => {
   let pagesPath: string;
   let wrappersPath: string;
+  let defaultPagesPath: string;
 
   beforeEach(async () => {
     const cwd = await createTempDir();
+    defaultPagesPath = await copyFixtureIntoTempDir(__dirname, 'default-pages');
     pagesPath = path.join(cwd, 'pages');
     wrappersPath = path.join(cwd, 'wrappers');
   });
@@ -18,6 +20,7 @@ describe('Generate pages build stage integration', () => {
     const input: StageInput = {
       pagesPath,
       wrappersPath,
+      defaultPagesPath,
       pages: {
         packageDocPages: [
           {
@@ -123,5 +126,8 @@ describe('Generate pages build stage integration', () => {
       path.join(pagesPath, 'package-home-pages'),
     );
     expect(packageHomePages).toEqual(['home1.js']);
+
+    const rootPages = await fs.readdir(pagesPath);
+    expect(rootPages).toContain('default-page.js');
   });
 });

packages/pipeline-stages/src/generate-pages/page-writers.ts

@@ -284,7 +284,10 @@ export const cleanPages = async (pagesPath: string) => {
  * @param defaultPagesPath absolure path to where the default pages are located
  * @param pagesPath the pages directory path
  */
-export const addBasePages = async (defaultPagesPath: string, pagesPath: string) => {
+export const addBasePages = async (
+  defaultPagesPath: string,
+  pagesPath: string,
+) => {
   await fs.copy(defaultPagesPath, pagesPath);
 };
 

packages/pipeline-stages/src/generate-pages/test.ts

@@ -19,6 +19,7 @@ jest.mock('./page-writers', () => ({
 const inputBase = {
   wrappersPath: 'WRAPPERS_PATH',
   pagesPath: 'PAGES_PATH',
+  defaultPagesPath: 'DEFAULT_PAGES_PATH',
   pages: {
     packageDocPages: [],
     projectDocPages: [],

packages/react-changelogs/package.json

@@ -11,7 +11,9 @@
   ],
   "author": "Aparna Raj",
   "license": "MIT",
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "peerDependencies": {
     "react": "16.10.2",
     "react-dom": "^16.8.4"

yarn.lock

@@ -13204,9 +13204,9 @@ [email protected], [email protected], mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
     minimist "0.0.8"
 
 mock-fs@^4.10.1:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.10.1.tgz#50a07a20114a6cdb119f35762f61f46266a1e323"
-  integrity sha512-w22rOL5ZYu6HbUehB5deurghGM0hS/xBVyHMGKOuQctkk93J9z9VEOhDsiWrXOprVNQpP9uzGKdl8v9mFspKuw==
+  version "4.10.4"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/mock-fs/-/mock-fs-4.10.4.tgz#4eaa3d6f7da2f44e1f3dd6b462cbbcb7b082e3d4"
+  integrity sha1-Tqo9b32i9E4fPda0Ysu8t7CC49Q=
 
 [email protected]:
   version "2.22.2"