From 0c8c185751263c10768624c8d3399a2acf9bc808 Mon Sep 17 00:00:00 2001
From: Robert Austin <rob@jugglerdigital.com>
Date: Tue, 21 Sep 2021 13:17:09 +1000
Subject: [PATCH] use modelName when generated components map

---
 package.json                 |  5 ++--
 scripts/build-dist.js        |  2 +-
 scripts/build-models.js      | 49 ------------------------------------
 src/components-manifest.json |  6 ++---
 4 files changed, 6 insertions(+), 56 deletions(-)
 delete mode 100755 scripts/build-models.js

diff --git a/package.json b/package.json
index b55b5d86..4c57bca7 100644
--- a/package.json
+++ b/package.json
@@ -9,10 +9,9 @@
     ],
     "main": "index.js",
     "scripts": {
-        "dev": "npm run prepare-storybook && start-storybook -s ./public -p 6006",
-        "build": "npm run prepare-storybook && build-storybook -s ./public",
+        "dev": "node ./scripts/build-storybook.js && start-storybook -s ./public -p 6006",
+        "build": "node ./scripts/build-storybook.js && build-storybook -s ./public",
         "dist": "./scripts/build-dist.js --clean",
-        "prepare-storybook": "node ./scripts/build-storybook.js",
         "version-minor": "npm version minor -m \"bumped version to v%s\"",
         "version-patch": "npm version patch -m \"bumped version to v%s\""
     },
diff --git a/scripts/build-dist.js b/scripts/build-dist.js
index f12a8bfe..42b889fc 100755
--- a/scripts/build-dist.js
+++ b/scripts/build-dist.js
@@ -75,7 +75,7 @@ componentsMap.components = Object.entries(componentsManifest).reduce((map, [comp
 componentsMap.dynamic = Object.entries(componentsManifest)
     .filter(([_, component]) => component.isDynamic)
     .reduce((map, [_, component]) => {
-        map[component.className] = '@stackbit/components/' + component.path;
+        map[component.modelName] = '@stackbit/components/' + component.path;
         return map;
     }, {});
 
diff --git a/scripts/build-models.js b/scripts/build-models.js
deleted file mode 100755
index 2d3167ab..00000000
--- a/scripts/build-models.js
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env node
-const path = require('path');
-const fs = require('fs-extra');
-const yaml = require('js-yaml');
-const args = process.argv.slice(2);
-
-const modelsFolder = path.join(__dirname, '../models');
-const modelsFilepaths = fs.readdirSync(modelsFolder).map((relFilename) => path.resolve(modelsFolder, relFilename));
-const dest = path.join(__dirname, '../stackbit-theme.yaml');
-
-console.log(`Merging models from ${modelsFolder}`);
-
-const models = {
-    stackbitVersion: '~0.4.0',
-    ssgName: 'nextjs',
-    nodeVersion: '14',
-    cmsName: 'git',
-    assets: {
-        referenceType: 'static',
-        staticDir: 'public',
-        uploadDir: 'images',
-        publicPath: '/'
-    },
-    dataDir: 'content/data',
-    pagesDir: 'content/pages',
-    pageLayoutKey: 'layout',
-    objectTypeKey: 'type',
-    models: {}
-};
-
-modelsFilepaths.forEach((modelAbsFilepath) => {
-    const fileData = fs.readFileSync(modelAbsFilepath);
-    const modelYaml = yaml.load(fileData);
-    models.models[modelYaml.name] = modelYaml;
-    delete models.models[modelYaml.name].name;
-});
-
-const stackbitYaml = yaml.dump(models);
-fs.writeFileSync(dest, stackbitYaml);
-
-console.log(`Writing stackbit.yaml to ${dest}`);
-
-fs.writeFileSync(path.join(__dirname, '../stackbit-theme.yaml'), stackbitYaml);
-
-fs.copy(path.join(__dirname, '../models'), path.join(__dirname, '../public/models'));
-
-if (args.includes('--local')) {
-    fs.writeFileSync(path.join(__dirname, '../../stackbit-nextjs-v2/stackbit.yaml'), stackbitYaml);
-}
diff --git a/src/components-manifest.json b/src/components-manifest.json
index 0f2fff43..22167c5b 100644
--- a/src/components-manifest.json
+++ b/src/components-manifest.json
@@ -2,13 +2,13 @@
     "Action": {
         "path": "components/Action",
         "className": "Action",
-        "modelName": "button",
+        "modelName": "Button",
         "isDynamic": false
     },
     "Badge": {
         "path": "components/Badge",
         "className": "Badge",
-        "modelName": "badge",
+        "modelName": null,
         "isDynamic": false
     },
     "CheckboxFormControl": {
@@ -80,7 +80,7 @@
     "InlineMarkdown": {
         "path": "components/InlineMarkdown",
         "className": "InlineMarkdown",
-        "modelName": "InlineMarkdown",
+        "modelName": null,
         "isDynamic": false
     },
     "NavBar": {