Merge pull request #4 from knapsack-cloud/merge-upstream

Merge upstream changes to remove dependency on shared types

CHANGELOG.md

@@ -1539,4 +1539,4 @@
 
 ---
 
-# v0.0.6 (Fri Oct 01 2021)
+# v0.0.6 (Fri Oct 01 2021)

knapsack.config.js

@@ -17,7 +17,6 @@ const {
 } = require('@knapsack/plugin-changelog-md');
 const { version } = require('./lerna.json');
 
-const sharedTypesDir = join(__dirname, './packages/shared-types/dist');
 const DesignTokenDir = join(__dirname, './packages/design-tokens/dist');
 
 module.exports = configureKnapsack({
@@ -39,7 +38,7 @@ module.exports = configureKnapsack({
       },
     },
   },
-  dist: sharedTypesDir,
+  dist: './dist',
   public: join(__dirname, 'ks-public/'),
   data: './data',
   version,

lerna.json

@@ -2,9 +2,7 @@
   "$schema": "http://json.schemastore.org/lerna",
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
   "version": "0.1.55",
   "command": {
     "version": {

package.json

@@ -6,8 +6,7 @@
   "scripts": {
     "clean": "lerna run clean && rm -rf ./ks-public/dist",
     "build": "run-s -l prep ks:build",
-    "prep": "run-s -l prep:tokens prep:styles prep:wc prep:meta prep:react",
-    "prep:meta": "KNAPSACK_LOG_LEVEL=error yarn knapsack build:meta",
+    "prep": "run-s -l prep:tokens prep:styles prep:wc prep:react",
     "prep:tokens": "[ -d ./packages/design-tokens/dist ] || yarn knapsack build:tokens",
     "prep:styles": "[ -d ./packages/styles/dist ] || yarn --cwd ./packages/styles build",
     "prep:react": "[ -d ./packages/react/dist ] || yarn --cwd ./packages/react build",

packages/react/package.json

@@ -11,7 +11,6 @@
   },
   "dependencies": {
     "@knapsack-cloud/workshop-demo-design-tokens": "^0.1.55",
-    "@knapsack-cloud/workshop-demo-shared-types": "^0.1.55",
     "@knapsack-cloud/workshop-demo-styles": "^0.1.55",
     "classnames": "^2.3.1"
   },

packages/react/src/author/author.tsx

@@ -1,6 +1,12 @@
 import * as React from 'react';
 import cn from 'classnames';
-import { AuthorProps } from '@knapsack-cloud/workshop-demo-shared-types';
+
+export interface AuthorProps {
+  date?: string;
+  read?: string;
+  imgSrc?: string;
+  children?: React.ReactNode;
+}
 
 export const Author: React.FC<AuthorProps> = ({
   imgSrc,

packages/react/src/layout/layout.tsx

@@ -1,5 +1,13 @@
 import * as React from 'react';
-import { LayoutProps } from '@knapsack-cloud/workshop-demo-shared-types';
+
+export interface LayoutProps {
+  bandTitle?: string;
+  bandContent?: string;
+  /**
+   * undefined. Only use: author, button, card
+   */
+  children?: React.ReactNode;
+}
 
 export const Layout: React.FC<LayoutProps> = ({
   bandTitle,

packages/react/src/top-nav/top-nav.tsx

@@ -1,5 +1,10 @@
 import * as React from 'react';
-import { TopNavProps } from '@knapsack-cloud/workshop-demo-shared-types';
+
+export interface TopNavProps {
+  logo?: string;
+  links?: string[];
+  button?: string;
+}
 
 export const TopNav: React.FC<TopNavProps> = ({
   button,