feat: ceate base-integration package

ccontrols · Mar 13, 2021 · 965c83c · 965c83c
1 parent de2faf1
commit 965c83c
Show file tree

Hide file tree

Showing 72 changed files with 596 additions and 851 deletions.
diff --git a/core/routes/src/routes/docs-index-pages.ts b/core/routes/src/routes/docs-index-pages.ts
@@ -9,11 +9,12 @@ import {
 } from '@component-controls/core';
 import { getUniquesByField } from './docs-pages';
 export interface DocHomePagesPath {
-  type: DocType;
+  type?: DocType;
   path: string;
   docId?: string;
   storyId?: string;
   lastModified?: string;
+  docIndex?: boolean;
 }
 
 export const getHomePages = (store?: Store): DocHomePagesPath[] => {
@@ -45,25 +46,32 @@ export const getHomePages = (store?: Store): DocHomePagesPath[] => {
         const storyId: string | undefined = docStories.length
           ? docStories[0]
           : undefined;
-        return {
-          lastModified: doc?.dateModified
-            ? new Date(doc?.dateModified).toISOString()
-            : undefined,
+        const result: DocHomePagesPath = {
           type,
           path,
-          docId,
-          storyId,
+          docIndex: true,
         };
+        if (docId) {
+          result.docId = docId;
+        }
+        if (storyId) {
+          result.storyId = storyId;
+        }
+        const lastModified = doc?.dateModified
+          ? new Date(doc?.dateModified).toISOString()
+          : undefined;
+        if (lastModified) {
+          result.lastModified = lastModified;
+        }
+        return result;
       })
       .filter(({ path }) => path);
     const categoryPaths: DocHomePagesPath[] = categories
       .map(category => {
         const uniques = getUniquesByField(store, category);
         return {
-          lastModified: undefined,
           type: category,
-          docId: undefined,
-          storyId: undefined,
+          docIndex: true,
           path: Object.keys(uniques).length
             ? getCategoryPath(store, category)
             : '',

diff --git a/core/routes/src/routes/docs-pages.ts b/core/routes/src/routes/docs-pages.ts
@@ -51,7 +51,7 @@ export const getUniquesByField = (
 };
 
 export interface DocPagesPath {
-  type: DocType;
+  type?: DocType;
   path: string;
   query?: string;
   lastModified?: string;
@@ -99,17 +99,27 @@ export const getDocPages = (store?: Store): DocPagesPath[] => {
                   route,
                 );
                 if (!docPaths.find(p => p.path === path)) {
-                  docPaths.push({
-                    lastModified: doc.dateModified
-                      ? new Date(doc.dateModified).toISOString()
-                      : undefined,
+                  const result: DocPagesPath = {
                     path,
-                    query,
                     type: docType,
-                    activeTab: route,
                     docId: doc.title,
-                    storyId,
-                  });
+                  };
+                  if (storyId) {
+                    result.storyId = storyId;
+                  }
+                  if (route) {
+                    result.activeTab = route;
+                  }
+                  const lastModified = doc.dateModified
+                    ? new Date(doc.dateModified).toISOString()
+                    : undefined;
+                  if (lastModified) {
+                    result.lastModified = lastModified;
+                  }
+                  if (query) {
+                    result.query = query;
+                  }
+                  docPaths.push(result);
                 }
               });
             }

diff --git a/core/routes/src/routes/index-page.ts b/core/routes/src/routes/index-page.ts
@@ -6,7 +6,7 @@ import {
 } from '@component-controls/core';
 
 export interface HomePageInfo {
-  type: string;
+  type?: string;
   docId?: string;
   storyId?: string;
   path: string;
@@ -29,18 +29,26 @@ export const getIndexPage = (store?: Store): HomePageInfo => {
     const docId = homePage?.title;
     const docStories: string[] =
       docId && store.docs[docId] ? store.docs[docId].stories || [] : [];
-    const storyId: string | undefined = docStories.length
-      ? docStories[0]
-      : undefined;
-    return {
-      lastModified: homePage?.dateModified
-        ? new Date(homePage?.dateModified).toISOString()
-        : undefined,
+    const result: HomePageInfo = {
       path: homePath,
-      storyId,
-      docId,
       type: homePage?.type || defDocType,
     };
+    const lastModified = homePage?.dateModified
+      ? new Date(homePage?.dateModified).toISOString()
+      : undefined;
+    if (lastModified) {
+      result.lastModified = lastModified;
+    }
+    const storyId: string | undefined = docStories.length
+      ? docStories[0]
+      : undefined;
+    if (storyId) {
+      result.storyId = storyId;
+    }
+    if (docId) {
+      result.docId = docId;
+    }
+    return result;
   }
   return {
     type: defDocType,

diff --git a/core/routes/src/routes/index.ts b/core/routes/src/routes/index.ts
@@ -1,3 +1,29 @@
+import { Store } from '@component-controls/core';
+import { getHomePages, DocHomePagesPath } from './docs-index-pages';
+import { getDocPages, DocPagesPath } from './docs-pages';
+import { getIndexPage, HomePageInfo } from './index-page';
+
 export * from './docs-index-pages';
 export * from './docs-pages';
 export * from './index-page';
+
+export type RoutePath = DocHomePagesPath & DocPagesPath & HomePageInfo;
+
+export const getRoutes = (store: Store): RoutePath[] => {
+  const routes = [];
+  //home page
+  const index = getIndexPage(store) || {};
+  routes.push(index);
+  //docs index pages
+  const homePages = getHomePages(store);
+  homePages.forEach(page => {
+    routes.push(page);
+  });
+
+  //document pages
+  const docPages = getDocPages(store);
+  docPages.forEach(page => {
+    routes.push(page);
+  });
+  return routes;
+};
diff --git a/core/store/loader.d.ts b/core/store/loader.d.ts
diff --git a/core/store/loader.js b/core/store/loader.js
diff --git a/core/store/package.json b/core/store/package.json
@@ -14,9 +14,7 @@
     "static_store.js",
     "static_store.d.ts",
     "controls-store.js",
-    "controls-store.d.ts",
-    "loader.js",
-    "loader.d.ts"
+    "controls-store.d.ts"
   ],
   "scripts": {
     "build": "yarn cross-env NODE_ENV=production rollup -c",

diff --git a/core/store/src/webpack/loader.ts b/core/store/src/webpack/loader.ts
diff --git a/examples/nextjs/next.config.js b/examples/nextjs/next.config.js
@@ -5,5 +5,4 @@ module.exports = withStories({
     webpack5: true,
   },
   configPath: '.config',
-  distDir: 'dist',
 });
diff --git a/examples/nextjs/pages/[doctype].tsx b/examples/nextjs/pages/[doctype].tsx
@@ -1,23 +1,21 @@
 import React from 'react';
 import { GetStaticProps, GetStaticPaths } from 'next';
 import {
-  DocHomeTemplate,
+  NextLayout,
   store,
   getHomePagesPaths,
   getDocHomePage,
 } from '@component-controls/nextjs-plugin';
 
-const DocHome: typeof DocHomeTemplate = props => <DocHomeTemplate {...props} />;
+const DocHome: typeof NextLayout = props => <NextLayout {...props} />;
 
 export const getStaticPaths: GetStaticPaths = async () => {
   return { paths: getHomePagesPaths(store), fallback: false };
 };
 
 export const getStaticProps: GetStaticProps = async ({ params }) => {
   const { doctype: basepath } = params as { doctype: string };
-  const page = getDocHomePage(store, basepath);
-  const { type = null, docId = null, storyId = null } = page || {};
-  return { props: { docId, storyId, type } };
+  return { props: getDocHomePage(store, basepath) };
 };
 
 export default DocHome;
diff --git a/examples/nextjs/pages/[doctype]/[...docid].tsx b/examples/nextjs/pages/[doctype]/[...docid].tsx
@@ -1,29 +1,21 @@
 import React from 'react';
 import { GetStaticProps, GetStaticPaths } from 'next';
 import {
-  DocPageTemplate,
+  NextLayout,
   store,
   getDocPagesPaths,
   getDocPage,
 } from '@component-controls/nextjs-plugin';
 
-const DocPage: typeof DocPageTemplate = props => <DocPageTemplate {...props} />;
+const DocPage: typeof NextLayout = props => <NextLayout {...props} />;
 
 export const getStaticPaths: GetStaticPaths = async () => {
   return { paths: getDocPagesPaths(store), fallback: false };
 };
 
 export const getStaticProps: GetStaticProps = async ({ params }) => {
   const { doctype, docid } = params as { doctype: string; docid: string[] };
-  const page = getDocPage(store, doctype, docid);
-  const {
-    type = null,
-    docId = null,
-    storyId = null,
-    category = null,
-    activeTab = null,
-  } = page || {};
-  return { props: { docId, type, storyId, category, activeTab } };
+  return { props: getDocPage(store, doctype, docid) };
 };
 
 export default DocPage;
diff --git a/examples/nextjs/pages/index.tsx b/examples/nextjs/pages/index.tsx
@@ -1,19 +1,15 @@
 import React from 'react';
 import { GetStaticProps } from 'next';
 import {
-  DocPageTemplate,
+  NextLayout,
   store,
   getIndexPage,
 } from '@component-controls/nextjs-plugin';
 
-const HomePage: typeof DocPageTemplate = props => (
-  <DocPageTemplate {...props} />
-);
+const HomePage: typeof NextLayout = props => <NextLayout {...props} />;
 
 export const getStaticProps: GetStaticProps = async () => {
-  const homePage = getIndexPage(store);
-  const { docId = null, type = null, storyId = null } = homePage;
-  return { props: { docId, type, storyId } };
+  return { props: getIndexPage(store) };
 };
 
 export default HomePage;
diff --git a/examples/react-webpack/webpack.dev.config.js b/examples/react-webpack/webpack.dev.config.js
@@ -58,6 +58,5 @@ module.exports = withComponentControls({
   options: {
     configPath: '.config',
     distFolder: publicPath,
-    fastRefresh: false,
   },
 });
diff --git a/examples/simple/next.config.js b/examples/simple/next.config.js
@@ -5,5 +5,4 @@ module.exports = withStories({
     webpack5: true,
   },
   configPath: 'docs',
-  distDir: 'dist',
 });
diff --git a/examples/simple/package.json b/examples/simple/package.json
@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "@component-controls/gatsby-theme-stories": "^3.3.0",
+    "@component-controls/nextjs-plugin": "^3.3.0",
     "gatsby": "^3.0.0",
     "next": "^10.0.7",
     "react": "^17.0.1",

diff --git a/examples/simple/pages/[doctype].tsx b/examples/simple/pages/[doctype].tsx
@@ -1,23 +1,21 @@
 import React from 'react';
 import { GetStaticProps, GetStaticPaths } from 'next';
 import {
-  DocHomeTemplate,
+  NextLayout,
   store,
   getHomePagesPaths,
   getDocHomePage,
 } from '@component-controls/nextjs-plugin';
 
-const DocHome: typeof DocHomeTemplate = props => <DocHomeTemplate {...props} />;
+const DocHome: typeof NextLayout = props => <NextLayout {...props} />;
 
 export const getStaticPaths: GetStaticPaths = async () => {
   return { paths: getHomePagesPaths(store), fallback: false };
 };
 
 export const getStaticProps: GetStaticProps = async ({ params }) => {
   const { doctype: basepath } = params as { doctype: string };
-  const page = getDocHomePage(store, basepath);
-  const { type = null, docId = null, storyId = null } = page || {};
-  return { props: { docId, storyId, type } };
+  return { props: getDocHomePage(store, basepath) };
 };
 
 export default DocHome;
diff --git a/examples/simple/pages/[doctype]/[...docid].tsx b/examples/simple/pages/[doctype]/[...docid].tsx
@@ -1,29 +1,21 @@
 import React from 'react';
 import { GetStaticProps, GetStaticPaths } from 'next';
 import {
-  DocPageTemplate,
+  NextLayout,
   store,
   getDocPagesPaths,
   getDocPage,
 } from '@component-controls/nextjs-plugin';
 
-const DocPage: typeof DocPageTemplate = props => <DocPageTemplate {...props} />;
+const DocPage: typeof NextLayout = props => <NextLayout {...props} />;
 
 export const getStaticPaths: GetStaticPaths = async () => {
   return { paths: getDocPagesPaths(store), fallback: false };
 };
 
 export const getStaticProps: GetStaticProps = async ({ params }) => {
   const { doctype, docid } = params as { doctype: string; docid: string[] };
-  const page = getDocPage(store, doctype, docid);
-  const {
-    type = null,
-    docId = null,
-    storyId = null,
-    category = null,
-    activeTab = null,
-  } = page || {};
-  return { props: { docId, type, storyId, category, activeTab } };
+  return { props: getDocPage(store, doctype, docid) };
 };
 
 export default DocPage;