fix: avoid loading run-time components at build

ccontrols · Jun 3, 2020 · babab24 · babab24
1 parent df33249
commit babab24
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -80,13 +80,13 @@
       ]
     },
     {
-      "name": "gatsby develop",
+      "name": "gatsby start",
       "type": "node",
       "request": "launch",
       "protocol": "inspector",
       "program": "${workspaceRoot}/node_modules/gatsby/dist/bin/gatsby",
       "cwd": "${workspaceFolder}/examples/gatsby",
-      "args": ["develop"],
+      "args": ["start"],
       "stopOnEntry": false,
       "runtimeArgs": ["--nolazy"],
       "sourceMaps": false

diff --git a/core/loader/package.json b/core/loader/package.json
@@ -12,7 +12,8 @@
     "plugin.js",
     "loader.js",
     "story-store-data.js",
-    "loader.d.ts"
+    "loader.d.ts",
+    "store.js"
   ],
   "scripts": {
     "build": "yarn cross-env NODE_ENV=production rollup -c",

diff --git a/core/loader/src/replaceSource.ts b/core/loader/src/replaceSource.ts
@@ -64,7 +64,6 @@ ${stories
 ${imports}
 ${storeConst}
 store.config = configJSON;
-debugger;
 ${loadStories}
 ${hmr}
 ${exports}

diff --git a/core/loader/store.js b/core/loader/store.js
@@ -0,0 +1 @@
+module.exports = require('./dist/store');
diff --git a/core/webpack-compile/src/utilities.ts b/core/webpack-compile/src/utilities.ts
@@ -72,7 +72,7 @@ export const runCompiler = (
         console.error(error);
         return reject(error);
       }
-      const store = require(path.resolve(__dirname, '../dist', 'bundle.js'));
+      const { store } = require('@component-controls/loader/store');
       resolve({ store, stats });
     });
   });

diff --git a/examples/gatsby/.config/main.js b/examples/gatsby/.config/main.js
@@ -1,6 +1,11 @@
 module.exports = {
   stories: [
     '../../stories/src/**/*.stories.(js|jsx|tsx|mdx)',
+    '../../../ui/editors/src/**/*.stories.(js|jsx|tsx|mdx)',
+    '../../../ui/components/src/**/*.stories.(js|jsx|tsx|mdx)',
+    '../../../ui/app-components/src/**/*.stories.(js|jsx|tsx|mdx)',
+    '../../../ui/blocks/src/**/*.stories.(js|jsx|tsx|mdx)',
     '../../../core/specification/src/stories/**/*.stories.(js|jsx|tsx|mdx)',
-  ],  
+    '../../../plugins/axe-plugin/src/stories/**/*.stories.(js|jsx|tsx|mdx)',
+  ],
 };
diff --git a/integrations/gatsby-theme-stories/src/gatsby-node.ts b/integrations/gatsby-theme-stories/src/gatsby-node.ts
@@ -4,8 +4,6 @@ import {
   CompileProps,
 } from '@component-controls/webpack-compile';
 import { NodePluginArgs, NodeInput, CreatePagesArgs } from 'gatsby';
-import { StoriesStore } from '@component-controls/specification';
-import { loadStoryStore } from '@component-controls/store';
 import { LoaderOptions } from './types';
 
 const defaultPresets = ['react', 'react-docgen-typescript'];
@@ -20,16 +18,15 @@ exports.sourceNodes = async function sourceNodes(
     presets: defaultPresets,
     configPath: options.configPath,
   };
-  const { store } = false ? await watch(config) : await compile(config);
-  const loadedStore: StoriesStore | undefined = loadStoryStore(store);
+  const { store } = true ? await watch(config) : await compile(config);
 
-  if (loadedStore) {
-    Object.keys(loadedStore.docs).forEach(key => {
+  if (store) {
+    store.stores.forEach(s => {
       //@ts-ignore
-      const doc = loadedStore.docs[key];
+      const doc = s.doc;
 
       const docMetadata: NodeInput = {
-        id: createNodeId(`storyDoc-${key}`),
+        id: createNodeId(`storyDoc-${doc?.title}`),
         children: [],
         internal: {
           type: 'storyDoc',