Merge branch 'master' into feature/ss-rendering

# Conflicts:
#	package.json

Author: aeagle

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmjs.org/

.storybook/main.js

@@ -1,8 +1,23 @@
 const path = require("path");
 
 module.exports = {
-	stories: ["./../**/*.stories.@(mdx|tsx)"],
-	addons: ["@storybook/addon-actions", "@storybook/addon-links", "@storybook/addon-docs/preset"],
+	stories: ["../src/**/*.stories.@(mdx|tsx)"],
+	addons: [
+		"@storybook/addon-actions",
+		"@storybook/addon-links",
+		{
+			name: "@storybook/addon-docs/preset",
+			options: {
+				configureJSX: true,
+				inlineStories: false,
+			},
+		},
+	],
+	typescript: {
+		check: true,
+		checkOptions: {},
+		reactDocgen: "react-docgen-typescript",
+	},
 	webpackFinal: async (config, { configType }) => {
 		if (process.env.NODE === "production") {
 			config.output.publicPath = "/react-spaces/docs";

.storybook/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "react-spaces-storybook",
-	"version": "0.2.0",
+	"version": "0.2.2",
 	"files": [
 		"**/*.*"
 	],

.storybook/preview-head.html

@@ -5,33 +5,21 @@
 		font-family: "Ubuntu", sans-serif;
 		font-size: 12px;
 	}
-	.sbdocs-wrapper {
-		padding: 15px !important;
-	}
-	.sbdocs-wrapper h2 {
-		font-weight: 300 !important;
-		border-bottom: none !important;
-		margin-bottom: 20px !important;
-	}
-	.sbdocs-wrapper h4 {
-		margin-top: 20px !important;
-		font-weight: 500 !important;
-	}
-	.sbdocs-wrapper p,
-	.sbdocs-wrapper li {
-		font-size: 16px !important;
-	}
-	.sbdocs-preview > div > div > div {
-		margin-bottom: 15px;
+
+	.docblock-source {
+		margin: 25px 0 !important;
 	}
-	.sbdocs-preview > div > div > div > div > div {
+
+	.docs-story > div > div > div > div > div > div {
 		position: relative;
-		height: 600px;
+		height: 600px !important;
 		outline: 1px solid black;
 	}
-	.docblock-source {
-		margin: 25px 0 !important;
+
+	.container-container {
+		outline: solid black 1px;
 	}
+
 	.spaces-resize-handle {
 		background-color: red !important;
 	}

.storybook/preview.js

@@ -0,0 +1,7 @@
+import { addParameters } from "@storybook/react";
+
+addParameters({
+	docs: {
+		inlineStories: false,
+	},
+});

GitVersion.yml

@@ -4,12 +4,37 @@
 # https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
 
 pool:
-  vmImage: 'ubuntu-latest'
+  vmImage: "ubuntu-latest"
 
 steps:
+- task: gitversion/setup@0
+  inputs:
+    versionSpec: '5.x'
+    
+- task: gitversion/execute@0 
+
+- script: echo "##vso[build.updatebuildnumber]$(GitVersion.MajorMinorPatch)"
+
+- task: Bash@3
+  displayName: Update version number in react-spaces package.json
+  inputs:
+    targetType: 'inline'
+    script:  sed -i "s/0.2.2/$GITVERSIONNUMBER/g" package.json
+  env:
+    GITVERSIONNUMBER: $(GitVersion.MajorMinorPatch)
+
+- task: Bash@3
+  displayName: Update version number in react-spaces-storybook package.json
+  inputs:
+    targetType: 'inline'
+    script:  sed -i "s/0.2.2/$GITVERSIONNUMBER/g" .storybook/package.json
+  env:
+    GITVERSIONNUMBER: $(GitVersion.MajorMinorPatch)
+
 - task: NodeTool@0
   inputs:
-    versionSpec: '10.x'
+    versionSpec: '12.x'
+    checkLatest: true
   displayName: 'Install Node.js'
 
 - script: |
@@ -23,10 +48,11 @@ steps:
   inputs:
     SourceFolder: '.storybook'
     Contents: 'package.json'
-    TargetFolder: 'storybook-static'
+    TargetFolder: './storybook-static'
     OverWrite: true
 
 - task: Npm@1
+  enabled: true
   displayName: Publish react-spaces-storybook
   inputs:
     command: 'publish'

azure-pipelines.yml

@@ -1 +1 @@
-See https://www.allaneagle.com/react-spaces/docs/?path=/docs/react-spaces-change-history--page
+See https://allaneagle.com/projects/react-spaces/history