Master -> Stable 11/4.a (microsoft#1487)

* Don't check production for CSP headers (microsoft#1464)

* Don't show Message activities in Activity menu (microsoft#1469)

* Use value property for improved experience (microsoft#1465)

* About page cleanup (microsoft#1472)

* Cleans up About page, adds PRIVACY.md

* Change help link to new issue template

* Remove dead code (microsoft#1477)

* Clean stdout on startup (microsoft#1479)

* Adjust stdout of build command

* Fix TypeScript casing

* Cleanup

* update readme for public preview (microsoft#1434)

* update readme for pblic preview

* update readme for pblic preview

* minor updates post doc merge

* removing old docs from main doc folder

* changes existingdocs to olddocs

* remove docs readme

* remove hardcode links to other branch, fix TOC, etc.

* adding updated TOC to the commit

Composer/jest.config.js

@@ -41,7 +41,6 @@ module.exports = {
     '<rootDir>/packages/extensions/obiformeditor',
     '<rootDir>/packages/extensions/visual-designer',
     '<rootDir>/packages/lib/code-editor',
-    '<rootDir>/packages/lib/component-scaffold',
     '<rootDir>/packages/lib/shared',
   ],
 };

Composer/package.json

@@ -13,20 +13,20 @@
     "packages/lib/*"
   ],
   "scripts": {
-    "build": "yarn build:prod",
+    "build": "node scripts/begin.js && yarn build:prod",
     "build:prod": "yarn build:lib && yarn build:extensions && yarn build:server && yarn build:client",
     "build:dev": "yarn build:lib && yarn build:extensions",
     "build:lib": "yarn workspace @bfc/libs build:all",
     "build:extensions": "yarn workspace @bfc/extensions build:all",
     "build:server": "yarn workspace @bfc/server build",
     "build:client": "yarn workspace @bfc/client build",
     "start": "cross-env NODE_ENV=production PORT=3000 concurrently --kill-others-on-fail \"npm:start:server\"",
-    "startall": "concurrently --kill-others-on-fail \"npm:start\" \"npm:runtime\"",
+    "startall": "concurrently --kill-others-on-fail \"npm:runtime\" \"npm:start\"",
     "start:dev": "concurrently  \"npm:start:client\" \"npm:start:server:dev\"",
     "start:client": "yarn workspace @bfc/client start",
     "start:server": "yarn workspace @bfc/server start",
     "start:server:dev": "yarn workspace @bfc/server start:dev",
-    "runtime": "cd ../BotProject/CSharp/ && dotnet clean && dotnet restore && dotnet build && dotnet run",
+    "runtime": "cd ../BotProject/CSharp/ && dotnet build && dotnet run",
     "test": "yarn typecheck && jest",
     "test:coverage": "yarn test --coverage --no-cache --reporters=default --reporters=jest-junit",
     "test:integration": "start-server-and-test test:integration:start http://localhost:5000 test:integration:run",

Composer/packages/client/config/env.js

@@ -89,6 +89,7 @@ function getClientEnvironment(publicUrl) {
         GIT_SHA: getGitSha()
           .toString()
           .replace('\n', ''),
+        SDK_PACKAGE_VERSON: '4.6.0-preview2', // TODO: change this when Composer supports custom schema/custom runtime
       }
     );
   // Stringify all values so we can feed into Webpack DefinePlugin

Composer/packages/client/scripts/build.js

@@ -22,7 +22,6 @@ const webpack = require('webpack');
 const bfj = require('bfj');
 const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
 const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
-const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
 const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
 const printBuildError = require('react-dev-utils/printBuildError');
 
@@ -31,7 +30,6 @@ const configFactory = require('../config/webpack.config');
 
 const measureFileSizesBeforeBuild = FileSizeReporter.measureFileSizesBeforeBuild;
 const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild;
-const useYarn = fs.existsSync(paths.yarnLockFile);
 
 // These sizes are pretty large. We'll warn for bundles exceeding them.
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
@@ -80,24 +78,21 @@ checkBrowsers(paths.appPath, isInteractive)
         );
         console.log('To ignore, add ' + chalk.cyan('// eslint-disable-next-line') + ' to the line before.\n');
       } else {
-        console.log(chalk.green('Compiled successfully.\n'));
+        console.log(
+          chalk.green('Compiled successfully! Run "yarn startall" to start the web application & test runtime.\n')
+        );
+      }
+      if (writeStatsJson) {
+        console.log('File sizes after gzip:\n');
+        printFileSizesAfterBuild(
+          stats,
+          previousFileSizes,
+          paths.appBuild,
+          WARN_AFTER_BUNDLE_GZIP_SIZE,
+          WARN_AFTER_CHUNK_GZIP_SIZE
+        );
+        console.log();
       }
-
-      console.log('File sizes after gzip:\n');
-      printFileSizesAfterBuild(
-        stats,
-        previousFileSizes,
-        paths.appBuild,
-        WARN_AFTER_BUNDLE_GZIP_SIZE,
-        WARN_AFTER_CHUNK_GZIP_SIZE
-      );
-      console.log();
-
-      const appPackage = require(paths.appPackageJson);
-      const publicUrl = paths.publicUrl;
-      const publicPath = config.output.publicPath;
-      const buildFolder = path.relative(process.cwd(), paths.appBuild);
-      printHostingInstructions(appPackage, publicUrl, publicPath, buildFolder, useYarn);
     },
     err => {
       console.log(chalk.red('Failed to compile.\n'));
@@ -114,7 +109,7 @@ checkBrowsers(paths.appPath, isInteractive)
 
 // Create the production build and print the deployment instructions.
 function build(previousFileSizes) {
-  console.log('Creating an optimized production build...');
+  console.log(chalk.yellow('Creating an optimized production build. This may take a few minutes..'));
 
   let compiler = webpack(config);
   return new Promise((resolve, reject) => {

Composer/packages/client/src/pages/about/index.js

@@ -14,55 +14,81 @@ export const About = () => {
       <div css={about.content}>
         <div css={about.title}> {formatMessage(`About`)} </div>
         <div css={about.body}>
-          <div css={about.version}>{formatMessage(`Version 0.0.1 - Alpha`)}</div>
+          <div css={about.version}>{formatMessage(`Release: Preview 1.0`)}</div>
           <div css={about.description}>
             <p>
-              {formatMessage(` Bot Framework Composer is an integrated development environment (IDE) for building
+              {formatMessage(`Bot Framework Composer is an integrated development environment (IDE) for building
             bots and other types of conversational software with the Microsoft Bot Framework technology stack.
-            Inside this web-based tool, you'll find everything you need to build a modern, state-of-the-art conversational experience.`)}
+            Inside this web-based tool you will find everything you need to build a modern, state-of-the-art conversational experience.`)}
             </p>
             <p>
               {formatMessage(`Bot Framework Composer enables teams working to create bots to build all kinds of conversational experiences that use the
-            latest features from the Bot Framework SDK without writing code. The Designer app reads and writes from the Adaptive Dialog format,
-            a JSON specification shared by many tools provided by the Bot Framework. Dialogs, NLU training data and message templates are treated
-                like normal developer assets - files that can be committed to source control and deployed alongside code updates.`)}
+            latest components from the Bot Framework: SDK, LG, LU, and declarative file formats, all without writing code.`)}
+              <Link
+                href={'https://github.com/microsoft/BotFramework-Composer/blob/stable/toc.md'}
+                tabIndex={-1}
+                target={'_blank'}
+                style={{ marginLeft: '5px' }}
+              >
+                {formatMessage(`Learn more`)}
+              </Link>
             </p>
           </div>
           <div css={about.DiagnosticsInfo}>
             <div css={about.DiagnosticsInfoText}>
-              <div css={about.DiagnosticsInfoTextAlignLeft}>{formatMessage(`Build SHA`)}</div>
+              <div css={about.DiagnosticsInfoTextAlignLeft}>{formatMessage(`Application SHA`)}</div>
               <div css={about.DiagnosticsInfoTextAlignLeft}>
-                {process.env.GIT_SHA || 'Unable to find Build number'}{' '}
+                <Link
+                  href={`https://github.com/microsoft/BotFramework-Composer/commit/${process.env.GIT_SHA}`}
+                  tabIndex={-1}
+                  target={'_blank'}
+                  style={{ marginLeft: '5px' }}
+                >
+                  {process.env.GIT_SHA || 'Unknown'}
+                </Link>
+              </div>
+            </div>
+            <div css={about.DiagnosticsInfoText}>
+              <div css={about.DiagnosticsInfoTextAlignLeft}>{formatMessage(`SDK runtime packages`)}</div>
+              <div css={about.DiagnosticsInfoTextAlignLeft}>
+                <Link
+                  href={`https://botbuilder.myget.org/feed/botbuilder-v4-dotnet-daily/package/nuget/Microsoft.Bot.Builder.Dialogs.Adaptive/${
+                    process.env.SDK_PACKAGE_VERSON
+                  }`}
+                  tabIndex={-1}
+                  target={'_blank'}
+                  style={{ marginLeft: '5px' }}
+                >
+                  {process.env.SDK_PACKAGE_VERSON || 'Unknown'}
+                </Link>
               </div>
             </div>
           </div>
         </div>
         <div css={about.linkRow}>
           <Link
-            href={'https://github.com/microsoft/BotFramework-Designer/blob/master/help.md'}
+            href={'https://github.com/microsoft/BotFramework-Composer/issues/new/choose'}
             tabIndex={-1}
             target={'_blank'}
           >
             <div css={about.helpLink}>{formatMessage(`Getting Help`)} </div>
           </Link>
         </div>
         <div css={about.linkContainer}>
-          <div css={about.linkRow}>
-            <IconButton styles={about.icon} iconProps={{ iconName: 'Info' }} />
-            <Link href={'/about'} tabIndex={-1} target={'_blank'}>
-              <div css={about.link}>{formatMessage(`Terms of Use`)} </div>
-            </Link>
-          </div>
           <div css={about.linkRow}>
             <IconButton styles={about.icon} iconProps={{ iconName: 'BlockedSite' }} />
-            <Link href={'/about'} tabIndex={-1} target={'_blank'}>
-              <div css={about.link}>{formatMessage(`Third-Party Notices`)} </div>
+            <Link
+              href={'https://github.com/microsoft/BotFramework-Composer/blob/stable/LICENSE.md'}
+              tabIndex={-1}
+              target={'_blank'}
+            >
+              <div css={about.link}>{formatMessage(`Terms of Use`)} </div>
             </Link>
           </div>
           <div css={about.linkRow}>
             <IconButton styles={about.icon} iconProps={{ iconName: 'Lock' }} />
             <Link
-              href={'https://github.com/microsoft/BotFramework-Designer/blob/master/Private-Preview-LICENSE.md'}
+              href={'https://github.com/microsoft/BotFramework-Composer/blob/stable/PRIVACY.md'}
               tabIndex={-1}
               target={'_blank'}
             >

Composer/packages/client/src/pages/about/styles.js

@@ -60,7 +60,6 @@ export const DiagnosticsInfoText = css`
 `;
 
 export const DiagnosticsInfoTextAlignLeft = css`
-  width: 50%;
   text-align: left;
 `;