- {formatMessage(
- 'We have created a sample bot to help you get started with Composer. Click here to open the bot.'
- )}
-
+ children: formatMessage(
+ 'We have created a sample bot to help you get started with Composer. Click here to open the bot.'
),
headline: formatMessage('Get started!'),
};
case 'mainDialog':
return {
- children: (
- {formatMessage('Main dialog is named after your bot. It is the root and entry point of a bot.')}
- ),
+ children: formatMessage('The main dialog is named after your bot. It is the root and entry point of a bot.'),
headline: formatMessage('Main dialog'),
};
case 'trigger':
return {
- children: (
-
- {formatMessage(
- 'Triggers connect intents with bot responses. Think of a trigger as one capability of your bot. So your bot is a collection of triggers.'
- )}
-
+ children: formatMessage.rich(
+ 'Triggers connect intents with bot responses. Think of a trigger as one capability of your bot. So your bot is a collection of triggers. To add a new trigger, click the Add button in the toolbar, and then select the Add a new trigger option from the dropdown menu.',
+ {
+ b: Bold,
+ }
),
- headline: formatMessage('Trigger'),
+ headline: formatMessage('Add a new trigger'),
};
case 'userInput':
return {
- children: (
-
- {formatMessage('You can define and manage ')}
- {formatMessage('intents ')}
- {formatMessage(
- 'here. Each intent describes a particular user intention through utterances (i.e. user says). '
- )}
- {formatMessage('Intents are often triggers of your bot.')}
-
+ children: formatMessage.rich(
+ 'You can define and manage intents here. Each intent describes a particular user intention through utterances (i.e. user says). Intents are often triggers of your bot.',
+ {
+ b: Bold,
+ }
),
headline: formatMessage('User input'),
};
case 'actions':
return {
- children: (
-
- {formatMessage('Actions define ')}
- {formatMessage('how the bot responds ')}
- {formatMessage('to a certain trigger.')}
-
- ),
+ children: formatMessage.rich('Actions define how the bot responds to a certain trigger.', {
+ b: Bold,
+ }),
headline: formatMessage('Actions'),
};
case 'botResponses':
return {
- children: (
-
- {formatMessage(
- 'You can manage all bot responses here. Make good use of the templates to create sophisticated response logic based on your own needs.'
- )}
-
+ children: formatMessage(
+ 'You can manage all bot responses here. Make good use of the templates to create sophisticated response logic based on your own needs.'
),
headline: formatMessage('Bot responses'),
};
@@ -176,45 +161,63 @@ export const getTeachingBubble = (id: string | undefined): IComposerTeachingBubb
return {
children: (
-
),
- headline: formatMessage('Add welcome message'),
+ headline: formatMessage('Add a welcome message'),
};
case 'intentTrigger':
return {
- children: (
-
- {formatMessage('The welcome message is triggered by the ')}
- {formatMessage('ConversationUpdate ')}
- {formatMessage('event. You may customize or add a new one. To do this:')}
-
+ {formatMessage.rich(
+ 'The welcome message is triggered by the ConversationUpdate event. To add a new ConversationUpdate trigger:',
+ {
+ i: Italics,
+ }
+ )}
- - {formatMessage('Create a new or go to the trigger: ')} - {formatMessage('ConversationUpdate')} + {formatMessage.rich( + 'Click the Add button in the toolbar, and select Add a new trigger from the dropdown menu.', + { + b: Bold, + } + )} + +
- + {formatMessage.rich( + 'In the Create a trigger wizard, set the trigger type to Activities in the dropdown. Then set the Activity Type to Greeting (ConversationUpdate activity), and click the Submit button.', + { b: Bold, i: Italics } + )} + +
- + {formatMessage.rich( + "To customize the welcome message, select the Send a response action in the Visual Editor. Then in the Form Editor on the right, you can edit the bot's welcome message in the Language Generation field.", + { b: Bold, i: Italics } + )} -
- {formatMessage('Select/add action: send an Activity')} -
- {formatMessage('Edit the message in the right pane')}
- {formatMessage(
- 'Click on the + and select intent as the trigger type. Follow the wizard to define the intent and other trigger settings. Then add actions in the visual editor.'
- )}
-
+ children: formatMessage.rich(
+ 'Click on the Add button in the toolbar, and select Add a new trigger. In the Create a trigger wizard, set the Trigger Type to Intent recognized and configure the Trigger Name and Trigger Phrases. Then add actions in the Visual Editor.',
+ { b: Bold, i: Italics }
),
headline: formatMessage('Add an intent trigger'),
};
case 'startBot':
return {
- children: (
-
- {formatMessage(
- "This will open your Emulator application. If you don't yet have the Bot Framework Emulator installed, you can download it "
- )}
- {formatMessage('here.')}
-
+ children: formatMessage.rich(
+ "This will open your Emulator application. If you don't yet have the Bot Framework Emulator installed, you can download it here.",
+ {
+ a: ({ children }) => (
+
+ {children}
+
+ ),
+ }
),
headline: formatMessage('Test your bot'),
};
diff --git a/Composer/packages/client/src/components/NavItem/index.tsx b/Composer/packages/client/src/components/NavItem/index.tsx
index fd98ed37d3..d12ed7dc2c 100644
--- a/Composer/packages/client/src/components/NavItem/index.tsx
+++ b/Composer/packages/client/src/components/NavItem/index.tsx
@@ -74,6 +74,21 @@ export const NavItem: React.FC = {
root: {
@@ -16,12 +17,11 @@ export const groupListStyle: Partial = {
},
};
-export const searchBox = {
+export const searchBox: ISearchBoxStyles = {
root: {
- outline: 'none',
- border: 'none',
borderBottom: '1px solid #edebe9',
height: '45px',
+ borderRadius: '0px',
},
};
export const root = css`
@@ -81,10 +81,17 @@ export const itemText = (depth: number) => css`
overflow: hidden;
text-align: left;
cursor: pointer;
+ width: 100%;
+
+ label: ProjectTreeItemContainer;
`;
export const content = css`
outline: none;
+ display: flex;
+ align-items: center;
+
+ label: ProjectTreeItem;
`;
export const moreButton = (isActive: boolean): IButtonStyles => {
@@ -121,9 +128,12 @@ export const overflowSet = css`
width: 100%;
height: 100%;
padding-left: 12px;
+ padding-right: 12px;
box-sizing: border-box;
line-height: 36px;
justify-content: space-between;
+ display: flex;
+ justify-content: space-between;
`;
export const styles = {
diff --git a/Composer/packages/client/src/components/ProjectTree/treeItem.tsx b/Composer/packages/client/src/components/ProjectTree/treeItem.tsx
index 67113346d1..c76d8171d0 100644
--- a/Composer/packages/client/src/components/ProjectTree/treeItem.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/treeItem.tsx
@@ -3,6 +3,7 @@
/** @jsx jsx */
import { jsx } from '@emotion/core';
+import React from 'react';
import { OverflowSet, IOverflowSetItemProps } from 'office-ui-fabric-react/lib/OverflowSet';
import { IconButton } from 'office-ui-fabric-react/lib/Button';
import { Icon } from 'office-ui-fabric-react/lib/Icon';
@@ -20,7 +21,7 @@ interface ITreeItemProps {
const onRenderItem = (item: IOverflowSetItemProps) => {
return (
-
+
{item.depth !== 0 && (
{
export const TreeItem: React.FC = props => {
const { link, isActive, isSubItemActive, depth, onDelete, onSelect } = props;
+
return (
= ({
}) => {
const onRenderChildren = () => {
return (
-
= props => {
},
]}
css={overflowSet}
+ styles={{ item: { flex: 1 } }}
data-testid={`DialogTreeItem${link.id}`}
onRenderItem={onRenderItem}
onRenderOverflowButton={onRenderOverflowButton(link.isRoot, isActive)}
diff --git a/Composer/packages/client/src/pages/design/PropertyEditor.tsx b/Composer/packages/client/src/pages/design/PropertyEditor.tsx
index 527064b160..4691b85405 100644
--- a/Composer/packages/client/src/pages/design/PropertyEditor.tsx
+++ b/Composer/packages/client/src/pages/design/PropertyEditor.tsx
@@ -106,10 +106,6 @@ const PropertyEditor: React.FC = () => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const handleDataChange = (newData?: any) => {
setLocalData(newData);
-
- if (!isEqual(formData, newData)) {
- shellApi.saveData(newData, focusedSteps[0]);
- }
};
return (
@@ -122,16 +118,11 @@ const PropertyEditor: React.FC = () => {
}}
onResizeStop={handleResize}
>
-
diff --git a/Composer/packages/client/src/pages/design/styles.ts b/Composer/packages/client/src/pages/design/styles.ts
index 3213d09d57..f6fd3c5113 100644
--- a/Composer/packages/client/src/pages/design/styles.ts
+++ b/Composer/packages/client/src/pages/design/styles.ts
@@ -9,12 +9,16 @@ export const pageRoot = css`
height: 100%;
display: flex;
flex-direction: row;
+
+ label: DesignPageContainer;
`;
export const contentWrapper = css`
display: flex;
flex-direction: column;
flex-grow: 1;
+
+ label: DesignPageContent;
`;
export const projectContainer = css`
@@ -25,10 +29,9 @@ export const projectContainer = css`
width: 255px;
overflow: auto;
border-right: 1px solid #c4c4c4;
-`;
-//remove TODO
-export const projectWrapper = css``;
+ label: DesignPageProjectContent;
+`;
export const projectHeader = css`
font-weight: bold;
@@ -39,16 +42,22 @@ export const projectHeader = css`
justify-content: space-between;
align-items: center;
background-color: ${NeutralColors.gray20};
+
+ label: DesignPageProjectHeader;
`;
export const projectTree = css`
flex-grow: 3;
flex-shrink: 3;
+
+ label: DesignPageProjectTree;
`;
export const assetTree = css`
flex-grow: 2;
flex-shrink: 2;
+
+ label: DesignPageAssetTree;
`;
/*******/
@@ -72,6 +81,13 @@ export const visualPanel = css`
flex: 1;
border-right: 1px solid #c4c4c4;
position: relative;
+
+ &:focus {
+ border: black solid 1px;
+ outline: none;
+ }
+
+ label: DesignPageVisualPanel;
`;
export const visualEditor = (hidden: boolean) => css`
diff --git a/Composer/packages/client/src/pages/home/ItemContainer.tsx b/Composer/packages/client/src/pages/home/ItemContainer.tsx
index 4abf6f8dae..0fbc7aefbd 100644
--- a/Composer/packages/client/src/pages/home/ItemContainer.tsx
+++ b/Composer/packages/client/src/pages/home/ItemContainer.tsx
@@ -5,6 +5,7 @@
import { jsx, SerializedStyles } from '@emotion/core';
import React from 'react';
import { Button } from 'office-ui-fabric-react/lib/Button';
+import { Text } from 'office-ui-fabric-react/lib/Text';
import {
itemContainerWrapper,
@@ -39,12 +40,16 @@ export const ItemContainer: React.FC
+
= ({ completeStep, skillManifests, setSkillManifest }) => {
- const { actions } = useContext(StoreContext);
+ const { actions, state } = useContext(StoreContext);
+ const { botName } = state;
const [manifestVersion, setManifestVersion] = useState(SCHEMA_URIS[0]);
const [errors, setErrors] = useState<{ version?: string }>({});
const [version] = VERSION_REGEX.exec(manifestVersion) || [''];
- const fileName = `skill-manifest-${version.replace(/\./g, '-')}`;
+ const fileName = `${botName}-${version.replace(/\./g, '-')}-manifest`;
const options: IDropdownOption[] = useMemo(
() =>
diff --git a/Composer/packages/client/src/pages/design/index.tsx b/Composer/packages/client/src/pages/design/index.tsx
index 58ae43d367..a689641bb5 100644
--- a/Composer/packages/client/src/pages/design/index.tsx
+++ b/Composer/packages/client/src/pages/design/index.tsx
@@ -5,13 +5,12 @@
import { jsx } from '@emotion/core';
import React, { Suspense, useContext, useEffect, useMemo, useState, useRef } from 'react';
import { Breadcrumb, IBreadcrumbItem } from 'office-ui-fabric-react/lib/Breadcrumb';
-import { Icon } from 'office-ui-fabric-react/lib/Icon';
import formatMessage from 'format-message';
import { globalHistory, RouteComponentProps } from '@reach/router';
import get from 'lodash/get';
import { PromptTab } from '@bfc/shared';
import { DialogFactory, SDKKinds, DialogInfo } from '@bfc/shared';
-import { Link } from 'office-ui-fabric-react/lib/Link';
+import { ActionButton } from 'office-ui-fabric-react/lib/Button';
import { JsonEditor } from '@bfc/code-editor';
import { useTriggerApi } from '@bfc/extension';
@@ -60,12 +59,7 @@ function onRenderContent(subTitle, style) {
}
function onRenderBreadcrumbItem(item, render) {
- return (
-
- {!item.isRoot && > = props => {
const { state, actions } = useContext(StoreContext);
const visualPanelRef: React.RefObject = useRef(null);
- const { dialogs, designPageLocation, breadcrumb, visualEditorSelection, projectId, schemas } = state;
+ const { dialogs, designPageLocation, breadcrumb, visualEditorSelection, projectId, schemas, focusPath } = state;
const {
removeDialog,
setDesignPageLocation,
@@ -299,22 +293,25 @@ const DesignPage: React.FC
+
undefined}
data-testid="Breadcrumb"
onRenderItem={onRenderBreadcrumbItem}
/>
- {
- setDialogJsonVisibility(current => !current);
- }}
- >
- {dialogJsonVisible ? formatMessage('Hide code') : formatMessage('Show code')}
-
+
);
}, [dialogs, breadcrumb, dialogJsonVisible]);
@@ -428,7 +425,7 @@ const DesignPage: React.FC
-
+ {
+ setDialogJsonVisibility(current => !current);
+ }}
+ >
+ {dialogJsonVisible ? formatMessage('Hide code') : formatMessage('Show code')}
+
+
+
);
@@ -59,7 +64,6 @@ export const ItemContainer: React.FC = ({
await onClick();
}
}}
- ref={forwardedRef}
{...rest}
onRenderChildren={onRenderChildren}
disabled={disabled}
diff --git a/Composer/packages/client/src/pages/language-understanding/publish-luis-modal.js b/Composer/packages/client/src/pages/language-understanding/publish-luis-modal.jsx
similarity index 100%
rename from Composer/packages/client/src/pages/language-understanding/publish-luis-modal.js
rename to Composer/packages/client/src/pages/language-understanding/publish-luis-modal.jsx
diff --git a/Composer/packages/client/src/pages/publish/createPublishTarget.tsx b/Composer/packages/client/src/pages/publish/createPublishTarget.tsx
index 030eb36a15..197b3638c8 100644
--- a/Composer/packages/client/src/pages/publish/createPublishTarget.tsx
+++ b/Composer/packages/client/src/pages/publish/createPublishTarget.tsx
@@ -30,7 +30,7 @@ const CreatePublishTarget: React.FC = props => {
const [errorMessage, setErrorMsg] = useState('');
const targetTypes = useMemo(() => {
- return props.types.map(t => ({ key: t.name, text: t.name }));
+ return props.types.map(t => ({ key: t.name, text: t.description }));
}, [props.targets]);
const updateType = (_e, option?: IDropdownOption) => {
@@ -57,6 +57,10 @@ const CreatePublishTarget: React.FC = props => {
}
};
+ const instructions: string | undefined = useMemo((): string | undefined => {
+ return targetType ? props.types.find(t => t.name === targetType)?.instructions : '';
+ }, [props.targets, targetType]);
+
const schema = useMemo(() => {
return targetType ? props.types.find(t => t.name === targetType)?.schema : undefined;
}, [props.targets, targetType]);
@@ -99,6 +103,7 @@ const CreatePublishTarget: React.FC = props => {
defaultSelectedKey={props.current ? props.current.type : null}
onChange={updateType}
/>
+ {instructions && = props => {
actions.getPublishHistory(projectId, _selected);
}
}
- }, [settings.publishTargets, selectedTargetName]);
+ }, [projectId, selectedTargetName]);
// once history is loaded, display it
useEffect(() => {
@@ -197,7 +197,7 @@ const Publish: React.FC = props => {
},
]);
}
- }, [publishHistory, selectedTargetName, settings.publishTargets]);
+ }, [publishHistory, selectedTargetName]);
// check history to see if a 202 is found
useEffect(() => {
diff --git a/Composer/packages/client/src/pages/setting/deployment/deploy-create-output.gif b/Composer/packages/client/src/pages/setting/deployment/deploy-create-output.gif
deleted file mode 100644
index 3c61811f55..0000000000
Binary files a/Composer/packages/client/src/pages/setting/deployment/deploy-create-output.gif and /dev/null differ
diff --git a/Composer/packages/client/src/pages/setting/deployment/deploy-create-output.png b/Composer/packages/client/src/pages/setting/deployment/deploy-create-output.png
deleted file mode 100644
index ed9c82e38f..0000000000
Binary files a/Composer/packages/client/src/pages/setting/deployment/deploy-create-output.png and /dev/null differ
diff --git a/Composer/packages/client/src/pages/setting/deployment/deploy-deploy-output.gif b/Composer/packages/client/src/pages/setting/deployment/deploy-deploy-output.gif
deleted file mode 100644
index a1ee55f4e1..0000000000
Binary files a/Composer/packages/client/src/pages/setting/deployment/deploy-deploy-output.gif and /dev/null differ
diff --git a/Composer/packages/client/src/pages/setting/deployment/deploy-deploy-output.png b/Composer/packages/client/src/pages/setting/deployment/deploy-deploy-output.png
deleted file mode 100644
index b33ea0bfc8..0000000000
Binary files a/Composer/packages/client/src/pages/setting/deployment/deploy-deploy-output.png and /dev/null differ
diff --git a/Composer/packages/client/src/pages/setting/deployment/deployWizard.js b/Composer/packages/client/src/pages/setting/deployment/deployWizard.js
deleted file mode 100644
index a481b7f75d..0000000000
--- a/Composer/packages/client/src/pages/setting/deployment/deployWizard.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import React, { Fragment, useState, useEffect } from 'react';
-import formatMessage from 'format-message';
-import { Dialog, DialogType } from 'office-ui-fabric-react/lib/Dialog';
-
-import { DeployWizardStepCreate } from './deployWizardStep-createDeploy';
-import { DeployWizardStepDeploy } from './deployWizardStep-deployOnly';
-import { DeployWizardStep2 } from './deployWizardStep-getCreate';
-import { DeployWizardStep3 } from './deployWizardStep-getDeploy';
-import { styles } from './styles';
-
-export const DeployWizard = props => {
- const { isOpen, closeModal, initialStep } = props;
- const [currentStep, setCurrentStep] = useState(initialStep);
- const [botValues, setBotValues] = useState();
-
- // update the step if it is changed externally
- useEffect(() => {
- setCurrentStep(initialStep);
- }, [initialStep]);
-
- const completeStepCreate = form => {
- setBotValues(form);
- setCurrentStep(2);
- };
-
- const completeStepDeploy = form => {
- setBotValues(form);
- setCurrentStep(3);
- };
-
- const completeStep2 = () => {
- setCurrentStep(3);
- };
-
- const resetModal = () => {
- setCurrentStep(0);
- closeModal();
- };
-
- const steps = [
- {
- title: formatMessage('Set bot name and password'),
- subText: 'Make sure to sign in to the Azure Portal or create an account',
- children:
-
-
- );
-};
diff --git a/Composer/packages/client/src/pages/setting/deployment/deployWizardStep-createDeploy.js b/Composer/packages/client/src/pages/setting/deployment/deployWizardStep-createDeploy.js
deleted file mode 100644
index 9b3a1d8936..0000000000
--- a/Composer/packages/client/src/pages/setting/deployment/deployWizardStep-createDeploy.js
+++ /dev/null
@@ -1,270 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import path from 'path';
-
-import React, { Fragment, useCallback, useContext, useEffect, useRef, useState } from 'react';
-import formatMessage from 'format-message';
-import { Stack, StackItem } from 'office-ui-fabric-react/lib/Stack';
-import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/Button';
-import { DialogFooter } from 'office-ui-fabric-react/lib/Dialog';
-import { TextField } from 'office-ui-fabric-react/lib/TextField';
-import { ComboBox } from 'office-ui-fabric-react/lib/ComboBox';
-
-import { StoreContext } from '../../../store';
-
-import { validateEnvironment, validateName, validateRegion, validateSecret } from './validators';
-import { styles } from './styles';
-// TODO: verify that this is the correct/complete list of azure regions
-// https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.documents.locationnames?view=azure-dotnet
-import { regionOptions } from './luisRegions.js';
-
-export const DeployWizardStepCreate = props => {
- const { nextStep, closeModal } = props;
- const { state } = useContext(StoreContext);
- const { botName, projectId } = state;
- const [disable, setDisable] = useState(false);
-
- const [formData, setFormData] = useState({
- name: botName,
- location: path.join(process.env.LOCAL_PUBLISH_PATH, projectId).replace(/\\/g, '/'), // use plugin localtion to support deployment
- secret: '',
- environment: '',
- region: regionOptions[0],
- errors: {},
- });
-
- const nameRef = useRef(null);
- const focusNameRef = () => nameRef.current.focus();
- const environmentRef = useRef(null);
- const focusEnvironmentRef = () => environmentRef.current.focus();
- const appSecretRef = useRef(null);
- const focusAppSecretRef = () => appSecretRef.current.focus();
- const regionRef = useRef(null);
- const focusRegionRef = () => regionRef.current.focus();
-
- useEffect(() => {
- if (!formData.name || !formData.environment || !formData.secret || !formData.region) {
- setDisable(true);
- } else {
- setDisable(false);
- }
- }, [formData.name, formData.environment, formData.appSecretRef, formData.region]);
-
- const nextEnabled = () => {
- if (
- Object.keys(formData.errors).length ||
- !formData.name ||
- !formData.environment ||
- !formData.secret ||
- !Object.keys(formData.region).length
- ) {
- setDisable(true);
- return false;
- }
- setDisable(false);
- return true;
- };
-
- const updateForm = field => (e, newValue) => {
- setFormData({
- ...formData,
- errors: {},
- [field]: newValue,
- });
- setDisable(false);
- };
-
- const setAppSecretErrors = () => {
- let appSecretErrors;
- if (validateSecret(formData.secret) !== true) {
- appSecretErrors = validateSecret(formData.secret);
- }
- if (appSecretErrors) {
- setFormData({
- ...formData,
- errors: {
- ...formData.errors,
- secret: appSecretErrors,
- },
- });
- }
-
- return nextEnabled();
- };
-
- const setEnvironmentErrors = () => {
- let environmentError;
- if (validateEnvironment(formData.environment) !== true) {
- environmentError = validateEnvironment(formData.environment);
- }
- if (environmentError) {
- setFormData({
- ...formData,
- errors: {
- ...formData.errors,
- environment: environmentError,
- },
- });
- }
-
- return nextEnabled();
- };
-
- const setNameErrors = () => {
- let nameError;
- if (validateName(formData.name) !== true) {
- nameError = validateName(formData.name);
- }
- if (nameError) {
- setFormData({
- ...formData,
- errors: {
- ...formData.errors,
- name: nameError,
- },
- });
- }
- return nextEnabled();
- };
-
- const setRegionErrors = () => {
- let regionError;
- if (validateName(formData.region) !== true) {
- regionError = validateRegion(formData.region);
- }
- if (regionError) {
- setFormData({
- ...formData,
- errors: {
- ...formData.errors,
- region: regionError,
- },
- });
- }
- return nextEnabled();
- };
-
- const validateForm = () => {
- const nameErrors = setNameErrors();
-
- const environmentErrors = setEnvironmentErrors();
-
- const appSecretErrors = setAppSecretErrors();
-
- const regionErrors = setRegionErrors();
-
- return nameErrors && environmentErrors && appSecretErrors && regionErrors;
- };
-
- const submit = e => {
- e.preventDefault();
-
- if (validateForm()) {
- nextStep(formData);
- } else {
- if (formData.errors.name) {
- focusNameRef();
- } else if (formData.errors.environment) {
- focusEnvironmentRef();
- } else if (formData.errors.secret) {
- focusAppSecretRef();
- } else {
- focusRegionRef();
- }
- }
- };
-
- return (
-
-
-
- );
-};
diff --git a/Composer/packages/client/src/pages/setting/deployment/deployWizardStep-deployOnly.js b/Composer/packages/client/src/pages/setting/deployment/deployWizardStep-deployOnly.js
deleted file mode 100644
index ebefb349b7..0000000000
--- a/Composer/packages/client/src/pages/setting/deployment/deployWizardStep-deployOnly.js
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import path from 'path';
-
-import React, { Fragment, useContext, useCallback, useEffect, useRef, useState } from 'react';
-import formatMessage from 'format-message';
-import { Stack, StackItem } from 'office-ui-fabric-react/lib/Stack';
-import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/Button';
-import { DialogFooter } from 'office-ui-fabric-react/lib/Dialog';
-import { TextField } from 'office-ui-fabric-react/lib/TextField';
-
-import { StoreContext } from '../../../store';
-
-import { validateEnvironment, validateName } from './validators';
-import { styles } from './styles';
-// TODO: get a complete list of azure regions
-// TODO: verify that this is the correct/complete list of azure regions
-// https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.documents.locationnames?view=azure-dotnet
-import { regionOptions } from './luisRegions.js';
-
-export const DeployWizardStepDeploy = props => {
- const { nextStep, closeModal } = props;
- const { state } = useContext(StoreContext);
- const { botName, projectId } = state;
- const [disable, setDisable] = useState(false);
- const [formData, setFormData] = useState({
- name: botName,
- location: path.join(process.env.LOCAL_PUBLISH_PATH, projectId).replace(/\\/g, '/'), // use plugin localtion to support deployment,
- secret: '',
- environment: '',
- region: regionOptions[0].key,
- errors: {},
- });
-
- const nameRef = useRef(null);
- const focusNameRef = () => nameRef.current.focus();
- const environmentRef = useRef(null);
- const focusEnvironmentRef = () => focusEnvironmentRef.current.focus();
-
- useEffect(() => {
- if (!formData.name || !formData.environment) {
- setDisable(true);
- } else {
- setDisable(false);
- }
- }, [formData.name, formData.environment]);
-
- const nextEnabled = () => {
- if (Object.keys(formData.errors).length || !formData.name || !formData.environment) {
- setDisable(true);
- return false;
- }
- setDisable(false);
- return true;
- };
-
- const updateForm = field => (e, newValue) => {
- setFormData({
- ...formData,
- errors: {},
- [field]: newValue,
- });
- };
-
- const setEnvironmentErrors = () => {
- let environmentError;
- if (validateEnvironment(formData.environment) !== true) {
- environmentError = validateEnvironment(formData.environment);
- }
- if (environmentError) {
- setFormData({
- ...formData,
- errors: {
- ...formData.errors,
- environment: environmentError,
- },
- });
- }
-
- return nextEnabled();
- };
-
- const setNameErrors = () => {
- let nameError;
- if (validateName(formData.name) !== true) {
- nameError = validateName(formData.name);
- }
- if (nameError) {
- setFormData({
- ...formData,
- errors: {
- ...formData.errors,
- name: nameError,
- },
- });
- }
- return nextEnabled();
- };
-
- const validateForm = () => {
- const nameErrors = setNameErrors();
-
- const environmentErrors = setEnvironmentErrors();
-
- return nameErrors && environmentErrors;
- };
-
- const submit = e => {
- e.preventDefault();
-
- if (validateForm()) {
- nextStep(formData);
- } else {
- if (formData.errors.name) {
- focusNameRef();
- } else if (formData.errors.environment) {
- focusEnvironmentRef();
- }
- }
- };
-
- return (
-
-
-
- );
-};
diff --git a/Composer/packages/client/src/pages/setting/deployment/deployWizardStep-getCreate.js b/Composer/packages/client/src/pages/setting/deployment/deployWizardStep-getCreate.js
deleted file mode 100644
index 83139f2b7e..0000000000
--- a/Composer/packages/client/src/pages/setting/deployment/deployWizardStep-getCreate.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import React, { Fragment } from 'react';
-import { useContext } from 'react';
-import formatMessage from 'format-message';
-import { Stack, StackItem } from 'office-ui-fabric-react/lib/Stack';
-import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/Button';
-import { DialogFooter } from 'office-ui-fabric-react/lib/Dialog';
-import { TextField } from 'office-ui-fabric-react/lib/TextField';
-
-import { StoreContext } from '../../../store';
-
-import { styles } from './styles';
-import processGif from './deploy-create-output.png';
-
-export const DeployWizardStep2 = props => {
- const { state } = useContext(StoreContext);
- const { settings } = state;
- const { nextStep, closeModal, botValues } = props;
- const luisAuthoringKey = settings.luis && settings.luis.authoringKey ? settings.luis.authoringKey : undefined;
- const scriptValue = [
- `cd ${botValues.location}`,
- `pwsh ./Scripts/create.ps1 -name ${botValues.name} -environment ${botValues.environment} -location ${
- botValues.region.key
- } -appPassword '${botValues.secret}' ${luisAuthoringKey ? '-luisAuthoringKey ' + luisAuthoringKey : ''}`,
- ].join('\n');
-
- const copyToClipboard = () => {
- navigator.clipboard.writeText(scriptValue);
- };
-
- return (
-
-
-
-
-
- {/*
-
-
-
- 
-
-
-
-
-
- );
-};
diff --git a/Composer/packages/client/src/pages/setting/deployment/deployWizardStep-getDeploy.js b/Composer/packages/client/src/pages/setting/deployment/deployWizardStep-getDeploy.js
deleted file mode 100644
index 4c4656c8b8..0000000000
--- a/Composer/packages/client/src/pages/setting/deployment/deployWizardStep-getDeploy.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import React, { Fragment } from 'react';
-import formatMessage from 'format-message';
-import { Stack, StackItem } from 'office-ui-fabric-react/lib/Stack';
-import { PrimaryButton } from 'office-ui-fabric-react/lib/Button';
-import { DialogFooter } from 'office-ui-fabric-react/lib/Dialog';
-import { TextField } from 'office-ui-fabric-react/lib/TextField';
-
-import { styles } from './styles';
-import processGif from './deploy-deploy-output.png';
-
-export const DeployWizardStep3 = props => {
- const { closeModal, botValues } = props;
-
- const scriptValue = [
- `cd ${botValues.location}`,
- `pwsh ./Scripts/deploy.ps1 -name ${botValues.name} -environment ${botValues.environment}`,
- ].join('\n');
-
- const copyToClipboard = () => {
- navigator.clipboard.writeText(scriptValue);
- };
-
- return (
-
-
-
-
-
- {/*
-
-
-
-
-
-
-
-
-
- );
-};
diff --git a/Composer/packages/client/src/pages/setting/deployment/index.tsx b/Composer/packages/client/src/pages/setting/deployment/index.tsx
deleted file mode 100644
index c648d3b09a..0000000000
--- a/Composer/packages/client/src/pages/setting/deployment/index.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import React, { useState, Fragment } from 'react';
-import formatMessage from 'format-message';
-import { DefaultButton } from 'office-ui-fabric-react/lib/Button';
-import { Stack } from 'office-ui-fabric-react/lib/Stack';
-import { Link } from 'office-ui-fabric-react/lib/Link';
-import { RouteComponentProps } from '@reach/router';
-
-import { DeployWizard } from './deployWizard.js';
-import { styles } from './styles';
-
-const instructions = {
- title: formatMessage('Publish your bot to Azure'),
- description: formatMessage(
- 'For team members or customers to interact with this bot, your bot needs to be published. In this version of Composer, this step is not yet automated, however, Composer can configure Azure Resources and generate a script to publish your bot. You can use this script whenever you want to publish an updated version of your bot.'
- ),
- button1: formatMessage('Create Azure Resources'),
- button2: formatMessage('Publish Bot to Azure'),
- helpLink: 'https://aka.ms/bfc-publishing-your-bot',
-};
-
-export const Deployment: React.FC = () => {
- const [wizardOpen, setWizardOpen] = useState(false);
- const [step, setStep] = useState(0);
-
- const openWizardCreate = () => {
- openWizard(0);
- };
-
- const openWizardDeploy = () => {
- openWizard(1);
- };
-
- const openWizard = initialStep => {
- setStep(initialStep);
- setWizardOpen(true);
- };
-
- const closeWizard = () => {
- setWizardOpen(false);
- };
-
- return (
-
-
- );
-};
diff --git a/Composer/packages/client/src/pages/setting/deployment/luisRegions.js b/Composer/packages/client/src/pages/setting/deployment/luisRegions.js
deleted file mode 100644
index 15fde5eeb4..0000000000
--- a/Composer/packages/client/src/pages/setting/deployment/luisRegions.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-//Currently luis authoring accounts are only supported in three regions
-module.exports.regionOptions = [
- {
- key: 'WestUS',
- text: 'WestUS',
- },
-];
diff --git a/Composer/packages/client/src/pages/setting/deployment/styles.tsx b/Composer/packages/client/src/pages/setting/deployment/styles.tsx
deleted file mode 100644
index 6ca4ff445b..0000000000
--- a/Composer/packages/client/src/pages/setting/deployment/styles.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import { FontWeights } from 'office-ui-fabric-react/lib/Styling';
-import { FontSizes } from '@uifabric/fluent-theme';
-
-export const styles = {
- gif: {
- margin: '0px auto 1rem',
- display: 'block',
- },
- page: {
- padding: '1rem',
- },
- header: {
- marginTop: '0',
- fontSize: FontSizes.size20,
- fontWeight: FontWeights.semibold as number,
- },
- halfstack: {
- root: [
- {
- flexBasis: '50%',
- },
- ],
- },
- stackinput: {
- root: [
- {
- marginBottom: '1rem',
- },
- ],
- },
- dialog: {
- title: {
- fontWeight: FontWeights.bold as number,
- fontSize: FontSizes.size20,
- paddingTop: '14px',
- paddingBottom: '11px',
- },
- subText: {
- fontSize: FontSizes.size14,
- },
- },
- modal: {
- main: {
- maxWidth: '80% !important',
- width: '960px !important',
- },
- },
- input: {
- subComponentStyles: {
- label: {
- root: [
- {
- fontWeight: FontWeights.semibold as number,
- },
- ],
- },
- },
- },
- textarea: {
- root: [
- {
- paddingBottom: '1rem',
- },
- ],
- subComponentStyles: {
- label: {
- root: [
- {
- fontWeight: FontWeights.semibold as number,
- },
- ],
- },
- },
- },
-};
diff --git a/Composer/packages/client/src/pages/setting/deployment/validators.js b/Composer/packages/client/src/pages/setting/deployment/validators.js
deleted file mode 100644
index ee912c99b3..0000000000
--- a/Composer/packages/client/src/pages/setting/deployment/validators.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import formatMessage from 'format-message';
-
-import { regionOptions } from './luisRegions.js';
-
-export const validateName = name => {
- if (name.length === 0) {
- return formatMessage('Bot name is a required field');
- }
- return true;
-};
-
-export const validateEnvironment = name => {
- if (name.length === 0) {
- return formatMessage('Environment name is a required field');
- }
- return true;
-};
-
-export const validateRegion = region => {
- if (!region || !region.key) {
- return formatMessage('Azure region is a required field');
- }
- if (
- regionOptions.filter(r => {
- return r.key === region.key;
- }).length === 0
- ) {
- return formatMessage('Select an Azure region from the list');
- }
- return true;
-};
-
-// 16 characters at least one special char
-export const validateSecret = val => {
- if (val.length !== 16) {
- return formatMessage('App secret must be exactly 16 characters long');
- }
- if (!val.match(/[a-z]/i)) {
- return formatMessage('App secret must contain at least 1 alpha character');
- }
- if (!val.match(/[0-9]/)) {
- return formatMessage('App secret must contain at least 1 number');
- }
- // eslint-disable-next-line no-useless-escape
- if (!val.match(/[!@$%^&#\?\.\+\*_\-\(\)\[\]]/)) {
- return formatMessage('App secret must contain at least 1 special character');
- }
-
- return true;
-};
diff --git a/Composer/packages/client/src/pages/setting/index.tsx b/Composer/packages/client/src/pages/setting/index.tsx
index 624340c485..36fd791ee2 100644
--- a/Composer/packages/client/src/pages/setting/index.tsx
+++ b/Composer/packages/client/src/pages/setting/index.tsx
@@ -11,7 +11,6 @@ import { RouteComponentProps } from '@reach/router';
import { StoreContext } from '../../store';
import { ToolBar } from '../../components/ToolBar';
import { navigateTo } from '../../utils';
-import { isAbsHosted } from '../../utils/envUtil';
import { Tree } from '../../components/Tree/index';
import { Conversation } from '../../components/Conversation/index';
import { MainContent } from '../../components/MainContent/index';
@@ -20,8 +19,6 @@ import { TestController } from '../../components/TestController';
import Routes from './router';
import { title, fileList, contentEditor } from './styles';
-const absHosted = isAbsHosted();
-
const SettingPage: React.FC> = props => {
const { state } = useContext(StoreContext);
const { projectId } = state;
@@ -31,7 +28,6 @@ const SettingPage: React.FC> = props => {
const settingLabels = {
title: formatMessage('Configuration'),
- publish: formatMessage('Publish'),
settings: formatMessage('Settings'),
preferences: formatMessage('User Preferences'),
runtime: formatMessage('Runtime Config'),
@@ -39,11 +35,6 @@ const SettingPage: React.FC> = props => {
const links: INavLink[] = [
{ key: 'dialog-settings', name: settingLabels.settings, url: '' },
- {
- key: `${absHosted ? 'remote-publish' : 'deployment'}`,
- name: settingLabels.publish,
- url: '',
- },
{ key: 'preferences', name: settingLabels.preferences, url: '' },
{ key: 'runtime', name: settingLabels.runtime, url: '' },
diff --git a/Composer/packages/client/src/pages/setting/remote-publish/index.tsx b/Composer/packages/client/src/pages/setting/remote-publish/index.tsx
deleted file mode 100644
index 69c861e1ac..0000000000
--- a/Composer/packages/client/src/pages/setting/remote-publish/index.tsx
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import React, { useContext, useEffect, useState } from 'react';
-import formatMessage from 'format-message';
-import TimeAgo from 'react-timeago';
-import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/Button';
-import { Icon } from 'office-ui-fabric-react/lib/Icon';
-import { Stack, StackItem } from 'office-ui-fabric-react/lib/Stack';
-import { Dialog, DialogFooter, DialogType } from 'office-ui-fabric-react/lib/Dialog';
-import { Spinner, SpinnerSize } from 'office-ui-fabric-react/lib/Spinner';
-import { RouteComponentProps } from '@reach/router';
-
-import { StoreContext } from './../../../store';
-import { styles } from './styles';
-
-const DateWidget = props => {
- const { date } = props;
-
- const timestamp = new Date(date);
- const now = new Date();
-
- const minutesAgo = Math.floor((now.getTime() - timestamp.getTime()) / 60000);
-
- if (minutesAgo < 60) {
- return = () => {
- const { state, actions } = useContext(StoreContext);
- const [dialogHidden, setDialogHidden] = useState(true);
- const [publishAction, setPublishAction] = useState('');
- const [dialogProps, setDialogProps] = useState({
- title: 'Title',
- subText: 'Sub Text',
- type: DialogType.normal,
- children: [],
- });
- const { publishVersions, remoteEndpoints, settings, publishStatus } = state;
-
- useEffect(() => {
- actions.getConnect('production');
- actions.getPublishHistory();
- }, []);
-
- const publish = async () => {
- setPublishAction('publish');
-
- // TODO???: first publish editing -> integration
-
- // publish integration -> prod
- await actions.publish();
- };
-
- useEffect(() => {
- if (publishStatus === 'inactive') {
- // noop
- } else if (publishStatus === 'start') {
- setDialogProps({
- title: formatMessage('Publishing'),
- subText: (
-
-
- ),
- });
- setPublishAction('');
- setDialogHidden(false);
- } else if (publishAction === 'rollback') {
- setDialogProps({
- title: formatMessage('Rollback successful'),
- subText: formatMessage(
- "Your bot was successfully rolled back to it's last published state.You can view your published bot by opening it locally in Emulator or online with Web Chat."
- ),
- type: DialogType.normal,
- children: (
-
-
- ),
- });
- setPublishAction('');
- setDialogHidden(false);
- }
- } else {
- // display confirmation
- setDialogProps({
- title: formatMessage('Error publishing bot'),
- subText: formatMessage('An error was encountered while attempting to publish your bot: { error }', {
- error: publishStatus,
- }),
- type: DialogType.normal,
- children: (
-
-
- ),
- });
- setDialogHidden(false);
- }
- }, [publishStatus]);
-
- const rollback = async () => {
- setPublishAction('rollback');
-
- // publish previousProd -> prod
- await actions.publishVersion(publishVersions.previousProduction.label);
-
- // reload publish history
- actions.getPublishHistory();
- };
-
- const openEmulator = () => {
- openInEmulator(
- remoteEndpoints.production,
- settings.MicrosoftAppId && settings.MicrosoftAppPassword
- ? { MicrosoftAppId: settings.MicrosoftAppId, MicrosoftAppPassword: settings.MicrosoftAppPassword }
- : { MicrosoftAppPassword: '', MicrosoftAppId: '' }
- );
- };
-
- const confirmRollback = () => {
- setDialogProps({
- title: formatMessage('Confirm rollback'),
- subText: formatMessage("Are you sure you want to rollback to your bot's last published state?"),
- type: DialogType.normal,
- children: (
-
-
- ),
- });
- setDialogHidden(false);
- };
-
- const confirmPublish = () => {
- setDialogProps({
- title: formatMessage('Confirm Publish'),
- subText: formatMessage('Are you sure you want to publish your bot?'),
- type: DialogType.normal,
- children: (
-
-
- ),
- });
- setDialogHidden(false);
- };
-
- const closeConfirm = () => {
- setDialogHidden(true);
- };
-
- const openInEmulator = (url, authSettings) => {
- // this creates a temporary hidden iframe to fire off the bfemulator protocol
- // and start up the emulator
- const i = document.createElement('iframe');
- i.style.display = 'none';
- i.onload = () => i.parentNode && i.parentNode.removeChild(i);
- i.src = `bfemulator://livechat.open?botUrl=${encodeURIComponent(url)}&msaAppId=${
- authSettings.MicrosoftAppId
- }&msaAppPassword=${encodeURIComponent(authSettings.MicrosoftAppPassword)} `;
- document.body.appendChild(i);
- };
-
- return (
-
diff --git a/Composer/packages/client/src/pages/skills/index.tsx b/Composer/packages/client/src/pages/skills/index.tsx
index 8a931f207f..913934d40a 100644
--- a/Composer/packages/client/src/pages/skills/index.tsx
+++ b/Composer/packages/client/src/pages/skills/index.tsx
@@ -4,22 +4,38 @@
/** @jsx jsx */
import { jsx } from '@emotion/core';
import { RouteComponentProps } from '@reach/router';
-import React, { useContext } from 'react';
+import React, { useContext, useCallback, useState } from 'react';
import formatMessage from 'format-message';
import { ToolBar } from '../../components/ToolBar/index';
import { TestController } from '../../components/TestController';
import { StoreContext } from '../../store';
-import { ContentHeaderStyle, HeaderText } from './styles';
+import { ContainerStyle, ContentHeaderStyle, HeaderText } from './styles';
import SkillSettings from './skill-settings';
import SkillList from './skill-list';
+import SkillForm from './skill-form';
+import { ISkillFormData } from './types';
const Skills: React.FC = () => {
const { state, actions } = useContext(StoreContext);
+ const [editIndex, setEditIndex] = useState();
- const { skills, projectId } = state;
+ const { skills, projectId, settings, botName } = state;
const toolbarItems = [
+ {
+ type: 'action',
+ text: formatMessage('Connect to a new skill'),
+ buttonProps: {
+ iconProps: {
+ iconName: 'Add',
+ },
+ onClick: () => {
+ setEditIndex(-1);
+ },
+ },
+ align: 'left',
+ },
{
type: 'element',
element: = () => {
},
];
+ const onSubmitForm = useCallback(
+ (submitFormData: ISkillFormData, editIndex: number) => {
+ const payload = {
+ projectId,
+ targetId: editIndex,
+ skillData: submitFormData,
+ };
+ actions.updateSkill(payload);
+ setEditIndex(undefined);
+ },
+ [projectId]
+ );
+
+ const onDismissForm = useCallback(() => {
+ setEditIndex(undefined);
+ }, []);
+
return (
- = props => {
);
}, []);
- const onRenderDetailsFooter = useCallback(() => {
- // do not allow add template in particular dialog lg, it suppose to be auto generated in form.
- return (
- ;
actions: BoundActionHandlers;
diff --git a/Composer/packages/client/src/store/persistence/FilePersistence.ts b/Composer/packages/client/src/store/persistence/FilePersistence.ts
index d8485c5c3e..b215348c3d 100644
--- a/Composer/packages/client/src/store/persistence/FilePersistence.ts
+++ b/Composer/packages/client/src/store/persistence/FilePersistence.ts
@@ -21,9 +21,9 @@ const actionType2ChangeType = {
[ActionTypes.UPDATE_LU]: { changeType: ChangeType.UPDATE, fileExtension: FileExtensions.Lu },
[ActionTypes.CREATE_LU]: { changeType: ChangeType.CREATE, fileExtension: FileExtensions.Lu },
[ActionTypes.REMOVE_LU]: { changeType: ChangeType.DELETE, fileExtension: FileExtensions.Lu },
- [ActionTypes.CREATE_SKILL_MANIFEST]: { changeType: ChangeType.CREATE, fileType: FileExtensions.Manifest },
- [ActionTypes.REMOVE_SKILL_MANIFEST]: { changeType: ChangeType.DELETE, fileType: FileExtensions.Manifest },
- [ActionTypes.UPDATE_SKILL_MANIFEST]: { changeType: ChangeType.UPDATE, fileType: FileExtensions.Manifest },
+ [ActionTypes.CREATE_SKILL_MANIFEST]: { changeType: ChangeType.CREATE, fileExtension: FileExtensions.Manifest },
+ [ActionTypes.REMOVE_SKILL_MANIFEST]: { changeType: ChangeType.DELETE, fileExtension: FileExtensions.Manifest },
+ [ActionTypes.UPDATE_SKILL_MANIFEST]: { changeType: ChangeType.UPDATE, fileExtension: FileExtensions.Manifest },
};
class FilePersistence {
diff --git a/Composer/packages/client/src/store/persistence/types.ts b/Composer/packages/client/src/store/persistence/types.ts
index 74ac3a4dfd..c0c6373d55 100644
--- a/Composer/packages/client/src/store/persistence/types.ts
+++ b/Composer/packages/client/src/store/persistence/types.ts
@@ -9,7 +9,7 @@ export enum ChangeType {
export enum FileExtensions {
Dialog = '.dialog',
- Manifest = '.manifest',
+ Manifest = '.json',
Lu = '.lu',
Lg = '.lg',
}
diff --git a/Composer/packages/client/src/store/types.ts b/Composer/packages/client/src/store/types.ts
index a7ee440708..17a2371501 100644
--- a/Composer/packages/client/src/store/types.ts
+++ b/Composer/packages/client/src/store/types.ts
@@ -50,6 +50,7 @@ export interface StorageFolder extends File {
export interface PublishType {
name: string;
description: string;
+ instructions?: string;
schema?: JSONSchema7;
features: {
history: boolean;
diff --git a/Composer/packages/client/src/styles.ts b/Composer/packages/client/src/styles.ts
index ef089f7763..aad8adeab7 100644
--- a/Composer/packages/client/src/styles.ts
+++ b/Composer/packages/client/src/styles.ts
@@ -10,7 +10,7 @@ export const main = css`
`;
export const sideBar = isExpand => css`
- width: ${isExpand ? '220' : '48'}px;
+ width: ${isExpand ? '175' : '48'}px;
background-color: ${NeutralColors.gray20};
height: 100%;
border-right: 1px solid ${NeutralColors.gray50};
diff --git a/Composer/packages/electron-server/README.md b/Composer/packages/electron-server/README.md
index df408aa1a9..b119f5a4f8 100644
--- a/Composer/packages/electron-server/README.md
+++ b/Composer/packages/electron-server/README.md
@@ -27,8 +27,8 @@ This package is a wrapper that will spin up the Composer web application inside
**Method 2**
-1. Run `yarn copy-templates` in the `/Composer/package/electron-server` directory.
-2. Run `yarn run pack` in the `/Composer/package/electron-server` directory.
+1. Run `yarn run pack` in the `/Composer/package/electron-server` directory.
+2. Run `yarn copy-templates` in the `/Composer/package/electron-server` directory.
3. Run `yarn copy-plugins` in the `/Composer/package/electron-server` directory.
4. Run `yarn dist`in the `/Composer/package/electron-server` directory.
5. Find your portable binary inside of `/Composer/package/electron-server/dist`.
diff --git a/Composer/packages/electron-server/package.json b/Composer/packages/electron-server/package.json
index a792725fab..dacd72a416 100644
--- a/Composer/packages/electron-server/package.json
+++ b/Composer/packages/electron-server/package.json
@@ -14,7 +14,7 @@
"copy-plugins": "node scripts/copy-plugins.js",
"copy-templates": "node scripts/copy-templates.js",
"dist": "node scripts/electronBuilderDist.js",
- "dist:full": "yarn clean && yarn build && yarn copy-templates && yarn run pack && yarn copy-plugins && yarn dist",
+ "dist:full": "yarn clean && yarn build && yarn run pack && yarn copy-templates && yarn copy-plugins && yarn dist",
"lint": "eslint --quiet --ext .js,.jsx,.ts,.tsx ./src",
"lint:fix": "yarn lint --fix",
"pack": "node scripts/electronBuilderPack.js",
@@ -48,7 +48,7 @@
"js-yaml": "^3.13.1",
"mock-fs": "^4.10.1",
"ncp": "2.0.0",
- "nodemon": "^1.18.11",
+ "nodemon": "^2.0.3",
"path": "^0.12.7",
"rimraf": "^2.6.3",
"source-map-explorer": "^2.1.0",
diff --git a/Composer/packages/electron-server/scripts/copy-templates.js b/Composer/packages/electron-server/scripts/copy-templates.js
index 471bf04105..4739ccc8f3 100644
--- a/Composer/packages/electron-server/scripts/copy-templates.js
+++ b/Composer/packages/electron-server/scripts/copy-templates.js
@@ -3,10 +3,34 @@
const fs = require('fs-extra');
const { resolve } = require('path');
+const electronBuildConfig = require('../electron-builder-config.json');
-const source = resolve(__dirname, '../../../../BotProject/Templates');
-const destination = resolve(__dirname, '../build/templates');
-console.log(`[copy-templates.js] Copying templates from ${source} to ${destination}`);
+const source = resolve(__dirname, '../../../../runtime');
+
+let destination;
+switch (process.platform) {
+ case 'darwin':
+ const productName = electronBuildConfig.productName;
+ destination = resolve(__dirname, `../dist/mac/${productName}.app/Contents/Resources/app.asar.unpacked/BotProject`);
+ console.log('[copy-plugins.js] Mac detected. Copying plugins to: ', destination);
+ break;
+
+ case 'linux':
+ destination = resolve(__dirname, '../dist/linux-unpacked/resources/app.asar.unpacked/BotProject');
+ console.log('[copy-plugins.js] Linux detected. Copying plugins to: ', destination);
+ break;
+
+ case 'win32':
+ destination = resolve(__dirname, '../dist/win-unpacked/resources/app.asar.unpacked/BotProject');
+ console.log(`[copy-plugins.js] Windows detected. Copying plugins from ${source} to ${destination}`);
+ break;
+
+ default:
+ console.error('[copy-plugins.js] Detected platform is not Mac / Linux / Windows');
+ process.exit(1);
+}
+
+console.log(`[copy-templates.js] Copying BotProject from ${source} to ${destination}`);
// copy project templates to build directory to be packaged
fs.copy(source, destination, err => {
diff --git a/Composer/packages/electron-server/src/main.ts b/Composer/packages/electron-server/src/main.ts
index 17308d1516..9ee47a4dca 100644
--- a/Composer/packages/electron-server/src/main.ts
+++ b/Composer/packages/electron-server/src/main.ts
@@ -47,12 +47,16 @@ function processArgsForWindows(args: string[]): string {
}
async function createAppDataDir() {
+ // TODO: Move all ENV variable setting to an env file and update build process to leverage those variables too
const appDataBasePath: string = process.env.APPDATA || process.env.HOME || '';
const compserAppDataDirectoryName = 'BotFrameworkComposer';
const composerAppDataPath: string = resolve(appDataBasePath, compserAppDataDirectoryName);
+ const localPublishPath: string = join(composerAppDataPath, 'hostedBots');
process.env.COMPOSER_APP_DATA = join(composerAppDataPath, 'data.json'); // path to the actual data file
log('creating composer app data path at: ', composerAppDataPath);
- await mkdirp(composerAppDataPath);
+ process.env.LOCAL_PUBLISH_PATH = localPublishPath;
+ log('creating local bot runtime publish path: ', localPublishPath);
+ await mkdirp(localPublishPath);
}
function initializeAppUpdater() {
@@ -97,7 +101,7 @@ async function loadServer() {
if (!isDevelopment) {
// only change paths if packaged electron app
const unpackedDir = getUnpackedAsarPath();
- process.env.COMPOSER_RUNTIME_FOLDER = join(unpackedDir, 'build', 'templates');
+ process.env.COMPOSER_RUNTIME_FOLDER = join(unpackedDir, 'BotProject', 'Templates');
pluginsDir = join(unpackedDir, 'build', 'plugins');
}
diff --git a/Composer/packages/extensions/adaptive-form/src/components/AdaptiveForm/FormTitle.tsx b/Composer/packages/extensions/adaptive-form/src/components/AdaptiveForm/FormTitle.tsx
index 4340e0a99f..3c3ab1024b 100644
--- a/Composer/packages/extensions/adaptive-form/src/components/AdaptiveForm/FormTitle.tsx
+++ b/Composer/packages/extensions/adaptive-form/src/components/AdaptiveForm/FormTitle.tsx
@@ -3,15 +3,14 @@
/** @jsx jsx */
import { jsx } from '@emotion/core';
-import React from 'react';
+import React, { useMemo } from 'react';
import { FontWeights } from '@uifabric/styling';
import { FontSizes } from '@uifabric/fluent-theme';
-import { Link } from 'office-ui-fabric-react/lib/Link';
-import startCase from 'lodash/startCase';
import formatMessage from 'format-message';
import { UIOptions, JSONSchema7 } from '@bfc/extension';
import { EditableField } from '../fields/EditableField';
+import { Link } from '../Link';
import { title as styles } from './styles';
@@ -19,35 +18,32 @@ interface FormTitleProps {
description?: string;
formData: any;
id: string;
- name?: string;
- onChange?: (data: any) => void;
+ onChange: ($designer: object) => void;
schema: JSONSchema7;
title?: string;
uiOptions?: UIOptions;
}
const FormTitle: React.FC = props => {
- const { name, description, schema, formData, uiOptions = {} } = props;
+ const { description, schema, formData, uiOptions = {} } = props;
const handleTitleChange = (newTitle?: string): void => {
- if (props.onChange) {
- props.onChange({
- ...formData.$designer,
- name: newTitle,
- });
- }
+ props.onChange({
+ ...formData.$designer,
+ name: newTitle,
+ });
};
const uiLabel = typeof uiOptions?.label === 'function' ? uiOptions.label(formData) : uiOptions.label;
const uiSubtitle = typeof uiOptions?.subtitle === 'function' ? uiOptions.subtitle(formData) : uiOptions.subtitle;
- const getTitle = (): string => {
+ const initialValue = useMemo(() => {
const designerName = formData.$designer?.name;
- return designerName || uiLabel || schema.title || startCase(name);
- };
+ return designerName || uiLabel || schema.title;
+ }, [formData.$designer?.name, uiLabel, schema.title]);
const getHelpLinkLabel = (): string => {
- return (uiLabel || schema.title || startCase(name) || '').toLowerCase();
+ return (uiLabel || schema.title || '').toLowerCase();
};
const getSubTitle = (): string => {
@@ -86,7 +82,7 @@ const FormTitle: React.FC = props => {
root: { margin: '5px 0 7px -9px' },
}}
uiOptions={{}}
- value={getTitle()}
+ value={initialValue}
onChange={handleTitleChange}
ariaLabel={formatMessage('form title')}
/>
diff --git a/Composer/packages/extensions/adaptive-form/src/components/FieldLabel.tsx b/Composer/packages/extensions/adaptive-form/src/components/FieldLabel.tsx
index 12f687210d..708b6ad735 100644
--- a/Composer/packages/extensions/adaptive-form/src/components/FieldLabel.tsx
+++ b/Composer/packages/extensions/adaptive-form/src/components/FieldLabel.tsx
@@ -1,13 +1,17 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
+/** @jsx jsx */
+import { jsx } from '@emotion/core';
import React from 'react';
import { DirectionalHint, TooltipHost, TooltipDelay } from 'office-ui-fabric-react/lib/Tooltip';
import { Icon } from 'office-ui-fabric-react/lib/Icon';
import { Label } from 'office-ui-fabric-react/lib/Label';
-import { Link } from 'office-ui-fabric-react/lib/Link';
import { NeutralColors } from '@uifabric/fluent-theme';
import formatMessage from 'format-message';
+import { Link } from './Link';
+import { focusBorder } from './sharedStyles';
+
interface DescriptionCalloutProps {
title: string;
description?: string;
@@ -49,7 +53,7 @@ const DescriptionCallout: React.FC = function Descripti
),
}}
>
-
{title}
-
{content}
+
+
+ {content}
+
+
{instructions}
}{formatMessage('Publish Configuration')}
{formatMessage('This is the name that your user will see.')}
*/} -- {formatMessage( - 'Copy the commands above, and paste them into your terminal. The output will look like the screenshot below. Note that it will take > 5 minutes for the provisioning process to complete.' - )} -
-{formatMessage('This is the name that your user will see.')}
*/} -- {formatMessage( - 'Copy the commands above, and paste them into your terminal. The output will look like the screenshot below. Note that it may take several minutes for the publish to complete.' - )} -
-
-
-
-
- {formatMessage('Learn more')}
-
-
- {instructions.title}
-{instructions.description}
-
-
- );
-};
diff --git a/Composer/packages/client/src/pages/setting/remote-publish/styles.js b/Composer/packages/client/src/pages/setting/remote-publish/styles.js
deleted file mode 100644
index dc264209c1..0000000000
--- a/Composer/packages/client/src/pages/setting/remote-publish/styles.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-module.exports.styles = {
- published: {
- backgroundColor: '#F2F2F2',
- padding: '1rem',
- width: '400px',
- marginBottom: '1rem',
- fontSize: '0.6875rem',
- },
- integration: {
- padding: '1rem',
- backgroundColor: 'rgba(0, 120, 212, 0.1)',
- width: '400px',
- marginBottom: '1rem',
- fontSize: '0.6875rem',
- },
- rollback: {
- padding: '1rem',
- paddingTop: '0',
- width: '400px',
- fontSize: '0.6875rem',
- },
- h1: {
- margin: '0px',
- fontSize: '0.81rem',
- },
- buttons: {
- root: {
- width: '150px',
- },
- },
- button: {
- root: [
- {
- width: '100%',
- fontSize: '14px',
- padding: '0px',
- },
- ],
- },
- icon: {
- root: [
- {
- width: '22px',
- height: '22px',
- fontSize: '22px',
- },
- ],
- },
- page: {
- padding: '1rem',
- },
- header: {
- marginTop: '0',
- },
- disabled: {
- root: [
- {
- color: '#808080',
- },
- ],
- },
- disabledIcon: {
- root: [
- {
- width: '22px',
- height: '22px',
- fontSize: '22px',
- color: '#808080',
- },
- ],
- },
-};
diff --git a/Composer/packages/client/src/pages/setting/router.tsx b/Composer/packages/client/src/pages/setting/router.tsx
index fd54cf22f3..7a353e1bdf 100644
--- a/Composer/packages/client/src/pages/setting/router.tsx
+++ b/Composer/packages/client/src/pages/setting/router.tsx
@@ -7,8 +7,6 @@ import { Router } from '@reach/router';
import { ErrorBoundary } from '../../components/ErrorBoundary';
import { DialogSettings } from './dialog-settings';
-import { RemotePublish } from './remote-publish';
-import { Deployment } from './deployment';
import { UserSettings } from './user-settings';
import { RuntimeSettings } from './runtime-settings';
@@ -17,8 +15,6 @@ const Routes = () => {
Publish your bot
- {publishVersions && publishVersions.integration && ( -
-
-
-
-
-
-
-
-
-
- )}
- {publishVersions && publishVersions.production && (
- In Test
- Last tested
-
-
-
-
-
-
-
-
-
- )}
- In Production
- Current version published
- {publishVersions && publishVersions.previousProduction && (
-
-
-
-
-
- Rollback
-
- to last published
-
- )}
- {publishVersions && !publishVersions.previousProduction && (
-
-
-
-
- Rollback will be available after your next publish.
-
-
- )}
-
- {!publishVersions && {formatMessage('Loading')}
}
-
-
-
+
setEditIndex(idx)} />
+
);
};
diff --git a/Composer/packages/client/src/pages/skills/skill-form.tsx b/Composer/packages/client/src/pages/skills/skill-form.tsx
index 44489cfe99..24fc9aad76 100644
--- a/Composer/packages/client/src/pages/skills/skill-form.tsx
+++ b/Composer/packages/client/src/pages/skills/skill-form.tsx
@@ -9,11 +9,13 @@ import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/Button'
import { Stack, StackItem } from 'office-ui-fabric-react/lib/Stack';
import { TextField } from 'office-ui-fabric-react/lib/TextField';
import { assignDefined, Skill } from '@bfc/shared';
+import { Modal } from 'office-ui-fabric-react/lib/Modal';
import { ISkillFormData, ISkillFormDataErrors, SkillUrlRegex } from './types';
-import { FormFieldManifestUrl, FormFieldEditName, MarginLeftSmall } from './styles';
+import { FormFieldManifestUrl, FormFieldEditName, MarginLeftSmall, FormModalTitle, FormModalBody } from './styles';
export interface ISkillFormProps {
+ isOpen: boolean;
editIndex?: number;
skills: Skill[];
onSubmit: (skillFormData: ISkillFormData, editIndex: number) => void;
@@ -25,7 +27,7 @@ const defaultFormData = {
};
const SkillForm: React.FC = props => {
- const { editIndex = -1, skills, onSubmit, onDismiss } = props;
+ const { editIndex = -1, skills, onSubmit, onDismiss, isOpen } = props;
const originFormData = skills[editIndex];
const initialFormData = originFormData
? assignDefined(defaultFormData, { manifestUrl: originFormData.manifestUrl, name: originFormData.name })
@@ -86,36 +88,46 @@ const SkillForm: React.FC = props => {
};
return (
-
+
+
);
};
diff --git a/Composer/packages/client/src/pages/skills/skill-list.tsx b/Composer/packages/client/src/pages/skills/skill-list.tsx
index 525a5bbf51..be16e46e63 100644
--- a/Composer/packages/client/src/pages/skills/skill-list.tsx
+++ b/Composer/packages/client/src/pages/skills/skill-list.tsx
@@ -16,7 +16,6 @@ import { TooltipHost } from 'office-ui-fabric-react/lib/Tooltip';
import { ScrollablePane, ScrollbarVisibility } from 'office-ui-fabric-react/lib/ScrollablePane';
import { Sticky, StickyPositionType } from 'office-ui-fabric-react/lib/Sticky';
import { Stack } from 'office-ui-fabric-react/lib/Stack';
-import { Link } from 'office-ui-fabric-react/lib/Link';
import { Modal } from 'office-ui-fabric-react/lib/Modal';
import { FontSizes } from '@uifabric/fluent-theme';
import formatMessage from 'format-message';
@@ -25,13 +24,12 @@ import { JsonEditor } from '@bfc/code-editor';
import { StoreContext } from '../../store';
-import SkillForm from './skill-form';
-import { TableView, ActionButton, TableCell, ManifestModalHeaderStyle, ManifestModalBodyStyle } from './styles';
-import { ISkillFormData } from './types';
+import { TableView, TableCell, ManifestModalHeaderStyle, ManifestModalBodyStyle } from './styles';
export interface ISkillListProps {
skills: Skill[];
projectId: string;
+ onEdit: (index?: number) => void;
}
const columns: IColumn[] = [
@@ -51,7 +49,8 @@ const columns: IColumn[] = [
key: 'msAppId',
name: formatMessage('App Id'),
fieldName: 'msAppId',
- minWidth: 200,
+ minWidth: 150,
+ maxWidth: 280,
isResizable: true,
data: 'string',
onRender: (item: Skill) => {
@@ -62,7 +61,8 @@ const columns: IColumn[] = [
key: 'endpointUrl',
name: formatMessage('Skill Endpoint'),
fieldName: 'endpointUrl',
- minWidth: 450,
+ minWidth: 250,
+ maxWidth: 400,
isResizable: true,
data: 'string',
onRender: (item: Skill) => {
@@ -73,7 +73,8 @@ const columns: IColumn[] = [
key: 'description',
name: formatMessage('Description'),
fieldName: 'description',
- minWidth: 300,
+ minWidth: 200,
+ maxWidth: 400,
isResizable: true,
data: 'string',
onRender: (item: Skill) => {
@@ -85,32 +86,10 @@ const columns: IColumn[] = [
const SkillList: React.FC = props => {
const { actions } = useContext(StoreContext);
- const { skills, projectId } = props;
+ const { skills, projectId, onEdit } = props;
- const [editIndex, setEditIndex] = useState(undefined);
const [selectedSkillIndex, setSelectedSkillIndex] = useState(null);
- const onSubmitForm = useCallback(
- (submitFormData: ISkillFormData, editIndex: number) => {
- const payload = {
- projectId,
- targetId: editIndex,
- skillData: submitFormData,
- };
- actions.updateSkill(payload);
- setEditIndex(undefined);
- },
- [projectId]
- );
-
- const onDismissForm = useCallback(() => {
- setEditIndex(undefined);
- }, []);
-
- const onItemEdit = useCallback(index => {
- setEditIndex(index);
- }, []);
-
const onItemDelete = useCallback(
index => {
const payload = {
@@ -119,13 +98,8 @@ const SkillList: React.FC = props => {
skillData: null,
};
actions.updateSkill(payload);
-
- // close form, if delete is current opened
- if (index === editIndex) {
- setEditIndex(undefined);
- }
},
- [projectId, editIndex]
+ [projectId]
);
const onViewManifest = index => {
@@ -152,9 +126,10 @@ const SkillList: React.FC = props => {
iconProps={{
iconName: 'Edit',
}}
- onClick={() => onItemEdit(index)}
+ onClick={() => onEdit(index)}
title="Edit"
ariaLabel="Edit"
+ data-testid="EditSkill"
/>
= props => {
onClick={() => onItemDelete(index)}
title="Delete"
ariaLabel="Delete"
+ data-testid="DeleteSkill"
/>
onViewManifest(index)}
title="View"
ariaLabel="View"
+ data-testid="ViewManifest"
/>
);
},
});
- }, [projectId, editIndex]);
+ }, [projectId]);
const onRenderDetailsHeader = useCallback((props, defaultRender) => {
return (
@@ -190,26 +167,8 @@ const SkillList: React.FC{formatMessage('Skills')}
+ {editIndex === -1 ? formatMessage('Connect to a new skill') : formatMessage('Edit skill connection')} +
+ +
- {typeof editIndex === 'number' ? (
-
- );
- }, [editIndex, skills]);
-
return (
-
+
= props => {
layoutMode={DetailsListLayoutMode.justified}
isHeaderVisible={true}
onRenderDetailsHeader={onRenderDetailsHeader}
- onRenderDetailsFooter={onRenderDetailsFooter}
checkboxVisibility={CheckboxVisibility.hidden}
/>
@@ -254,7 +212,7 @@ const SkillList: React.FC = props => {
/>
-
+
);
};
diff --git a/Composer/packages/client/src/pages/skills/styles.ts b/Composer/packages/client/src/pages/skills/styles.ts
index 1575eada84..49ba3413a2 100644
--- a/Composer/packages/client/src/pages/skills/styles.ts
+++ b/Composer/packages/client/src/pages/skills/styles.ts
@@ -4,6 +4,12 @@
import { FontWeights, FontSizes } from 'office-ui-fabric-react/lib/Styling';
import { css } from '@emotion/core';
+export const ContainerStyle = css`
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+`;
+
export const ContentHeaderStyle = css`
padding: 5px 20px;
height: 60px;
@@ -34,7 +40,6 @@ export const ContentStyle = css`
export const TableView = css`
flex: 4;
margin: 20px;
- height: calc(100vh - 200px);
position: relative;
overflow: visible;
fontsize: 16px;
@@ -60,6 +65,14 @@ export const ChoiceGroupAlignHorizontal = css`
}
`;
+export const FormModalTitle = css`
+ padding: 0 24px;
+`;
+
+export const FormModalBody = css`
+ padding: 24px;
+`;
+
export const FormFieldManifestUrl = css`
width: 40rem;
`;
@@ -108,7 +121,7 @@ export const MarginLeftSmall = css`
export const ManifestModalHeaderStyle = css`
margin: 14px 0 0 16px;
- fon-size: 20px;
+ font-size: 20px;
font-weight: bolder;
align-items: left;
`;
diff --git a/Composer/packages/client/src/store/index.tsx b/Composer/packages/client/src/store/index.tsx
index 17f52001c8..608cacd32b 100644
--- a/Composer/packages/client/src/store/index.tsx
+++ b/Composer/packages/client/src/store/index.tsx
@@ -28,7 +28,7 @@ import filePersistence from './persistence/FilePersistence';
const { defaultFileResolver } = TemplatesParser;
-const initialState: State = {
+export const initialState: State = {
dialogs: [],
projectId: '',
botName: '',
@@ -103,7 +103,7 @@ const initialState: State = {
},
};
-interface StoreContextValue {
+export interface StoreContextValue {
state: State;
dispatch: React.Dispatch
+
= props => {
+ return (
+
+ {props.children}
+
+ );
+};
+
+export { Link };
diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/index.tsx b/Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/index.tsx
index b2fae0bead..60fd1bd3f1 100644
--- a/Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/index.tsx
+++ b/Composer/packages/extensions/adaptive-form/src/components/fields/OpenObjectField/index.tsx
@@ -64,15 +64,18 @@ const OpenObjectField: React.FC
formatMessage('Send an Activity'),
+ label: () => formatMessage('Send a response'),
helpLink: 'https://aka.ms/bfc-send-activity',
order: ['activity', '*'],
},
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/getUIOptions.test.ts b/Composer/packages/extensions/adaptive-form/src/utils/__tests__/getUIOptions.test.ts
index c924422e4b..6b10d7d94a 100644
--- a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/getUIOptions.test.ts
+++ b/Composer/packages/extensions/adaptive-form/src/utils/__tests__/getUIOptions.test.ts
@@ -19,7 +19,11 @@ describe('getUIOptions', () => {
},
},
};
- expect(getUIOptions(schema)).toMatchInlineSnapshot(`Object {}`);
+ expect(getUIOptions(schema)).toMatchInlineSnapshot(`
+Object {
+ "field": undefined,
+}
+`);
});
it('merges overrides into default schema', () => {
@@ -39,6 +43,7 @@ describe('getUIOptions', () => {
};
expect(getUIOptions(schema, uiSchema)).toMatchInlineSnapshot(`
Object {
+ "field": undefined,
"label": "First Label",
"order": Array [
"*",
@@ -73,6 +78,7 @@ Object {
expect(getUIOptions(schema, uiSchema, plugin)).toMatchInlineSnapshot(`
Object {
+ "field": undefined,
"helpLink": "https://example.com/plugin",
"label": "First Label",
"order": Array [
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/mergePluginConfigs.test.ts b/Composer/packages/extensions/adaptive-form/src/utils/__tests__/mergePluginConfigs.test.ts
index 70b7ed8e0f..5616c3f022 100644
--- a/Composer/packages/extensions/adaptive-form/src/utils/__tests__/mergePluginConfigs.test.ts
+++ b/Composer/packages/extensions/adaptive-form/src/utils/__tests__/mergePluginConfigs.test.ts
@@ -37,482 +37,482 @@ describe('mergePluginConfigs', () => {
};
expect(mergePluginConfigs(overrides)).toMatchInlineSnapshot(`
-Object {
- "formSchema": Object {
- "Microsoft.AdaptiveDialog": Object {
- "description": [Function],
- "helpLink": "https://aka.ms/botframework",
- "hidden": Array [
- "recognizer",
- ],
- "label": "Adaptive dialog",
- "order": Array [
- "recognizer",
- "*",
- ],
- "properties": Object {
- "recognizer": Object {
- "description": [Function],
- "label": [Function],
- },
- "triggers": Object {
- "label": "Foo",
- },
- },
- },
- "Microsoft.AttachmentInput": Object {
- "helpLink": "https://aka.ms/bfc-ask-for-user-input",
- "label": "Prompt for Attachment",
- },
- "Microsoft.BeginDialog": Object {
- "helpLink": "https://aka.ms/bfc-understanding-dialogs",
- "label": "Begin a Dialog",
- "order": Array [
- "dialog",
- "options",
- "resultProperty",
- "includeActivity",
- "*",
- ],
- },
- "Microsoft.BreakLoop": Object {
- "label": [Function],
- },
- "Microsoft.CancelAllDialogs": Object {
- "helpLink": "https://aka.ms/bfc-understanding-dialogs",
- "label": [Function],
- "order": Array [
- "dialog",
- "property",
- "*",
- ],
- },
- "Microsoft.ChoiceInput": Object {
- "helpLink": "https://aka.ms/bfc-ask-for-user-input",
- "label": [Function],
- },
- "Microsoft.ConfirmInput": Object {
- "helpLink": "https://aka.ms/bfc-ask-for-user-input",
- "label": [Function],
- },
- "Microsoft.ContinueLoop": Object {
- "label": [Function],
- },
- "Microsoft.DateTimeInput": Object {
- "helpLink": "https://aka.ms/bfc-ask-for-user-input",
- "label": [Function],
- },
- "Microsoft.DebugBreak": Object {
- "label": [Function],
- },
- "Microsoft.DeleteProperties": Object {
- "helpLink": "https://aka.ms/bfc-using-memory",
- "label": [Function],
- },
- "Microsoft.DeleteProperty": Object {
- "helpLink": "https://aka.ms/bfc-using-memory",
- "label": [Function],
- },
- "Microsoft.EditActions": Object {
- "label": [Function],
- },
- "Microsoft.EditArray": Object {
- "helpLink": "https://aka.ms/bfc-using-memory",
- "label": [Function],
- },
- "Microsoft.EmitEvent": Object {
- "helpLink": "https://aka.ms/bfc-custom-events",
- "label": [Function],
- },
- "Microsoft.EndDialog": Object {
- "helpLink": "https://aka.ms/bfc-understanding-dialogs",
- "label": [Function],
- },
- "Microsoft.EndTurn": Object {
- "helpLink": "https://aka.ms/bfc-understanding-dialogs",
- "label": [Function],
- },
- "Microsoft.Foreach": Object {
- "helpLink": "https://aka.ms/bfc-controlling-conversation-flow",
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "itemsProperty",
- "*",
- ],
- },
- "Microsoft.ForeachPage": Object {
- "helpLink": "https://aka.ms/bfc-controlling-conversation-flow",
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "itemsProperty",
- "pageSize",
- "*",
- ],
- },
- "Microsoft.HttpRequest": Object {
- "helpLink": "https://aka.ms/bfc-using-http",
- "label": [Function],
- "order": Array [
- "method",
- "url",
- "body",
- "headers",
- "*",
- ],
- },
- "Microsoft.IRecognizer": Object {
- "field": [Function],
- "helpLink": "https://aka.ms/BFC-Using-LU",
- },
- "Microsoft.IfCondition": Object {
- "helpLink": "https://aka.ms/bfc-controlling-conversation-flow",
- "hidden": Array [
- "actions",
- "elseActions",
- ],
- "label": [Function],
- },
- "Microsoft.LogAction": Object {
- "helpLink": "https://aka.ms/bfc-debugging-bots",
- "label": [Function],
- },
- "Microsoft.NumberInput": Object {
- "helpLink": "https://aka.ms/bfc-ask-for-user-input",
- "label": [Function],
- },
- "Microsoft.OAuthInput": Object {
- "helpLink": "https://aka.ms/bfc-using-oauth",
- "label": [Function],
- "order": Array [
- "connectionName",
- "*",
- ],
- },
- "Microsoft.OnActivity": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnBeginDialog": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnCancelDialog": Object {
- "hidden": Array [
- "actions",
- ],
- "order": Array [
- "condition",
- "*",
- ],
- },
- "Microsoft.OnCondition": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnConversationUpdateActivity": Object {
- "description": [Function],
- "helpLink": "https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-conversations?view=azure-bot-service-4.0#conversation-lifetime",
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnCustomEvent": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnDialogEvent": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnEndOfConversationActivity": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnError": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnEventActivity": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnHandoffActivity": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnIntent": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "intent",
- "condition",
- "entities",
- "*",
- ],
- "properties": Object {
- "intent": Object {
- "field": [Function],
+ Object {
+ "formSchema": Object {
+ "Microsoft.AdaptiveDialog": Object {
+ "description": [Function],
+ "helpLink": "https://aka.ms/botframework",
+ "hidden": Array [
+ "recognizer",
+ ],
+ "label": "Adaptive dialog",
+ "order": Array [
+ "recognizer",
+ "*",
+ ],
+ "properties": Object {
+ "recognizer": Object {
+ "description": [Function],
+ "label": [Function],
+ },
+ "triggers": Object {
+ "label": "Foo",
+ },
+ },
+ },
+ "Microsoft.AttachmentInput": Object {
+ "helpLink": "https://aka.ms/bfc-ask-for-user-input",
+ "label": "Prompt for Attachment",
+ },
+ "Microsoft.BeginDialog": Object {
+ "helpLink": "https://aka.ms/bfc-understanding-dialogs",
+ "label": "Begin a Dialog",
+ "order": Array [
+ "dialog",
+ "options",
+ "resultProperty",
+ "includeActivity",
+ "*",
+ ],
+ },
+ "Microsoft.BreakLoop": Object {
+ "label": [Function],
+ },
+ "Microsoft.CancelAllDialogs": Object {
+ "helpLink": "https://aka.ms/bfc-understanding-dialogs",
+ "label": [Function],
+ "order": Array [
+ "dialog",
+ "property",
+ "*",
+ ],
+ },
+ "Microsoft.ChoiceInput": Object {
+ "helpLink": "https://aka.ms/bfc-ask-for-user-input",
+ "label": [Function],
+ },
+ "Microsoft.ConfirmInput": Object {
+ "helpLink": "https://aka.ms/bfc-ask-for-user-input",
+ "label": [Function],
+ },
+ "Microsoft.ContinueLoop": Object {
+ "label": [Function],
+ },
+ "Microsoft.DateTimeInput": Object {
+ "helpLink": "https://aka.ms/bfc-ask-for-user-input",
+ "label": [Function],
+ },
+ "Microsoft.DebugBreak": Object {
+ "label": [Function],
+ },
+ "Microsoft.DeleteProperties": Object {
+ "helpLink": "https://aka.ms/bfc-using-memory",
+ "label": [Function],
+ },
+ "Microsoft.DeleteProperty": Object {
+ "helpLink": "https://aka.ms/bfc-using-memory",
+ "label": [Function],
+ },
+ "Microsoft.EditActions": Object {
+ "label": [Function],
+ },
+ "Microsoft.EditArray": Object {
+ "helpLink": "https://aka.ms/bfc-using-memory",
+ "label": [Function],
+ },
+ "Microsoft.EmitEvent": Object {
+ "helpLink": "https://aka.ms/bfc-custom-events",
+ "label": [Function],
+ },
+ "Microsoft.EndDialog": Object {
+ "helpLink": "https://aka.ms/bfc-understanding-dialogs",
+ "label": [Function],
+ },
+ "Microsoft.EndTurn": Object {
+ "helpLink": "https://aka.ms/bfc-understanding-dialogs",
+ "label": [Function],
+ },
+ "Microsoft.Foreach": Object {
+ "helpLink": "https://aka.ms/bfc-controlling-conversation-flow",
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "itemsProperty",
+ "*",
+ ],
+ },
+ "Microsoft.ForeachPage": Object {
+ "helpLink": "https://aka.ms/bfc-controlling-conversation-flow",
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "itemsProperty",
+ "pageSize",
+ "*",
+ ],
+ },
+ "Microsoft.HttpRequest": Object {
+ "helpLink": "https://aka.ms/bfc-using-http",
+ "label": [Function],
+ "order": Array [
+ "method",
+ "url",
+ "body",
+ "headers",
+ "*",
+ ],
+ },
+ "Microsoft.IRecognizer": Object {
+ "field": [Function],
+ "helpLink": "https://aka.ms/BFC-Using-LU",
+ },
+ "Microsoft.IfCondition": Object {
+ "helpLink": "https://aka.ms/bfc-controlling-conversation-flow",
+ "hidden": Array [
+ "actions",
+ "elseActions",
+ ],
+ "label": [Function],
+ },
+ "Microsoft.LogAction": Object {
+ "helpLink": "https://aka.ms/bfc-debugging-bots",
+ "label": [Function],
+ },
+ "Microsoft.NumberInput": Object {
+ "helpLink": "https://aka.ms/bfc-ask-for-user-input",
+ "label": [Function],
+ },
+ "Microsoft.OAuthInput": Object {
+ "helpLink": "https://aka.ms/bfc-using-oauth",
+ "label": [Function],
+ "order": Array [
+ "connectionName",
+ "*",
+ ],
+ },
+ "Microsoft.OnActivity": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnBeginDialog": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnCancelDialog": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ },
+ "Microsoft.OnCondition": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnConversationUpdateActivity": Object {
+ "description": [Function],
+ "helpLink": "https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-conversations?view=azure-bot-service-4.0#conversation-lifetime",
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnCustomEvent": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnDialogEvent": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnEndOfConversationActivity": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnError": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnEventActivity": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnHandoffActivity": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnIntent": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "intent",
+ "condition",
+ "entities",
+ "*",
+ ],
+ "properties": Object {
+ "intent": Object {
+ "field": [Function],
+ },
+ },
+ "subtitle": [Function],
+ },
+ "Microsoft.OnInvokeActivity": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnMessageActivity": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnMessageDeleteActivity": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnMessageReactionActivity": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnMessageUpdateActivity": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnRepromptDialog": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnTypingActivity": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.OnUnknownIntent": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ "label": [Function],
+ "order": Array [
+ "condition",
+ "*",
+ ],
+ "subtitle": [Function],
+ },
+ "Microsoft.QnAMakerDialog": Object {
+ "helpLink": "https://aka.ms/bfc-using-QnA",
+ "label": [Function],
+ },
+ "Microsoft.RegexRecognizer": Object {
+ "hidden": Array [
+ "entities",
+ ],
+ },
+ "Microsoft.RepeatDialog": Object {
+ "helpLink": "https://aka.ms/bfc-understanding-dialogs",
+ "label": [Function],
+ "order": Array [
+ "options",
+ "includeActivity",
+ "*",
+ ],
+ },
+ "Microsoft.ReplaceDialog": Object {
+ "helpLink": "https://aka.ms/bfc-understanding-dialogs",
+ "label": [Function],
+ "order": Array [
+ "dialog",
+ "options",
+ "includeActivity",
+ "*",
+ ],
+ },
+ "Microsoft.SendActivity": Object {
+ "helpLink": "https://aka.ms/bfc-send-activity",
+ "label": [Function],
+ "order": Array [
+ "activity",
+ "*",
+ ],
+ },
+ "Microsoft.SetProperties": Object {
+ "helpLink": "https://aka.ms/bfc-using-memory",
+ "label": [Function],
+ },
+ "Microsoft.SetProperty": Object {
+ "helpLink": "https://aka.ms/bfc-using-memory",
+ "label": [Function],
+ },
+ "Microsoft.SkillDialog": Object {
+ "helpLink": "https://aka.ms/bfc-call-skill",
+ "label": [Function],
+ },
+ "Microsoft.SwitchCondition": Object {
+ "helpLink": "https://aka.ms/bfc-controlling-conversation-flow",
+ "hidden": Array [
+ "default",
+ ],
+ "label": [Function],
+ "properties": Object {
+ "cases": Object {
+ "hidden": Array [
+ "actions",
+ ],
+ },
+ },
+ },
+ "Microsoft.TextInput": Object {
+ "helpLink": "https://aka.ms/bfc-ask-for-user-input",
+ "label": [Function],
+ },
+ "Microsoft.TraceActivity": Object {
+ "helpLink": "https://aka.ms/bfc-debugging-bots",
+ "label": [Function],
+ },
},
- },
- "subtitle": [Function],
- },
- "Microsoft.OnInvokeActivity": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnMessageActivity": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnMessageDeleteActivity": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnMessageReactionActivity": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnMessageUpdateActivity": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnRepromptDialog": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnTypingActivity": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.OnUnknownIntent": Object {
- "hidden": Array [
- "actions",
- ],
- "label": [Function],
- "order": Array [
- "condition",
- "*",
- ],
- "subtitle": [Function],
- },
- "Microsoft.QnAMakerDialog": Object {
- "helpLink": "https://aka.ms/bfc-using-QnA",
- "label": [Function],
- },
- "Microsoft.RegexRecognizer": Object {
- "hidden": Array [
- "entities",
- ],
- },
- "Microsoft.RepeatDialog": Object {
- "helpLink": "https://aka.ms/bfc-understanding-dialogs",
- "label": [Function],
- "order": Array [
- "options",
- "includeActivity",
- "*",
- ],
- },
- "Microsoft.ReplaceDialog": Object {
- "helpLink": "https://aka.ms/bfc-understanding-dialogs",
- "label": [Function],
- "order": Array [
- "dialog",
- "options",
- "includeActivity",
- "*",
- ],
- },
- "Microsoft.SendActivity": Object {
- "helpLink": "https://aka.ms/bfc-send-activity",
- "label": [Function],
- "order": Array [
- "activity",
- "*",
- ],
- },
- "Microsoft.SetProperties": Object {
- "helpLink": "https://aka.ms/bfc-using-memory",
- "label": [Function],
- },
- "Microsoft.SetProperty": Object {
- "helpLink": "https://aka.ms/bfc-using-memory",
- "label": [Function],
- },
- "Microsoft.SkillDialog": Object {
- "helpLink": "https://aka.ms/bfc-call-skill",
- "label": [Function],
- },
- "Microsoft.SwitchCondition": Object {
- "helpLink": "https://aka.ms/bfc-controlling-conversation-flow",
- "hidden": Array [
- "default",
- ],
- "label": [Function],
- "properties": Object {
- "cases": Object {
- "hidden": Array [
- "actions",
- ],
+ "recognizers": Array [
+ Object {
+ "displayName": [Function],
+ "handleRecognizerChange": [Function],
+ "id": "none",
+ "isSelected": [Function],
+ },
+ Object {
+ "displayName": [Function],
+ "editor": [Function],
+ "handleRecognizerChange": [Function],
+ "id": "Microsoft.RegexRecognizer",
+ "isSelected": [Function],
+ },
+ ],
+ "roleSchema": Object {
+ "expression": Object {
+ "label": "expression label",
+ },
},
- },
- },
- "Microsoft.TextInput": Object {
- "helpLink": "https://aka.ms/bfc-ask-for-user-input",
- "label": [Function],
- },
- "Microsoft.TraceActivity": Object {
- "helpLink": "https://aka.ms/bfc-debugging-bots",
- "label": [Function],
- },
- },
- "recognizers": Array [
- Object {
- "displayName": [Function],
- "handleRecognizerChange": [Function],
- "id": "none",
- "isSelected": [Function],
- },
- Object {
- "displayName": [Function],
- "editor": [Function],
- "handleRecognizerChange": [Function],
- "id": "Microsoft.RegexRecognizer",
- "isSelected": [Function],
- },
- ],
- "roleSchema": Object {
- "expression": Object {
- "label": "expression label",
- },
- },
-}
-`);
+ }
+ `);
});
});
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/getUIOptions.ts b/Composer/packages/extensions/adaptive-form/src/utils/getUIOptions.ts
index 80796996d3..8c7129bedb 100644
--- a/Composer/packages/extensions/adaptive-form/src/utils/getUIOptions.ts
+++ b/Composer/packages/extensions/adaptive-form/src/utils/getUIOptions.ts
@@ -13,5 +13,7 @@ export function getUIOptions(schema?: JSONSchema7, uiSchema?: UISchema, roleSche
const formOptions = uiSchema && kind && uiSchema[kind] ? uiSchema[kind] : {};
const roleOptions = roleSchema && $role && roleSchema[$role] ? roleSchema[$role] : {};
- return { ...roleOptions, ...formOptions };
+ // remove the field from the role schema
+ const combined = { ...roleOptions, field: undefined, ...formOptions };
+ return combined;
}
diff --git a/Composer/packages/extensions/adaptive-form/src/utils/resolveRef.ts b/Composer/packages/extensions/adaptive-form/src/utils/resolveRef.ts
index ef9b35162e..46c9f13723 100644
--- a/Composer/packages/extensions/adaptive-form/src/utils/resolveRef.ts
+++ b/Composer/packages/extensions/adaptive-form/src/utils/resolveRef.ts
@@ -8,7 +8,7 @@ export function resolveRef(
): JSONSchema7 {
if (typeof schema?.$ref === 'string') {
const defName = schema.$ref.replace('#/definitions/', '');
- const defSchema = typeof definitions[defName] === 'object' ? (definitions[defName] as JSONSchema7) : {};
+ const defSchema = typeof definitions?.[defName] === 'object' ? (definitions?.[defName] as JSONSchema7) : {};
const resolvedSchema = {
...defSchema,
diff --git a/Composer/packages/extensions/extension/src/types/formSchema.ts b/Composer/packages/extensions/extension/src/types/formSchema.ts
index ee5708c1a4..2cf9e58a92 100644
--- a/Composer/packages/extensions/extension/src/types/formSchema.ts
+++ b/Composer/packages/extensions/extension/src/types/formSchema.ts
@@ -45,7 +45,7 @@ export interface UIOptions {
get: (value: any) => any;
set: (value: any) => any;
};
- /** subtitle rendered in form title */
+ /** subtitle rendered in form title, defaults to schema.$kind */
subtitle?: UIOptionValue;
}
diff --git a/Composer/packages/extensions/plugin-loader/src/composerPluginRegistration.ts b/Composer/packages/extensions/plugin-loader/src/composerPluginRegistration.ts
index 9e7803afdf..73a1856473 100644
--- a/Composer/packages/extensions/plugin-loader/src/composerPluginRegistration.ts
+++ b/Composer/packages/extensions/plugin-loader/src/composerPluginRegistration.ts
@@ -7,7 +7,7 @@ import { JSONSchema7 } from 'json-schema';
import { PluginLoader } from './pluginLoader';
import log from './logger';
-import { PublishPlugin, RuntimeTemplate } from './types';
+import { PublishPlugin, RuntimeTemplate, BotTemplate } from './types';
export class ComposerPluginRegistration {
public loader: PluginLoader;
@@ -38,9 +38,8 @@ export class ComposerPluginRegistration {
this._description = val;
}
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- public log(message: string, ...args: any[]) {
- this._log(message, ...args);
+ public get log() {
+ return this._log;
}
/**************************************************************************************
@@ -57,10 +56,11 @@ export class ComposerPluginRegistration {
/**************************************************************************************
* Publish related features
*************************************************************************************/
- public async addPublishMethod(plugin: PublishPlugin, schema?: JSONSchema7) {
+ public async addPublishMethod(plugin: PublishPlugin, schema?: JSONSchema7, instructions?: string) {
log('registering publish method', this.name);
this.loader.extensions.publish[this.name] = {
plugin: this,
+ instructions: instructions,
methods: plugin,
schema: schema,
};
@@ -78,9 +78,9 @@ export class ComposerPluginRegistration {
* to communicate with the Bot Framework Emulator.
* ```ts
* await composer.addRuntimeTemplate({
- * key: 'csharp',
+ * key: 'azurewebapp',
* name: 'C#',
- * path: __dirname + '/../../../../BotProject/Templates/CSharp',
+ * path: __dirname + '/../../../../runtime/dotnet/azurewebapp',
* startCommand: 'dotnet run',
* });
* ```
@@ -89,6 +89,20 @@ export class ComposerPluginRegistration {
this.loader.extensions.runtimeTemplates.push(plugin);
}
+ /**************************************************************************************
+ * Add Bot Template (aka, SampleBot)
+ *************************************************************************************/
+ public addBotTemplate(template: BotTemplate) {
+ this.loader.extensions.botTemplates.push(template);
+ }
+
+ /**************************************************************************************
+ * Add Base Template (aka, BoilerPlate)
+ *************************************************************************************/
+ public addBaseTemplate(template: BotTemplate) {
+ this.loader.extensions.baseTemplates.push(template);
+ }
+
/**************************************************************************************
* Express/web related features
*************************************************************************************/
diff --git a/Composer/packages/extensions/plugin-loader/src/pluginLoader.ts b/Composer/packages/extensions/plugin-loader/src/pluginLoader.ts
index 698a84bd31..f9a13804a6 100644
--- a/Composer/packages/extensions/plugin-loader/src/pluginLoader.ts
+++ b/Composer/packages/extensions/plugin-loader/src/pluginLoader.ts
@@ -32,6 +32,8 @@ export class PluginLoader {
allowedUrls: [this.loginUri],
},
runtimeTemplates: [],
+ botTemplates: [],
+ baseTemplates: [],
};
this._passport = passport;
}
diff --git a/Composer/packages/extensions/plugin-loader/src/types.ts b/Composer/packages/extensions/plugin-loader/src/types.ts
index 3b81ad5866..ba8d174e35 100644
--- a/Composer/packages/extensions/plugin-loader/src/types.ts
+++ b/Composer/packages/extensions/plugin-loader/src/types.ts
@@ -23,6 +23,18 @@ export interface PublishResponse {
result: PublishResult;
}
+export interface BotTemplate {
+ id: string;
+ name: string;
+ description: string;
+ /* absolute path */
+ path: string;
+ /* tags for further grouping and search secenario */
+ tags?: string[];
+ /* list of supported runtime versions */
+ support?: string[];
+}
+
// TODO: Add types for project, metadata
export interface PublishPlugin {
publish: (config: Config, project: any, metadata: any, user?: UserIdentity) => Promise;
@@ -59,6 +71,8 @@ export interface ExtensionCollection {
[key: string]: {
plugin: ComposerPluginRegistration;
methods: PublishPlugin;
+ /** (Optional instructions displayed in the UI) */
+ instructions?: string;
/** (Optional) Schema for publishing configuration. */
schema?: JSONSchema7;
};
@@ -71,4 +85,6 @@ export interface ExtensionCollection {
[key: string]: any;
};
runtimeTemplates: RuntimeTemplate[];
+ botTemplates: BotTemplate[];
+ baseTemplates: BotTemplate[];
}
diff --git a/Composer/packages/extensions/visual-designer/src/components/groups/StepGroup.tsx b/Composer/packages/extensions/visual-designer/src/components/groups/StepGroup.tsx
index e5acf96c8e..e724e86b9c 100644
--- a/Composer/packages/extensions/visual-designer/src/components/groups/StepGroup.tsx
+++ b/Composer/packages/extensions/visual-designer/src/components/groups/StepGroup.tsx
@@ -43,13 +43,7 @@ const calculateLayout = (nodeMap: GraphNodeMap): GraphLayout => {
return sequentialLayouter(nodes);
};
-export const StepGroup: FunctionComponent = ({
- id,
- addCoachMarkRef,
- data,
- onEvent,
- onResize,
-}: NodeProps): JSX.Element => {
+export const StepGroup: FunctionComponent = ({ id, data, onEvent, onResize }: NodeProps): JSX.Element => {
const initialNodes = useMemo(() => calculateNodes(id, data), [id, data]);
const { layout, updateNodeBoundary } = useSmartLayout(initialNodes, calculateLayout, onResize);
@@ -84,7 +78,6 @@ export const StepGroup: FunctionComponent = ({
onClick={$kind => onEvent(NodeEventTypes.Insert, { id, $kind, position: 0 })}
data-testid="StepGroupAdd"
id={`${id}[0]`}
- addCoachMarkRef={addCoachMarkRef}
/>
{nodes
diff --git a/Composer/packages/extensions/visual-designer/src/components/lib/KeyboardZone.tsx b/Composer/packages/extensions/visual-designer/src/components/lib/KeyboardZone.tsx
index 01b25b7e31..ffa2b3ad4d 100644
--- a/Composer/packages/extensions/visual-designer/src/components/lib/KeyboardZone.tsx
+++ b/Composer/packages/extensions/visual-designer/src/components/lib/KeyboardZone.tsx
@@ -2,11 +2,29 @@
// Licensed under the MIT License.
/** @jsx jsx */
-import { jsx } from '@emotion/core';
+import { jsx, css } from '@emotion/core';
import { FC } from 'react';
import { mapShortcutToKeyboardCommand } from '../../constants/KeyboardCommandTypes';
+const styles = css`
+ position: relative;
+
+ &:focus {
+ outline: none;
+
+ &::after {
+ content: '';
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ border: 1px solid black;
+ }
+ }
+`;
+
const KeyNameByModifierAttr = {
ctrlKey: 'Control',
metaKey: 'Meta',
@@ -47,7 +65,7 @@ export const KeyboardZone: FC = ({ onCommand, children }): JS
};
return (
-
-
-
+ = ({ id, addCoachMarkRef, onClick, ...rest }) => {
+export const EdgeMenu: React.FC = ({ id, forwardedRef, onClick, ...rest }) => {
const { clipboardActions, customSchemas } = useContext(NodeRendererContext);
const selfHosted = useContext(SelfHostContext);
const { selectedIds } = useContext(SelectionContext);
@@ -39,7 +39,6 @@ export const EdgeMenu: React.FC = ({ id, addCoachMarkRef, onClick
};
const [menuSelected, setMenuSelected] = useState(false);
- const addRef = useCallback((action: HTMLDivElement) => addCoachMarkRef && addCoachMarkRef({ action }), []);
let boxShaow = '0px 2px 8px rgba(0, 0, 0, 0.1)';
boxShaow += menuSelected ? `,0 0 0 2px ${ObiColors.AzureBlue}` : nodeSelected ? `, 0 0 0 2px ${ObiColors.Black}` : '';
@@ -61,7 +60,7 @@ export const EdgeMenu: React.FC = ({ id, addCoachMarkRef, onClick
);
return (
{
const outputs = await client.deployments.get(resourceGroupName, deployName);
- return new Promise((resolve, reject) => {
- if (outputs?.properties?.outputs) {
- const outputResult = outputs.properties.outputs;
- const applicatoinResult = {
- MicrosoftAppId: appId,
- MicrosoftAppPassword: appPwd,
- };
- const outputObj = this.unpackObject(outputResult);
-
- let result = {};
- Object.assign(result, outputObj, applicatoinResult);
-
- fs.writeFile(settingsPath, JSON.stringify(result, null, 4), err => {
- if (err) {
- reject(err);
- }
- resolve(result);
- });
- } else {
- resolve({});
- }
- });
+ if (outputs?.properties?.outputs) {
+ const outputResult = outputs.properties.outputs;
+ const applicationResult = {
+ MicrosoftAppId: appId,
+ MicrosoftAppPassword: appPwd,
+ };
+ const outputObj = this.unpackObject(outputResult);
+
+ const result = {};
+ Object.assign(result, outputObj, applicationResult);
+ return result;
+ } else {
+ return null;
+ }
}
private async getFiles(dir: string): Promise {
@@ -227,50 +271,39 @@ export class BotProjectDeploy {
private async botPrepareDeploy(pathToDeploymentFile: string) {
return new Promise((resolve, reject) => {
- const data = `[config]\nproject = BotProject.csproj`;
+ const data = `[config]\nproject = Microsoft.BotFramework.Composer.WebApp.csproj`;
fs.writeFile(pathToDeploymentFile, data, err => {
- reject(err);
+ if (err) {
+ reject(err);
+ }
+ resolve();
});
});
}
private async dotnetPublish(publishFolder: string, projFolder: string, botPath?: string) {
+ // perform the dotnet publish command
+ // this builds the app and prepares it to be deployed
+ // results in a built copy in publishFolder/
await exec(`dotnet publish ${this.dotnetProjectPath} -c release -o ${publishFolder} -v q`);
- return new Promise((resolve, reject) => {
- const remoteBotPath = path.join(publishFolder, 'ComposerDialogs');
- const localBotPath = path.join(projFolder, 'ComposerDialogs');
-
- if (botPath) {
- this.logger({
- status: BotProjectDeployLoggerType.DEPLOY_INFO,
- message: `Publishing dialogs from external bot project: ${botPath}`,
- });
- fs.copy(
- botPath,
- remoteBotPath,
- {
- overwrite: true,
- recursive: true,
- },
- err => {
- reject(err);
- }
- );
- } else {
- fs.copy(
- localBotPath,
- remoteBotPath,
- {
- overwrite: true,
- recursive: true,
- },
- err => {
- reject(err);
- }
- );
- }
- resolve();
- });
+ const remoteBotPath = path.join(publishFolder, 'ComposerDialogs');
+ const localBotPath = path.join(projFolder, 'ComposerDialogs');
+ // Then, copy the declarative assets into the build folder.
+ if (botPath) {
+ this.logger({
+ status: BotProjectDeployLoggerType.DEPLOY_INFO,
+ message: `Publishing dialogs from external bot project: ${botPath}`,
+ });
+ await fs.copy(botPath, remoteBotPath, {
+ overwrite: true,
+ recursive: true,
+ });
+ } else {
+ await fs.copy(localBotPath, remoteBotPath, {
+ overwrite: true,
+ recursive: true,
+ });
+ }
}
private async zipDirectory(source: string, out: string) {
@@ -292,45 +325,16 @@ export class BotProjectDeploy {
return fs.readFileSync(file).length > 0;
}
- public async deploy(
+ // Run through the lubuild process
+ // This happens in the build folder, NOT in the original source folder
+ private async publishLuis(
name: string,
environment: string,
+ language: string,
+ luisEndpointKey: string,
luisAuthoringKey?: string,
- luisAuthoringRegion?: string,
- botPath?: string,
- language?: string
+ luisAuthoringRegion?: string
) {
- const webClient = new WebSiteManagementClient(this.creds, this.subId);
-
- // Check for existing deployment files
- if (!(await fs.pathExists(this.deployFilePath))) {
- await this.botPrepareDeploy(this.deployFilePath);
- }
-
- if (await fs.pathExists(this.zipPath)) {
- await fs.remove(this.zipPath);
- }
-
- // dotnet publish
- await this.dotnetPublish(this.publishFolder, this.projPath, botPath);
- const settings = await fs.readJSON(this.settingsPath);
- const luisSettings = settings.luis;
-
- let luisEndpointKey: string = '';
-
- if (!luisAuthoringKey) {
- luisAuthoringKey = luisSettings.authoringKey;
- luisEndpointKey = luisSettings.endpointKey;
- }
-
- if (!luisAuthoringRegion) {
- luisAuthoringRegion = luisSettings.region;
- }
-
- if (!language) {
- language = 'en-us';
- }
-
if (luisAuthoringKey && luisAuthoringRegion) {
// publishing luis
const botFiles = await this.getFiles(this.remoteBotPath);
@@ -341,7 +345,7 @@ export class BotProjectDeploy {
if (!(await fs.pathExists(this.generatedFolder))) {
await fs.mkdir(this.generatedFolder);
}
- let builder = new luBuild.Builder(msg =>
+ const builder = new luBuild.Builder(msg =>
this.logger({
status: BotProjectDeployLoggerType.DEPLOY_INFO,
message: msg,
@@ -377,46 +381,63 @@ export class BotProjectDeploy {
const luisConfigFiles = (await this.getFiles(this.remoteBotPath)).filter(filename =>
filename.includes('luis.settings')
);
- let luisAppIds: any = {};
+ const luisAppIds: any = {};
- for (let luisConfigFile of luisConfigFiles) {
+ for (const luisConfigFile of luisConfigFiles) {
const luisSettings = await fs.readJson(luisConfigFile);
Object.assign(luisAppIds, luisSettings.luis);
}
const luisEndpoint = `https://${luisAuthoringRegion}.api.cognitive.microsoft.com`;
- let luisConfig: any = {
+ const luisConfig: any = {
endpoint: luisEndpoint,
endpointKey: luisEndpointKey,
};
Object.assign(luisConfig, luisAppIds);
- let settings: any = await fs.readJson(this.deploymentSettingsPath);
- settings['luis'] = luisConfig;
+ // Update deploymentSettings with the luis config
+ const settings: any = await fs.readJson(this.deploymentSettingsPath);
+ settings.luis = luisConfig;
- await fs.writeJson(this.deploymentSettingsPath, settings);
- const token = await this.creds.getToken();
+ await fs.writeJson(this.deploymentSettingsPath, settings, {
+ spaces: 4,
+ });
- const getAccountUri = `${luisEndpoint}/luis/api/v2.0/azureaccounts`;
- const options = {
- headers: { Authorization: `Bearer ${token.accessToken}`, 'Ocp-Apim-Subscription-Key': luisAuthoringKey },
- } as rp.RequestPromiseOptions;
- const response = await rp.get(getAccountUri, options);
- const jsonRes = JSON.parse(response);
+ let jsonRes;
+ try {
+ // Assign a LUIS key to the endpoint of each app
+ const getAccountUri = `${luisEndpoint}/luis/api/v2.0/azureaccounts`;
+ const options = {
+ headers: { Authorization: `Bearer ${this.accessToken}`, 'Ocp-Apim-Subscription-Key': luisAuthoringKey },
+ } as rp.RequestPromiseOptions;
+ const response = await rp.get(getAccountUri, options);
+ jsonRes = JSON.parse(response);
+ } catch (err) {
+ // handle the token invalid
+ const error = JSON.parse(err.error);
+ if (error?.error?.message && error?.error?.message.indexOf('access token expiry') > 0) {
+ throw new Error(
+ `Type: ${error?.error?.code}, Message: ${error?.error?.message}, run az account get-access-token, then replace the accessToken in your configuration`
+ );
+ } else {
+ throw err;
+ }
+ }
const account = this.getAccount(jsonRes, `${name}-${environment}-luis`);
- for (let k in luisAppIds) {
+ for (const k in luisAppIds) {
const luisAppId = luisAppIds[k];
this.logger({
status: BotProjectDeployLoggerType.DEPLOY_INFO,
message: `Assigning to luis app id: ${luisAppIds}`,
});
+
const luisAssignEndpoint = `${luisEndpoint}/luis/api/v2.0/apps/${luisAppId}/azureaccounts`;
const options = {
body: account,
json: true,
- headers: { Authorization: `Bearer ${token.accessToken}`, 'Ocp-Apim-Subscription-Key': luisAuthoringKey },
+ headers: { Authorization: `Bearer ${this.accessToken}`, 'Ocp-Apim-Subscription-Key': luisAuthoringKey },
} as rp.RequestPromiseOptions;
const response = await rp.post(luisAssignEndpoint, options);
this.logger({
@@ -429,81 +450,136 @@ export class BotProjectDeploy {
message: 'Luis Publish Success! ...',
});
}
- this.logger({
- status: BotProjectDeployLoggerType.DEPLOY_INFO,
- message: 'Packing up the bot service ...',
- });
- await this.zipDirectory(this.publishFolder, this.zipPath);
- this.logger({
- status: BotProjectDeployLoggerType.DEPLOY_INFO,
- message: 'Packing Service Success!',
- });
+ }
+ /**
+ * Deploy a bot to a location
+ */
+ public async deploy(
+ name: string,
+ environment: string,
+ luisAuthoringKey?: string,
+ luisAuthoringRegion?: string,
+ botPath?: string,
+ language?: string
+ ) {
+ try {
+ // Check for existing deployment files
+ if (!fs.pathExistsSync(this.deployFilePath)) {
+ await this.botPrepareDeploy(this.deployFilePath);
+ }
- this.logger({
- status: BotProjectDeployLoggerType.DEPLOY_INFO,
- message: 'Publishing to Azure ...',
- });
- await this.deployZip(webClient, this.zipPath, name, environment);
- this.logger({
- status: BotProjectDeployLoggerType.DEPLOY_SUCCESS,
- message: 'Publish To Azure Success!',
- });
+ if (await fs.pathExists(this.zipPath)) {
+ await fs.remove(this.zipPath);
+ }
+
+ // dotnet publish
+ await this.dotnetPublish(this.publishFolder, this.projPath, botPath);
+
+ // LUIS build
+ const settings = await fs.readJSON(this.settingsPath);
+ const luisSettings = settings.luis;
+
+ let luisEndpointKey = '';
+
+ if (luisSettings) {
+ // if luisAuthoringKey is not set, use the one from the luis settings
+ luisAuthoringKey = luisAuthoringKey || luisSettings.authoringKey;
+ luisAuthoringRegion = luisAuthoringRegion || luisSettings.region;
+ luisEndpointKey = luisSettings.endpointKey;
+ }
+
+ if (!language) {
+ language = 'en-us';
+ }
+
+ await this.publishLuis(name, environment, language, luisEndpointKey, luisAuthoringKey, luisAuthoringRegion);
+
+ // Build a zip file of the project
+ this.logger({
+ status: BotProjectDeployLoggerType.DEPLOY_INFO,
+ message: 'Packing up the bot service ...',
+ });
+ await this.zipDirectory(this.publishFolder, this.zipPath);
+ this.logger({
+ status: BotProjectDeployLoggerType.DEPLOY_INFO,
+ message: 'Packing Service Success!',
+ });
+
+ // Deploy the zip file to the web app
+ this.logger({
+ status: BotProjectDeployLoggerType.DEPLOY_INFO,
+ message: 'Publishing to Azure ...',
+ });
+
+ await this.deployZip(this.accessToken, this.zipPath, name, environment);
+ this.logger({
+ status: BotProjectDeployLoggerType.DEPLOY_SUCCESS,
+ message: 'Publish To Azure Success!',
+ });
+ } catch (error) {
+ console.log(error);
+ throw error;
+ }
}
private getAccount(accounts: any, filter: string) {
- for (let account of accounts) {
+ for (const account of accounts) {
if (account.AccountName === filter) {
return account;
}
}
}
- private async deployZip(webSiteClient: WebSiteManagementClient, zipPath: string, name: string, env: string) {
+ // Upload the zip file to Azure
+ private async deployZip(token: string, zipPath: string, name: string, env: string) {
this.logger({
status: BotProjectDeployLoggerType.DEPLOY_INFO,
message: 'Retrieve publishing details ...',
});
- const userName = `${name}-${env}`;
- const userPwd = `${name}-${env}-${new Date().getTime().toString()}`;
-
- const updateRes = await webSiteClient.updatePublishingUser({
- publishingUserName: userName,
- publishingPassword: userPwd,
- });
- this.logger({
- status: BotProjectDeployLoggerType.DEPLOY_INFO,
- message: updateRes,
- });
const publishEndpoint = `https://${name}-${env}.scm.azurewebsites.net/zipdeploy`;
-
- const publishCreds = Buffer.from(`${userName}:${userPwd}`).toString('base64');
-
const fileContent = await fs.readFile(zipPath);
const options = {
body: fileContent,
encoding: null,
headers: {
- Authorization: `Basic ${publishCreds}`,
+ Authorization: `Bearer ${token}`,
'Content-Type': 'application/zip',
'Content-Length': fileContent.length,
},
} as rp.RequestPromiseOptions;
- const response = await rp.post(publishEndpoint, options);
- this.logger({
- status: BotProjectDeployLoggerType.DEPLOY_INFO,
- message: response,
- });
+ try {
+ const response = await rp.post(publishEndpoint, options);
+ this.logger({
+ status: BotProjectDeployLoggerType.DEPLOY_INFO,
+ message: response,
+ });
+ } catch (err) {
+ if (err.statusCode === 403) {
+ throw new Error(
+ `Token expired, please run az account get-access-token, then replace the accessToken in your configuration`
+ );
+ } else {
+ throw err;
+ }
+ }
}
+ /**
+ * Provision a set of Azure resources for use with a bot
+ */
public async create(
name: string,
location: string,
environment: string,
appPassword: string,
- luisAuthoringKey?: string
+ createLuisResource = true,
+ createLuisAuthoringResource = true,
+ createCosmosDb = true,
+ createStorage = true,
+ createAppInsignts = true
) {
- const credsForGraph = new msRestNodeAuth.DeviceTokenCredentials(
+ const graphCreds = new DeviceTokenCredentials(
this.creds.clientId,
this.tenantId,
this.creds.username,
@@ -511,38 +587,41 @@ export class BotProjectDeploy {
this.creds.environment,
this.creds.tokenCache
);
- const graphClient = new GraphRbacManagementClient(credsForGraph, this.tenantId, {
+ const graphClient = new GraphRbacManagementClient(graphCreds, this.tenantId, {
baseUri: 'https://graph.windows.net',
});
- if (!fs.existsSync(this.deploymentSettingsPath)) {
- this.logger({
- status: BotProjectDeployLoggerType.PROVISION_INFO,
- message: `! Could not find an 'appsettings.deployment.json' file in the current directory.`,
- });
- return;
+ let settings: any = {};
+ if (fs.existsSync(this.settingsPath)) {
+ settings = await fs.readJson(this.settingsPath);
}
- const settings = await fs.readJson(this.deploymentSettingsPath);
+ // Validate settings
let appId = settings.MicrosoftAppId;
+ // If the appId is not specified, create one
if (!appId) {
+ // this requires an app password. if one not specified, fail.
if (!appPassword) {
this.logger({
status: BotProjectDeployLoggerType.PROVISION_INFO,
message: `App password is required`,
});
- return;
+ throw new Error(`App password is required`);
}
this.logger({
status: BotProjectDeployLoggerType.PROVISION_INFO,
message: '> Creating App Registration ...',
});
+
+ // create the app registration
const appCreated = await this.createApp(graphClient, name, appPassword);
this.logger({
status: BotProjectDeployLoggerType.PROVISION_INFO,
message: appCreated,
});
+
+ // use the newly created app
appId = appCreated.appId;
}
@@ -551,35 +630,37 @@ export class BotProjectDeploy {
message: `> Create App Id Success! ID: ${appId}`,
});
- var shouldCreateAuthoringResource = true;
- if (luisAuthoringKey) {
- shouldCreateAuthoringResource = false;
- }
-
const resourceGroupName = `${name}-${environment}`;
// timestamp will be used as deployment name
const timeStamp = new Date().getTime().toString();
const client = new ResourceManagementClient(this.creds, this.subId);
+ // Create a resource group to contain the new resources
const rpres = await this.createResourceGroup(client, location, resourceGroupName);
this.logger({
status: BotProjectDeployLoggerType.PROVISION_INFO,
message: rpres,
});
+ // Caste the parameters into the right format
const deploymentTemplateParam = this.getDeploymentTemplateParam(
appId,
appPassword,
location,
name,
- shouldCreateAuthoringResource
+ createLuisAuthoringResource,
+ createLuisResource,
+ createAppInsignts,
+ createCosmosDb,
+ createStorage
);
this.logger({
status: BotProjectDeployLoggerType.PROVISION_INFO,
message: deploymentTemplateParam,
});
+ // Validate the deployment using the Azure API
const validation = await this.validateDeployment(
client,
this.templatePath,
@@ -593,6 +674,7 @@ export class BotProjectDeploy {
message: validation,
});
+ // Handle validation errors
if (validation.error) {
this.logger({
status: BotProjectDeployLoggerType.PROVISION_ERROR,
@@ -606,9 +688,16 @@ export class BotProjectDeploy {
status: BotProjectDeployLoggerType.PROVISION_ERROR,
message: `+ To delete this resource group, run 'az group delete -g ${resourceGroupName} --no-wait'`,
});
- return false;
+ this.logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR_DETAILS,
+ message: validation.error.details,
+ });
+
+ throw new Error(`! Error: ${validation.error.message}`);
}
+ // Create the entire stack of resources inside the new resource group
+ // this is controlled by an ARM template identified in this.templatePath
const deployment = await this.createDeployment(
client,
this.templatePath,
@@ -622,6 +711,7 @@ export class BotProjectDeploy {
message: deployment,
});
+ // Handle errors
if (deployment._response.status != 200) {
this.logger({
status: BotProjectDeployLoggerType.PROVISION_ERROR,
@@ -635,22 +725,19 @@ export class BotProjectDeploy {
status: BotProjectDeployLoggerType.PROVISION_ERROR,
message: `+ To delete this resource group, run 'az group delete -g ${resourceGroupName} --no-wait'`,
});
- return false;
+
+ throw new Error(`! Error: ${validation.error}`);
}
- const updateResult = await this.updateDeploymentJsonFile(
- this.deploymentSettingsPath,
- client,
- resourceGroupName,
- timeStamp,
- appId,
- appPassword
- );
+ // Validate that everything was successfully created.
+ // Then, update the settings file with information about the new resources
+ const updateResult = await this.updateDeploymentJsonFile(client, resourceGroupName, timeStamp, appId, appPassword);
this.logger({
status: BotProjectDeployLoggerType.PROVISION_INFO,
message: updateResult,
});
+ // Handle errors
if (!updateResult) {
const operations = await client.deploymentOperations.list(resourceGroupName, timeStamp);
if (operations) {
@@ -692,8 +779,13 @@ export class BotProjectDeploy {
status: BotProjectDeployLoggerType.PROVISION_SUCCESS,
message: `+ To delete this resource group, run 'az group delete -g ${resourceGroupName} --no-wait'`,
});
+ return updateResult;
}
+ /**
+ * createAndDeploy
+ * provision the Azure resources AND deploy a bot to those resources
+ */
public async createAndDeploy(
name: string,
location: string,
@@ -702,7 +794,7 @@ export class BotProjectDeploy {
luisAuthoringKey?: string,
luisAuthoringRegion?: string
) {
- await this.create(name, location, environment, appPassword, luisAuthoringKey);
+ await this.create(name, location, environment, appPassword);
await this.deploy(name, environment, luisAuthoringKey, luisAuthoringRegion);
}
}
diff --git a/Composer/packages/lib/bot-deploy/src/botProjectDeployConfig.ts b/Composer/packages/lib/bot-deploy/src/botProjectDeployConfig.ts
index ae8da6f575..b83b91dc76 100644
--- a/Composer/packages/lib/bot-deploy/src/botProjectDeployConfig.ts
+++ b/Composer/packages/lib/bot-deploy/src/botProjectDeployConfig.ts
@@ -2,11 +2,14 @@
// Licensed under the MIT License.
export interface BotProjectDeployConfig {
- // Subscription Id of Auzre Account
+ // Subscription Id of Azure Account
subId: string;
- // The credentials from user login
- creds: any;
+ // credential
+ creds?: any;
+
+ // access token to access azure
+ accessToken: string;
// The project path to deploy
projPath: string;
@@ -23,7 +26,7 @@ export interface BotProjectDeployConfig {
// Zip file path, default is 'code.zip'
zipPath?: string;
- // Pulblishing folder for 'dotnet publish' command, default is 'bin/Release/netcoreapp3.1'
+ // Publishing folder for 'dotnet publish' command, default is 'bin/Release/netcoreapp3.1'
publishFolder?: string;
// The deployment settings file path, default is 'appsettings.deployment.json'
@@ -32,7 +35,7 @@ export interface BotProjectDeployConfig {
// The ARM template file path, default is 'DeploymentTemplates/template-with-preexisting-rg.json'
templatePath?: string;
- // Dotnet project path, default is 'BotProject.csproj'
+ // Dotnet project path, default is 'Microsoft.BotFramework.Composer.WebApp.csproj'
dotnetProjectPath?: string;
// Lubuild generated folder path, default is 'generated'
@@ -40,4 +43,6 @@ export interface BotProjectDeployConfig {
// Remote bot json dialog path, default is 'ComposerDialogs'
remoteBotPath?: string;
+
+ [key: string]: any;
}
diff --git a/Composer/packages/lib/bot-deploy/src/botProjectLoggerType.ts b/Composer/packages/lib/bot-deploy/src/botProjectLoggerType.ts
index 8afa94c4dd..b726b5cb8f 100644
--- a/Composer/packages/lib/bot-deploy/src/botProjectLoggerType.ts
+++ b/Composer/packages/lib/bot-deploy/src/botProjectLoggerType.ts
@@ -7,6 +7,7 @@ export enum BotProjectDeployLoggerType {
PROVISION_ERROR = 'PROVISION_ERROR',
PROVISION_WARNING = 'PROVISION_WARNING',
PROVISION_SUCCESS = 'PROVISION_SUCCESS',
+ PROVISION_ERROR_DETAILS = 'PROVISION_ERROR_DETAILS',
// Logger Type for Deploy
DEPLOY_INFO = 'DEPLOY_INFO',
diff --git a/Composer/packages/lib/indexers/src/dialogIndexer.ts b/Composer/packages/lib/indexers/src/dialogIndexer.ts
index ca5a9b25d8..d4c8388fd4 100644
--- a/Composer/packages/lib/indexers/src/dialogIndexer.ts
+++ b/Composer/packages/lib/indexers/src/dialogIndexer.ts
@@ -18,7 +18,6 @@ import { createPath } from './dialogUtils/dialogChecker';
import { checkerFuncs } from './dialogUtils/dialogChecker';
import { JsonWalk, VisitorFunc } from './utils/jsonWalk';
import { getBaseName } from './utils/help';
-import ExtractMemoryPaths from './dialogUtils/extractMemoryPaths';
import ExtractIntentTriggers from './dialogUtils/extractIntentTriggers';
// find out all lg templates given dialog
function ExtractLgTemplates(id, dialog): LgTemplateJsonPath[] {
@@ -207,7 +206,6 @@ function parse(id: string, content: any, schema: any) {
diagnostics: validate(id, content, schema),
referredDialogs: ExtractReferredDialogs(content),
lgTemplates: ExtractLgTemplates(id, content),
- userDefinedVariables: ExtractMemoryPaths(content),
referredLuIntents: ExtractLuIntents(content, id),
luFile: getBaseName(luFile, '.lu'),
lgFile: getBaseName(lgFile, '.lg'),
diff --git a/Composer/packages/lib/indexers/src/dialogUtils/extractMemoryPaths.ts b/Composer/packages/lib/indexers/src/dialogUtils/extractMemoryPaths.ts
index bdcb2f3e50..26bfbd627d 100644
--- a/Composer/packages/lib/indexers/src/dialogUtils/extractMemoryPaths.ts
+++ b/Composer/packages/lib/indexers/src/dialogUtils/extractMemoryPaths.ts
@@ -44,7 +44,7 @@ export function getProperties(value: any): string[] {
}
// find out all properties from given dialog
-function ExtractMemoryPaths(dialog): string[] {
+function ExtractMemoryPaths(dialog: { [key: string]: any }): string[] {
let properties: string[] = [];
const visitor: VisitorFunc = (path: string, value: any): boolean => {
diff --git a/Composer/packages/lib/indexers/src/skillManifestIndexer.ts b/Composer/packages/lib/indexers/src/skillManifestIndexer.ts
index 19d873b061..fa0529db15 100644
--- a/Composer/packages/lib/indexers/src/skillManifestIndexer.ts
+++ b/Composer/packages/lib/indexers/src/skillManifestIndexer.ts
@@ -9,7 +9,7 @@ const index = (skillManifestFiles: FileInfo[]) => {
return skillManifestFiles.reduce((manifests: SkillManifestInfo[], { content, name, lastModified }) => {
try {
const jsonContent = JSON.parse(content);
- return [...manifests, { content: jsonContent, id: getBaseName(name, '.manifest'), lastModified }];
+ return [...manifests, { content: jsonContent, id: getBaseName(name, '.json'), lastModified }];
} catch (error) {
return manifests;
}
diff --git a/Composer/packages/lib/indexers/src/utils/fileExtensions.ts b/Composer/packages/lib/indexers/src/utils/fileExtensions.ts
index aa3d9dca39..184672e9d2 100644
--- a/Composer/packages/lib/indexers/src/utils/fileExtensions.ts
+++ b/Composer/packages/lib/indexers/src/utils/fileExtensions.ts
@@ -5,5 +5,5 @@ export enum FileExtensions {
Dialog = '.dialog',
Lu = '.lu',
lg = '.lg',
- Manifest = '.manifest',
+ Manifest = '.json',
}
diff --git a/Composer/packages/lib/package.json b/Composer/packages/lib/package.json
index 9e9a57e975..8102f63a5f 100644
--- a/Composer/packages/lib/package.json
+++ b/Composer/packages/lib/package.json
@@ -11,8 +11,9 @@
"build:shared": "cd shared && yarn build",
"build:indexers": "cd indexers && yarn build",
"build:uishared": "cd ui-shared && yarn build",
- "build:all": "yarn build:shared && yarn build:indexers && yarn build:code-editor && yarn build:uishared"
+ "build:bot-deploy": "cd bot-deploy && yarn build",
+ "build:all": "yarn build:shared && yarn build:indexers && yarn build:code-editor && yarn build:uishared && yarn build:bot-deploy"
},
"author": "",
"license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/Composer/packages/lib/shared/src/types/indexers.ts b/Composer/packages/lib/shared/src/types/indexers.ts
index ae11207167..f9456efcb4 100644
--- a/Composer/packages/lib/shared/src/types/indexers.ts
+++ b/Composer/packages/lib/shared/src/types/indexers.ts
@@ -35,7 +35,6 @@ export interface DialogInfo {
luFile: string;
referredLuIntents: ReferredLuIntents[];
referredDialogs: string[];
- userDefinedVariables: string[];
triggers: ITrigger[];
intentTriggers: IIntentTrigger[];
}
diff --git a/Composer/packages/lib/shared/src/types/schema.ts b/Composer/packages/lib/shared/src/types/schema.ts
index 12ed04d3fc..df93d1da8b 100644
--- a/Composer/packages/lib/shared/src/types/schema.ts
+++ b/Composer/packages/lib/shared/src/types/schema.ts
@@ -6,7 +6,7 @@ import { JSONSchema6 } from 'json-schema';
// All of the known SDK types. Update this list when we take a schema update.
// To get this list copy the output of the following commands in a node repl from the project root:
-// const schema = JSON.parse(fs.readFileSync('./BotProject/CSharp/Schemas/sdk.schema', 'utf-8'));
+// const schema = JSON.parse(fs.readFileSync('./runtime/dotnet/azurewebapp/Schemas/sdk.schema', 'utf-8'));
// const types = schema.oneOf.map(t => t.title);
// let uType = 'export enum SDKKinds {\n';
// uType += types.map(t => ` ${t.replace('Microsoft.', '')} = '${t}',`).join('\n');
diff --git a/Composer/packages/lib/shared/src/types/server.ts b/Composer/packages/lib/shared/src/types/server.ts
index da3819ae9d..1407ec1358 100644
--- a/Composer/packages/lib/shared/src/types/server.ts
+++ b/Composer/packages/lib/shared/src/types/server.ts
@@ -5,8 +5,10 @@ export interface ProjectTemplate {
id: string;
name: string;
description: string;
- /** Absolute path of the template */
- path?: string;
- /** Optional order property */
- order?: number;
+ /* absolute path */
+ path: string;
+ /* tags for further grouping and search secenario */
+ tags?: string[];
+ /* list of supported runtime versions */
+ support?: string[];
}
diff --git a/Composer/packages/lib/ui-shared/src/styled/sharedCSS.tsx b/Composer/packages/lib/ui-shared/src/styled/sharedCSS.tsx
index 1d134bdb33..6ee762ca62 100644
--- a/Composer/packages/lib/ui-shared/src/styled/sharedCSS.tsx
+++ b/Composer/packages/lib/ui-shared/src/styled/sharedCSS.tsx
@@ -18,8 +18,8 @@ export const TruncatedCSS = css`
export const MultilineCSS = css`
white-space: initial;
- overflow-wrap: break-word;
- word-break: break-all;
+ overflow-wrap: anywhere;
+ word-break: normal;
`;
export const ColorlessFontCSS = css`
diff --git a/Composer/packages/server/__tests__/controllers/project.test.ts b/Composer/packages/server/__tests__/controllers/project.test.ts
index c85e08af94..9b9d1e6f83 100644
--- a/Composer/packages/server/__tests__/controllers/project.test.ts
+++ b/Composer/packages/server/__tests__/controllers/project.test.ts
@@ -3,11 +3,28 @@
import { Request, Response } from 'express';
import rimraf from 'rimraf';
+import { pluginLoader } from '@bfc/plugin-loader';
import { BotProjectService } from '../../src/services/project';
import { ProjectController } from '../../src/controllers/project';
import { Path } from '../../src/utility/path';
+jest.mock('@bfc/plugin-loader', () => {
+ return {
+ pluginLoader: {
+ extensions: {
+ botTemplates: [],
+ baseTemplates: [],
+ },
+ },
+ PluginLoader: {
+ getUserFromRequest: jest.fn(),
+ },
+ };
+});
+
+const mockSampleBotPath = Path.join(__dirname, '../mocks/asset/projects/SampleBot');
+
let mockRes: Response;
const newBot = Path.resolve(__dirname, '../mocks/samplebots/newBot');
@@ -34,6 +51,12 @@ beforeEach(() => {
});
beforeAll(async () => {
+ pluginLoader.extensions.botTemplates.push({
+ id: 'SampleBot',
+ name: 'Sample Bot',
+ description: 'Sample Bot',
+ path: mockSampleBotPath,
+ });
const currentProjectId = await BotProjectService.openProject(location1);
const currentProject = await BotProjectService.getProjectById(currentProjectId);
await BotProjectService.saveProjectAs(currentProject, location2);
@@ -134,7 +157,7 @@ describe('create a Empty Bot project', () => {
const mockReq = {
params: {},
query: {},
- body: { storageId: 'default', location: newBotDir, description: '', name: name, templateId: '' },
+ body: { storageId: 'default', location: newBotDir, description: '', name: name, templateId: 'SampleBot' },
} as Request;
await ProjectController.createProject(mockReq, mockRes);
expect(mockRes.status).toHaveBeenCalledWith(200);
diff --git a/Composer/packages/server/__tests__/mocks/runtimes/dotnet/readme.md b/Composer/packages/server/__tests__/mocks/runtimes/dotnet/readme.md
new file mode 100644
index 0000000000..9980956435
--- /dev/null
+++ b/Composer/packages/server/__tests__/mocks/runtimes/dotnet/readme.md
@@ -0,0 +1 @@
+this is a sample (empty) runtime folder for tests.
\ No newline at end of file
diff --git a/Composer/packages/server/__tests__/models/asset/assetManager.test.ts b/Composer/packages/server/__tests__/models/asset/assetManager.test.ts
index 4479643cba..863d827570 100644
--- a/Composer/packages/server/__tests__/models/asset/assetManager.test.ts
+++ b/Composer/packages/server/__tests__/models/asset/assetManager.test.ts
@@ -2,23 +2,44 @@
// Licensed under the MIT License.
import rimraf from 'rimraf';
+import { pluginLoader } from '@bfc/plugin-loader';
import { Path } from '../../../src/utility/path';
import { AssetManager } from '../../../src/models/asset/assetManager';
jest.mock('azure-storage', () => {
return {};
});
-const mockAssetLibraryPath = Path.join(__dirname, '../../mocks/asset');
-const mockRuntimeLibraryPath = Path.join(__dirname, '../../mocks/runtimes');
+jest.mock('@bfc/plugin-loader', () => {
+ //const p = require('path');
+ return {
+ pluginLoader: {
+ extensions: {
+ botTemplates: [],
+ },
+ },
+ };
+});
+
+const mockSampleBotPath = Path.join(__dirname, '../../mocks/asset/projects/SampleBot');
const mockCopyToPath = Path.join(__dirname, '../../mocks/new');
const locationRef = {
storageId: 'default',
path: mockCopyToPath,
};
+
+beforeAll(() => {
+ pluginLoader.extensions.botTemplates.push({
+ id: 'SampleBot',
+ name: 'Sample Bot',
+ description: 'Sample Bot',
+ path: mockSampleBotPath,
+ });
+});
+
describe('assetManager', () => {
it('getProjectTemplate', async () => {
- const assetManager = new AssetManager(mockAssetLibraryPath, mockRuntimeLibraryPath);
+ const assetManager = new AssetManager();
const result = await assetManager.getProjectTemplates();
expect(result.length).toBeGreaterThan(0);
expect(result[0].name).toBe('Sample Bot');
@@ -26,9 +47,8 @@ describe('assetManager', () => {
});
it('copyProjectTemplateTo', async () => {
- const assetManager = new AssetManager(mockAssetLibraryPath, mockRuntimeLibraryPath);
+ const assetManager = new AssetManager();
await assetManager.getProjectTemplates();
- await assetManager.getProjectRuntime();
await expect(assetManager.copyProjectTemplateTo('SampleBot', locationRef)).resolves.toBe(locationRef);
// remove the saveas files
diff --git a/Composer/packages/server/assets/projects/EchoBot/language-generation/en-us/echobot.en-us.lg b/Composer/packages/server/assets/projects/EchoBot/language-generation/en-us/echobot.en-us.lg
deleted file mode 100644
index 884c7c277d..0000000000
--- a/Composer/packages/server/assets/projects/EchoBot/language-generation/en-us/echobot.en-us.lg
+++ /dev/null
@@ -1,4 +0,0 @@
-[import](common.lg)
-
-# SendActivity_003038
-- You said '${turn.activity.text}'
\ No newline at end of file
diff --git a/Composer/packages/server/assets/projects/EmptyBot/language-generation/en-us/emptybot.en-us.lg b/Composer/packages/server/assets/projects/EmptyBot/language-generation/en-us/emptybot.en-us.lg
deleted file mode 100644
index d8bdd2fc09..0000000000
--- a/Composer/packages/server/assets/projects/EmptyBot/language-generation/en-us/emptybot.en-us.lg
+++ /dev/null
@@ -1,3 +0,0 @@
-[import](common.lg)
-
-
diff --git a/Composer/packages/server/assets/shared/README.md b/Composer/packages/server/assets/shared/README.md
deleted file mode 100644
index 287ab61101..0000000000
--- a/Composer/packages/server/assets/shared/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-This folder contains a Bot Project created with Bot Framework Composer.
-
-The full documentation for Composer lives here:
-https://github.com/microsoft/botframework-composer
-
-To test this bot locally, open this folder in Composer, then click "Start Bot"
\ No newline at end of file
diff --git a/BotProject/Templates/CSharp/DeploymentTemplates/new-rg-parameters.json b/Composer/packages/server/assets/shared/scripts/DeploymentTemplates/new-rg-parameters.json
similarity index 100%
rename from BotProject/Templates/CSharp/DeploymentTemplates/new-rg-parameters.json
rename to Composer/packages/server/assets/shared/scripts/DeploymentTemplates/new-rg-parameters.json
diff --git a/BotProject/Templates/CSharp/DeploymentTemplates/preexisting-rg-parameters.json b/Composer/packages/server/assets/shared/scripts/DeploymentTemplates/preexisting-rg-parameters.json
similarity index 100%
rename from BotProject/Templates/CSharp/DeploymentTemplates/preexisting-rg-parameters.json
rename to Composer/packages/server/assets/shared/scripts/DeploymentTemplates/preexisting-rg-parameters.json
diff --git a/BotProject/Templates/CSharp/DeploymentTemplates/template-with-new-rg.json b/Composer/packages/server/assets/shared/scripts/DeploymentTemplates/template-with-new-rg.json
similarity index 100%
rename from BotProject/Templates/CSharp/DeploymentTemplates/template-with-new-rg.json
rename to Composer/packages/server/assets/shared/scripts/DeploymentTemplates/template-with-new-rg.json
diff --git a/BotProject/Templates/CSharp/DeploymentTemplates/template-with-preexisting-rg.json b/Composer/packages/server/assets/shared/scripts/DeploymentTemplates/template-with-preexisting-rg.json
similarity index 93%
rename from BotProject/Templates/CSharp/DeploymentTemplates/template-with-preexisting-rg.json
rename to Composer/packages/server/assets/shared/scripts/DeploymentTemplates/template-with-preexisting-rg.json
index 183586e08f..72f7a29298 100644
--- a/BotProject/Templates/CSharp/DeploymentTemplates/template-with-preexisting-rg.json
+++ b/Composer/packages/server/assets/shared/scripts/DeploymentTemplates/template-with-preexisting-rg.json
@@ -22,10 +22,18 @@
"type": "bool",
"defaultValue": true
},
+ "useAppInsights": {
+ "type": "bool",
+ "defaultValue": true
+ },
"shouldCreateAuthoringResource": {
"type": "bool",
"defaultValue": true
},
+ "shouldCreateLuisResource": {
+ "type": "bool",
+ "defaultValue": true
+ },
"cosmosDbName": {
"type": "string",
"defaultValue": "[resourceGroup().name]"
@@ -216,7 +224,8 @@
"id": "botstate-db"
},
"options": {}
- }
+ },
+ "condition": "[parameters('useCosmosDb')]"
},
{
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
@@ -255,7 +264,8 @@
}
},
"options": {}
- }
+ },
+ "condition": "[parameters('useCosmosDb')]"
},
{
"apiVersion": "2017-12-01",
@@ -289,7 +299,8 @@
"location": "[parameters('appInsightsLocation')]",
"properties": {
"Application_Type": "web"
- }
+ },
+ "condition": "[parameters('useAppInsights')]"
},
{
"comments": "storage account",
@@ -324,14 +335,15 @@
"location": "[parameters('luisServiceLocation')]",
"sku": {
"name": "[parameters('luisServiceRunTimeSku')]"
- }
+ },
+ "condition": "[parameters('shouldCreateLuisResource')]"
}
],
"outputs": {
"ApplicationInsights": {
"type": "object",
"value": {
- "InstrumentationKey": "[reference(resourceId('Microsoft.Insights/components', parameters('appInsightsName'))).InstrumentationKey]"
+ "InstrumentationKey": "[if(parameters('useAppInsights'), reference(resourceId('Microsoft.Insights/components', parameters('appInsightsName'))).InstrumentationKey, '')]"
}
},
"cosmosDb": {
@@ -354,7 +366,7 @@
"luis": {
"type": "object",
"value": {
- "endpointKey": "[listKeys(resourceId('Microsoft.CognitiveServices/accounts', parameters('luisServiceName')),'2017-04-18').key1]",
+ "endpointKey": "[if(parameters('shouldCreateLuisResource'), listKeys(resourceId('Microsoft.CognitiveServices/accounts', parameters('luisServiceName')),'2017-04-18').key1, '')]",
"authoringKey": "[if(parameters('shouldCreateAuthoringResource'), listKeys(resourceId('Microsoft.CognitiveServices/accounts', variables('LuisAuthoringAccountName')),'2017-04-18').key1, parameters('luisAuthoringKey'))]",
"region": "[parameters('luisServiceLocation')]"
}
diff --git a/Composer/packages/server/assets/shared/scripts/package-lock.json b/Composer/packages/server/assets/shared/scripts/package-lock.json
new file mode 100644
index 0000000000..079a5df5af
--- /dev/null
+++ b/Composer/packages/server/assets/shared/scripts/package-lock.json
@@ -0,0 +1,226 @@
+{
+ "name": "azure_provision",
+ "version": "1.0.0",
+ "lockfileVersion": 1,
+ "requires": true,
+ "dependencies": {
+ "@types/color-name": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+ "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
+ },
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+ "requires": {
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
+ "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "cli-cursor": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+ "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+ "requires": {
+ "restore-cursor": "^3.1.0"
+ }
+ },
+ "cli-spinners": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz",
+ "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w=="
+ },
+ "clone": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+ "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+ },
+ "defaults": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+ "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+ "requires": {
+ "clone": "^1.0.2"
+ }
+ },
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+ },
+ "is-interactive": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+ "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="
+ },
+ "log-symbols": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+ "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+ "requires": {
+ "chalk": "^2.4.2"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ }
+ },
+ "color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "requires": {
+ "color-name": "1.1.3"
+ }
+ },
+ "color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
+ }
+ },
+ "mimic-fn": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+ },
+ "mute-stream": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
+ },
+ "onetime": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+ "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+ "requires": {
+ "mimic-fn": "^2.1.0"
+ }
+ },
+ "ora": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz",
+ "integrity": "sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==",
+ "requires": {
+ "chalk": "^3.0.0",
+ "cli-cursor": "^3.1.0",
+ "cli-spinners": "^2.2.0",
+ "is-interactive": "^1.0.0",
+ "log-symbols": "^3.0.0",
+ "mute-stream": "0.0.8",
+ "strip-ansi": "^6.0.0",
+ "wcwidth": "^1.0.1"
+ },
+ "dependencies": {
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ }
+ }
+ },
+ "restore-cursor": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+ "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+ "requires": {
+ "onetime": "^5.1.0",
+ "signal-exit": "^3.0.2"
+ }
+ },
+ "signal-exit": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+ "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+ },
+ "strip-ansi": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+ "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+ "requires": {
+ "ansi-regex": "^5.0.0"
+ }
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "wcwidth": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+ "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+ "requires": {
+ "defaults": "^1.0.3"
+ }
+ }
+ }
+}
diff --git a/Composer/packages/server/assets/shared/scripts/package.json b/Composer/packages/server/assets/shared/scripts/package.json
new file mode 100644
index 0000000000..f8c1c5519c
--- /dev/null
+++ b/Composer/packages/server/assets/shared/scripts/package.json
@@ -0,0 +1,20 @@
+{
+ "name": "azure_provision",
+ "version": "1.0.0",
+ "description": "provision to azure cloud",
+ "main": "provisionComposer.js",
+ "license": "MIT",
+ "scripts": {
+ "start": "node provisionComposer.js"
+ },
+ "dependencies": {
+ "@azure/arm-resources": "^2.1.0",
+ "@azure/graph": "^5.0.1",
+ "@azure/ms-rest-nodeauth": "^3.0.3",
+ "@types/fs-extra": "^8.1.0",
+ "chalk": "^4.0.0",
+ "fs-extra": "^8.1.0",
+ "minimist": "^1.2.5",
+ "ora": "^4.0.4"
+ }
+}
diff --git a/Composer/packages/server/assets/shared/scripts/provisionComposer.js b/Composer/packages/server/assets/shared/scripts/provisionComposer.js
new file mode 100644
index 0000000000..038561b23a
--- /dev/null
+++ b/Composer/packages/server/assets/shared/scripts/provisionComposer.js
@@ -0,0 +1,508 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+const chalk = require('chalk');
+const fs = require('fs-extra');
+const msRestNodeAuth = require('@azure/ms-rest-nodeauth');
+const argv = require('minimist')(process.argv.slice(2));
+const path = require('path');
+const { promisify } = require('util');
+const { GraphRbacManagementClient } = require('@azure/graph');
+const { ResourceManagementClient } = require('@azure/arm-resources');
+const readFile = promisify(fs.readFile);
+const ora = require('ora');
+
+const logger = msg => {
+ if (msg.status === BotProjectDeployLoggerType.PROVISION_ERROR) {
+ console.log(chalk.red(msg.message));
+ } else if (msg.status === BotProjectDeployLoggerType.PROVISION_ERROR_DETAILS) {
+ console.log(chalk.white(msg.message));
+ } else {
+ console.log(chalk.green(msg.message));
+ }
+};
+const tenantId = '72f988bf-86f1-41af-91ab-2d7cd011db47';
+
+const usage = () => {
+ const options = [
+ ['subscriptionId', 'Azure Subscription Id'],
+ ['name', 'Project Name'],
+ ['appPassword', '16 character password'],
+ ['environment', 'Environment name (Defaults to dev)'],
+ ['location', 'Azure Region (Defaults to westus)'],
+ ['appId', 'Microsoft App ID (Will create if absent)'],
+ ['luisAuthoringKey', 'LUIS Authoring Key to use when publishing to LUIS'],
+ ['luisAuthoringRegion', 'Azure Region used with LUIS (defaults to westus)'],
+ ['createLuisResource', 'Create a LUIS resource? Default true'],
+ ['createLuisAuthoringResource', 'Create a LUIS authoring resource? Default true'],
+ ['createCosmosDb', 'Create a CosmosDB? Default true'],
+ ['createStorage', 'Create a storage account? Default true'],
+ ['createAppInsights', 'Create an AppInsights resource? Default true'],
+ ];
+
+ const instructions = [
+ ``,
+ chalk.bold('Provision Azure resources for use with Bot Framework Composer bots'),
+ `* This script will create a new resource group and the necessary Azure resources needed to operate a Bot Framework bot in the cloud.`,
+ `* Use this to create a publishing profile used in Composer's "Publish" toolbar.`,
+ ``,
+ chalk.bold(`Basic Usage:`),
+ chalk.greenBright(`node provisionComposer --subscriptionId=`) +
+ chalk.yellow('') +
+ chalk.greenBright(' --name=') +
+ chalk.yellow('') +
+ chalk.greenBright(' --appPassword=') +
+ chalk.yellow('<16 character password>'),
+ ``,
+ chalk.bold(`All options:`),
+ ...options.map(option => {
+ return chalk.greenBright('--' + option[0]) + '\t' + chalk.yellow(option[1]);
+ }),
+ ];
+
+ console.log(instructions.join('\n'));
+};
+
+// check for required parameters
+if (Object.keys(argv).length === 0) {
+ return usage();
+}
+
+if (!argv.name || !argv.subscriptionId || !argv.appPassword) {
+ return usage();
+}
+
+// Get required fields from the arguments
+const subId = argv.subscriptionId;
+const name = argv.name.toString();
+const appPassword = argv.appPassword;
+
+// Get optional fields from the arguments
+const environment = argv.environment || 'dev';
+const location = argv.location || 'westus';
+const appId = argv.appId; // MicrosoftAppId - generated if left blank
+const luisAuthoringKey = argv.luisAuthoringKey;
+const luisAuthoringRegion = argv.luisAuthoringRegion || 'westus';
+
+// Get option flags
+const createLuisResource = argv.createLuisResource == 'false' ? false : true;
+const createLuisAuthoringResource = argv.createLuisAuthoringResource == 'false' ? false : true;
+const createCosmosDb = argv.createCosmosDb == 'false' ? false : true;
+const createStorage = argv.createStorage == 'false' ? false : true;
+const createAppInsignts = argv.createAppInsignts == 'false' ? false : true;
+
+const templatePath = path.join(__dirname, 'DeploymentTemplates', 'template-with-preexisting-rg.json');
+
+const BotProjectDeployLoggerType = {
+ // Logger Type for Provision
+ PROVISION_INFO: 'PROVISION_INFO',
+ PROVISION_ERROR: 'PROVISION_ERROR',
+ PROVISION_WARNING: 'PROVISION_WARNING',
+ PROVISION_SUCCESS: 'PROVISION_SUCCESS',
+ PROVISION_ERROR_DETAILS: 'PROVISION_ERROR_DETAILS',
+};
+
+/**
+ * Create a Bot Framework registration
+ * @param {} graphClient
+ * @param {*} displayName
+ * @param {*} appPassword
+ */
+const createApp = async (graphClient, displayName, appPassword) => {
+ try {
+ const createRes = await graphClient.applications.create({
+ displayName: displayName,
+ passwordCredentials: [
+ {
+ value: appPassword,
+ startDate: new Date(),
+ endDate: new Date(new Date().setFullYear(new Date().getFullYear() + 2)),
+ },
+ ],
+ availableToOtherTenants: true,
+ replyUrls: ['https://token.botframework.com/.auth/web/redirect'],
+ });
+ return createRes;
+ } catch (err) {
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: err.body.message,
+ });
+ return false;
+ }
+};
+
+/**
+ * Create an Azure resources group
+ * @param {} client
+ * @param {*} location
+ * @param {*} resourceGroupName
+ */
+const createResourceGroup = async (client, location, resourceGroupName) => {
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_INFO,
+ message: `> Creating resource group ...`,
+ });
+ const param = {
+ location: location,
+ };
+
+ return await client.resourceGroups.createOrUpdate(resourceGroupName, param);
+};
+
+/**
+ * Format parameters
+ * @param {} scope
+ */
+const pack = scope => {
+ return {
+ value: scope,
+ };
+};
+
+const unpackObject = output => {
+ const unpacked = {};
+ for (const key in output) {
+ const objValue = output[key];
+ if (objValue.value) {
+ unpacked[key] = objValue.value;
+ }
+ }
+ return unpacked;
+};
+
+const getDeploymentTemplateParam = (
+ appId,
+ appPwd,
+ location,
+ name,
+ shouldCreateAuthoringResource,
+ shouldCreateLuisResource,
+ useAppInsights,
+ useCosmosDb,
+ useStorage
+) => {
+ return {
+ appId: pack(appId),
+ appSecret: pack(appPwd),
+ appServicePlanLocation: pack(location),
+ botId: pack(name),
+ shouldCreateAuthoringResource: pack(shouldCreateAuthoringResource),
+ shouldCreateLuisResource: pack(shouldCreateLuisResource),
+ useAppInsights: pack(useAppInsights),
+ useCosmosDb: pack(useCosmosDb),
+ useStorage: pack(useStorage),
+ };
+};
+
+/**
+ * Validate the deployment using the Azure API
+ */
+const validateDeployment = async (client, resourceGroupName, deployName, templateParam) => {
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_INFO,
+ message: '> Validating Azure deployment ...',
+ });
+
+ const templateFile = await readFile(templatePath, { encoding: 'utf-8' });
+ const deployParam = {
+ properties: {
+ template: JSON.parse(templateFile),
+ parameters: templateParam,
+ mode: 'Incremental',
+ },
+ };
+ return await client.deployments.validate(resourceGroupName, deployName, deployParam);
+};
+
+/**
+ * Using an ARM template, provision a bunch of resources
+ */
+const createDeployment = async (client, resourceGroupName, deployName, templateParam) => {
+ const templateFile = await readFile(templatePath, { encoding: 'utf-8' });
+ const deployParam = {
+ properties: {
+ template: JSON.parse(templateFile),
+ parameters: templateParam,
+ mode: 'Incremental',
+ },
+ };
+
+ return await client.deployments.createOrUpdate(resourceGroupName, deployName, deployParam);
+};
+
+/**
+ * Format the results into the expected shape
+ */
+const updateDeploymentJsonFile = async (client, resourceGroupName, deployName, appId, appPwd) => {
+ const outputs = await client.deployments.get(resourceGroupName, deployName);
+ if (outputs && outputs.properties && outputs.properties.outputs) {
+ const outputResult = outputs.properties.outputs;
+ const applicationResult = {
+ MicrosoftAppId: appId,
+ MicrosoftAppPassword: appPwd,
+ };
+ const outputObj = unpackObject(outputResult);
+
+ if (!createAppInsignts) {
+ delete outputObj.applicationInsights;
+ }
+ if (!createCosmosDb) {
+ delete outputObj.cosmosDb;
+ }
+ if (!createLuisAuthoringResource && !createLuisResource) {
+ delete outputObj.luis;
+ }
+ if (!createStorage) {
+ delete outputObj.blobStorage;
+ }
+ const result = {};
+ Object.assign(result, outputObj, applicationResult);
+ return result;
+ } else {
+ return null;
+ }
+};
+
+const provisionFailed = msg => {
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: chalk.bold('** Provision failed **'),
+ });
+};
+
+/**
+ * Provision a set of Azure resources for use with a bot
+ */
+const create = async (
+ creds,
+ subId,
+ name,
+ location,
+ environment,
+ appId,
+ appPassword,
+ createLuisResource = true,
+ createLuisAuthoringResource = true,
+ createCosmosDb = true,
+ createStorage = true,
+ createAppInsignts = true
+) => {
+ const graphCreds = new msRestNodeAuth.DeviceTokenCredentials(
+ creds.clientId,
+ tenantId,
+ creds.username,
+ 'graph',
+ creds.environment,
+ creds.tokenCache
+ );
+ const graphClient = new GraphRbacManagementClient(graphCreds, tenantId, {
+ baseUri: 'https://graph.windows.net',
+ });
+
+ // If the appId is not specified, create one
+ if (!appId) {
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_INFO,
+ message: '> Creating App Registration ...',
+ });
+
+ // create the app registration
+ const appCreated = await createApp(graphClient, name, appPassword);
+ if (appCreated === false) {
+ return provisionFailed();
+ }
+
+ // use the newly created app
+ appId = appCreated.appId;
+ }
+
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_INFO,
+ message: `> Create App Id Success! ID: ${appId}`,
+ });
+
+ const resourceGroupName = `${name}-${environment}`;
+
+ // timestamp will be used as deployment name
+ const timeStamp = new Date().getTime().toString();
+ const client = new ResourceManagementClient(creds, subId);
+
+ // Create a resource group to contain the new resources
+ try {
+ const rpres = await createResourceGroup(client, location, resourceGroupName);
+ } catch (err) {
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: err.body.message,
+ });
+ return provisionFailed();
+ }
+
+ // Caste the parameters into the right format
+ const deploymentTemplateParam = getDeploymentTemplateParam(
+ appId,
+ appPassword,
+ location,
+ name,
+ createLuisAuthoringResource,
+ createLuisResource,
+ createAppInsignts,
+ createCosmosDb,
+ createStorage
+ );
+
+ // Validate the deployment using the Azure API
+ const validation = await validateDeployment(client, resourceGroupName, timeStamp, deploymentTemplateParam);
+
+ // Handle validation errors
+ if (validation.error) {
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: `! Error: ${validation.error.message}`,
+ });
+ if (validation.error.details) {
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR_DETAILS,
+ message: JSON.stringify(validation.error.details, null, 2),
+ });
+ }
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: `+ To delete this resource group, run 'az group delete -g ${resourceGroupName} --no-wait'`,
+ });
+ return provisionFailed();
+ }
+
+ // Create the entire stack of resources inside the new resource group
+ // this is controlled by an ARM template identified in templatePath
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_INFO,
+ message: `> Deploying Azure services (this could take a while)...`,
+ });
+ const spinner = ora().start();
+ try {
+ const deployment = await createDeployment(client, resourceGroupName, timeStamp, deploymentTemplateParam);
+ // Handle errors
+ if (deployment._response.status != 200) {
+ spinner.fail();
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: `! Template is not valid with provided parameters. Review the log for more information.`,
+ });
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: `! Error: ${validation.error}`,
+ });
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: `+ To delete this resource group, run 'az group delete -g ${resourceGroupName} --no-wait'`,
+ });
+ return provisionFailed();
+ }
+ } catch (err) {
+ spinner.fail();
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: err.body.message,
+ });
+ return provisionFailed();
+ }
+
+ spinner.succeed('Success!');
+
+ // Validate that everything was successfully created.
+ // Then, update the settings file with information about the new resources
+ const updateResult = await updateDeploymentJsonFile(client, resourceGroupName, timeStamp, appId, appPassword);
+
+ // Handle errors
+ if (!updateResult) {
+ const operations = await client.deploymentOperations.list(resourceGroupName, timeStamp);
+ if (operations) {
+ const failedOperations = operations.filter(
+ value => value && value.properties && value.properties.statusMessage.error !== null
+ );
+ if (failedOperations) {
+ failedOperations.forEach(operation => {
+ switch (
+ operation &&
+ operation.properties &&
+ operation.properties.statusMessage.error.code &&
+ operation.properties.targetResource
+ ) {
+ case 'MissingRegistrationForLocation':
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: `! Deployment failed for resource of type ${operation.properties.targetResource.resourceType}. This resource is not avaliable in the location provided.`,
+ });
+ break;
+ default:
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: `! Deployment failed for resource of type ${operation.properties.targetResource.resourceType}.`,
+ });
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: `! Code: ${operation.properties.statusMessage.error.code}.`,
+ });
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: `! Message: ${operation.properties.statusMessage.error.message}.`,
+ });
+ break;
+ }
+ });
+ }
+ } else {
+ logger({
+ status: BotProjectDeployLoggerType.PROVISION_ERROR,
+ message: `! Deployment failed. Please refer to the log file for more information.`,
+ });
+ }
+ }
+ return updateResult;
+};
+
+console.log(chalk.bold('Login to Azure:'));
+msRestNodeAuth
+ .interactiveLogin()
+ .then(async creds => {
+ const createResult = await create(
+ creds,
+ subId,
+ name,
+ location,
+ environment,
+ appId,
+ appPassword,
+ createLuisResource,
+ createLuisAuthoringResource,
+ createCosmosDb,
+ createStorage,
+ createAppInsignts
+ );
+
+ if (createResult) {
+ console.log('');
+ console.log(
+ chalk.bold(
+ `Your Azure hosting environment has been created! Copy paste the following configuration into a new profile in Composer's Publishing tab.`
+ )
+ );
+ console.log('');
+
+ const token = await creds.getToken();
+ const profile = {
+ accessToken: token.accessToken,
+ publishName: name,
+ environment: environment,
+ provision: createResult,
+ };
+
+ console.log(chalk.white(JSON.stringify(profile, null, 2)));
+
+ console.log('');
+ }
+ })
+ .catch(err => {
+ console.error(err);
+ });
diff --git a/Composer/packages/server/package.json b/Composer/packages/server/package.json
index 2661c206d5..26761acf8e 100644
--- a/Composer/packages/server/package.json
+++ b/Composer/packages/server/package.json
@@ -49,13 +49,13 @@
"@types/rimraf": "^2.0.2",
"fs-extra": "7.0.1",
"mock-fs": "^4.10.1",
- "nodemon": "^1.18.11",
+ "nodemon": "^2.0.3",
"rimraf": "^2.6.3",
"source-map-explorer": "^2.1.0",
"ts-node": "^8.4.1"
},
"dependencies": {
- "@azure/ms-rest-js": "^1.8.7",
+ "@azure/ms-rest-js": "^2.0.6",
"@bfc/client": "*",
"@bfc/indexers": "*",
"@bfc/lg-languageserver": "*",
@@ -65,7 +65,7 @@
"@microsoft/bf-dispatcher": "4.9.0-preview.121555",
"@microsoft/bf-lu": "4.9.0-preview.121555",
"archiver": "^3.0.0",
- "axios": "^0.18.0",
+ "axios": "^0.19.2",
"azure-storage": "^2.10.3",
"body-parser": "^1.18.3",
"chalk": "^4.0.0",
diff --git a/Composer/packages/server/src/controllers/publisher.ts b/Composer/packages/server/src/controllers/publisher.ts
index af52206a45..84929ed7f7 100644
--- a/Composer/packages/server/src/controllers/publisher.ts
+++ b/Composer/packages/server/src/controllers/publisher.ts
@@ -14,18 +14,19 @@ const defaultPublishConfig = {
type: 'localpublish',
configuration: JSON.stringify({}),
};
-const DEFAULT_RUNTIME = 'CSharp';
+const DEFAULT_RUNTIME = 'dotnet';
export const PublishController = {
getTypes: async (req, res) => {
res.json(
Object.values(pluginLoader.extensions.publish)
.filter(extension => extension.plugin.name !== defaultPublishConfig.type)
.map(extension => {
- const { plugin, methods, schema } = extension;
+ const { plugin, methods, schema, instructions } = extension;
return {
name: plugin.name,
description: plugin.description,
+ instructions: instructions,
schema,
features: {
history: methods.history ? true : false,
@@ -55,9 +56,9 @@ export const PublishController = {
// append config from client(like sensitive settings)
const configuration = {
name: profile.name,
- ...JSON.parse(profile.configuration),
settings: merge({}, currentProject.settings, sensitiveSettings),
templatePath: path.resolve(runtimeFolder, DEFAULT_RUNTIME),
+ ...JSON.parse(profile.configuration),
};
if (
diff --git a/Composer/packages/server/src/models/asset/assetManager.ts b/Composer/packages/server/src/models/asset/assetManager.ts
index 080aaf8266..2bbfeebdbc 100644
--- a/Composer/packages/server/src/models/asset/assetManager.ts
+++ b/Composer/packages/server/src/models/asset/assetManager.ts
@@ -2,8 +2,7 @@
// Licensed under the MIT License.
import find from 'lodash/find';
-import { ProjectTemplate } from '@bfc/shared';
-import { UserIdentity } from '@bfc/plugin-loader';
+import { UserIdentity, pluginLoader } from '@bfc/plugin-loader';
import log from '../../logger';
import { LocalDiskStorage } from '../storage/localDiskStorage';
@@ -13,164 +12,31 @@ import { copyDir } from '../../utility/storage';
import StorageService from '../../services/storage';
import { IFileStorage } from '../storage/interface';
-interface TemplateData {
- [key: string]: {
- name: string;
- description: string;
- order?: number;
- icon?: string;
- };
-}
-
-const templates: TemplateData = {
- EchoBot: {
- name: 'Echo Bot',
- description: 'A bot that echoes and responds with whatever message the user entered',
- order: 1,
- },
- EmptyBot: {
- name: 'Empty Bot',
- description: 'Basic bot template that is ready for your creativity',
- order: 2,
- },
- TodoSample: {
- name: 'Simple Todo',
- description: 'A sample bot that allows you to add, list, and remove to do items.',
- order: 3,
- },
- ToDoBotWithLuisSample: {
- name: 'Todo with LUIS',
- description: 'A sample bot that allows you to add, list, and remove to do items using Language Understanding',
- order: 4,
- },
- RespondingWithCardsSample: {
- name: 'Responding with Cards',
- description: 'A sample bot that uses Language Generation to create cards.',
- },
- AskingQuestionsSample: {
- name: 'Asking Questions',
- description: 'A sample bot that shows how to ask questions and capture user input.',
- },
- InterruptionSample: {
- name: 'Interruptions',
- description:
- 'An advanced sample bot that shows how to handle context switching and interruption in a conversation.',
- },
- RespondingWithTextSample: {
- name: 'Responding with Text',
- description: 'A sample bot that uses Language Generation to create bot responses.',
- },
- ControllingConversationFlowSample: {
- name: 'Controlling Conversation Flow',
- description: 'A sample bot that shows how to control the flow of a conversation.',
- },
- ActionsSample: {
- name: 'Dialog Actions',
- description: 'A sample bot that shows how to use Dialog Actions.',
- },
- QnAMakerLUISSample: {
- name: 'QnA Maker and LUIS',
- description: 'A sample bot that demonstrates use of both QnA Maker & LUIS',
- },
- SampleBot: {
- name: 'Sample Bot',
- description: 'A sample bot used for testing',
- },
-};
-
-const runtimes: TemplateData = {
- CSharp: {
- name: 'CSharp Runtime',
- description: 'A Bot Framework runtime using the CSharp/dotnet version of the SDK',
- },
-};
-
-// set a default runtime template.
-// when we have multiple runtimes this will be a parameter.
-const DEFAULT_RUNTIME = 'CSharp';
-
export class AssetManager {
public templateStorage: LocalDiskStorage;
- private assetsLibraryPath: string;
- private runtimesPath: string;
- private projectTemplates: ProjectTemplate[] = [];
- private runtimeTemplates: ProjectTemplate[] = [];
- constructor(assetsLibraryPath: string, runtimesPath: string) {
- this.assetsLibraryPath = assetsLibraryPath;
- this.runtimesPath = runtimesPath;
+ constructor() {
this.templateStorage = new LocalDiskStorage();
-
- // initialize the list of project tempaltes
- this.getProjectTemplates();
-
- // initialize the list of runtimes.
- this.getProjectRuntime();
}
- public async getProjectTemplates(): Promise {
- const path = this.assetsLibraryPath + '/projects';
- const output: ProjectTemplate[] = [];
- if (await this.templateStorage.exists(path)) {
- const folders = await this.templateStorage.readDir(path);
- this.projectTemplates = [];
- for (const name of folders) {
- const templateData = templates[name];
- if (!templateData) continue;
- const absPath = Path.join(path, name);
- const folder = await this.templateStorage.stat(absPath);
- if (folder.isDir) {
- const base = { id: name, ...templateData };
- this.projectTemplates.push({ ...base, path: absPath });
- output.push(base);
- }
- }
- }
-
- return output.sort((a, b) => {
- if (a.order && b.order) {
- return a.order < b.order ? -1 : 1;
- } else if (a.order) {
- return -1;
- } else if (b.order) {
- return 1;
- } else {
- return a.name < b.name ? -1 : 1;
- }
- });
+ public async getProjectTemplates() {
+ return pluginLoader.extensions.botTemplates;
}
- public async getProjectRuntime() {
- const path = this.runtimesPath;
- const output: ProjectTemplate[] = [];
-
- if (await this.templateStorage.exists(path)) {
- const folders = await this.templateStorage.readDir(path);
- this.runtimeTemplates = [];
- for (const name of folders) {
- const absPath = Path.join(path, name);
- if ((await this.templateStorage.stat(absPath)).isDir) {
- const base = { id: name, name: runtimes[name].name, description: runtimes[name].description };
- this.runtimeTemplates.push({ ...base, path: absPath });
- output.push(base);
- }
- }
- }
-
- return output;
- }
-
- // Copy material from the boilerplate into the project
- // This is used to copy shared content into every new project
- public async copyBoilerplate(dstDir: string, dstStorage: IFileStorage) {
- const boilerplatePath = Path.join(this.assetsLibraryPath, 'shared');
- if (await this.templateStorage.exists(boilerplatePath)) {
- await copyDir(boilerplatePath, this.templateStorage, dstDir, dstStorage);
+ public async copyProjectTemplateTo(templateId: string, ref: LocationRef, user?: UserIdentity): Promise {
+ // user storage maybe diff from template storage
+ const dstStorage = StorageService.getStorageClient(ref.storageId, user);
+ const dstDir = Path.resolve(ref.path);
+ if (await dstStorage.exists(dstDir)) {
+ log('Failed copying template to %s', dstDir);
+ throw new Error('already have this folder, please give another name');
}
+ await this.copyDataFilesTo(templateId, dstDir, dstStorage);
+ return ref;
}
- public async copyDataFilesTo(templateId: string, dstDir: string, dstStorage: IFileStorage) {
- const template = find(this.projectTemplates, { id: templateId });
+ private async copyDataFilesTo(templateId: string, dstDir: string, dstStorage: IFileStorage) {
+ const template = find(pluginLoader.extensions.botTemplates, { id: templateId });
if (template === undefined || template.path === undefined) {
throw new Error(`no such template with id ${templateId}`);
}
@@ -178,25 +44,14 @@ export class AssetManager {
await copyDir(template.path, this.templateStorage, dstDir, dstStorage);
}
- public async copyRuntimeTo(dstDir: string, dstStorage: IFileStorage) {
- const runtime = find(this.runtimeTemplates, { id: DEFAULT_RUNTIME });
- if (runtime === undefined || runtime.path === undefined) {
- throw new Error(`no such runtime with id ${DEFAULT_RUNTIME}`);
- }
- // copy runtime code files
- await copyDir(runtime.path, this.templateStorage, dstDir, dstStorage);
- }
-
- public async copyProjectTemplateTo(templateId: string, ref: LocationRef, user?: UserIdentity): Promise {
- // user storage maybe diff from template storage
- const dstStorage = StorageService.getStorageClient(ref.storageId, user);
- const dstDir = Path.resolve(ref.path);
- if (await dstStorage.exists(dstDir)) {
- log('Failed copying template to %s', dstDir);
- throw new Error('already have this folder, please give another name');
+ // Copy material from the boilerplate into the project
+ // This is used to copy shared content into every new project
+ public async copyBoilerplate(dstDir: string, dstStorage: IFileStorage) {
+ for (const boilerplate of pluginLoader.extensions.baseTemplates) {
+ const boilerplatePath = boilerplate.path;
+ if (await this.templateStorage.exists(boilerplatePath)) {
+ await copyDir(boilerplatePath, this.templateStorage, dstDir, dstStorage);
+ }
}
- await this.copyDataFilesTo(templateId, dstDir, dstStorage);
- // await this.copyRuntimeTo(dstDir, dstStorage);
- return ref;
}
}
diff --git a/Composer/packages/server/src/models/bot/botProject.ts b/Composer/packages/server/src/models/bot/botProject.ts
index 963f170823..57d188f4c2 100644
--- a/Composer/packages/server/src/models/bot/botProject.ts
+++ b/Composer/packages/server/src/models/bot/botProject.ts
@@ -46,7 +46,7 @@ const BotStructureTemplate = {
lg: 'language-generation/${LOCALE}/${DIALOGNAME}.${LOCALE}.lg',
lu: 'language-understanding/${LOCALE}/${DIALOGNAME}.${LOCALE}.lu',
},
- skillManifests: 'skill-manifests/${MANIFESTNAME}.manifest',
+ skillManifests: 'manifests/${MANIFESTNAME}.json',
};
const templateInterpolate = (str: string, obj: { [key: string]: string }) =>
@@ -133,6 +133,7 @@ export class BotProject {
// create or update dialog settings
public updateEnvSettings = async (slot: string, config: DialogSetting) => {
await this.settingManager.set(slot, config);
+ this.settings = config;
};
// update skill in settings
@@ -368,7 +369,7 @@ export class BotProject {
DIALOGNAME,
LOCALE,
});
- } else if (fileType === '.manifest') {
+ } else if (fileType === '.json') {
dir = templateInterpolate(
Path.dirname(Path.join(BotStructureTemplate.folder, BotStructureTemplate.skillManifests)),
{
@@ -457,7 +458,7 @@ export class BotProject {
}
const fileList: FileInfo[] = [];
- const patterns = ['**/*.dialog', '**/*.lg', '**/*.lu', '**/*.manifest'];
+ const patterns = ['**/*.dialog', '**/*.lg', '**/*.lu', 'manifests/*.json'];
for (const pattern of patterns) {
// load only from the data dir, otherwise may get "build" versions from
// deployment process
diff --git a/Composer/packages/server/src/services/asset.ts b/Composer/packages/server/src/services/asset.ts
index aa40308de8..3e90f96174 100644
--- a/Composer/packages/server/src/services/asset.ts
+++ b/Composer/packages/server/src/services/asset.ts
@@ -1,14 +1,13 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import settings from '../settings';
import { AssetManager } from '../models/asset/assetManager';
class AssetService {
public manager: AssetManager;
constructor() {
- this.manager = new AssetManager(settings.assetsLibray, settings.runtimeFolder);
+ this.manager = new AssetManager();
}
}
diff --git a/Composer/packages/server/src/services/project.ts b/Composer/packages/server/src/services/project.ts
index 5af12caa27..9f62672400 100644
--- a/Composer/packages/server/src/services/project.ts
+++ b/Composer/packages/server/src/services/project.ts
@@ -3,6 +3,7 @@
import merge from 'lodash/merge';
import find from 'lodash/find';
+import flatten from 'lodash/flatten';
import { importResolverGenerator, ResolverResource } from '@bfc/shared';
import extractMemoryPaths from '@bfc/indexers/lib/dialogUtils/extractMemoryPaths';
import { UserIdentity } from '@bfc/plugin-loader';
@@ -89,15 +90,15 @@ export class BotProjectService {
'turn.repeatedIds',
'turn.activityProcessed',
];
- const projectVariables = BotProjectService.getIndexedProjectById(projectId)
- ?.files.filter(file => file.name.endsWith('.dialog'))
- .map(({ content }) => extractMemoryPaths(content));
-
- const userDefined: string[] =
- projectVariables?.reduce((result: string[], variables) => {
- result = [...variables, ...result];
- return result;
- }, []) || [];
+ const projectVariables =
+ BotProjectService.getIndexedProjectById(projectId)
+ ?.files.filter(file => file.name.endsWith('.dialog'))
+ .map(({ content }) => {
+ const dialogJson = JSON.parse(content);
+ return extractMemoryPaths(dialogJson);
+ }) || [];
+
+ const userDefined: string[] = flatten(projectVariables);
return [...defaultProperties, ...userDefined];
}
diff --git a/Composer/packages/server/src/settings/env.ts b/Composer/packages/server/src/settings/env.ts
index 948ac96686..f4afbc6c0f 100644
--- a/Composer/packages/server/src/settings/env.ts
+++ b/Composer/packages/server/src/settings/env.ts
@@ -37,6 +37,5 @@ export const environment = process.env.NODE_ENV || 'development';
export const botsFolder = folder;
export const botEndpoint = process.env.BOT_ENDPOINT || 'http://localhost:3979';
export const appDataPath = process.env.COMPOSER_APP_DATA || Path.resolve(__dirname, '../../data.json');
-export const runtimeFolder =
- process.env.COMPOSER_RUNTIME_FOLDER || Path.resolve(__dirname, '../../../../../BotProject/Templates');
+export const runtimeFolder = process.env.COMPOSER_RUNTIME_FOLDER || Path.resolve(__dirname, '../../../../../runtime');
export const runtimeFrameworkVersion = process.env.COMPOSER_RUNTIME_VERSION || 'netcoreapp3.1';
diff --git a/Composer/packages/server/src/settings/index.ts b/Composer/packages/server/src/settings/index.ts
index 3611781bac..07ca3d67b5 100644
--- a/Composer/packages/server/src/settings/index.ts
+++ b/Composer/packages/server/src/settings/index.ts
@@ -8,22 +8,11 @@ import merge from 'lodash/merge';
import log from '../logger';
import { Path } from '../utility/path';
-import {
- botsFolder,
- botEndpoint,
- appDataPath,
- environment,
- runtimeFolder,
- runtimeFrameworkVersion,
- platform,
- diskNames,
-} from './env';
+import { botsFolder, botEndpoint, appDataPath, environment, runtimeFrameworkVersion, platform, diskNames } from './env';
interface Settings {
botAdminEndpoint: string;
botEndpoint: string;
- assetsLibray: string;
- runtimeFolder: string;
runtimeFrameworkVersion: string;
botsFolder: string;
appDataPath: string;
@@ -35,9 +24,7 @@ const envSettings: { [env: string]: Settings } = {
development: {
botAdminEndpoint: botEndpoint,
botEndpoint: botEndpoint,
- assetsLibray: Path.resolve(__dirname, '../../assets'),
botsFolder: botsFolder || Path.join(os.homedir(), 'Documents', 'Composer'),
- runtimeFolder,
runtimeFrameworkVersion,
appDataPath,
platform,
diff --git a/Composer/plugins/README.md b/Composer/plugins/README.md
index f11386b077..78ecd996b4 100644
--- a/Composer/plugins/README.md
+++ b/Composer/plugins/README.md
@@ -251,9 +251,9 @@ to communicate with the Bot Framework Emulator.
```ts
await composer.addRuntimeTemplate({
- key: 'csharp',
+ key: 'azurewebapp',
name: 'C#',
- path: __dirname + '/../../../../BotProject/Templates/CSharp',
+ path: __dirname + '/../../../../runtime/dotnet/azurewebapp',
startCommand: 'dotnet run',
});
```
diff --git a/Composer/plugins/azurePublish/.gitignore b/Composer/plugins/azurePublish/.gitignore
new file mode 100644
index 0000000000..70cf140132
--- /dev/null
+++ b/Composer/plugins/azurePublish/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+lib
+publishHistory.txt
+publishBots
+cred.txt
+provisionResult.json
\ No newline at end of file
diff --git a/Composer/plugins/azurePublish/package-lock.json b/Composer/plugins/azurePublish/package-lock.json
new file mode 100644
index 0000000000..664a44f1c6
--- /dev/null
+++ b/Composer/plugins/azurePublish/package-lock.json
@@ -0,0 +1,795 @@
+{
+ "name": "azurePublish",
+ "version": "1.0.0",
+ "lockfileVersion": 1,
+ "requires": true,
+ "dependencies": {
+ "@azure/arm-resources": {
+ "version": "2.1.0",
+ "requires": {
+ "@azure/ms-rest-azure-js": "^2.0.1",
+ "@azure/ms-rest-js": "^2.0.4",
+ "tslib": "^1.10.0"
+ }
+ },
+ "@azure/ms-rest-azure-env": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz",
+ "integrity": "sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="
+ },
+ "@azure/ms-rest-azure-js": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.0.1.tgz",
+ "integrity": "sha512-5e+A710O7gRFISoV4KI/ZyLQbKmjXxQZ1L8Z/sx7jSUQqmswjTnN4yyIZxs5JzfLVkobU0rXxbi5/LVzaI8QXQ==",
+ "requires": {
+ "@azure/ms-rest-js": "^2.0.4",
+ "tslib": "^1.10.0"
+ }
+ },
+ "@azure/ms-rest-js": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.0.6.tgz",
+ "integrity": "sha512-Llp4/tN3SNoHFZ03JBc1g+doPa90rRkyR3WnbRUUAUiso2a70iWlruANgT6LgE4RxIvB4GGaCkAUnrXQtA4UIA==",
+ "requires": {
+ "@types/node-fetch": "^2.3.7",
+ "@types/tunnel": "0.0.1",
+ "abort-controller": "^3.0.0",
+ "form-data": "^2.5.0",
+ "node-fetch": "^2.6.0",
+ "tough-cookie": "^3.0.1",
+ "tslib": "^1.10.0",
+ "tunnel": "0.0.6",
+ "uuid": "^3.3.2",
+ "xml2js": "^0.4.19"
+ },
+ "dependencies": {
+ "uuid": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+ }
+ }
+ },
+ "@azure/ms-rest-nodeauth": {
+ "version": "3.0.3",
+ "requires": {
+ "@azure/ms-rest-azure-env": "^2.0.0",
+ "@azure/ms-rest-js": "^2.0.4",
+ "adal-node": "^0.1.28"
+ },
+ "dependencies": {
+ "@types/node": {
+ "version": "8.10.60",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.60.tgz",
+ "integrity": "sha512-YjPbypHFuiOV0bTgeF07HpEEqhmHaZqYNSdCKeBJa+yFoQ/7BC+FpJcwmi34xUIIRVFktnUyP1dPU8U0612GOg=="
+ },
+ "adal-node": {
+ "version": "0.1.28",
+ "resolved": "https://registry.npmjs.org/adal-node/-/adal-node-0.1.28.tgz",
+ "integrity": "sha1-RoxLs+u9lrEnBmn0ucuk4AZepIU=",
+ "requires": {
+ "@types/node": "^8.0.47",
+ "async": ">=0.6.0",
+ "date-utils": "*",
+ "jws": "3.x.x",
+ "request": ">= 2.52.0",
+ "underscore": ">= 1.3.1",
+ "uuid": "^3.1.0",
+ "xmldom": ">= 0.1.x",
+ "xpath.js": "~1.1.0"
+ },
+ "dependencies": {
+ "date-utils": {
+ "version": "1.2.21",
+ "resolved": "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz",
+ "integrity": "sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q="
+ },
+ "jws": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+ "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+ "requires": {
+ "jwa": "^1.4.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "request": {
+ "version": "2.88.2",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+ "requires": {
+ "aws-sign2": "~0.7.0",
+ "aws4": "^1.8.0",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.6",
+ "extend": "~3.0.2",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.3.2",
+ "har-validator": "~5.1.3",
+ "http-signature": "~1.2.0",
+ "is-typedarray": "~1.0.0",
+ "isstream": "~0.1.2",
+ "json-stringify-safe": "~5.0.1",
+ "mime-types": "~2.1.19",
+ "oauth-sign": "~0.9.0",
+ "performance-now": "^2.1.0",
+ "qs": "~6.5.2",
+ "safe-buffer": "^5.1.2",
+ "tough-cookie": "~2.5.0",
+ "tunnel-agent": "^0.6.0",
+ "uuid": "^3.3.2"
+ }
+ },
+ "underscore": {
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
+ "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="
+ },
+ "xmldom": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz",
+ "integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="
+ },
+ "xpath.js": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz",
+ "integrity": "sha512-jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ=="
+ }
+ }
+ },
+ "form-data": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.6",
+ "mime-types": "^2.1.12"
+ }
+ },
+ "tough-cookie": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+ "requires": {
+ "psl": "^1.1.28",
+ "punycode": "^2.1.1"
+ }
+ },
+ "uuid": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+ }
+ }
+ },
+ "@types/archiver": {
+ "version": "3.1.0",
+ "requires": {
+ "@types/glob": "*"
+ }
+ },
+ "@types/bluebird": {
+ "version": "3.5.30",
+ "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.30.tgz",
+ "integrity": "sha512-8LhzvcjIoqoi1TghEkRMkbbmM+jhHnBokPGkJWjclMK+Ks0MxEBow3/p2/iFTZ+OIbJHQDSfpgdZEb+af3gfVw=="
+ },
+ "@types/caseless": {
+ "version": "0.12.2",
+ "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
+ "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="
+ },
+ "@types/events": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+ "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="
+ },
+ "@types/fs-extra": {
+ "version": "8.1.0",
+ "requires": {
+ "@types/node": "*"
+ }
+ },
+ "@types/glob": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+ "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+ "requires": {
+ "@types/events": "*",
+ "@types/minimatch": "*",
+ "@types/node": "*"
+ }
+ },
+ "@types/minimatch": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
+ },
+ "@types/node": {
+ "version": "13.13.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz",
+ "integrity": "sha512-LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A=="
+ },
+ "@types/node-fetch": {
+ "version": "2.5.7",
+ "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+ "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+ "requires": {
+ "@types/node": "*",
+ "form-data": "^3.0.0"
+ },
+ "dependencies": {
+ "form-data": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+ "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "mime-types": "^2.1.12"
+ }
+ }
+ }
+ },
+ "@types/request-promise": {
+ "version": "4.1.46",
+ "requires": {
+ "@types/bluebird": "*",
+ "@types/request": "*"
+ },
+ "dependencies": {
+ "@types/request": {
+ "version": "2.48.4",
+ "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz",
+ "integrity": "sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==",
+ "requires": {
+ "@types/caseless": "*",
+ "@types/node": "*",
+ "@types/tough-cookie": "*",
+ "form-data": "^2.5.0"
+ }
+ }
+ }
+ },
+ "@types/tough-cookie": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz",
+ "integrity": "sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="
+ },
+ "@types/tunnel": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.1.tgz",
+ "integrity": "sha512-AOqu6bQu5MSWwYvehMXLukFHnupHrpZ8nvgae5Ggie9UwzDR1CCwoXgSSWNZJuyOlCdfdsWMA5F2LlmvyoTv8A==",
+ "requires": {
+ "@types/node": "*"
+ }
+ },
+ "abort-controller": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+ "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+ "requires": {
+ "event-target-shim": "^5.0.0"
+ }
+ },
+ "adal-node": {
+ "version": "0.2.1",
+ "requires": {
+ "@types/node": "^8.0.47",
+ "async": "^2.6.3",
+ "date-utils": "*",
+ "jws": "3.x.x",
+ "request": "^2.88.0",
+ "underscore": ">= 1.3.1",
+ "uuid": "^3.1.0",
+ "xmldom": ">= 0.1.x",
+ "xpath.js": "~1.1.0"
+ },
+ "dependencies": {
+ "@types/node": {
+ "version": "8.10.60",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.60.tgz",
+ "integrity": "sha512-YjPbypHFuiOV0bTgeF07HpEEqhmHaZqYNSdCKeBJa+yFoQ/7BC+FpJcwmi34xUIIRVFktnUyP1dPU8U0612GOg=="
+ },
+ "uuid": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+ }
+ }
+ },
+ "ajv": {
+ "version": "6.12.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+ "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+ "requires": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ }
+ },
+ "asn1": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+ "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+ "requires": {
+ "safer-buffer": "~2.1.0"
+ }
+ },
+ "assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+ },
+ "async": {
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+ "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+ "requires": {
+ "lodash": "^4.17.14"
+ }
+ },
+ "asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+ },
+ "aws-sign2": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+ },
+ "aws4": {
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
+ "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="
+ },
+ "bcrypt-pbkdf": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+ "requires": {
+ "tweetnacl": "^0.14.3"
+ }
+ },
+ "buffer-equal-constant-time": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+ "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+ },
+ "caseless": {
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+ },
+ "charenc": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+ "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
+ },
+ "combined-stream": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "requires": {
+ "delayed-stream": "~1.0.0"
+ }
+ },
+ "core-util-is": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+ },
+ "crypt": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+ "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
+ },
+ "dashdash": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+ "requires": {
+ "assert-plus": "^1.0.0"
+ }
+ },
+ "date-utils": {
+ "version": "1.2.21",
+ "resolved": "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz",
+ "integrity": "sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q="
+ },
+ "delayed-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+ },
+ "ecc-jsbn": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+ "requires": {
+ "jsbn": "~0.1.0",
+ "safer-buffer": "^2.1.0"
+ }
+ },
+ "ecdsa-sig-formatter": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+ "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+ "requires": {
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "event-target-shim": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+ "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
+ },
+ "extend": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+ },
+ "extsprintf": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+ },
+ "fast-deep-equal": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+ "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
+ },
+ "fast-json-stable-stringify": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+ },
+ "forever-agent": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+ },
+ "form-data": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+ "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.6",
+ "mime-types": "^2.1.12"
+ }
+ },
+ "getpass": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+ "requires": {
+ "assert-plus": "^1.0.0"
+ }
+ },
+ "har-schema": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+ },
+ "har-validator": {
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+ "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+ "requires": {
+ "ajv": "^6.5.5",
+ "har-schema": "^2.0.0"
+ }
+ },
+ "http-signature": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+ "requires": {
+ "assert-plus": "^1.0.0",
+ "jsprim": "^1.2.2",
+ "sshpk": "^1.7.0"
+ }
+ },
+ "ip-regex": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+ "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
+ },
+ "is-buffer": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+ },
+ "is-typedarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+ },
+ "isstream": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+ },
+ "jsbn": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+ },
+ "json-schema": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+ },
+ "json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+ },
+ "json-stringify-safe": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+ },
+ "jsprim": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+ "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+ "requires": {
+ "assert-plus": "1.0.0",
+ "extsprintf": "1.3.0",
+ "json-schema": "0.2.3",
+ "verror": "1.10.0"
+ }
+ },
+ "jwa": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+ "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+ "requires": {
+ "buffer-equal-constant-time": "1.0.1",
+ "ecdsa-sig-formatter": "1.0.11",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "jws": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+ "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+ "requires": {
+ "jwa": "^1.4.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "lodash": {
+ "version": "4.17.15",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+ },
+ "md5": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
+ "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
+ "requires": {
+ "charenc": "~0.0.1",
+ "crypt": "~0.0.1",
+ "is-buffer": "~1.1.1"
+ }
+ },
+ "mime-db": {
+ "version": "1.44.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+ "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+ },
+ "mime-types": {
+ "version": "2.1.27",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+ "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+ "requires": {
+ "mime-db": "1.44.0"
+ }
+ },
+ "minimist": {
+ "version": "1.2.5"
+ },
+ "node-fetch": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+ "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+ },
+ "oauth-sign": {
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+ },
+ "performance-now": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+ },
+ "psl": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+ "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+ },
+ "punycode": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+ },
+ "qs": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+ },
+ "request": {
+ "version": "2.88.2",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+ "requires": {
+ "aws-sign2": "~0.7.0",
+ "aws4": "^1.8.0",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.6",
+ "extend": "~3.0.2",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.3.2",
+ "har-validator": "~5.1.3",
+ "http-signature": "~1.2.0",
+ "is-typedarray": "~1.0.0",
+ "isstream": "~0.1.2",
+ "json-stringify-safe": "~5.0.1",
+ "mime-types": "~2.1.19",
+ "oauth-sign": "~0.9.0",
+ "performance-now": "^2.1.0",
+ "qs": "~6.5.2",
+ "safe-buffer": "^5.1.2",
+ "tough-cookie": "~2.5.0",
+ "tunnel-agent": "^0.6.0",
+ "uuid": "^3.3.2"
+ },
+ "dependencies": {
+ "form-data": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.6",
+ "mime-types": "^2.1.12"
+ }
+ },
+ "tough-cookie": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+ "requires": {
+ "psl": "^1.1.28",
+ "punycode": "^2.1.1"
+ }
+ },
+ "uuid": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+ }
+ }
+ },
+ "safe-buffer": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+ "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+ },
+ "safer-buffer": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+ },
+ "sax": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+ },
+ "sshpk": {
+ "version": "1.16.1",
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+ "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+ "requires": {
+ "asn1": "~0.2.3",
+ "assert-plus": "^1.0.0",
+ "bcrypt-pbkdf": "^1.0.0",
+ "dashdash": "^1.12.0",
+ "ecc-jsbn": "~0.1.1",
+ "getpass": "^0.1.1",
+ "jsbn": "~0.1.0",
+ "safer-buffer": "^2.0.2",
+ "tweetnacl": "~0.14.0"
+ }
+ },
+ "tough-cookie": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+ "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+ "requires": {
+ "ip-regex": "^2.1.0",
+ "psl": "^1.1.28",
+ "punycode": "^2.1.1"
+ }
+ },
+ "tslib": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
+ "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="
+ },
+ "tunnel": {
+ "version": "0.0.6",
+ "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+ "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
+ },
+ "tunnel-agent": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+ "requires": {
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "tweetnacl": {
+ "version": "0.14.5",
+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+ },
+ "underscore": {
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
+ "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="
+ },
+ "uri-js": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+ "requires": {
+ "punycode": "^2.1.0"
+ }
+ },
+ "uuid": {
+ "version": "7.0.3"
+ },
+ "verror": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+ "requires": {
+ "assert-plus": "^1.0.0",
+ "core-util-is": "1.0.2",
+ "extsprintf": "^1.2.0"
+ }
+ },
+ "xml2js": {
+ "version": "0.4.23",
+ "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+ "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+ "requires": {
+ "sax": ">=0.6.0",
+ "xmlbuilder": "~11.0.0"
+ }
+ },
+ "xmlbuilder": {
+ "version": "11.0.1",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+ "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+ },
+ "xmldom": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz",
+ "integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="
+ },
+ "xpath.js": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz",
+ "integrity": "sha512-jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ=="
+ }
+ }
+}
diff --git a/Composer/plugins/azurePublish/package.json b/Composer/plugins/azurePublish/package.json
new file mode 100644
index 0000000000..64d982b5cf
--- /dev/null
+++ b/Composer/plugins/azurePublish/package.json
@@ -0,0 +1,24 @@
+{
+ "name": "azurePublish",
+ "version": "1.0.0",
+ "description": "Publish bot to an Azure Web App",
+ "main": "lib/index.js",
+ "license": "MIT",
+ "scripts": {
+ "build": "tsc"
+ },
+ "extendsComposer": true,
+ "dependencies": {
+ "@azure/arm-resources": "^2.1.0",
+ "@azure/ms-rest-nodeauth": "^3.0.3",
+ "@bfc/plugin-loader": "../../packages/extensions/plugin-loader",
+ "@types/archiver": "^3.1.0",
+ "@types/fs-extra": "^8.1.0",
+ "@types/request": "^2.48.4",
+ "@types/request-promise": "^4.1.45",
+ "adal-node": "^0.2.1",
+ "md5": "^2.2.1",
+ "minimist": "^1.2.5",
+ "uuid": "^7.0.3"
+ }
+}
diff --git a/Composer/plugins/azurePublish/src/index.ts b/Composer/plugins/azurePublish/src/index.ts
new file mode 100644
index 0000000000..bd31e77587
--- /dev/null
+++ b/Composer/plugins/azurePublish/src/index.ts
@@ -0,0 +1,353 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import path from 'path';
+
+import { BotProjectDeploy } from '@bfc/libs/bot-deploy';
+import { v4 as uuid } from 'uuid';
+import md5 from 'md5';
+import { copy, rmdir, emptyDir, readJson, pathExists, writeJson, mkdirSync, writeFileSync } from 'fs-extra';
+
+import schema from './schema';
+
+// This option controls whether the history is serialized to a file between sessions with Composer
+// set to TRUE for history to be saved to disk
+// set to FALSE for history to be cached in memory only
+const PERSIST_HISTORY = false;
+const DEFAULT_RUNTIME = 'azurewebapp';
+
+const instructions = `To create a publish configuration, follow the instructions in the README file in your bot project folder.`;
+
+interface CreateAndDeployResources {
+ publishName: string;
+ environment: string;
+ subscriptionID: string;
+ luisAuthoringKey?: string;
+ luisAuthoringRegion?: string;
+}
+
+interface PublishConfig {
+ settings: any;
+ templatePath: string;
+ name: string; //profile name
+ [key: string]: any;
+}
+
+class AzurePublisher {
+ private publishingBots: { [key: string]: any };
+ private historyFilePath: string;
+ private histories: any;
+ private azDeployer: BotProjectDeploy;
+ private logMessages: any[];
+ constructor() {
+ this.histories = {};
+ this.historyFilePath = path.resolve(__dirname, '../publishHistory.txt');
+ if (PERSIST_HISTORY) {
+ this.loadHistoryFromFile();
+ }
+ this.publishingBots = {};
+ this.logMessages = [];
+ }
+
+ private getRuntimeFolder = (key: string) => path.resolve(__dirname, `../publishBots/${key}`);
+ private getProjectFolder = (key: string, template: string) => path.resolve(__dirname, `../publishBots/${key}/${template}`);
+ private getBotFolder = (key: string, template: string) => path.resolve(this.getProjectFolder(key, template), 'ComposerDialogs');
+ private getSettingsPath = (key: string, template: string) => path.resolve(this.getBotFolder(key, template), 'settings/appsettings.json');
+
+ private init = async (botFiles: any, settings: any, srcTemplate: string, resourcekey: string) => {
+ const runtimeExist = await pathExists(this.getRuntimeFolder(resourcekey));
+ const botExist = await pathExists(this.getBotFolder(resourcekey, DEFAULT_RUNTIME));
+ const botFolder = this.getBotFolder(resourcekey, DEFAULT_RUNTIME);
+ const runtimeFolder = this.getRuntimeFolder(resourcekey);
+ const settingsPath = this.getSettingsPath(resourcekey, DEFAULT_RUNTIME);
+
+ // deploy resource exist
+ await emptyDir(runtimeFolder);
+ if (!runtimeExist) {
+ mkdirSync(runtimeFolder, { recursive: true });
+ }
+ if (!botExist) {
+ mkdirSync(botFolder, { recursive: true });
+ }
+ // save bot files
+ for (const file of botFiles) {
+ const filePath = path.resolve(botFolder, file.relativePath);
+ if (!(await pathExists(path.dirname(filePath)))) {
+ mkdirSync(path.dirname(filePath), { recursive: true });
+ }
+ writeFileSync(filePath, file.content);
+ }
+
+ // save the settings file
+ if (!(await pathExists(path.dirname(settingsPath)))) {
+ mkdirSync(path.dirname(settingsPath), { recursive: true });
+ }
+ await writeJson(settingsPath, settings, { spaces: 4 });
+ // copy bot and runtime into projFolder
+ await copy(srcTemplate, runtimeFolder);
+ };
+
+ private async cleanup(resourcekey: string) {
+ const projFolder = this.getRuntimeFolder(resourcekey);
+ await emptyDir(projFolder);
+ await rmdir(projFolder);
+ }
+
+ private async loadHistoryFromFile() {
+ if (await pathExists(this.historyFilePath)) {
+ this.histories = await readJson(this.historyFilePath);
+ }
+ }
+
+ private getHistory = async (botId: string, profileName: string) => {
+ if (this.histories && this.histories[botId] && this.histories[botId][profileName]) {
+ return this.histories[botId][profileName];
+ }
+ return [];
+ };
+
+ private updateHistory = async (botId: string, profileName: string, newHistory: any) => {
+ if (!this.histories[botId]) {
+ this.histories[botId] = {};
+ }
+ if (!this.histories[botId][profileName]) {
+ this.histories[botId][profileName] = [];
+ }
+ this.histories[botId][profileName].unshift(newHistory);
+ if (PERSIST_HISTORY) {
+ await writeJson(this.historyFilePath, this.histories);
+ }
+ };
+
+ private addLoadingStatus = (botId: string, profileName: string, newStatus) => {
+ // save in publishingBots
+ if (!this.publishingBots[botId]) {
+ this.publishingBots[botId] = {};
+ }
+ if (!this.publishingBots[botId][profileName]) {
+ this.publishingBots[botId][profileName] = [];
+ }
+ this.publishingBots[botId][profileName].push(newStatus);
+ };
+ private removeLoadingStatus = (botId: string, profileName: string, jobId: string) => {
+ if (this.publishingBots[botId] && this.publishingBots[botId][profileName]) {
+ const index = this.publishingBots[botId][profileName].findIndex(item => item.result.id === jobId);
+ const status = this.publishingBots[botId][profileName][index];
+ this.publishingBots[botId][profileName] = this.publishingBots[botId][profileName]
+ .slice(0, index)
+ .concat(this.publishingBots[botId][profileName].slice(index + 1));
+ return status;
+ }
+ return;
+ };
+ private getLoadingStatus = (botId: string, profileName: string, jobId = '') => {
+ if (this.publishingBots[botId] && this.publishingBots[botId][profileName].length > 0) {
+ // get current status
+ if (jobId) {
+ return this.publishingBots[botId][profileName].find(item => item.result.id === jobId);
+ }
+ return this.publishingBots[botId][profileName][this.publishingBots[botId][profileName].length - 1];
+ }
+ return undefined;
+ };
+
+ private createAndDeploy = async (
+ botId: string,
+ profileName: string,
+ jobId: string,
+ resourcekey: string,
+ customizeConfiguration: CreateAndDeployResources
+ ) => {
+ const { publishName, environment, luisAuthoringKey, luisAuthoringRegion } = customizeConfiguration;
+ try {
+ // Perform the deploy
+ await this.azDeployer.deploy(publishName, environment, luisAuthoringKey, luisAuthoringRegion);
+
+ // update status and history
+ const status = this.getLoadingStatus(botId, profileName, jobId);
+
+ if (status) {
+ status.status = 200;
+ status.result.message = 'Success';
+ status.result.log = this.logMessages.join('\n');
+ await this.updateHistory(botId, profileName, { status: status.status, ...status.result });
+ this.removeLoadingStatus(botId, profileName, jobId);
+ await this.cleanup(resourcekey);
+ }
+ } catch (error) {
+ console.log(error);
+ // update status and history
+ const status = this.getLoadingStatus(botId, profileName, jobId);
+ if (status) {
+ status.status = 500;
+ status.result.message = error ? error.message : 'publish error';
+ status.result.log = this.logMessages.join('\n');
+ await this.updateHistory(botId, profileName, { status: status.status, ...status.result });
+ this.removeLoadingStatus(botId, profileName, jobId);
+ await this.cleanup(resourcekey);
+ }
+ }
+ };
+
+ /**************************************************************************************************
+ * plugin methods
+ *************************************************************************************************/
+ publish = async (config: PublishConfig, project, metadata, user) => {
+ // templatePath point to the dotnet code
+ const {
+ settings,
+ templatePath,
+ name,
+ subscriptionID,
+ publishName,
+ environment,
+ luisAuthoringKey,
+ luisAuthoringRegion,
+ provision,
+ accessToken,
+ } = config;
+
+ // point to the declarative assets (possibly in remote storage)
+ const botFiles = project.files;
+
+ // get the bot id from the project
+ const botId = project.id;
+
+ // generate an id to track this deploy
+ const jobId = uuid();
+
+ // resource key to map to one provision resource
+ const resourcekey = md5(
+ [
+ project.name,
+ publishName,
+ environment,
+ provision?.MicrosoftAppPassword,
+ luisAuthoringKey,
+ luisAuthoringRegion,
+ ].join()
+ );
+
+ // If the project is using an "ejected" runtime, use that version of the code instead of the built-in template
+ let runtimeCodePath = templatePath;
+ if (
+ project.settings &&
+ project.settings.runtime &&
+ project.settings.runtime.customRuntime === true &&
+ project.settings.runtime.path
+ ) {
+ runtimeCodePath = project.settings.runtime.path;
+ }
+
+ await this.init(botFiles, settings, runtimeCodePath, resourcekey);
+
+ try {
+ // test creds, if not valid, return 500
+ if (!accessToken) {
+ throw new Error('Required field `accessToken` is missing from publishing profile.');
+ }
+ if (!provision) {
+ throw new Error(
+ 'no successful created resource in Azure according to your config, please run provision script to do the provision'
+ );
+ }
+
+ const customizeConfiguration: CreateAndDeployResources = {
+ subscriptionID,
+ publishName,
+ environment,
+ luisAuthoringKey,
+ luisAuthoringRegion,
+ };
+
+ // append provision resource into file
+ // TODO: here is where we configure the template for the runtime, and should be parameterized when we
+ // implement interchangeable runtimes
+ const resourcePath = path.resolve(this.getProjectFolder(resourcekey, DEFAULT_RUNTIME), 'appsettings.deployment.json');
+ const appSettings = await readJson(resourcePath);
+ await writeJson(
+ resourcePath,
+ { ...appSettings, ...provision },
+ {
+ spaces: 4,
+ }
+ );
+
+ this.azDeployer = new BotProjectDeploy({
+ subId: subscriptionID,
+ logger: (msg: any) => {
+ console.log(msg);
+ this.logMessages.push(JSON.stringify(msg, null, 2));
+ },
+ accessToken: accessToken,
+ projPath: this.getProjectFolder(resourcekey, 'azurewebapp'),
+ });
+
+ this.logMessages = ['Publish starting...'];
+ const response = {
+ status: 202,
+ result: {
+ id: jobId,
+ time: new Date(),
+ message: 'Accepted for publishing.',
+ log: this.logMessages.join('\n'),
+ comment: metadata.comment,
+ },
+ };
+ this.addLoadingStatus(botId, name, response);
+
+ this.createAndDeploy(botId, name, jobId, resourcekey, customizeConfiguration);
+
+ return response;
+ } catch (err) {
+ console.log(err);
+ this.logMessages.push(err.message);
+ const response = {
+ status: 500,
+ result: {
+ id: jobId,
+ time: new Date(),
+ message: 'Publish Fail',
+ log: this.logMessages.join('\n'),
+ comment: metadata.comment,
+ },
+ };
+ this.updateHistory(botId, name, { status: response.status, ...response.result });
+ this.cleanup(resourcekey);
+ return response;
+ }
+ };
+
+ getStatus = async (config: PublishConfig, project, user) => {
+ const profileName = config.name;
+ const botId = project.id;
+ // return latest status
+ const status = this.getLoadingStatus(botId, profileName);
+ if (status) {
+ return status;
+ } else {
+ const current = await this.getHistory(botId, profileName);
+ if (current.length > 0) {
+ return { status: current[0].status, result: { ...current[0] } };
+ }
+ return {
+ status: 404,
+ result: {
+ message: 'bot not published',
+ },
+ };
+ }
+ };
+
+ history = async (config: PublishConfig, project, user) => {
+ const profileName = config.name;
+ const botId = project.id;
+ return await this.getHistory(botId, profileName);
+ };
+}
+
+const azurePublish = new AzurePublisher();
+
+export default async (composer: any): Promise => {
+ await composer.addPublishMethod(azurePublish, schema, instructions);
+};
diff --git a/Composer/plugins/azurePublish/src/schema.ts b/Composer/plugins/azurePublish/src/schema.ts
new file mode 100644
index 0000000000..05cbc3fc4f
--- /dev/null
+++ b/Composer/plugins/azurePublish/src/schema.ts
@@ -0,0 +1,126 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import { JSONSchema7 } from '@bfc/plugin-loader';
+const schema: JSONSchema7 = {
+ type: 'object',
+ properties: {
+ accessToken: {
+ type: 'string',
+ },
+ publishName: {
+ type: 'string',
+ title: 'publishName',
+ },
+ environment: {
+ type: 'string',
+ title: 'Environment',
+ },
+ luisAuthoringRegion: {
+ type: 'string',
+ title: 'LUIS authoring region',
+ },
+ luisAuthoringKey: {
+ type: 'string',
+ title: 'LUIS authoring Key',
+ },
+ provision: {
+ type: 'object',
+ title: 'Provision resource',
+ properties: {
+ applicationInsights: {
+ type: 'object',
+ properties: {
+ InstrumentationKey: {
+ type: 'string',
+ },
+ },
+ },
+ cosmosDb: {
+ type: 'object',
+ properties: {
+ cosmosDBEndpoint: {
+ type: 'string',
+ },
+ authKey: {
+ type: 'string',
+ },
+ databaseId: {
+ type: 'string',
+ },
+ collectionId: {
+ type: 'string',
+ },
+ containerId: {
+ type: 'string',
+ },
+ },
+ required: ['cosmosDBEndpoint', 'authKey', 'databaseId', 'collectionId', 'containerId'],
+ },
+ blobStorage: {
+ type: 'object',
+ properties: {
+ connectionString: {
+ type: 'string',
+ },
+ container: {
+ type: 'string',
+ },
+ },
+ required: ['connectionString', 'container'],
+ },
+ luis: {
+ type: 'object',
+ properties: {
+ endpointKey: {
+ type: 'string',
+ },
+ authoringKey: {
+ type: 'string',
+ },
+ region: {
+ type: 'string',
+ },
+ },
+ required: ['endpointKey', 'authoringKey', 'region'],
+ },
+ MicrosoftAppId: {
+ type: 'string',
+ },
+ MicrosoftAppPassword: {
+ type: 'string',
+ },
+ },
+ required: ['MicrosoftAppId', 'MicrosoftAppPassword'],
+ },
+ },
+ required: ['subscriptionID', 'publishName', 'provision', 'accessToken'],
+ default: {
+ accessToken: '',
+ publishName: '',
+ environment: 'dev',
+ provision: {
+ applicationInsights: {
+ InstrumentationKey: '',
+ },
+ cosmosDb: {
+ cosmosDBEndpoint: '',
+ authKey: '',
+ databaseId: 'botstate-db',
+ collectionId: 'botstate-collection',
+ containerId: 'botstate-container',
+ },
+ blobStorage: {
+ connectionString: '',
+ container: '',
+ },
+ luis: {
+ endpointKey: '',
+ authoringKey: '',
+ region: 'westus',
+ },
+ MicrosoftAppId: '',
+ MicrosoftAppPassword: '',
+ },
+ },
+};
+export default schema;
diff --git a/Composer/plugins/azurePublish/tsconfig.json b/Composer/plugins/azurePublish/tsconfig.json
new file mode 100644
index 0000000000..13305de8f2
--- /dev/null
+++ b/Composer/plugins/azurePublish/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "compilerOptions": {
+ "target": "es6",
+ "module": "commonjs",
+ "declaration": true,
+ "sourceMap": true,
+ "esModuleInterop": true,
+ "skipLibCheck": true,
+ "outDir": "./lib",
+ "rootDir": "./src",
+ "types": [
+ "node"
+ ]
+ },
+ "include": [
+ "src/**/*"
+ ],
+ "exclude": [
+ "node_modules"
+ ]
+}
\ No newline at end of file
diff --git a/Composer/plugins/azurePublish/yarn.lock b/Composer/plugins/azurePublish/yarn.lock
new file mode 100644
index 0000000000..ea74fbdd2d
--- /dev/null
+++ b/Composer/plugins/azurePublish/yarn.lock
@@ -0,0 +1,861 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@azure/arm-resources@^2.1.0":
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/@azure/arm-resources/-/arm-resources-2.1.0.tgz#bb7a3faca0c717656bef93c6f81ff6a9d1d8fa8b"
+ integrity sha512-WpBQt3QwfulWAgss7r6apfKswc6SS8Z005AhQalx618757dX+0kTiizL5XipDZFWq/nlCN2fFv9ba1m4v5x2tg==
+ dependencies:
+ "@azure/ms-rest-azure-js" "^2.0.1"
+ "@azure/ms-rest-js" "^2.0.4"
+ tslib "^1.10.0"
+
+"@azure/ms-rest-azure-env@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz#45809f89763a480924e21d3c620cd40866771625"
+ integrity sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw==
+
+"@azure/ms-rest-azure-js@^2.0.1":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.0.1.tgz#fa1b38f039b3ee48a9e086a88c8a5b5b7776491c"
+ integrity sha512-5e+A710O7gRFISoV4KI/ZyLQbKmjXxQZ1L8Z/sx7jSUQqmswjTnN4yyIZxs5JzfLVkobU0rXxbi5/LVzaI8QXQ==
+ dependencies:
+ "@azure/ms-rest-js" "^2.0.4"
+ tslib "^1.10.0"
+
+"@azure/ms-rest-js@^2.0.4":
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-2.0.6.tgz#236f3acdae72f3eb9ce4468f601921985fad3e26"
+ integrity sha512-Llp4/tN3SNoHFZ03JBc1g+doPa90rRkyR3WnbRUUAUiso2a70iWlruANgT6LgE4RxIvB4GGaCkAUnrXQtA4UIA==
+ dependencies:
+ "@types/node-fetch" "^2.3.7"
+ "@types/tunnel" "0.0.1"
+ abort-controller "^3.0.0"
+ form-data "^2.5.0"
+ node-fetch "^2.6.0"
+ tough-cookie "^3.0.1"
+ tslib "^1.10.0"
+ tunnel "0.0.6"
+ uuid "^3.3.2"
+ xml2js "^0.4.19"
+
+"@azure/ms-rest-nodeauth@^3.0.3":
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.0.3.tgz#e485b9c960da718d0476115e9f0ec550ccbba561"
+ integrity sha512-/KAgVV68vkOdrx6O3T6qO7thCep4nPbWzkpNIPFN3P6uzEzDIk6BCGgkzabnmkb2kXaf4+IGHs0UMoXSfN/IgQ==
+ dependencies:
+ "@azure/ms-rest-azure-env" "^2.0.0"
+ "@azure/ms-rest-js" "^2.0.4"
+ adal-node "^0.1.28"
+
+"@bfc/plugin-loader@../../packages/extensions/plugin-loader":
+ version "1.0.0"
+ dependencies:
+ debug "^4.1.1"
+ globby "^11.0.0"
+ passport "^0.4.1"
+ path-to-regexp "^6.1.0"
+
+"@nodelib/fs.scandir@2.1.3":
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+ integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+ dependencies:
+ "@nodelib/fs.stat" "2.0.3"
+ run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+ integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+
+"@nodelib/fs.walk@^1.2.3":
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+ integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+ dependencies:
+ "@nodelib/fs.scandir" "2.1.3"
+ fastq "^1.6.0"
+
+"@types/archiver@^3.1.0":
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/@types/archiver/-/archiver-3.1.0.tgz#0d5bd922ba5cf06e137cd6793db7942439b1805e"
+ integrity sha512-nTvHwgWONL+iXG+9CX+gnQ/tTOV+qucAjwpXqeUn4OCRMxP42T29FFP/7XaOo0EqqO3TlENhObeZEe7RUJAriw==
+ dependencies:
+ "@types/glob" "*"
+
+"@types/bluebird@*":
+ version "3.5.30"
+ resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.30.tgz#ee034a0eeea8b84ed868b1aa60d690b08a6cfbc5"
+ integrity sha512-8LhzvcjIoqoi1TghEkRMkbbmM+jhHnBokPGkJWjclMK+Ks0MxEBow3/p2/iFTZ+OIbJHQDSfpgdZEb+af3gfVw==
+
+"@types/caseless@*":
+ version "0.12.2"
+ resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8"
+ integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==
+
+"@types/events@*":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+ integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
+"@types/fs-extra@^8.1.0":
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.0.tgz#1114834b53c3914806cd03b3304b37b3bd221a4d"
+ integrity sha512-UoOfVEzAUpeSPmjm7h1uk5MH6KZma2z2O7a75onTGjnNvAvMVrPzPL/vBbT65iIGHWj6rokwfmYcmxmlSf2uwg==
+ dependencies:
+ "@types/node" "*"
+
+"@types/glob@*":
+ version "7.1.1"
+ resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+ integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+ dependencies:
+ "@types/events" "*"
+ "@types/minimatch" "*"
+ "@types/node" "*"
+
+"@types/minimatch@*":
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
+"@types/node-fetch@^2.3.7":
+ version "2.5.7"
+ resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
+ integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
+ dependencies:
+ "@types/node" "*"
+ form-data "^3.0.0"
+
+"@types/node@*":
+ version "13.13.2"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.2.tgz#160d82623610db590a64e8ca81784e11117e5a54"
+ integrity sha512-LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A==
+
+"@types/node@^8.0.47":
+ version "8.10.60"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.60.tgz#73eb4d1e1c8aa5dc724363b57db019cf28863ef7"
+ integrity sha512-YjPbypHFuiOV0bTgeF07HpEEqhmHaZqYNSdCKeBJa+yFoQ/7BC+FpJcwmi34xUIIRVFktnUyP1dPU8U0612GOg==
+
+"@types/request-promise@^4.1.45":
+ version "4.1.46"
+ resolved "https://registry.yarnpkg.com/@types/request-promise/-/request-promise-4.1.46.tgz#37df6efae984316dfbfbbe8fcda37f3ba52822f2"
+ integrity sha512-3Thpj2Va5m0ji3spaCk8YKrjkZyZc6RqUVOphA0n/Xet66AW/AiOAs5vfXhQIL5NmkaO7Jnun7Nl9NEjJ2zBaw==
+ dependencies:
+ "@types/bluebird" "*"
+ "@types/request" "*"
+
+"@types/request@*", "@types/request@^2.48.4":
+ version "2.48.4"
+ resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.4.tgz#df3d43d7b9ed3550feaa1286c6eabf0738e6cf7e"
+ integrity sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==
+ dependencies:
+ "@types/caseless" "*"
+ "@types/node" "*"
+ "@types/tough-cookie" "*"
+ form-data "^2.5.0"
+
+"@types/tough-cookie@*":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.0.tgz#fef1904e4668b6e5ecee60c52cc6a078ffa6697d"
+ integrity sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==
+
+"@types/tunnel@0.0.1":
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.1.tgz#0d72774768b73df26f25df9184273a42da72b19c"
+ integrity sha512-AOqu6bQu5MSWwYvehMXLukFHnupHrpZ8nvgae5Ggie9UwzDR1CCwoXgSSWNZJuyOlCdfdsWMA5F2LlmvyoTv8A==
+ dependencies:
+ "@types/node" "*"
+
+abort-controller@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+ integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+ dependencies:
+ event-target-shim "^5.0.0"
+
+adal-node@^0.1.28:
+ version "0.1.28"
+ resolved "https://registry.yarnpkg.com/adal-node/-/adal-node-0.1.28.tgz#468c4bb3ebbd96b1270669f4b9cba4e0065ea485"
+ integrity sha1-RoxLs+u9lrEnBmn0ucuk4AZepIU=
+ dependencies:
+ "@types/node" "^8.0.47"
+ async ">=0.6.0"
+ date-utils "*"
+ jws "3.x.x"
+ request ">= 2.52.0"
+ underscore ">= 1.3.1"
+ uuid "^3.1.0"
+ xmldom ">= 0.1.x"
+ xpath.js "~1.1.0"
+
+adal-node@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/adal-node/-/adal-node-0.2.1.tgz#19e401bd579977448c1a77ce0e5b4c9accdc334e"
+ integrity sha512-C/oasZuTy0NIqh5wPWjG/09XaG+zS7elC8upf1ZVExt9lSRncme4Ejbx8CKYk+wsGgj609y84txtRAXQVvqApg==
+ dependencies:
+ "@types/node" "^8.0.47"
+ async "^2.6.3"
+ date-utils "*"
+ jws "3.x.x"
+ request "^2.88.0"
+ underscore ">= 1.3.1"
+ uuid "^3.1.0"
+ xmldom ">= 0.1.x"
+ xpath.js "~1.1.0"
+
+ajv@^6.5.5:
+ version "6.12.2"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
+ integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+ dependencies:
+ fast-deep-equal "^3.1.1"
+ fast-json-stable-stringify "^2.0.0"
+ json-schema-traverse "^0.4.1"
+ uri-js "^4.2.2"
+
+array-union@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+ integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+asn1@~0.2.3:
+ version "0.2.4"
+ resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+ integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+ dependencies:
+ safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+ integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+async@>=0.6.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
+ integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
+
+async@^2.6.3:
+ version "2.6.3"
+ resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+ integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+ dependencies:
+ lodash "^4.17.14"
+
+asynckit@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+ integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+aws-sign2@~0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+ integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
+ integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+
+bcrypt-pbkdf@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+ integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+ dependencies:
+ tweetnacl "^0.14.3"
+
+braces@^3.0.1:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+ integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+ dependencies:
+ fill-range "^7.0.1"
+
+buffer-equal-constant-time@1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+ integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
+
+caseless@~0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+ integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+charenc@~0.0.1:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+ integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
+
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+ integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+ dependencies:
+ delayed-stream "~1.0.0"
+
+core-util-is@1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+ integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+crypt@~0.0.1:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+ integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
+
+dashdash@^1.12.0:
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+ integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+ dependencies:
+ assert-plus "^1.0.0"
+
+date-utils@*:
+ version "1.2.21"
+ resolved "https://registry.yarnpkg.com/date-utils/-/date-utils-1.2.21.tgz#61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"
+ integrity sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q=
+
+debug@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+ integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+ dependencies:
+ ms "^2.1.1"
+
+delayed-stream@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+ integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+dir-glob@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+ integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+ dependencies:
+ path-type "^4.0.0"
+
+ecc-jsbn@~0.1.1:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+ integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+ dependencies:
+ jsbn "~0.1.0"
+ safer-buffer "^2.1.0"
+
+ecdsa-sig-formatter@1.0.11:
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+ integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
+ dependencies:
+ safe-buffer "^5.0.1"
+
+event-target-shim@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+ integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
+extend@~3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+ integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+extsprintf@1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+ integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+ integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+ integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+
+fast-glob@^3.1.1:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d"
+ integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==
+ dependencies:
+ "@nodelib/fs.stat" "^2.0.2"
+ "@nodelib/fs.walk" "^1.2.3"
+ glob-parent "^5.1.0"
+ merge2 "^1.3.0"
+ micromatch "^4.0.2"
+ picomatch "^2.2.1"
+
+fast-json-stable-stringify@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+ integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fastq@^1.6.0:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.7.0.tgz#fcd79a08c5bd7ec5b55cd3f5c4720db551929801"
+ integrity sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==
+ dependencies:
+ reusify "^1.0.4"
+
+fill-range@^7.0.1:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+ integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+ dependencies:
+ to-regex-range "^5.0.1"
+
+forever-agent@~0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+ integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@^2.5.0:
+ version "2.5.1"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
+ integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.6"
+ mime-types "^2.1.12"
+
+form-data@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
+ integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.8"
+ mime-types "^2.1.12"
+
+form-data@~2.3.2:
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+ integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.6"
+ mime-types "^2.1.12"
+
+getpass@^0.1.1:
+ version "0.1.7"
+ resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+ integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+ dependencies:
+ assert-plus "^1.0.0"
+
+glob-parent@^5.1.0:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+ integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+ dependencies:
+ is-glob "^4.0.1"
+
+globby@^11.0.0:
+ version "11.0.0"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz#56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154"
+ integrity sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==
+ dependencies:
+ array-union "^2.1.0"
+ dir-glob "^3.0.1"
+ fast-glob "^3.1.1"
+ ignore "^5.1.4"
+ merge2 "^1.3.0"
+ slash "^3.0.0"
+
+har-schema@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+ integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.3:
+ version "5.1.3"
+ resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+ integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+ dependencies:
+ ajv "^6.5.5"
+ har-schema "^2.0.0"
+
+http-signature@~1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+ integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+ dependencies:
+ assert-plus "^1.0.0"
+ jsprim "^1.2.2"
+ sshpk "^1.7.0"
+
+ignore@^5.1.4:
+ version "5.1.4"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
+ integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+
+ip-regex@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+ integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
+
+is-buffer@~1.1.1:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+ integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-extglob@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+ integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-glob@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+ integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+ dependencies:
+ is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+ integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-typedarray@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+ integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+isstream@~0.1.2:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+ integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+jsbn@~0.1.0:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+ integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+json-schema-traverse@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+ integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema@0.2.3:
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+ integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stringify-safe@~5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+ integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+jsprim@^1.2.2:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+ integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+ dependencies:
+ assert-plus "1.0.0"
+ extsprintf "1.3.0"
+ json-schema "0.2.3"
+ verror "1.10.0"
+
+jwa@^1.4.1:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+ integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+ dependencies:
+ buffer-equal-constant-time "1.0.1"
+ ecdsa-sig-formatter "1.0.11"
+ safe-buffer "^5.0.1"
+
+jws@3.x.x:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+ integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+ dependencies:
+ jwa "^1.4.1"
+ safe-buffer "^5.0.1"
+
+lodash@^4.17.14:
+ version "4.17.15"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+ integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
+md5@^2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+ integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
+ dependencies:
+ charenc "~0.0.1"
+ crypt "~0.0.1"
+ is-buffer "~1.1.1"
+
+merge2@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
+ integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
+
+micromatch@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+ integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+ dependencies:
+ braces "^3.0.1"
+ picomatch "^2.0.5"
+
+mime-db@1.44.0:
+ version "1.44.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+ integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+
+mime-types@^2.1.12, mime-types@~2.1.19:
+ version "2.1.27"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+ integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+ dependencies:
+ mime-db "1.44.0"
+
+minimist@^1.2.5:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+ integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+ms@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+ integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+node-fetch@^2.6.0:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
+ integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+
+oauth-sign@~0.9.0:
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+ integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+passport-strategy@1.x.x:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
+ integrity sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ=
+
+passport@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270"
+ integrity sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==
+ dependencies:
+ passport-strategy "1.x.x"
+ pause "0.0.1"
+
+path-to-regexp@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.1.0.tgz#0b18f88b7a0ce0bfae6a25990c909ab86f512427"
+ integrity sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw==
+
+path-type@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+ integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+pause@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
+ integrity sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10=
+
+performance-now@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+ integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+picomatch@^2.0.5, picomatch@^2.2.1:
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+ integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
+psl@^1.1.28:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+ integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
+punycode@^2.1.0, punycode@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+ integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+qs@~6.5.2:
+ version "6.5.2"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+ integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+"request@>= 2.52.0", request@^2.88.0:
+ version "2.88.2"
+ resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+ integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+ dependencies:
+ aws-sign2 "~0.7.0"
+ aws4 "^1.8.0"
+ caseless "~0.12.0"
+ combined-stream "~1.0.6"
+ extend "~3.0.2"
+ forever-agent "~0.6.1"
+ form-data "~2.3.2"
+ har-validator "~5.1.3"
+ http-signature "~1.2.0"
+ is-typedarray "~1.0.0"
+ isstream "~0.1.2"
+ json-stringify-safe "~5.0.1"
+ mime-types "~2.1.19"
+ oauth-sign "~0.9.0"
+ performance-now "^2.1.0"
+ qs "~6.5.2"
+ safe-buffer "^5.1.2"
+ tough-cookie "~2.5.0"
+ tunnel-agent "^0.6.0"
+ uuid "^3.3.2"
+
+reusify@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+ integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+run-parallel@^1.1.9:
+ version "1.1.9"
+ resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
+ integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.2:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+ integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+
+safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+ integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sax@>=0.6.0:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+ integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+slash@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+ integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+sshpk@^1.7.0:
+ version "1.16.1"
+ resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+ integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+ dependencies:
+ asn1 "~0.2.3"
+ assert-plus "^1.0.0"
+ bcrypt-pbkdf "^1.0.0"
+ dashdash "^1.12.0"
+ ecc-jsbn "~0.1.1"
+ getpass "^0.1.1"
+ jsbn "~0.1.0"
+ safer-buffer "^2.0.2"
+ tweetnacl "~0.14.0"
+
+to-regex-range@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+ integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+ dependencies:
+ is-number "^7.0.0"
+
+tough-cookie@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
+ integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
+ dependencies:
+ ip-regex "^2.1.0"
+ psl "^1.1.28"
+ punycode "^2.1.1"
+
+tough-cookie@~2.5.0:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+ integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+ dependencies:
+ psl "^1.1.28"
+ punycode "^2.1.1"
+
+tslib@^1.10.0:
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
+ integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
+
+tunnel-agent@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+ integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+ dependencies:
+ safe-buffer "^5.0.1"
+
+tunnel@0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+ integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+ version "0.14.5"
+ resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+ integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+"underscore@>= 1.3.1":
+ version "1.10.2"
+ resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.10.2.tgz#73d6aa3668f3188e4adb0f1943bd12cfd7efaaaf"
+ integrity sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==
+
+uri-js@^4.2.2:
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+ integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+ dependencies:
+ punycode "^2.1.0"
+
+uuid@^3.1.0, uuid@^3.3.2:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+ integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+uuid@^7.0.3:
+ version "7.0.3"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
+ integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
+
+verror@1.10.0:
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+ integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+ dependencies:
+ assert-plus "^1.0.0"
+ core-util-is "1.0.2"
+ extsprintf "^1.2.0"
+
+xml2js@^0.4.19:
+ version "0.4.23"
+ resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+ integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+ dependencies:
+ sax ">=0.6.0"
+ xmlbuilder "~11.0.0"
+
+xmlbuilder@~11.0.0:
+ version "11.0.1"
+ resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+ integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
+"xmldom@>= 0.1.x":
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.3.0.tgz#e625457f4300b5df9c2e1ecb776147ece47f3e5a"
+ integrity sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g==
+
+xpath.js@~1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1"
+ integrity sha512-jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ==
diff --git a/Composer/plugins/localPublish/package-lock.json b/Composer/plugins/localPublish/package-lock.json
index b4adaac1d4..cfe03ab173 100644
--- a/Composer/plugins/localPublish/package-lock.json
+++ b/Composer/plugins/localPublish/package-lock.json
@@ -4,6 +4,229 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+ "@bfc/plugin-loader": {
+ "version": "file:../../packages/extensions/plugin-loader",
+ "requires": {
+ "debug": "^4.1.1",
+ "globby": "^11.0.0",
+ "passport": "^0.4.1",
+ "path-to-regexp": "^6.1.0"
+ },
+ "dependencies": {
+ "@nodelib/fs.scandir": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+ "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+ "requires": {
+ "@nodelib/fs.stat": "2.0.3",
+ "run-parallel": "^1.1.9"
+ }
+ },
+ "@nodelib/fs.stat": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+ "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="
+ },
+ "@nodelib/fs.walk": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+ "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+ "requires": {
+ "@nodelib/fs.scandir": "2.1.3",
+ "fastq": "^1.6.0"
+ }
+ },
+ "@types/express": {
+ "version": "4.17.6"
+ },
+ "array-union": {
+ "version": "2.1.0"
+ },
+ "braces": {
+ "version": "3.0.2",
+ "requires": {
+ "fill-range": "^7.0.1"
+ }
+ },
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "dir-glob": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+ "requires": {
+ "path-type": "^4.0.0"
+ }
+ },
+ "fast-glob": {
+ "version": "3.2.2",
+ "requires": {
+ "@nodelib/fs.stat": "^2.0.2",
+ "@nodelib/fs.walk": "^1.2.3",
+ "glob-parent": "^5.1.0",
+ "merge2": "^1.3.0",
+ "micromatch": "^4.0.2",
+ "picomatch": "^2.2.1"
+ }
+ },
+ "fastq": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz",
+ "integrity": "sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==",
+ "requires": {
+ "reusify": "^1.0.4"
+ }
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "glob-parent": {
+ "version": "5.1.0",
+ "requires": {
+ "is-glob": "^4.0.1"
+ }
+ },
+ "globby": {
+ "version": "11.0.0",
+ "requires": {
+ "array-union": "^2.1.0",
+ "dir-glob": "^3.0.1",
+ "fast-glob": "^3.1.1",
+ "ignore": "^5.1.4",
+ "merge2": "^1.3.0",
+ "slash": "^3.0.0"
+ }
+ },
+ "ignore": {
+ "version": "5.1.4"
+ },
+ "is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+ },
+ "is-glob": {
+ "version": "4.0.1",
+ "requires": {
+ "is-extglob": "^2.1.1"
+ }
+ },
+ "is-number": {
+ "version": "7.0.0"
+ },
+ "merge2": {
+ "version": "1.3.0"
+ },
+ "micromatch": {
+ "version": "4.0.2",
+ "requires": {
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
+ },
+ "dependencies": {
+ "picomatch": {
+ "version": "2.0.7"
+ }
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+ },
+ "passport": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz",
+ "integrity": "sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==",
+ "requires": {
+ "passport-strategy": "1.x.x",
+ "pause": "0.0.1"
+ }
+ },
+ "passport-strategy": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
+ "integrity": "sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ="
+ },
+ "path-to-regexp": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.1.0.tgz",
+ "integrity": "sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw=="
+ },
+ "path-type": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+ },
+ "pause": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
+ "integrity": "sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10="
+ },
+ "picomatch": {
+ "version": "2.2.1"
+ },
+ "reusify": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
+ },
+ "rimraf": {
+ "version": "3.0.2"
+ },
+ "run-parallel": {
+ "version": "1.1.9",
+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+ "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
+ },
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "requires": {
+ "is-number": "^7.0.0"
+ }
+ },
+ "typescript": {
+ "version": "3.8.3"
+ }
+ }
+ },
+ "@nodelib/fs.scandir": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+ "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+ "requires": {
+ "@nodelib/fs.stat": "2.0.3",
+ "run-parallel": "^1.1.9"
+ }
+ },
+ "@nodelib/fs.stat": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+ "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="
+ },
+ "@nodelib/fs.walk": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+ "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+ "requires": {
+ "@nodelib/fs.scandir": "2.1.3",
+ "fastq": "^1.6.0"
+ }
+ },
"adm-zip": {
"version": "0.4.14",
"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz",
@@ -56,6 +279,11 @@
}
}
},
+ "array-union": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
+ },
"async": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
@@ -91,6 +319,14 @@
"concat-map": "0.0.1"
}
},
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "requires": {
+ "fill-range": "^7.0.1"
+ }
+ },
"buffer": {
"version": "5.4.3",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz",
@@ -159,6 +395,22 @@
"readable-stream": "^3.4.0"
}
},
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "dir-glob": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+ "requires": {
+ "path-type": "^4.0.0"
+ }
+ },
"end-of-stream": {
"version": "1.4.4",
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -167,6 +419,35 @@
"once": "^1.4.0"
}
},
+ "fast-glob": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz",
+ "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==",
+ "requires": {
+ "@nodelib/fs.stat": "^2.0.2",
+ "@nodelib/fs.walk": "^1.2.3",
+ "glob-parent": "^5.1.0",
+ "merge2": "^1.3.0",
+ "micromatch": "^4.0.2",
+ "picomatch": "^2.2.1"
+ }
+ },
+ "fastq": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz",
+ "integrity": "sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==",
+ "requires": {
+ "reusify": "^1.0.4"
+ }
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
"fs-constants": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -190,6 +471,27 @@
"path-is-absolute": "^1.0.0"
}
},
+ "glob-parent": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+ "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+ "requires": {
+ "is-glob": "^4.0.1"
+ }
+ },
+ "globby": {
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz",
+ "integrity": "sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==",
+ "requires": {
+ "array-union": "^2.1.0",
+ "dir-glob": "^3.0.1",
+ "fast-glob": "^3.1.1",
+ "ignore": "^5.1.4",
+ "merge2": "^1.3.0",
+ "slash": "^3.0.0"
+ }
+ },
"graceful-fs": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
@@ -200,6 +502,11 @@
"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
},
+ "ignore": {
+ "version": "5.1.4",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
+ "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A=="
+ },
"inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -214,6 +521,24 @@
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
},
+ "is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+ },
+ "is-glob": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+ "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+ "requires": {
+ "is-extglob": "^2.1.1"
+ }
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+ },
"isarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -273,6 +598,20 @@
"resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
"integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg="
},
+ "merge2": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
+ "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw=="
+ },
+ "micromatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "requires": {
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
+ }
+ },
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -281,6 +620,24 @@
"brace-expansion": "^1.1.7"
}
},
+ "minimist": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+ },
+ "mkdirp": {
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+ "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+ "requires": {
+ "minimist": "^1.2.5"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+ },
"normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -294,11 +651,45 @@
"wrappy": "1"
}
},
+ "path": {
+ "version": "0.12.7",
+ "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+ "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
+ "requires": {
+ "process": "^0.11.1",
+ "util": "^0.10.3"
+ }
+ },
"path-is-absolute": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
},
+ "path-type": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+ },
+ "picomatch": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+ "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
+ },
+ "portfinder": {
+ "version": "1.0.26",
+ "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
+ "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==",
+ "requires": {
+ "async": "^2.6.2",
+ "debug": "^3.1.1",
+ "mkdirp": "^0.5.1"
+ }
+ },
+ "process": {
+ "version": "0.11.10",
+ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+ "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+ },
"process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -314,11 +705,34 @@
"util-deprecate": "^1.0.1"
}
},
+ "reusify": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
+ },
+ "rimraf": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+ "requires": {
+ "glob": "^7.1.3"
+ }
+ },
+ "run-parallel": {
+ "version": "1.1.9",
+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+ "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
+ },
"safe-buffer": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+ },
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -339,6 +753,29 @@
"readable-stream": "^3.1.1"
}
},
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "requires": {
+ "is-number": "^7.0.0"
+ }
+ },
+ "util": {
+ "version": "0.10.4",
+ "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+ "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+ "requires": {
+ "inherits": "2.0.3"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+ }
+ }
+ },
"util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
diff --git a/Composer/plugins/localPublish/package.json b/Composer/plugins/localPublish/package.json
index 11e1d12363..59f18dfc56 100644
--- a/Composer/plugins/localPublish/package.json
+++ b/Composer/plugins/localPublish/package.json
@@ -11,12 +11,13 @@
"author": "",
"license": "ISC",
"dependencies": {
+ "@bfc/plugin-loader": "file:../../packages/extensions/plugin-loader",
"adm-zip": "^0.4.14",
"archiver": "^3.1.1",
"globby": "^11.0.0",
"path": "^0.12.7",
- "portfinder": "^1.0.25",
+ "portfinder": "^1.0.26",
"rimraf": "^3.0.2",
"uuid": "^7.0.1"
}
-}
\ No newline at end of file
+}
diff --git a/Composer/plugins/localPublish/src/index.ts b/Composer/plugins/localPublish/src/index.ts
index 2c3c7c36e3..2297f2eda5 100644
--- a/Composer/plugins/localPublish/src/index.ts
+++ b/Composer/plugins/localPublish/src/index.ts
@@ -11,6 +11,7 @@ import archiver from 'archiver';
import { v4 as uuid } from 'uuid';
import AdmZip from 'adm-zip';
import portfinder from 'portfinder';
+import { ComposerPluginRegistration, PublishResponse, PublishPlugin } from '@bfc/plugin-loader';
import { copyDir } from './copyDir';
import { IFileStorage } from './interface';
@@ -33,24 +34,34 @@ interface PublishConfig {
templatePath: string;
}
-class LocalPublisher {
+const isWin = process.platform === 'win32';
+
+class LocalPublisher implements PublishPlugin {
static runningBots: { [key: string]: RunningBot } = {};
private readonly baseDir = path.resolve(__dirname, '../');
private templatePath;
+ private composer: ComposerPluginRegistration;
+
+ constructor(composer: ComposerPluginRegistration) {
+ this.composer = composer;
+ }
- constructor() {}
// config include botId and version, project is content(ComposerDialogs)
- publish = async (config: PublishConfig, project, metadata, user) => {
+ publish = async (config: PublishConfig, project, metadata, user): Promise => {
const { templatePath, settings } = config;
this.templatePath = templatePath;
const botId = project.id;
const version = 'default';
+ this.composer.log('Starting publish');
+
// if enableCustomRuntime is not true, initialize the runtime code in a tmp folder
// and export the content into that folder as well.
if (project.settings.runtime && project.settings.runtime.customRuntime !== true) {
+ this.composer.log('Using managed runtime');
await this.initBot(botId);
await this.saveContent(botId, version, project.dataDir, user);
+ await this.saveSkillManifests(botId, project.dataDir);
} else if (!project.settings.runtime.path || !project.settings.runtime.command) {
return {
status: 400,
@@ -68,11 +79,12 @@ class LocalPublisher {
status: 200,
result: {
id: uuid(),
- version: version,
endpointURL: url,
+ message: 'Local publish success.',
},
};
} catch (error) {
+ console.error('Error in local publish', error);
return {
status: 500,
result: {
@@ -113,6 +125,10 @@ class LocalPublisher {
private getHistoryDir = (botId: string) => path.resolve(this.getBotDir(botId), 'history');
+ private getManifestSrcDir = (srcDir: string) => path.resolve(srcDir, 'manifests');
+
+ private getManifestDstDir = (botId: string) => path.resolve(this.getBotRuntimeDir(botId), 'wwwroot', 'manifests');
+
private getDownloadPath = (botId: string, version: string) =>
path.resolve(this.getHistoryDir(botId), `${version}.zip`);
@@ -135,6 +151,7 @@ class LocalPublisher {
};
private initBot = async (botId: string) => {
+ this.composer.log('Initializing bot');
const isExist = await this.botExist(botId);
if (!isExist) {
const botDir = this.getBotDir(botId);
@@ -151,7 +168,8 @@ class LocalPublisher {
await this.copyDir(this.templatePath, runtimeDir);
try {
- execSync('dotnet user-secrets init', { cwd: runtimeDir });
+ // TODO ccastro: discuss with benbrown. Consider init command as template metadata. Remove azurewebapp from here.
+ execSync('dotnet user-secrets init --project azurewebapp', { cwd: runtimeDir });
execSync('dotnet build', { cwd: runtimeDir });
} catch (error) {
// delete the folder to make sure build again.
@@ -162,15 +180,30 @@ class LocalPublisher {
};
private saveContent = async (botId: string, version: string, srcDir: string, user: any) => {
+ this.composer.log('Packaging bot assets');
const dstPath = this.getDownloadPath(botId, version);
await this.zipBot(dstPath, srcDir);
};
+ private saveSkillManifests = async (botId: string, srcDir: string) => {
+ const manifestSrcDir = this.getManifestSrcDir(srcDir);
+ const manifestDstDir = this.getManifestDstDir(botId);
+
+ if (await this.dirExist(manifestDstDir)) {
+ await rmDir(manifestDstDir);
+ }
+
+ if (await this.dirExist(manifestSrcDir)) {
+ this.copyDir(manifestSrcDir, manifestDstDir);
+ }
+ };
+
// start bot in current version
private setBot = async (botId: string, version: string, settings: any, project: any = undefined) => {
// get port, and stop previous bot if exist
let port;
if (LocalPublisher.runningBots[botId]) {
+ this.composer.log('Bot already running. Stopping bot...');
port = LocalPublisher.runningBots[botId].port;
this.stopBot(botId);
} else {
@@ -179,6 +212,7 @@ class LocalPublisher {
// if not using custom runtime, update assets in tmp older
if (!settings.runtime || settings.runtime.customRuntime !== true) {
+ this.composer.log('Updating bot assets');
await this.restoreBot(botId, version);
}
@@ -200,7 +234,7 @@ class LocalPublisher {
const commandAndArgs =
settings.runtime && settings.runtime.customRuntime === true
? settings.runtime.command.split(/\s+/)
- : ['dotnet', 'run'];
+ : ['dotnet', 'run', '--project', 'azurewebapp']; //TODO: ccastro should pick up the bot start command here. After, remove azurewebapp arg
return new Promise((resolve, reject) => {
// ensure the specified runtime path exists
@@ -209,8 +243,8 @@ class LocalPublisher {
}
// take the 0th item off the array, leaving just the args
+ this.composer.log('Starting bot on port %d. (%s)', port, commandAndArgs.join(' '));
const startCommand = commandAndArgs.shift();
-
let process;
try {
process = spawn(
@@ -219,13 +253,16 @@ class LocalPublisher {
{
cwd: botDir,
stdio: ['ignore', 'pipe', 'pipe'],
+ detached: !isWin, // detach in non-windows
}
);
+ this.composer.log('Started process %d', process.pid);
} catch (err) {
return reject(err);
}
LocalPublisher.runningBots[botId] = { process: process, port: port };
- this.addListeners(process, resolve, reject);
+ const processLog = this.composer.log.extend(process.pid);
+ this.addListeners(process, processLog, resolve, reject);
});
};
@@ -248,10 +285,17 @@ class LocalPublisher {
return configList;
};
- private addListeners = (child: ChildProcess, resolve: Function, reject: Function) => {
+ private addListeners = (
+ child: ChildProcess,
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ logger: (...args: any[]) => void,
+ resolve: Function,
+ reject: Function
+ ) => {
let erroutput = '';
child.stdout &&
child.stdout.on('data', (data: any) => {
+ logger('%s', data);
resolve(child.pid);
});
@@ -267,11 +311,12 @@ class LocalPublisher {
});
child.on('error', err => {
+ logger('error: %s', err.message);
reject(`Could not launch bot runtime process: ${err.message}`);
});
child.on('message', msg => {
- console.log(msg);
+ logger('%s', msg);
});
};
@@ -312,7 +357,21 @@ class LocalPublisher {
};
private stopBot = (botId: string) => {
- LocalPublisher.runningBots[botId]?.process.kill('SIGKILL');
+ const proc = LocalPublisher.runningBots[botId]?.process;
+
+ if (proc) {
+ this.composer.log('Killing process %d', -proc.pid);
+ // Kill the bot process AND all child processes
+ try {
+ process.kill(isWin ? proc.pid : -proc.pid);
+ } catch (err) {
+ // ESRCH means pid not found
+ // this throws an error but doesn't indicate failure for us
+ if (err.code !== 'ESRCH') {
+ throw err;
+ }
+ }
+ }
delete LocalPublisher.runningBots[botId];
};
@@ -340,26 +399,31 @@ class LocalPublisher {
static stopAll = () => {
for (const botId in LocalPublisher.runningBots) {
const bot = LocalPublisher.runningBots[botId];
- bot.process.kill('SIGKILL');
+ // Kill the bot process AND all child processes
+ try {
+ process.kill(isWin ? bot.process.pid : -bot.process.pid);
+ } catch (err) {
+ // swallow this error which happens if the child process is already gone
+ }
delete LocalPublisher.runningBots[botId];
}
};
}
-const publisher = new LocalPublisher();
-export default async (composer: any): Promise => {
+export default async (composer: ComposerPluginRegistration): Promise => {
+ const publisher = new LocalPublisher(composer);
// register this publishing method with Composer
await composer.addPublishMethod(publisher);
// register the bundled c# runtime used by the local publisher with the eject feature
- await composer.addRuntimeTemplate({
- key: 'csharp',
+ composer.addRuntimeTemplate({
+ key: 'azurewebapp',
name: 'C#',
- startCommand: 'dotnet run',
+ startCommand: 'dotnet run --project azurewebapp',
eject: async (project: any, localDisk: IFileStorage) => {
- const sourcePath = path.resolve(__dirname, '../../../../BotProject/Templates/CSharp');
+ const sourcePath = path.resolve(__dirname, '../../../../runtime/dotnet');
const destPath = path.join(project.dir, 'runtime');
- const schemaSrcPath = path.join(sourcePath, 'Schemas');
+ const schemaSrcPath = path.join(sourcePath, 'azurewebapp/Schemas');
const schemaDstPath = path.join(project.dir, 'schemas');
if (!(await project.fileStorage.exists(destPath))) {
// used to read bot project template from source (bundled in plugin)
diff --git a/Composer/plugins/localPublish/tsconfig.json b/Composer/plugins/localPublish/tsconfig.json
index d43fd5f5f0..2824efac1d 100644
--- a/Composer/plugins/localPublish/tsconfig.json
+++ b/Composer/plugins/localPublish/tsconfig.json
@@ -7,6 +7,7 @@
"esModuleInterop": true,
"outDir": "./lib",
"rootDir": "./src",
+ "skipLibCheck": true,
"types": [
"node"
]
@@ -17,4 +18,4 @@
"exclude": [
"node_modules"
]
-}
\ No newline at end of file
+}
diff --git a/Composer/plugins/localPublish/yarn.lock b/Composer/plugins/localPublish/yarn.lock
index e01b269694..b26efa8c86 100644
--- a/Composer/plugins/localPublish/yarn.lock
+++ b/Composer/plugins/localPublish/yarn.lock
@@ -2,6 +2,14 @@
# yarn lockfile v1
+"@bfc/plugin-loader@file:../../packages/extensions/plugin-loader":
+ version "1.0.0"
+ dependencies:
+ debug "^4.1.1"
+ globby "^11.0.0"
+ passport "^0.4.1"
+ path-to-regexp "^6.1.0"
+
"@nodelib/fs.scandir@2.1.3":
version "2.1.3"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -156,6 +164,13 @@ debug@^3.1.1:
dependencies:
ms "^2.1.1"
+debug@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+ integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+ dependencies:
+ ms "^2.1.1"
+
dir-glob@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -349,17 +364,17 @@ minimatch@^3.0.4:
dependencies:
brace-expansion "^1.1.7"
-minimist@0.0.8:
- version "0.0.8"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
- integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+minimist@^1.2.5:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+ integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
mkdirp@^0.5.1:
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
- integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+ version "0.5.5"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+ integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
dependencies:
- minimist "0.0.8"
+ minimist "^1.2.5"
ms@^2.1.1:
version "2.1.2"
@@ -378,11 +393,29 @@ once@^1.3.0, once@^1.4.0:
dependencies:
wrappy "1"
+passport-strategy@1.x.x:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
+ integrity sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ=
+
+passport@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270"
+ integrity sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==
+ dependencies:
+ passport-strategy "1.x.x"
+ pause "0.0.1"
+
path-is-absolute@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+path-to-regexp@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.1.0.tgz#0b18f88b7a0ce0bfae6a25990c909ab86f512427"
+ integrity sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw==
+
path-type@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -396,15 +429,20 @@ path@^0.12.7:
process "^0.11.1"
util "^0.10.3"
+pause@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
+ integrity sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10=
+
picomatch@^2.0.5, picomatch@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
-portfinder@^1.0.25:
- version "1.0.25"
- resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
- integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
+portfinder@^1.0.26:
+ version "1.0.26"
+ resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70"
+ integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==
dependencies:
async "^2.6.2"
debug "^3.1.1"
diff --git a/Composer/plugins/mockRemotePublish/package.json b/Composer/plugins/mockRemotePublish/package.json
index 62e38421a6..42658d985a 100644
--- a/Composer/plugins/mockRemotePublish/package.json
+++ b/Composer/plugins/mockRemotePublish/package.json
@@ -15,7 +15,7 @@
"archiver": "^3.1.1",
"globby": "^11.0.0",
"path": "^0.12.7",
- "portfinder": "^1.0.25",
+ "portfinder": "^1.0.26",
"rimraf": "^3.0.2",
"uuid": "^7.0.1"
},
diff --git a/Composer/plugins/mockRemotePublish/yarn.lock b/Composer/plugins/mockRemotePublish/yarn.lock
index e01b269694..c397a5a5f2 100644
--- a/Composer/plugins/mockRemotePublish/yarn.lock
+++ b/Composer/plugins/mockRemotePublish/yarn.lock
@@ -2,6 +2,14 @@
# yarn lockfile v1
+"@bfc/plugin-loader@file:../../packages/extensions/plugin-loader":
+ version "1.0.0"
+ dependencies:
+ debug "^4.1.1"
+ globby "^11.0.0"
+ passport "^0.4.1"
+ path-to-regexp "^6.1.0"
+
"@nodelib/fs.scandir@2.1.3":
version "2.1.3"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -23,6 +31,11 @@
"@nodelib/fs.scandir" "2.1.3"
fastq "^1.6.0"
+"@types/uuid@^7.0.2":
+ version "7.0.3"
+ resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-7.0.3.tgz#45cd03e98e758f8581c79c535afbd4fc27ba7ac8"
+ integrity sha512-PUdqTZVrNYTNcIhLHkiaYzoOIaUi5LFg/XLerAdgvwQrUCx+oSbtoBze1AMyvYbcwzUSNC+Isl58SM4Sm/6COw==
+
adm-zip@^0.4.14:
version "0.4.14"
resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.14.tgz#2cf312bcc9f8875df835b0f6040bd89be0a727a9"
@@ -156,6 +169,13 @@ debug@^3.1.1:
dependencies:
ms "^2.1.1"
+debug@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+ integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+ dependencies:
+ ms "^2.1.1"
+
dir-glob@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -349,17 +369,17 @@ minimatch@^3.0.4:
dependencies:
brace-expansion "^1.1.7"
-minimist@0.0.8:
- version "0.0.8"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
- integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+minimist@^1.2.5:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+ integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
mkdirp@^0.5.1:
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
- integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+ version "0.5.5"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+ integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
dependencies:
- minimist "0.0.8"
+ minimist "^1.2.5"
ms@^2.1.1:
version "2.1.2"
@@ -378,11 +398,29 @@ once@^1.3.0, once@^1.4.0:
dependencies:
wrappy "1"
+passport-strategy@1.x.x:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
+ integrity sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ=
+
+passport@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270"
+ integrity sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==
+ dependencies:
+ passport-strategy "1.x.x"
+ pause "0.0.1"
+
path-is-absolute@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+path-to-regexp@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.1.0.tgz#0b18f88b7a0ce0bfae6a25990c909ab86f512427"
+ integrity sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw==
+
path-type@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -396,15 +434,20 @@ path@^0.12.7:
process "^0.11.1"
util "^0.10.3"
+pause@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
+ integrity sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10=
+
picomatch@^2.0.5, picomatch@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
-portfinder@^1.0.25:
- version "1.0.25"
- resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
- integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
+portfinder@^1.0.26:
+ version "1.0.26"
+ resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70"
+ integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==
dependencies:
async "^2.6.2"
debug "^3.1.1"
diff --git a/Composer/plugins/mongoStorage/package-lock.json b/Composer/plugins/mongoStorage/package-lock.json
index e86b040adf..699888ff43 100644
--- a/Composer/plugins/mongoStorage/package-lock.json
+++ b/Composer/plugins/mongoStorage/package-lock.json
@@ -1,22 +1,22 @@
{
- "name": "mongostorage",
+ "name": "mongoStorage",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@types/bson": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.1.tgz",
- "integrity": "sha512-K6VAEdLVJFBxKp8m5cRTbUfeZpuSvOuLKJLrgw9ANIXo00RiyGzgH4BKWWR4F520gV4tWmxG7q9sKQRVDuzrBw==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.2.tgz",
+ "integrity": "sha512-+uWmsejEHfmSjyyM/LkrP0orfE2m5Mx9Xel4tXNeqi1ldK5XMQcDsFkBmLDtuyKUbxj2jGDo0H240fbCRJZo7Q==",
"dev": true,
"requires": {
"@types/node": "*"
}
},
"@types/mongodb": {
- "version": "3.3.14",
- "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.3.14.tgz",
- "integrity": "sha512-Ie0Fjoifm/TPY2rNOgixzhNSjDgxgR0dMKQk9XqUXHnkfuw26SpbMXjwECfxSnEdG1bH6bIlpLIK7HvGHQhzqg==",
+ "version": "3.5.14",
+ "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.5.14.tgz",
+ "integrity": "sha512-6SBBf4/pFTPu+Xmio6A4JPv/zXbsS/h7d3SdhaXRfTdE8pPNKUfOG3Tn7O0sjcu7Nz0syorSiQE6CMcoQD15TQ==",
"dev": true,
"requires": {
"@types/bson": "*",
@@ -24,9 +24,9 @@
}
},
"@types/mongoose": {
- "version": "5.5.38",
- "resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.5.38.tgz",
- "integrity": "sha512-W+vLJ4t0DUQhnV/ivLBLVCOvx3UnU/HgrKrEeHCUwE9VGDTdoOQOgOTiElErf+ome9zZUek6VZil5t7HfJvO+w==",
+ "version": "5.7.14",
+ "resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.7.14.tgz",
+ "integrity": "sha512-jdMhuIluxmPKP58juOvQEl1C0syqyG0LK19zP+FRha0gvlFUwttXr2uxX4pzTHcuu/V6omzia9iGeXCoTEOT+w==",
"dev": true,
"requires": {
"@types/mongodb": "*",
@@ -34,20 +34,34 @@
}
},
"@types/node": {
- "version": "13.1.4",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.4.tgz",
- "integrity": "sha512-Lue/mlp2egZJoHXZr4LndxDAd7i/7SQYhV0EjWfb/a4/OZ6tuVwMCVPiwkU5nsEipxEf7hmkSU7Em5VQ8P5NGA==",
+ "version": "13.13.4",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz",
+ "integrity": "sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==",
"dev": true
},
+ "bl": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz",
+ "integrity": "sha512-wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA==",
+ "requires": {
+ "readable-stream": "^2.3.5",
+ "safe-buffer": "^5.1.1"
+ }
+ },
"bluebird": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
},
"bson": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.3.tgz",
- "integrity": "sha512-TdiJxMVnodVS7r0BdL42y/pqC9cL2iKynVwA0Ho3qbsQYr428veL3l7BQyuqiw+Q5SqqoT0m4srSY/BlZ9AxXg=="
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.4.tgz",
+ "integrity": "sha512-S/yKGU1syOMzO86+dGpg2qGoDL0zvzcb262G+gqEy6TgP6rt6z6qxSFX/8X6vLC91P7G7C3nLs0+bvDzmvBA3Q=="
+ },
+ "core-util-is": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
},
"debug": {
"version": "3.1.0",
@@ -64,11 +78,26 @@
}
}
},
+ "denque": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz",
+ "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ=="
+ },
"glob-to-regexp": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
},
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+ },
"kareem": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz",
@@ -81,26 +110,28 @@
"optional": true
},
"mongodb": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.4.1.tgz",
- "integrity": "sha512-juqt5/Z42J4DcE7tG7UdVaTKmUC6zinF4yioPfpeOSNBieWSK6qCY+0tfGQcHLKrauWPDdMZVROHJOa8q2pWsA==",
+ "version": "3.5.6",
+ "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.6.tgz",
+ "integrity": "sha512-sh3q3GLDLT4QmoDLamxtAECwC3RGjq+oNuK1ENV8+tnipIavss6sMYt77hpygqlMOCt0Sla5cl7H4SKCVBCGEg==",
"requires": {
- "bson": "^1.1.1",
+ "bl": "^2.2.0",
+ "bson": "^1.1.4",
+ "denque": "^1.4.1",
"require_optional": "^1.0.1",
"safe-buffer": "^5.1.2",
"saslprep": "^1.0.0"
}
},
"mongoose": {
- "version": "5.8.5",
- "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.8.5.tgz",
- "integrity": "sha512-Ek73KYUVpD9+O0tK//C6I69akmVfhJLdSX7RwpyIhfBlVEyi9tW+255A+BUXvOKNS0e6SX8e7C42+WD5kcylCg==",
+ "version": "5.9.10",
+ "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.10.tgz",
+ "integrity": "sha512-w1HNukfJzzDLfcI1f79h2Wj4ogVbf+X8hRkyFgqlcjK7OnDlAgahjDMIsT+mCS9jKojrMhjSsZIs9FiRPkLqMg==",
"requires": {
- "bson": "~1.1.1",
+ "bson": "^1.1.4",
"kareem": "2.3.1",
- "mongodb": "3.4.1",
+ "mongodb": "3.5.6",
"mongoose-legacy-pluralize": "1.0.2",
- "mpath": "0.6.0",
+ "mpath": "0.7.0",
"mquery": "3.2.2",
"ms": "2.1.2",
"regexp-clone": "1.0.0",
@@ -115,9 +146,9 @@
"integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ=="
},
"mpath": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.6.0.tgz",
- "integrity": "sha512-i75qh79MJ5Xo/sbhxrDrPSEG0H/mr1kcZXJ8dH6URU5jD/knFxCVqVC/gVSW7GIXL/9hHWlT9haLbCXWOll3qw=="
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.7.0.tgz",
+ "integrity": "sha512-Aiq04hILxhz1L+f7sjGyn7IxYzWm1zLNNXcfhDtx04kZ2Gk7uvFdgZ8ts1cWa/6d0TQmag2yR8zSGZUmp0tFNg=="
},
"mquery": {
"version": "3.2.2",
@@ -136,6 +167,25 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
+ "process-nextick-args": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+ },
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
"regexp-clone": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz",
@@ -192,6 +242,19 @@
"requires": {
"memory-pager": "^1.0.2"
}
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
}
}
}
diff --git a/Composer/plugins/mongoStorage/package.json b/Composer/plugins/mongoStorage/package.json
index 04ba2479ec..afcd6c8022 100644
--- a/Composer/plugins/mongoStorage/package.json
+++ b/Composer/plugins/mongoStorage/package.json
@@ -12,10 +12,10 @@
"license": "MIT",
"dependencies": {
"glob-to-regexp": "^0.4.1",
- "mongoose": "^5.8.5"
+ "mongoose": "^5.9.10"
},
"devDependencies": {
- "@types/mongodb": "^3.3.14",
- "@types/mongoose": "^5.5.38"
+ "@types/mongodb": "^3.5.14",
+ "@types/mongoose": "^5.7.14"
}
}
diff --git a/Composer/plugins/mongoStorage/yarn.lock b/Composer/plugins/mongoStorage/yarn.lock
new file mode 100644
index 0000000000..9283cef2ce
--- /dev/null
+++ b/Composer/plugins/mongoStorage/yarn.lock
@@ -0,0 +1,239 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/bson@*":
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/@types/bson/-/bson-4.0.2.tgz#7accb85942fc39bbdb7515d4de437c04f698115f"
+ integrity sha512-+uWmsejEHfmSjyyM/LkrP0orfE2m5Mx9Xel4tXNeqi1ldK5XMQcDsFkBmLDtuyKUbxj2jGDo0H240fbCRJZo7Q==
+ dependencies:
+ "@types/node" "*"
+
+"@types/mongodb@*", "@types/mongodb@^3.5.14":
+ version "3.5.14"
+ resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.5.14.tgz#c6e679f2f64e5cc9da63814aacc46bc8853deb63"
+ integrity sha512-6SBBf4/pFTPu+Xmio6A4JPv/zXbsS/h7d3SdhaXRfTdE8pPNKUfOG3Tn7O0sjcu7Nz0syorSiQE6CMcoQD15TQ==
+ dependencies:
+ "@types/bson" "*"
+ "@types/node" "*"
+
+"@types/mongoose@^5.7.14":
+ version "5.7.14"
+ resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.7.14.tgz#f0bc55e2cbb19c96cd7826c7fe7965d48f41bb58"
+ integrity sha512-jdMhuIluxmPKP58juOvQEl1C0syqyG0LK19zP+FRha0gvlFUwttXr2uxX4pzTHcuu/V6omzia9iGeXCoTEOT+w==
+ dependencies:
+ "@types/mongodb" "*"
+ "@types/node" "*"
+
+"@types/node@*":
+ version "13.13.4"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.4.tgz#1581d6c16e3d4803eb079c87d4ac893ee7501c2c"
+ integrity sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==
+
+bl@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.0.tgz#e1a574cdf528e4053019bb800b041c0ac88da493"
+ integrity sha512-wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA==
+ dependencies:
+ readable-stream "^2.3.5"
+ safe-buffer "^5.1.1"
+
+bluebird@3.5.1:
+ version "3.5.1"
+ resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+ integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==
+
+bson@^1.1.4:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.4.tgz#f76870d799f15b854dffb7ee32f0a874797f7e89"
+ integrity sha512-S/yKGU1syOMzO86+dGpg2qGoDL0zvzcb262G+gqEy6TgP6rt6z6qxSFX/8X6vLC91P7G7C3nLs0+bvDzmvBA3Q==
+
+core-util-is@~1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+ integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+debug@3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+ integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+ dependencies:
+ ms "2.0.0"
+
+denque@^1.4.1:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf"
+ integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==
+
+glob-to-regexp@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+ integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
+
+inherits@~2.0.3:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+isarray@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+ integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+kareem@2.3.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.3.1.tgz#def12d9c941017fabfb00f873af95e9c99e1be87"
+ integrity sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw==
+
+memory-pager@^1.0.2:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5"
+ integrity sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==
+
+mongodb@3.5.6:
+ version "3.5.6"
+ resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.5.6.tgz#a1be2d9796c8a8a5b0e6bcbc6baaaa406bd5c0d5"
+ integrity sha512-sh3q3GLDLT4QmoDLamxtAECwC3RGjq+oNuK1ENV8+tnipIavss6sMYt77hpygqlMOCt0Sla5cl7H4SKCVBCGEg==
+ dependencies:
+ bl "^2.2.0"
+ bson "^1.1.4"
+ denque "^1.4.1"
+ require_optional "^1.0.1"
+ safe-buffer "^5.1.2"
+ optionalDependencies:
+ saslprep "^1.0.0"
+
+mongoose-legacy-pluralize@1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
+ integrity sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==
+
+mongoose@^5.9.10:
+ version "5.9.10"
+ resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.9.10.tgz#e0f0e5e2f14fac1fe219123515630eba165f27bc"
+ integrity sha512-w1HNukfJzzDLfcI1f79h2Wj4ogVbf+X8hRkyFgqlcjK7OnDlAgahjDMIsT+mCS9jKojrMhjSsZIs9FiRPkLqMg==
+ dependencies:
+ bson "^1.1.4"
+ kareem "2.3.1"
+ mongodb "3.5.6"
+ mongoose-legacy-pluralize "1.0.2"
+ mpath "0.7.0"
+ mquery "3.2.2"
+ ms "2.1.2"
+ regexp-clone "1.0.0"
+ safe-buffer "5.1.2"
+ sift "7.0.1"
+ sliced "1.0.1"
+
+mpath@0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.7.0.tgz#20e8102e276b71709d6e07e9f8d4d0f641afbfb8"
+ integrity sha512-Aiq04hILxhz1L+f7sjGyn7IxYzWm1zLNNXcfhDtx04kZ2Gk7uvFdgZ8ts1cWa/6d0TQmag2yR8zSGZUmp0tFNg==
+
+mquery@3.2.2:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/mquery/-/mquery-3.2.2.tgz#e1383a3951852ce23e37f619a9b350f1fb3664e7"
+ integrity sha512-XB52992COp0KP230I3qloVUbkLUxJIu328HBP2t2EsxSFtf4W1HPSOBWOXf1bqxK4Xbb66lfMJ+Bpfd9/yZE1Q==
+ dependencies:
+ bluebird "3.5.1"
+ debug "3.1.0"
+ regexp-clone "^1.0.0"
+ safe-buffer "5.1.2"
+ sliced "1.0.1"
+
+ms@2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+ integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.2:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+ integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+process-nextick-args@~2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+ integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+readable-stream@^2.3.5:
+ version "2.3.7"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+ integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+ dependencies:
+ core-util-is "~1.0.0"
+ inherits "~2.0.3"
+ isarray "~1.0.0"
+ process-nextick-args "~2.0.0"
+ safe-buffer "~5.1.1"
+ string_decoder "~1.1.1"
+ util-deprecate "~1.0.1"
+
+regexp-clone@1.0.0, regexp-clone@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-1.0.0.tgz#222db967623277056260b992626354a04ce9bf63"
+ integrity sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw==
+
+require_optional@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.1.tgz#4cf35a4247f64ca3df8c2ef208cc494b1ca8fc2e"
+ integrity sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==
+ dependencies:
+ resolve-from "^2.0.0"
+ semver "^5.1.0"
+
+resolve-from@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+ integrity sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=
+
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+ version "5.1.2"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+ integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-buffer@^5.1.1, safe-buffer@^5.1.2:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+ integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+
+saslprep@^1.0.0:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226"
+ integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==
+ dependencies:
+ sparse-bitfield "^3.0.3"
+
+semver@^5.1.0:
+ version "5.7.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+ integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+sift@7.0.1:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/sift/-/sift-7.0.1.tgz#47d62c50b159d316f1372f8b53f9c10cd21a4b08"
+ integrity sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g==
+
+sliced@1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41"
+ integrity sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=
+
+sparse-bitfield@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11"
+ integrity sha1-/0rm5oZWBWuks+eSqzM004JzyhE=
+ dependencies:
+ memory-pager "^1.0.2"
+
+string_decoder@~1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+ integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+ dependencies:
+ safe-buffer "~5.1.0"
+
+util-deprecate@~1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+ integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
diff --git a/Composer/plugins/samples/.eslintrc.js b/Composer/plugins/samples/.eslintrc.js
new file mode 100644
index 0000000000..bcfa12e31d
--- /dev/null
+++ b/Composer/plugins/samples/.eslintrc.js
@@ -0,0 +1,10 @@
+module.exports = {
+ extends: ['../../.eslintrc.js'],
+ parserOptions: {
+ project: './tsconfig.json',
+ tsconfigRootDir: __dirname,
+ },
+ rules: {
+ 'security/detect-non-literal-fs-filename': 'off',
+ },
+};
diff --git a/Composer/plugins/samples/.gitignore b/Composer/plugins/samples/.gitignore
new file mode 100644
index 0000000000..43ae3f7fd8
--- /dev/null
+++ b/Composer/plugins/samples/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+lib
+package-lock.json
\ No newline at end of file
diff --git a/Composer/packages/server/assets/projects/ActionsSample/actionssample.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/actionssample.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/actionssample.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/actionssample.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/actions/actions.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/actions/actions.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/actions/actions.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/actions/actions.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/actions/language-generation/en-us/actions.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/actions/language-generation/en-us/actions.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/actions/language-generation/en-us/actions.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/actions/language-generation/en-us/actions.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/actions/language-understanding/en-us/actions.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/actions/language-understanding/en-us/actions.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/actions/language-understanding/en-us/actions.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/actions/language-understanding/en-us/actions.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/editactions/editactions.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/editactions/editactions.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/editactions/editactions.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/editactions/editactions.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/editactions/language-generation/en-us/editactions.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/editactions/language-generation/en-us/editactions.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/editactions/language-generation/en-us/editactions.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/editactions/language-generation/en-us/editactions.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/editactions/language-understanding/en-us/editactions.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/editactions/language-understanding/en-us/editactions.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/editactions/language-understanding/en-us/editactions.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/editactions/language-understanding/en-us/editactions.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/editarray/editarray.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/editarray/editarray.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/editarray/editarray.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/editarray/editarray.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/editarray/language-generation/en-us/editarray.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/editarray/language-generation/en-us/editarray.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/editarray/language-generation/en-us/editarray.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/editarray/language-generation/en-us/editarray.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/editarray/language-understanding/en-us/editarray.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/editarray/language-understanding/en-us/editarray.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/editarray/language-understanding/en-us/editarray.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/editarray/language-understanding/en-us/editarray.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/emitanevent/emitanevent.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/emitanevent/emitanevent.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/emitanevent/emitanevent.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/emitanevent/emitanevent.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/emitanevent/language-generation/en-us/emitanevent.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/emitanevent/language-generation/en-us/emitanevent.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/emitanevent/language-generation/en-us/emitanevent.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/emitanevent/language-generation/en-us/emitanevent.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/emitanevent/language-understanding/en-us/emitanevent.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/emitanevent/language-understanding/en-us/emitanevent.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/emitanevent/language-understanding/en-us/emitanevent.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/emitanevent/language-understanding/en-us/emitanevent.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/emitevent/emitevent.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/emitevent/emitevent.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/emitevent/emitevent.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/emitevent/emitevent.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/emitevent/language-generation/en-us/emitevent.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/emitevent/language-generation/en-us/emitevent.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/emitevent/language-generation/en-us/emitevent.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/emitevent/language-generation/en-us/emitevent.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/emitevent/language-understanding/en-us/emitevent.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/emitevent/language-understanding/en-us/emitevent.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/emitevent/language-understanding/en-us/emitevent.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/emitevent/language-understanding/en-us/emitevent.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/enddialog/dialogs/telljoke/language-generation/en-us/telljoke.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/enddialog/dialogs/telljoke/language-generation/en-us/telljoke.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/enddialog/dialogs/telljoke/language-generation/en-us/telljoke.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/enddialog/dialogs/telljoke/language-generation/en-us/telljoke.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/enddialog/dialogs/telljoke/language-understanding/en-us/telljoke.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/enddialog/dialogs/telljoke/language-understanding/en-us/telljoke.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/enddialog/dialogs/telljoke/language-understanding/en-us/telljoke.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/enddialog/dialogs/telljoke/language-understanding/en-us/telljoke.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/enddialog/dialogs/telljoke/telljoke.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/enddialog/dialogs/telljoke/telljoke.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/enddialog/dialogs/telljoke/telljoke.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/enddialog/dialogs/telljoke/telljoke.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/enddialog/enddialog.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/enddialog/enddialog.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/enddialog/enddialog.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/enddialog/enddialog.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/enddialog/language-generation/en-us/enddialog.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/enddialog/language-generation/en-us/enddialog.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/enddialog/language-generation/en-us/enddialog.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/enddialog/language-generation/en-us/enddialog.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/enddialog/language-understanding/en-us/enddialog.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/enddialog/language-understanding/en-us/enddialog.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/enddialog/language-understanding/en-us/enddialog.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/enddialog/language-understanding/en-us/enddialog.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/endturn/endturn.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/endturn/endturn.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/endturn/endturn.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/endturn/endturn.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/endturn/language-generation/en-us/endturn.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/endturn/language-generation/en-us/endturn.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/endturn/language-generation/en-us/endturn.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/endturn/language-generation/en-us/endturn.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/endturn/language-understanding/en-us/endturn.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/endturn/language-understanding/en-us/endturn.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/endturn/language-understanding/en-us/endturn.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/endturn/language-understanding/en-us/endturn.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/httprequest/httprequest.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/httprequest/httprequest.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/httprequest/httprequest.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/httprequest/httprequest.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/httprequest/language-generation/en-us/httprequest.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/httprequest/language-generation/en-us/httprequest.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/httprequest/language-generation/en-us/httprequest.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/httprequest/language-generation/en-us/httprequest.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/httprequest/language-understanding/en-us/httprequest.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/httprequest/language-understanding/en-us/httprequest.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/httprequest/language-understanding/en-us/httprequest.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/httprequest/language-understanding/en-us/httprequest.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/ifcondition/ifcondition.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/ifcondition/ifcondition.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/ifcondition/ifcondition.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/ifcondition/ifcondition.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/ifcondition/language-generation/en-us/ifcondition.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/ifcondition/language-generation/en-us/ifcondition.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/ifcondition/language-generation/en-us/ifcondition.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/ifcondition/language-generation/en-us/ifcondition.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/ifcondition/language-understanding/en-us/ifcondition.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/ifcondition/language-understanding/en-us/ifcondition.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/ifcondition/language-understanding/en-us/ifcondition.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/ifcondition/language-understanding/en-us/ifcondition.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/qnamakeraction/language-generation/en-us/qnamakeraction.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/qnamakeraction/language-generation/en-us/qnamakeraction.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/qnamakeraction/language-generation/en-us/qnamakeraction.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/qnamakeraction/language-generation/en-us/qnamakeraction.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/qnamakeraction/language-understanding/en-us/qnamakeraction.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/qnamakeraction/language-understanding/en-us/qnamakeraction.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/qnamakeraction/language-understanding/en-us/qnamakeraction.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/qnamakeraction/language-understanding/en-us/qnamakeraction.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/qnamakeraction/qnamakeraction.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/qnamakeraction/qnamakeraction.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/qnamakeraction/qnamakeraction.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/qnamakeraction/qnamakeraction.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/repeatdialog/language-generation/en-us/repeatdialog.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/repeatdialog/language-generation/en-us/repeatdialog.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/repeatdialog/language-generation/en-us/repeatdialog.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/repeatdialog/language-generation/en-us/repeatdialog.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/repeatdialog/language-understanding/en-us/repeatdialog.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/repeatdialog/language-understanding/en-us/repeatdialog.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/repeatdialog/language-understanding/en-us/repeatdialog.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/repeatdialog/language-understanding/en-us/repeatdialog.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/repeatdialog/repeatdialog.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/repeatdialog/repeatdialog.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/repeatdialog/repeatdialog.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/repeatdialog/repeatdialog.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/fortunetellerdialog/fortunetellerdialog.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/fortunetellerdialog/fortunetellerdialog.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/fortunetellerdialog/fortunetellerdialog.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/fortunetellerdialog/fortunetellerdialog.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/fortunetellerdialog/language-generation/en-us/fortunetellerdialog.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/fortunetellerdialog/language-generation/en-us/fortunetellerdialog.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/fortunetellerdialog/language-generation/en-us/fortunetellerdialog.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/fortunetellerdialog/language-generation/en-us/fortunetellerdialog.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/fortunetellerdialog/language-understanding/en-us/fortunetellerdialog.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/fortunetellerdialog/language-understanding/en-us/fortunetellerdialog.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/fortunetellerdialog/language-understanding/en-us/fortunetellerdialog.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/fortunetellerdialog/language-understanding/en-us/fortunetellerdialog.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/telljokedialog/language-generation/en-us/telljokedialog.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/telljokedialog/language-generation/en-us/telljokedialog.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/telljokedialog/language-generation/en-us/telljokedialog.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/telljokedialog/language-generation/en-us/telljokedialog.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/telljokedialog/language-understanding/en-us/telljokedialog.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/telljokedialog/language-understanding/en-us/telljokedialog.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/telljokedialog/language-understanding/en-us/telljokedialog.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/telljokedialog/language-understanding/en-us/telljokedialog.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/telljokedialog/telljokedialog.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/telljokedialog/telljokedialog.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/telljokedialog/telljokedialog.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/dialogs/telljokedialog/telljokedialog.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/language-generation/en-us/replacedialog.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/language-generation/en-us/replacedialog.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/language-generation/en-us/replacedialog.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/language-generation/en-us/replacedialog.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/language-understanding/en-us/replacedialog.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/language-understanding/en-us/replacedialog.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/language-understanding/en-us/replacedialog.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/language-understanding/en-us/replacedialog.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/replacedialog.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/replacedialog.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/replacedialog/replacedialog.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/replacedialog/replacedialog.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/switchcondition/language-generation/en-us/switchcondition.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/switchcondition/language-generation/en-us/switchcondition.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/switchcondition/language-generation/en-us/switchcondition.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/switchcondition/language-generation/en-us/switchcondition.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/switchcondition/language-understanding/en-us/switchcondition.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/switchcondition/language-understanding/en-us/switchcondition.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/switchcondition/language-understanding/en-us/switchcondition.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/switchcondition/language-understanding/en-us/switchcondition.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/switchcondition/switchcondition.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/switchcondition/switchcondition.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/switchcondition/switchcondition.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/switchcondition/switchcondition.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/traceandlog/language-generation/en-us/traceandlog.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/traceandlog/language-generation/en-us/traceandlog.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/traceandlog/language-generation/en-us/traceandlog.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/traceandlog/language-generation/en-us/traceandlog.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/traceandlog/language-understanding/en-us/traceandlog.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/traceandlog/language-understanding/en-us/traceandlog.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/traceandlog/language-understanding/en-us/traceandlog.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/traceandlog/language-understanding/en-us/traceandlog.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ActionsSample/dialogs/traceandlog/traceandlog.dialog b/Composer/plugins/samples/assets/projects/ActionsSample/dialogs/traceandlog/traceandlog.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/dialogs/traceandlog/traceandlog.dialog
rename to Composer/plugins/samples/assets/projects/ActionsSample/dialogs/traceandlog/traceandlog.dialog
diff --git a/Composer/packages/server/assets/projects/ActionsSample/language-generation/en-us/actionssample.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/language-generation/en-us/actionssample.en-us.lg
similarity index 65%
rename from Composer/packages/server/assets/projects/ActionsSample/language-generation/en-us/actionssample.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/language-generation/en-us/actionssample.en-us.lg
index 50f383267b..6905535799 100644
--- a/Composer/packages/server/assets/projects/ActionsSample/language-generation/en-us/actionssample.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/ActionsSample/language-generation/en-us/actionssample.en-us.lg
@@ -1,7 +1,7 @@
[import](common.lg)
# SendActivity_640616
--${help()}
+-${WelcomeUser()}
# SendActivity_640617
--${help()}
\ No newline at end of file
+-${WelcomeUser()}
\ No newline at end of file
diff --git a/Composer/packages/server/assets/projects/ActionsSample/language-generation/en-us/common.en-us.lg b/Composer/plugins/samples/assets/projects/ActionsSample/language-generation/en-us/common.en-us.lg
similarity index 96%
rename from Composer/packages/server/assets/projects/ActionsSample/language-generation/en-us/common.en-us.lg
rename to Composer/plugins/samples/assets/projects/ActionsSample/language-generation/en-us/common.en-us.lg
index c0bd663a56..3e8d9f5b6f 100644
--- a/Composer/packages/server/assets/projects/ActionsSample/language-generation/en-us/common.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/ActionsSample/language-generation/en-us/common.en-us.lg
@@ -1,4 +1,4 @@
-# help
+# WelcomeUser
-```I can show you examples on how to use actions. Enter the number next to the entity that you with to see in action.
01 - Actions
02 - EndTurn
diff --git a/Composer/packages/server/assets/projects/ActionsSample/language-understanding/en-us/actionssample.en-us.lu b/Composer/plugins/samples/assets/projects/ActionsSample/language-understanding/en-us/actionssample.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ActionsSample/language-understanding/en-us/actionssample.en-us.lu
rename to Composer/plugins/samples/assets/projects/ActionsSample/language-understanding/en-us/actionssample.en-us.lu
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/askingquestionssample.dialog b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/askingquestionssample.dialog
similarity index 98%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/askingquestionssample.dialog
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/askingquestionssample.dialog
index e35038a0de..a0dbfd3000 100644
--- a/Composer/packages/server/assets/projects/AskingQuestionsSample/askingquestionssample.dialog
+++ b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/askingquestionssample.dialog
@@ -65,7 +65,7 @@
"actions": [
{
"$kind": "Microsoft.SendActivity",
- "activity": "${help()}"
+ "activity": "${WelcomeUser()}"
}
]
}
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/attachmentinput/attachmentinput.dialog b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/attachmentinput/attachmentinput.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/attachmentinput/attachmentinput.dialog
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/attachmentinput/attachmentinput.dialog
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/attachmentinput/language-generation/en-us/attachmentinput.en-us.lg b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/attachmentinput/language-generation/en-us/attachmentinput.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/attachmentinput/language-generation/en-us/attachmentinput.en-us.lg
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/attachmentinput/language-generation/en-us/attachmentinput.en-us.lg
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/attachmentinput/language-understanding/en-us/attachmentinput.en-us.lu b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/attachmentinput/language-understanding/en-us/attachmentinput.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/attachmentinput/language-understanding/en-us/attachmentinput.en-us.lu
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/attachmentinput/language-understanding/en-us/attachmentinput.en-us.lu
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/choiceinput/choiceinput.dialog b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/choiceinput/choiceinput.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/choiceinput/choiceinput.dialog
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/choiceinput/choiceinput.dialog
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/choiceinput/language-generation/en-us/choiceinput.en-us.lg b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/choiceinput/language-generation/en-us/choiceinput.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/choiceinput/language-generation/en-us/choiceinput.en-us.lg
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/choiceinput/language-generation/en-us/choiceinput.en-us.lg
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/choiceinput/language-understanding/en-us/choiceinput.en-us.lu b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/choiceinput/language-understanding/en-us/choiceinput.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/choiceinput/language-understanding/en-us/choiceinput.en-us.lu
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/choiceinput/language-understanding/en-us/choiceinput.en-us.lu
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/confirminput/confirminput.dialog b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/confirminput/confirminput.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/confirminput/confirminput.dialog
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/confirminput/confirminput.dialog
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/confirminput/language-generation/en-us/confirminput.en-us.lg b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/confirminput/language-generation/en-us/confirminput.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/confirminput/language-generation/en-us/confirminput.en-us.lg
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/confirminput/language-generation/en-us/confirminput.en-us.lg
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/confirminput/language-understanding/en-us/confirminput.en-us.lu b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/confirminput/language-understanding/en-us/confirminput.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/confirminput/language-understanding/en-us/confirminput.en-us.lu
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/confirminput/language-understanding/en-us/confirminput.en-us.lu
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/datetimeinput/datetimeinput.dialog b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/datetimeinput/datetimeinput.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/datetimeinput/datetimeinput.dialog
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/datetimeinput/datetimeinput.dialog
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/datetimeinput/language-generation/en-us/datetimeinput.en-us.lg b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/datetimeinput/language-generation/en-us/datetimeinput.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/datetimeinput/language-generation/en-us/datetimeinput.en-us.lg
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/datetimeinput/language-generation/en-us/datetimeinput.en-us.lg
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/datetimeinput/language-understanding/en-us/datetimeinput.en-us.lu b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/datetimeinput/language-understanding/en-us/datetimeinput.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/datetimeinput/language-understanding/en-us/datetimeinput.en-us.lu
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/datetimeinput/language-understanding/en-us/datetimeinput.en-us.lu
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/numberinput/language-generation/en-us/numberinput.en-us.lg b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/numberinput/language-generation/en-us/numberinput.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/numberinput/language-generation/en-us/numberinput.en-us.lg
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/numberinput/language-generation/en-us/numberinput.en-us.lg
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/numberinput/language-understanding/en-us/numberinput.en-us.lu b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/numberinput/language-understanding/en-us/numberinput.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/numberinput/language-understanding/en-us/numberinput.en-us.lu
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/numberinput/language-understanding/en-us/numberinput.en-us.lu
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/numberinput/numberinput.dialog b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/numberinput/numberinput.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/numberinput/numberinput.dialog
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/numberinput/numberinput.dialog
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/oauthinput/language-generation/en-us/oauthinput.en-us.lg b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/oauthinput/language-generation/en-us/oauthinput.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/oauthinput/language-generation/en-us/oauthinput.en-us.lg
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/oauthinput/language-generation/en-us/oauthinput.en-us.lg
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/oauthinput/language-understanding/en-us/oauthinput.en-us.lu b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/oauthinput/language-understanding/en-us/oauthinput.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/oauthinput/language-understanding/en-us/oauthinput.en-us.lu
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/oauthinput/language-understanding/en-us/oauthinput.en-us.lu
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/oauthinput/oauthinput.dialog b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/oauthinput/oauthinput.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/oauthinput/oauthinput.dialog
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/oauthinput/oauthinput.dialog
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/textinput/language-generation/en-us/textinput.en-us.lg b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/textinput/language-generation/en-us/textinput.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/textinput/language-generation/en-us/textinput.en-us.lg
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/textinput/language-generation/en-us/textinput.en-us.lg
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/textinput/language-understanding/en-us/textinput.en-us.lu b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/textinput/language-understanding/en-us/textinput.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/textinput/language-understanding/en-us/textinput.en-us.lu
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/textinput/language-understanding/en-us/textinput.en-us.lu
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/textinput/textinput.dialog b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/textinput/textinput.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/dialogs/textinput/textinput.dialog
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/dialogs/textinput/textinput.dialog
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/language-generation/en-us/askingquestionssample.en-us.lg b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/language-generation/en-us/askingquestionssample.en-us.lg
similarity index 65%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/language-generation/en-us/askingquestionssample.en-us.lg
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/language-generation/en-us/askingquestionssample.en-us.lg
index b88e047b08..f227f98f43 100644
--- a/Composer/packages/server/assets/projects/AskingQuestionsSample/language-generation/en-us/askingquestionssample.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/language-generation/en-us/askingquestionssample.en-us.lg
@@ -1,7 +1,7 @@
[import](common.lg)
# SendActivity_068558
--${help()}
+-${WelcomeUser()}
# SendActivity_581197
--${help()}
\ No newline at end of file
+-${WelcomeUser()}
\ No newline at end of file
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/language-generation/en-us/common.en-us.lg b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/language-generation/en-us/common.en-us.lg
similarity index 96%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/language-generation/en-us/common.en-us.lg
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/language-generation/en-us/common.en-us.lg
index 218fcce578..ee6d2966a8 100644
--- a/Composer/packages/server/assets/projects/AskingQuestionsSample/language-generation/en-us/common.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/language-generation/en-us/common.en-us.lg
@@ -1,4 +1,4 @@
-# help
+# WelcomeUser
-```Welcome to Input Sample Bot.
I can show you examples on how to use actions, You can enter number 01-07
01 - TextInput
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/language-understanding/en-us/askingquestionssample.en-us.lu b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/language-understanding/en-us/askingquestionssample.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/AskingQuestionsSample/language-understanding/en-us/askingquestionssample.en-us.lu
rename to Composer/plugins/samples/assets/projects/AskingQuestionsSample/language-understanding/en-us/askingquestionssample.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/controllingconversationflowsample.dialog b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/controllingconversationflowsample.dialog
similarity index 98%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/controllingconversationflowsample.dialog
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/controllingconversationflowsample.dialog
index 65b98ff295..36fc5900c7 100644
--- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/controllingconversationflowsample.dialog
+++ b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/controllingconversationflowsample.dialog
@@ -164,7 +164,7 @@
"$designer": {
"id": "953339"
},
- "activity": "${help()}"
+ "activity": "${WelcomeUser()}"
}
]
},
@@ -197,7 +197,7 @@
"id": "859266",
"name": "Send a response"
},
- "activity": "${help()}"
+ "activity": "${WelcomeUser()}"
}
]
}
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/canceldialog/canceldialog.dialog b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/canceldialog/canceldialog.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/canceldialog/canceldialog.dialog
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/canceldialog/canceldialog.dialog
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/canceldialog/language-generation/en-us/canceldialog.en-us.lg b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/canceldialog/language-generation/en-us/canceldialog.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/canceldialog/language-generation/en-us/canceldialog.en-us.lg
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/canceldialog/language-generation/en-us/canceldialog.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/canceldialog/language-understanding/en-us/canceldialog.en-us.lu b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/canceldialog/language-understanding/en-us/canceldialog.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/canceldialog/language-understanding/en-us/canceldialog.en-us.lu
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/canceldialog/language-understanding/en-us/canceldialog.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachpagestep/foreachpagestep.dialog b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachpagestep/foreachpagestep.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachpagestep/foreachpagestep.dialog
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachpagestep/foreachpagestep.dialog
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachpagestep/language-generation/en-us/foreachpagestep.en-us.lg b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachpagestep/language-generation/en-us/foreachpagestep.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachpagestep/language-generation/en-us/foreachpagestep.en-us.lg
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachpagestep/language-generation/en-us/foreachpagestep.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachpagestep/language-understanding/en-us/foreachpagestep.en-us.lu b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachpagestep/language-understanding/en-us/foreachpagestep.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachpagestep/language-understanding/en-us/foreachpagestep.en-us.lu
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachpagestep/language-understanding/en-us/foreachpagestep.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachstep/foreachstep.dialog b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachstep/foreachstep.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachstep/foreachstep.dialog
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachstep/foreachstep.dialog
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachstep/language-generation/en-us/foreachstep.en-us.lg b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachstep/language-generation/en-us/foreachstep.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachstep/language-generation/en-us/foreachstep.en-us.lg
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachstep/language-generation/en-us/foreachstep.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachstep/language-understanding/en-us/foreachstep.en-us.lu b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachstep/language-understanding/en-us/foreachstep.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachstep/language-understanding/en-us/foreachstep.en-us.lu
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachstep/language-understanding/en-us/foreachstep.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachwithbreakandcontinue/foreachwithbreakandcontinue.dialog b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachwithbreakandcontinue/foreachwithbreakandcontinue.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachwithbreakandcontinue/foreachwithbreakandcontinue.dialog
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachwithbreakandcontinue/foreachwithbreakandcontinue.dialog
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachwithbreakandcontinue/language-generation/en-us/foreachwithbreakandcontinue.en-us.lg b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachwithbreakandcontinue/language-generation/en-us/foreachwithbreakandcontinue.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachwithbreakandcontinue/language-generation/en-us/foreachwithbreakandcontinue.en-us.lg
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachwithbreakandcontinue/language-generation/en-us/foreachwithbreakandcontinue.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachwithbreakandcontinue/language-understanding/en-us/foreachwithbreakandcontinue.en-us.lu b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachwithbreakandcontinue/language-understanding/en-us/foreachwithbreakandcontinue.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/foreachwithbreakandcontinue/language-understanding/en-us/foreachwithbreakandcontinue.en-us.lu
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/foreachwithbreakandcontinue/language-understanding/en-us/foreachwithbreakandcontinue.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/gotoaction/gotoaction.dialog b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/gotoaction/gotoaction.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/gotoaction/gotoaction.dialog
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/gotoaction/gotoaction.dialog
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/gotoaction/language-generation/en-us/gotoaction.en-us.lg b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/gotoaction/language-generation/en-us/gotoaction.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/gotoaction/language-generation/en-us/gotoaction.en-us.lg
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/gotoaction/language-generation/en-us/gotoaction.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/gotoaction/language-understanding/en-us/gotoaction.en-us.lu b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/gotoaction/language-understanding/en-us/gotoaction.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/gotoaction/language-understanding/en-us/gotoaction.en-us.lu
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/gotoaction/language-understanding/en-us/gotoaction.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/ifcondition/ifcondition.dialog b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/ifcondition/ifcondition.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/ifcondition/ifcondition.dialog
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/ifcondition/ifcondition.dialog
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/ifcondition/language-generation/en-us/ifcondition.en-us.lg b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/ifcondition/language-generation/en-us/ifcondition.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/ifcondition/language-generation/en-us/ifcondition.en-us.lg
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/ifcondition/language-generation/en-us/ifcondition.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/ifcondition/language-understanding/en-us/ifcondition.en-us.lu b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/ifcondition/language-understanding/en-us/ifcondition.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/ifcondition/language-understanding/en-us/ifcondition.en-us.lu
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/ifcondition/language-understanding/en-us/ifcondition.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/repeatdialog/language-generation/en-us/repeatdialog.en-us.lg b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/repeatdialog/language-generation/en-us/repeatdialog.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/repeatdialog/language-generation/en-us/repeatdialog.en-us.lg
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/repeatdialog/language-generation/en-us/repeatdialog.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/repeatdialog/language-understanding/en-us/repeatdialog.en-us.lu b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/repeatdialog/language-understanding/en-us/repeatdialog.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/repeatdialog/language-understanding/en-us/repeatdialog.en-us.lu
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/repeatdialog/language-understanding/en-us/repeatdialog.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/repeatdialog/repeatdialog.dialog b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/repeatdialog/repeatdialog.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/repeatdialog/repeatdialog.dialog
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/repeatdialog/repeatdialog.dialog
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/switchcondition/language-generation/en-us/switchcondition.en-us.lg b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/switchcondition/language-generation/en-us/switchcondition.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/switchcondition/language-generation/en-us/switchcondition.en-us.lg
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/switchcondition/language-generation/en-us/switchcondition.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/switchcondition/language-understanding/en-us/switchcondition.en-us.lu b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/switchcondition/language-understanding/en-us/switchcondition.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/switchcondition/language-understanding/en-us/switchcondition.en-us.lu
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/switchcondition/language-understanding/en-us/switchcondition.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/switchcondition/switchcondition.dialog b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/switchcondition/switchcondition.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/dialogs/switchcondition/switchcondition.dialog
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/dialogs/switchcondition/switchcondition.dialog
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/language-generation/en-us/common.en-us.lg b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/language-generation/en-us/common.en-us.lg
similarity index 96%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/language-generation/en-us/common.en-us.lg
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/language-generation/en-us/common.en-us.lg
index 23c7e89d2a..21687a6f94 100644
--- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/language-generation/en-us/common.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/language-generation/en-us/common.en-us.lg
@@ -1,4 +1,4 @@
-# help
+# WelcomeUser
[Activity
Text = ${helpText()}
SuggestedActions = IfCondition|SwitchCondition|ForeachStep|ForeachPageStep|Cancel|Endturn|RepeatDialog|ForeachWithBreakAndContinue|GotoAction
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/language-generation/en-us/controllingconversationflowsample.en-us.lg b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/language-generation/en-us/controllingconversationflowsample.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/language-generation/en-us/controllingconversationflowsample.en-us.lg
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/language-generation/en-us/controllingconversationflowsample.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/language-understanding/en-us/controllingconversationflowsample.en-us.lu b/Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/language-understanding/en-us/controllingconversationflowsample.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ControllingConversationFlowSample/language-understanding/en-us/controllingconversationflowsample.en-us.lu
rename to Composer/plugins/samples/assets/projects/ControllingConversationFlowSample/language-understanding/en-us/controllingconversationflowsample.en-us.lu
diff --git a/Composer/packages/server/assets/projects/EchoBot/echobot.dialog b/Composer/plugins/samples/assets/projects/EchoBot/echobot.dialog
similarity index 96%
rename from Composer/packages/server/assets/projects/EchoBot/echobot.dialog
rename to Composer/plugins/samples/assets/projects/EchoBot/echobot.dialog
index 9598a3a144..9882b850e2 100644
--- a/Composer/packages/server/assets/projects/EchoBot/echobot.dialog
+++ b/Composer/plugins/samples/assets/projects/EchoBot/echobot.dialog
@@ -50,7 +50,7 @@
"id": "859266",
"name": "Send a response"
},
- "activity": "${help()}"
+ "activity": "${SendActivity_Welcome()}"
}
]
}
diff --git a/Composer/packages/server/assets/projects/EchoBot/language-generation/en-us/common.en-us.lg b/Composer/plugins/samples/assets/projects/EchoBot/language-generation/en-us/common.en-us.lg
similarity index 69%
rename from Composer/packages/server/assets/projects/EchoBot/language-generation/en-us/common.en-us.lg
rename to Composer/plugins/samples/assets/projects/EchoBot/language-generation/en-us/common.en-us.lg
index c1303f3588..f2a885213f 100644
--- a/Composer/packages/server/assets/projects/EchoBot/language-generation/en-us/common.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/EchoBot/language-generation/en-us/common.en-us.lg
@@ -1,2 +1,2 @@
-# help
+# WelcomeUser
- Welcome to the EchoBot sample.
\ No newline at end of file
diff --git a/Composer/plugins/samples/assets/projects/EchoBot/language-generation/en-us/echobot.en-us.lg b/Composer/plugins/samples/assets/projects/EchoBot/language-generation/en-us/echobot.en-us.lg
new file mode 100644
index 0000000000..25c38553a9
--- /dev/null
+++ b/Composer/plugins/samples/assets/projects/EchoBot/language-generation/en-us/echobot.en-us.lg
@@ -0,0 +1,7 @@
+[import](common.lg)
+
+# SendActivity_Welcome
+- ${WelcomeUser()}
+
+# SendActivity_003038
+- You said '${turn.activity.text}'
diff --git a/Composer/packages/server/assets/projects/EchoBot/language-understanding/en-us/echobot.en-us.lu b/Composer/plugins/samples/assets/projects/EchoBot/language-understanding/en-us/echobot.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/EchoBot/language-understanding/en-us/echobot.en-us.lu
rename to Composer/plugins/samples/assets/projects/EchoBot/language-understanding/en-us/echobot.en-us.lu
diff --git a/Composer/packages/server/assets/projects/EmptyBot/emptybot.dialog b/Composer/plugins/samples/assets/projects/EmptyBot/emptybot.dialog
similarity index 95%
rename from Composer/packages/server/assets/projects/EmptyBot/emptybot.dialog
rename to Composer/plugins/samples/assets/projects/EmptyBot/emptybot.dialog
index 6332fad6a0..cc22dcb852 100644
--- a/Composer/packages/server/assets/projects/EmptyBot/emptybot.dialog
+++ b/Composer/plugins/samples/assets/projects/EmptyBot/emptybot.dialog
@@ -34,7 +34,7 @@
"id": "859266",
"name": "Send a response"
},
- "activity": "${help()}"
+ "activity": "${SendActivity_Welcome()}"
}
]
}
diff --git a/Composer/packages/server/assets/projects/EmptyBot/language-generation/en-us/common.en-us.lg b/Composer/plugins/samples/assets/projects/EmptyBot/language-generation/en-us/common.en-us.lg
similarity index 69%
rename from Composer/packages/server/assets/projects/EmptyBot/language-generation/en-us/common.en-us.lg
rename to Composer/plugins/samples/assets/projects/EmptyBot/language-generation/en-us/common.en-us.lg
index 6ccfc5abcb..65cae9d65f 100644
--- a/Composer/packages/server/assets/projects/EmptyBot/language-generation/en-us/common.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/EmptyBot/language-generation/en-us/common.en-us.lg
@@ -1,2 +1,2 @@
-# help
+# WelcomeUser
- Welcome to the EmptyBot sample
\ No newline at end of file
diff --git a/Composer/plugins/samples/assets/projects/EmptyBot/language-generation/en-us/emptybot.en-us.lg b/Composer/plugins/samples/assets/projects/EmptyBot/language-generation/en-us/emptybot.en-us.lg
new file mode 100644
index 0000000000..de332cb328
--- /dev/null
+++ b/Composer/plugins/samples/assets/projects/EmptyBot/language-generation/en-us/emptybot.en-us.lg
@@ -0,0 +1,4 @@
+[import](common.lg)
+
+# SendActivity_Welcome
+- ${WelcomeUser()}
diff --git a/Composer/packages/server/assets/projects/EmptyBot/language-understanding/en-us/emptybot.en-us.lu b/Composer/plugins/samples/assets/projects/EmptyBot/language-understanding/en-us/emptybot.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/EmptyBot/language-understanding/en-us/emptybot.en-us.lu
rename to Composer/plugins/samples/assets/projects/EmptyBot/language-understanding/en-us/emptybot.en-us.lu
diff --git a/Composer/packages/server/assets/projects/InterruptionSample/dialogs/getprofile/getprofile.dialog b/Composer/plugins/samples/assets/projects/InterruptionSample/dialogs/getprofile/getprofile.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/InterruptionSample/dialogs/getprofile/getprofile.dialog
rename to Composer/plugins/samples/assets/projects/InterruptionSample/dialogs/getprofile/getprofile.dialog
diff --git a/Composer/packages/server/assets/projects/InterruptionSample/dialogs/getprofile/language-generation/en-us/getprofile.en-us.lg b/Composer/plugins/samples/assets/projects/InterruptionSample/dialogs/getprofile/language-generation/en-us/getprofile.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/InterruptionSample/dialogs/getprofile/language-generation/en-us/getprofile.en-us.lg
rename to Composer/plugins/samples/assets/projects/InterruptionSample/dialogs/getprofile/language-generation/en-us/getprofile.en-us.lg
diff --git a/Composer/packages/server/assets/projects/InterruptionSample/dialogs/getprofile/language-understanding/en-us/getprofile.en-us.lu b/Composer/plugins/samples/assets/projects/InterruptionSample/dialogs/getprofile/language-understanding/en-us/getprofile.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/InterruptionSample/dialogs/getprofile/language-understanding/en-us/getprofile.en-us.lu
rename to Composer/plugins/samples/assets/projects/InterruptionSample/dialogs/getprofile/language-understanding/en-us/getprofile.en-us.lu
diff --git a/Composer/packages/server/assets/projects/InterruptionSample/interruptionsample.dialog b/Composer/plugins/samples/assets/projects/InterruptionSample/interruptionsample.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/InterruptionSample/interruptionsample.dialog
rename to Composer/plugins/samples/assets/projects/InterruptionSample/interruptionsample.dialog
diff --git a/Composer/packages/server/assets/projects/InterruptionSample/language-generation/en-us/common.en-us.lg b/Composer/plugins/samples/assets/projects/InterruptionSample/language-generation/en-us/common.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/InterruptionSample/language-generation/en-us/common.en-us.lg
rename to Composer/plugins/samples/assets/projects/InterruptionSample/language-generation/en-us/common.en-us.lg
diff --git a/Composer/packages/server/assets/projects/InterruptionSample/language-generation/en-us/interruptionsample.en-us.lg b/Composer/plugins/samples/assets/projects/InterruptionSample/language-generation/en-us/interruptionsample.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/InterruptionSample/language-generation/en-us/interruptionsample.en-us.lg
rename to Composer/plugins/samples/assets/projects/InterruptionSample/language-generation/en-us/interruptionsample.en-us.lg
diff --git a/Composer/packages/server/assets/projects/InterruptionSample/language-understanding/en-us/interruptionsample.en-us.lu b/Composer/plugins/samples/assets/projects/InterruptionSample/language-understanding/en-us/interruptionsample.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/InterruptionSample/language-understanding/en-us/interruptionsample.en-us.lu
rename to Composer/plugins/samples/assets/projects/InterruptionSample/language-understanding/en-us/interruptionsample.en-us.lu
diff --git a/Composer/packages/server/assets/projects/QnAMakerLUISSample/language-generation/en-us/common.en-us.lg b/Composer/plugins/samples/assets/projects/QnAMakerLUISSample/language-generation/en-us/common.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/QnAMakerLUISSample/language-generation/en-us/common.en-us.lg
rename to Composer/plugins/samples/assets/projects/QnAMakerLUISSample/language-generation/en-us/common.en-us.lg
diff --git a/Composer/packages/server/assets/projects/QnAMakerLUISSample/language-generation/en-us/qnamakerluissample.en-us.lg b/Composer/plugins/samples/assets/projects/QnAMakerLUISSample/language-generation/en-us/qnamakerluissample.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/QnAMakerLUISSample/language-generation/en-us/qnamakerluissample.en-us.lg
rename to Composer/plugins/samples/assets/projects/QnAMakerLUISSample/language-generation/en-us/qnamakerluissample.en-us.lg
diff --git a/Composer/packages/server/assets/projects/QnAMakerLUISSample/language-understanding/en-us/qnamakerluissample.en-us.lu b/Composer/plugins/samples/assets/projects/QnAMakerLUISSample/language-understanding/en-us/qnamakerluissample.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/QnAMakerLUISSample/language-understanding/en-us/qnamakerluissample.en-us.lu
rename to Composer/plugins/samples/assets/projects/QnAMakerLUISSample/language-understanding/en-us/qnamakerluissample.en-us.lu
diff --git a/Composer/packages/server/assets/projects/QnAMakerLUISSample/qnamakerluissample.dialog b/Composer/plugins/samples/assets/projects/QnAMakerLUISSample/qnamakerluissample.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/QnAMakerLUISSample/qnamakerluissample.dialog
rename to Composer/plugins/samples/assets/projects/QnAMakerLUISSample/qnamakerluissample.dialog
diff --git a/Composer/packages/server/assets/projects/RespondingWithCardsSample/language-generation/en-us/adaptiveCard.json b/Composer/plugins/samples/assets/projects/RespondingWithCardsSample/language-generation/en-us/adaptiveCard.json
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithCardsSample/language-generation/en-us/adaptiveCard.json
rename to Composer/plugins/samples/assets/projects/RespondingWithCardsSample/language-generation/en-us/adaptiveCard.json
diff --git a/Composer/packages/server/assets/projects/RespondingWithCardsSample/language-generation/en-us/common.en-us.lg b/Composer/plugins/samples/assets/projects/RespondingWithCardsSample/language-generation/en-us/common.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithCardsSample/language-generation/en-us/common.en-us.lg
rename to Composer/plugins/samples/assets/projects/RespondingWithCardsSample/language-generation/en-us/common.en-us.lg
diff --git a/Composer/packages/server/assets/projects/RespondingWithCardsSample/language-generation/en-us/respondingwithcardssample.en-us.lg b/Composer/plugins/samples/assets/projects/RespondingWithCardsSample/language-generation/en-us/respondingwithcardssample.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithCardsSample/language-generation/en-us/respondingwithcardssample.en-us.lg
rename to Composer/plugins/samples/assets/projects/RespondingWithCardsSample/language-generation/en-us/respondingwithcardssample.en-us.lg
diff --git a/Composer/packages/server/assets/projects/RespondingWithCardsSample/language-understanding/en-us/respondingwithcardssample.en-us.lu b/Composer/plugins/samples/assets/projects/RespondingWithCardsSample/language-understanding/en-us/respondingwithcardssample.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithCardsSample/language-understanding/en-us/respondingwithcardssample.en-us.lu
rename to Composer/plugins/samples/assets/projects/RespondingWithCardsSample/language-understanding/en-us/respondingwithcardssample.en-us.lu
diff --git a/Composer/packages/server/assets/projects/RespondingWithCardsSample/respondingwithcardssample.dialog b/Composer/plugins/samples/assets/projects/RespondingWithCardsSample/respondingwithcardssample.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithCardsSample/respondingwithcardssample.dialog
rename to Composer/plugins/samples/assets/projects/RespondingWithCardsSample/respondingwithcardssample.dialog
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/ifelsecondition/ifelsecondition.dialog b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/ifelsecondition/ifelsecondition.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/ifelsecondition/ifelsecondition.dialog
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/ifelsecondition/ifelsecondition.dialog
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/ifelsecondition/language-generation/en-us/ifelsecondition.en-us.lg b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/ifelsecondition/language-generation/en-us/ifelsecondition.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/ifelsecondition/language-generation/en-us/ifelsecondition.en-us.lg
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/ifelsecondition/language-generation/en-us/ifelsecondition.en-us.lg
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/ifelsecondition/language-understanding/en-us/ifelsecondition.en-us.lu b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/ifelsecondition/language-understanding/en-us/ifelsecondition.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/ifelsecondition/language-understanding/en-us/ifelsecondition.en-us.lu
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/ifelsecondition/language-understanding/en-us/ifelsecondition.en-us.lu
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/lgcomposition/language-generation/en-us/lgcomposition.en-us.lg b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/lgcomposition/language-generation/en-us/lgcomposition.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/lgcomposition/language-generation/en-us/lgcomposition.en-us.lg
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/lgcomposition/language-generation/en-us/lgcomposition.en-us.lg
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/lgcomposition/language-understanding/en-us/lgcomposition.en-us.lu b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/lgcomposition/language-understanding/en-us/lgcomposition.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/lgcomposition/language-understanding/en-us/lgcomposition.en-us.lu
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/lgcomposition/language-understanding/en-us/lgcomposition.en-us.lu
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/lgcomposition/lgcomposition.dialog b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/lgcomposition/lgcomposition.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/lgcomposition/lgcomposition.dialog
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/lgcomposition/lgcomposition.dialog
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/lgwithparam/language-generation/en-us/lgwithparam.en-us.lg b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/lgwithparam/language-generation/en-us/lgwithparam.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/lgwithparam/language-generation/en-us/lgwithparam.en-us.lg
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/lgwithparam/language-generation/en-us/lgwithparam.en-us.lg
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/lgwithparam/language-understanding/en-us/lgwithparam.en-us.lu b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/lgwithparam/language-understanding/en-us/lgwithparam.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/lgwithparam/language-understanding/en-us/lgwithparam.en-us.lu
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/lgwithparam/language-understanding/en-us/lgwithparam.en-us.lu
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/lgwithparam/lgwithparam.dialog b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/lgwithparam/lgwithparam.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/lgwithparam/lgwithparam.dialog
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/lgwithparam/lgwithparam.dialog
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/multilinetext/language-generation/en-us/multilinetext.en-us.lg b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/multilinetext/language-generation/en-us/multilinetext.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/multilinetext/language-generation/en-us/multilinetext.en-us.lg
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/multilinetext/language-generation/en-us/multilinetext.en-us.lg
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/multilinetext/language-understanding/en-us/multilinetext.en-us.lu b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/multilinetext/language-understanding/en-us/multilinetext.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/multilinetext/language-understanding/en-us/multilinetext.en-us.lu
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/multilinetext/language-understanding/en-us/multilinetext.en-us.lu
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/multilinetext/multilinetext.dialog b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/multilinetext/multilinetext.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/multilinetext/multilinetext.dialog
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/multilinetext/multilinetext.dialog
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/simpletext/language-generation/en-us/simpletext.en-us.lg b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/simpletext/language-generation/en-us/simpletext.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/simpletext/language-generation/en-us/simpletext.en-us.lg
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/simpletext/language-generation/en-us/simpletext.en-us.lg
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/simpletext/language-understanding/en-us/simpletext.en-us.lu b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/simpletext/language-understanding/en-us/simpletext.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/simpletext/language-understanding/en-us/simpletext.en-us.lu
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/simpletext/language-understanding/en-us/simpletext.en-us.lu
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/simpletext/simpletext.dialog b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/simpletext/simpletext.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/simpletext/simpletext.dialog
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/simpletext/simpletext.dialog
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/structuredlg/language-generation/en-us/structuredlg.en-us.lg b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/structuredlg/language-generation/en-us/structuredlg.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/structuredlg/language-generation/en-us/structuredlg.en-us.lg
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/structuredlg/language-generation/en-us/structuredlg.en-us.lg
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/structuredlg/language-understanding/en-us/structuredlg.en-us.lu b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/structuredlg/language-understanding/en-us/structuredlg.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/structuredlg/language-understanding/en-us/structuredlg.en-us.lu
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/structuredlg/language-understanding/en-us/structuredlg.en-us.lu
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/structuredlg/structuredlg.dialog b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/structuredlg/structuredlg.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/structuredlg/structuredlg.dialog
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/structuredlg/structuredlg.dialog
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/switchcondition/language-generation/en-us/switchcondition.en-us.lg b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/switchcondition/language-generation/en-us/switchcondition.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/switchcondition/language-generation/en-us/switchcondition.en-us.lg
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/switchcondition/language-generation/en-us/switchcondition.en-us.lg
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/switchcondition/language-understanding/en-us/switchcondition.en-us.lu b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/switchcondition/language-understanding/en-us/switchcondition.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/switchcondition/language-understanding/en-us/switchcondition.en-us.lu
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/switchcondition/language-understanding/en-us/switchcondition.en-us.lu
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/switchcondition/switchcondition.dialog b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/switchcondition/switchcondition.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/switchcondition/switchcondition.dialog
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/switchcondition/switchcondition.dialog
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/textwithmemory/language-generation/en-us/textwithmemory.en-us.lg b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/textwithmemory/language-generation/en-us/textwithmemory.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/textwithmemory/language-generation/en-us/textwithmemory.en-us.lg
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/textwithmemory/language-generation/en-us/textwithmemory.en-us.lg
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/textwithmemory/language-understanding/en-us/textwithmemory.en-us.lu b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/textwithmemory/language-understanding/en-us/textwithmemory.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/textwithmemory/language-understanding/en-us/textwithmemory.en-us.lu
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/textwithmemory/language-understanding/en-us/textwithmemory.en-us.lu
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/textwithmemory/textwithmemory.dialog b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/textwithmemory/textwithmemory.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/dialogs/textwithmemory/textwithmemory.dialog
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/dialogs/textwithmemory/textwithmemory.dialog
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/language-generation/en-us/common.en-us.lg b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/language-generation/en-us/common.en-us.lg
similarity index 98%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/language-generation/en-us/common.en-us.lg
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/language-generation/en-us/common.en-us.lg
index e871b7d453..69a7b4063f 100644
--- a/Composer/packages/server/assets/projects/RespondingWithTextSample/language-generation/en-us/common.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/language-generation/en-us/common.en-us.lg
@@ -12,7 +12,7 @@
- Hey, this is simple text
- Hello, this is simple text
-# help
+# WelcomeUser
- ```
I can show you examples on sending messages. Restart the conversation to get started.
```
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/language-generation/en-us/respondingwithtextsample.en-us.lg b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/language-generation/en-us/respondingwithtextsample.en-us.lg
similarity index 91%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/language-generation/en-us/respondingwithtextsample.en-us.lg
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/language-generation/en-us/respondingwithtextsample.en-us.lg
index 6d18c7d205..5e8145711d 100644
--- a/Composer/packages/server/assets/projects/RespondingWithTextSample/language-generation/en-us/respondingwithtextsample.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/language-generation/en-us/respondingwithtextsample.en-us.lg
@@ -1,7 +1,7 @@
[import](common.lg)
# SendActivity_551445
--${help()}
+-${WelcomeUser()}
# SendActivity_576166
-Welcome to the Message Samples. You can use this sample to explore different capabilities of sending messages to users.
\ No newline at end of file
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/language-understanding/en-us/respondingwithtextsample.en-us.lu b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/language-understanding/en-us/respondingwithtextsample.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/language-understanding/en-us/respondingwithtextsample.en-us.lu
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/language-understanding/en-us/respondingwithtextsample.en-us.lu
diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/respondingwithtextsample.dialog b/Composer/plugins/samples/assets/projects/RespondingWithTextSample/respondingwithtextsample.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/RespondingWithTextSample/respondingwithtextsample.dialog
rename to Composer/plugins/samples/assets/projects/RespondingWithTextSample/respondingwithtextsample.dialog
diff --git a/BotProject/Templates/CSharp/.gitignore b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/.gitignore
similarity index 100%
rename from BotProject/Templates/CSharp/.gitignore
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/.gitignore
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/additem/additem.dialog b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/additem/additem.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/additem/additem.dialog
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/additem/additem.dialog
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/additem/language-generation/en-us/additem.en-us.lg b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/additem/language-generation/en-us/additem.en-us.lg
similarity index 96%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/additem/language-generation/en-us/additem.en-us.lg
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/additem/language-generation/en-us/additem.en-us.lg
index f2345c0e83..83e681aeeb 100644
--- a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/additem/language-generation/en-us/additem.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/additem/language-generation/en-us/additem.en-us.lg
@@ -1,13 +1,13 @@
-[import](common.lg)
-
-# TextInput_Prompt_282825()
-- What would you like to add?
-
-# TextInput_Prompt_878594()
-- Pick a list to add the item to..
-
-# SendActivity_139532()
-- Sure. I've added **${dialog.itemTitle}** to **${dialog.listType}** list. You have ${count(user.lists[dialog.listType])} items in your list.
-
-
-
+[import](common.lg)
+
+# TextInput_Prompt_282825()
+- What would you like to add?
+
+# TextInput_Prompt_878594()
+- Pick a list to add the item to..
+
+# SendActivity_139532()
+- Sure. I've added **${dialog.itemTitle}** to **${dialog.listType}** list. You have ${count(user.lists[dialog.listType])} items in your list.
+
+
+
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/additem/language-understanding/en-us/additem.en-us.lu b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/additem/language-understanding/en-us/additem.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/additem/language-understanding/en-us/additem.en-us.lu
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/additem/language-understanding/en-us/additem.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/deleteitem.dialog b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/deleteitem.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/deleteitem.dialog
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/deleteitem.dialog
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/language-generation/en-us/deleteitem.en-us.lg b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/language-generation/en-us/deleteitem.en-us.lg
similarity index 95%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/language-generation/en-us/deleteitem.en-us.lg
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/language-generation/en-us/deleteitem.en-us.lg
index 25f7665275..aed53341e6 100644
--- a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/language-generation/en-us/deleteitem.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/language-generation/en-us/deleteitem.en-us.lg
@@ -1,27 +1,27 @@
-[import](common.lg)
-[import](viewitem.lg)
-
-# TextInput_Prompt_461607()
-- What list would you like to delete an item from?
-
-> This LG template is defined in viewitem. You can refer to this with an import statement (see line #2)
-
-# SendActivity_555579()
-- ${showLists()}
-
-# SendActivity_534454()
-- ${showLists()}
-
-# TextInput_Prompt_702637()
-- What would you like to delete? \n Give me the item number or exact item text
-
-# SendActivity_728630()
-- Sure, deleting ${dialog.itemTitle} from ${dialog.listType}
-
-# SendActivity_015149()
-- ${showLists()}
-
-# SendActivity_121384()
-- Nothing to delete...
-
-
+[import](common.lg)
+[import](viewitem.lg)
+
+# TextInput_Prompt_461607()
+- What list would you like to delete an item from?
+
+> This LG template is defined in viewitem. You can refer to this with an import statement (see line #2)
+
+# SendActivity_555579()
+- ${showLists()}
+
+# SendActivity_534454()
+- ${showLists()}
+
+# TextInput_Prompt_702637()
+- What would you like to delete? \n Give me the item number or exact item text
+
+# SendActivity_728630()
+- Sure, deleting ${dialog.itemTitle} from ${dialog.listType}
+
+# SendActivity_015149()
+- ${showLists()}
+
+# SendActivity_121384()
+- Nothing to delete...
+
+
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/language-understanding/en-us/deleteitem.en-us.lu b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/language-understanding/en-us/deleteitem.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/language-understanding/en-us/deleteitem.en-us.lu
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/deleteitem/language-understanding/en-us/deleteitem.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/help/help.dialog b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/help/help.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/help/help.dialog
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/help/help.dialog
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/help/language-generation/en-us/help.en-us.lg b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/help/language-generation/en-us/help.en-us.lg
similarity index 92%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/help/language-generation/en-us/help.en-us.lg
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/help/language-generation/en-us/help.en-us.lg
index 72faf7d3e0..0b9343f2f8 100644
--- a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/help/language-generation/en-us/help.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/help/language-generation/en-us/help.en-us.lg
@@ -1,9 +1,9 @@
-[import](common.lg)
-
-# SendActivity_641395()
-- I'm a demo bot. I can manage todo or shopping lists.
-
-
-
-
-
+[import](common.lg)
+
+# SendActivity_641395()
+- I'm a demo bot. I can manage todo or shopping lists.
+
+
+
+
+
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/help/language-understanding/en-us/help.en-us.lu b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/help/language-understanding/en-us/help.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/help/language-understanding/en-us/help.en-us.lu
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/help/language-understanding/en-us/help.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/language-generation/en-us/userprofile.en-us.lg b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/language-generation/en-us/userprofile.en-us.lg
similarity index 97%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/language-generation/en-us/userprofile.en-us.lg
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/language-generation/en-us/userprofile.en-us.lg
index 3d508ed0ea..d051d413dc 100644
--- a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/language-generation/en-us/userprofile.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/language-generation/en-us/userprofile.en-us.lg
@@ -1,33 +1,33 @@
-[import](common.lg)
-
-# TextInput_Prompt_267073()
-- Hi, what is your name? You can \n - state your name \n - say things like 'my name is ' \n - ask 'why do you need my name' \n - say 'I'm not going to give you my name'.
-
-# SendActivity_744717()
-- Thanks. I have ${user.name} as your name and ${user.age} as your age.
-
-# TextInput_Prompt_826115()
-- Hello ${user.name}, how old are you?
-
-# TextInput_InvalidPrompt_826115()
-- Sorry ${this.value} does not work. I'm expecting a value between 1-150. What is your age?
-
-# TextInput_DefaultValueResponse_826115()
-- Sorry, this is not working :(. For now, I'm going to set your age to 30.
-
-# SendActivity_210613()
-- Sure, cancelling user profile...
-
-# SendActivity_351007()
-- I need your name to address you correctly! \n You can say things like 'My name is ' to introduce yourself to me.
-
-# SendActivity_977137()
-- I just like to know your age .. no good reason! \n Try saying "I'm years old"
-
-# SendActivity_304840()
-- No worries. I'm going to set your name to 'Human'. \n You can say "My name is " to re-introduce yourself to me.
-
-# SendActivity_991655()
-- No worries. I'm just going to assume you are 30!
-
-
+[import](common.lg)
+
+# TextInput_Prompt_267073()
+- Hi, what is your name? You can \n - state your name \n - say things like 'my name is ' \n - ask 'why do you need my name' \n - say 'I'm not going to give you my name'.
+
+# SendActivity_744717()
+- Thanks. I have ${user.name} as your name and ${user.age} as your age.
+
+# TextInput_Prompt_826115()
+- Hello ${user.name}, how old are you?
+
+# TextInput_InvalidPrompt_826115()
+- Sorry ${this.value} does not work. I'm expecting a value between 1-150. What is your age?
+
+# TextInput_DefaultValueResponse_826115()
+- Sorry, this is not working :(. For now, I'm going to set your age to 30.
+
+# SendActivity_210613()
+- Sure, cancelling user profile...
+
+# SendActivity_351007()
+- I need your name to address you correctly! \n You can say things like 'My name is ' to introduce yourself to me.
+
+# SendActivity_977137()
+- I just like to know your age .. no good reason! \n Try saying "I'm years old"
+
+# SendActivity_304840()
+- No worries. I'm going to set your name to 'Human'. \n You can say "My name is " to re-introduce yourself to me.
+
+# SendActivity_991655()
+- No worries. I'm just going to assume you are 30!
+
+
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/language-understanding/en-us/userprofile.en-us.lu b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/language-understanding/en-us/userprofile.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/language-understanding/en-us/userprofile.en-us.lu
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/language-understanding/en-us/userprofile.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/userprofile.dialog b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/userprofile.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/userprofile.dialog
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/userprofile/userprofile.dialog
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/language-generation/en-us/viewitem.en-us.lg b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/language-generation/en-us/viewitem.en-us.lg
similarity index 77%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/language-generation/en-us/viewitem.en-us.lg
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/language-generation/en-us/viewitem.en-us.lg
index 9c5fbdfdd0..7ff7ced7f2 100644
--- a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/language-generation/en-us/viewitem.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/language-generation/en-us/viewitem.en-us.lg
@@ -1,34 +1,29 @@
-[import](common.lg)
-
-# TextInput_Prompt_308464()
-- What list would you like to see?
-
-# SendActivity_996807()
-- ${showLists()}
-
-# showLists
-- SWITCH : ${dialog.listType}
- - CASE : ${'todo'}
- - ${list(user.lists.todo, 'todo')}
- - CASE : ${'grocery'}
- - ${list(user.lists.grocery, 'grocery')}
- - CASE : ${'shopping'}
- - ${list(user.lists.shopping, 'shopping')}
- - DEFAULT :
- - ```
-## Todo list
-${list(user.lists.todo, 'todo')}
-
-## Grocery list
-${list(user.lists.grocery, 'grocery')}
-
-## Shopping list
-${list(user.lists.shopping, 'shopping')}
- ```
-
-# list(collection, name)
-- IF : ${collection != null}
- - You have ${count(collection)} item(s) in your **${name}** list. \n ${join(foreach(collection, item, concat('- ', item)), '\n')}
-- ELSE :
- - You do not have any items in your **${name}** list.
-
+[import](common.lg)
+
+# TextInput_Prompt_308464()
+- What list would you like to see?
+
+# SendActivity_996807()
+- ${showLists()}
+
+# showLists
+- SWITCH : ${dialog.listType}
+ - CASE : ${'todo'}
+ - ${list(user.lists.todo, 'todo')}
+ - CASE : ${'grocery'}
+ - ${list(user.lists.grocery, 'grocery')}
+ - CASE : ${'shopping'}
+ - ${list(user.lists.shopping, 'shopping')}
+ - DEFAULT :
+ - ```
+ ${list(user.lists.todo, 'todo')}
+ ${list(user.lists.grocery, 'grocery')}
+ ${list(user.lists.shopping, 'shopping')}
+ ```
+
+# list(collection, name)
+- IF : ${collection != null}
+ - You have ${count(collection)} item(s) in your **${name}** list. \n ${join(foreach(collection, item, concat('- ', item)), '\n')}
+- ELSE :
+ - You do not have any items in your **${name}** list.
+
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/language-understanding/en-us/viewitem.en-us.lu b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/language-understanding/en-us/viewitem.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/language-understanding/en-us/viewitem.en-us.lu
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/language-understanding/en-us/viewitem.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/viewitem.dialog b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/viewitem.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/viewitem.dialog
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/dialogs/viewitem/viewitem.dialog
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/language-generation/en-us/common.en-us.lg b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/language-generation/en-us/common.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/language-generation/en-us/common.en-us.lg
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/language-generation/en-us/common.en-us.lg
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/language-generation/en-us/todobotwithluissample.en-us.lg b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/language-generation/en-us/todobotwithluissample.en-us.lg
similarity index 94%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/language-generation/en-us/todobotwithluissample.en-us.lg
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/language-generation/en-us/todobotwithluissample.en-us.lg
index 14d00e332d..22552cdbad 100644
--- a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/language-generation/en-us/todobotwithluissample.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/language-generation/en-us/todobotwithluissample.en-us.lg
@@ -1,25 +1,25 @@
-[import](common.lg)
-
-# SendActivity_202664()
-[Activity
- Text = Hi, how can I help today?
- SuggestedActions = Add | Show | Delete | Profile
-]
-
-# foo
-- test
-
-# SendActivity_269411()
-- ${@answer}
-
-# TextInput_Prompt_107784()
-- Are you sure you want to cancel?
-
-# SendActivity_140076()
-- Sure, cancelling all dialogs.
-
-# SendActivity_272233()
-- No worries.
-
-# SendActivity_037398()
-- Sorry, not sure what you mean. Can you rephrase?
+[import](common.lg)
+
+# SendActivity_202664()
+[Activity
+ Text = Hi, how can I help today?
+ SuggestedActions = Add | Show | Delete | Profile
+]
+
+# foo
+- test
+
+# SendActivity_269411()
+- ${@answer}
+
+# TextInput_Prompt_107784()
+- Are you sure you want to cancel?
+
+# SendActivity_140076()
+- Sure, cancelling all dialogs.
+
+# SendActivity_272233()
+- No worries.
+
+# SendActivity_037398()
+- Sorry, not sure what you mean. Can you rephrase?
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/language-understanding/en-us/todobotwithluissample.en-us.lu b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/language-understanding/en-us/todobotwithluissample.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/language-understanding/en-us/todobotwithluissample.en-us.lu
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/language-understanding/en-us/todobotwithluissample.en-us.lu
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/todobotwithluissample.dialog b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/todobotwithluissample.dialog
similarity index 98%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/todobotwithluissample.dialog
rename to Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/todobotwithluissample.dialog
index 771d2ac433..3ffcfb3738 100644
--- a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/todobotwithluissample.dialog
+++ b/Composer/plugins/samples/assets/projects/ToDoBotWithLuisSample/todobotwithluissample.dialog
@@ -1,12 +1,10 @@
{
"$kind": "Microsoft.AdaptiveDialog",
"$designer": {
- "$designer": {
- "name": "ToDoBotWithLuisSample-17",
- "id": "232009"
- }
+ "name": "ToDoBotWithLuisSample",
+ "id": "232009"
},
- "autoEndDialog": "true",
+ "autoEndDialog": true,
"defaultResultProperty": "dialog.result",
"recognizer": "todobotwithluissample.lu",
"triggers": [
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/addtodo/addtodo.dialog b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/addtodo/addtodo.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/addtodo/addtodo.dialog
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/addtodo/addtodo.dialog
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/addtodo/language-generation/en-us/addtodo.en-us.lg b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/addtodo/language-generation/en-us/addtodo.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/addtodo/language-generation/en-us/addtodo.en-us.lg
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/addtodo/language-generation/en-us/addtodo.en-us.lg
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/addtodo/language-understanding/en-us/addtodo.en-us.lu b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/addtodo/language-understanding/en-us/addtodo.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/addtodo/language-understanding/en-us/addtodo.en-us.lu
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/addtodo/language-understanding/en-us/addtodo.en-us.lu
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/cleartodos/cleartodos.dialog b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/cleartodos/cleartodos.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/cleartodos/cleartodos.dialog
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/cleartodos/cleartodos.dialog
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/cleartodos/language-generation/en-us/cleartodos.en-us.lg b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/cleartodos/language-generation/en-us/cleartodos.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/cleartodos/language-generation/en-us/cleartodos.en-us.lg
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/cleartodos/language-generation/en-us/cleartodos.en-us.lg
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/cleartodos/language-understanding/en-us/cleartodos.en-us.lu b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/cleartodos/language-understanding/en-us/cleartodos.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/cleartodos/language-understanding/en-us/cleartodos.en-us.lu
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/cleartodos/language-understanding/en-us/cleartodos.en-us.lu
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/deletetodo/deletetodo.dialog b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/deletetodo/deletetodo.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/deletetodo/deletetodo.dialog
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/deletetodo/deletetodo.dialog
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/deletetodo/language-generation/en-us/deletetodo.en-us.lg b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/deletetodo/language-generation/en-us/deletetodo.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/deletetodo/language-generation/en-us/deletetodo.en-us.lg
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/deletetodo/language-generation/en-us/deletetodo.en-us.lg
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/deletetodo/language-understanding/en-us/deletetodo.en-us.lu b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/deletetodo/language-understanding/en-us/deletetodo.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/deletetodo/language-understanding/en-us/deletetodo.en-us.lu
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/deletetodo/language-understanding/en-us/deletetodo.en-us.lu
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/showtodos/language-generation/en-us/showtodos.en-us.lg b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/showtodos/language-generation/en-us/showtodos.en-us.lg
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/showtodos/language-generation/en-us/showtodos.en-us.lg
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/showtodos/language-generation/en-us/showtodos.en-us.lg
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/showtodos/language-understanding/en-us/showtodos.en-us.lu b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/showtodos/language-understanding/en-us/showtodos.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/showtodos/language-understanding/en-us/showtodos.en-us.lu
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/showtodos/language-understanding/en-us/showtodos.en-us.lu
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/showtodos/showtodos.dialog b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/showtodos/showtodos.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/dialogs/showtodos/showtodos.dialog
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/dialogs/showtodos/showtodos.dialog
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/language-generation/en-us/common.en-us.lg b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/language-generation/en-us/common.en-us.lg
similarity index 98%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/language-generation/en-us/common.en-us.lg
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/language-generation/en-us/common.en-us.lg
index 951d3595ca..a4e6b0982d 100644
--- a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/language-generation/en-us/common.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/language-generation/en-us/common.en-us.lg
@@ -33,7 +33,7 @@ ${join(foreach(user.todos, x, showSingleTodo(x)), '\n')}
- ELSE:
- Your most recent ${count(user.todos)} tasks are
-# help
+# WelcomeUser
-I can add a todo, show todos, remove a todo, and clear all todos
-I can help you yes I can
-Help, we don't need no stinkin' help!
\ No newline at end of file
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/language-generation/en-us/todorecognizersetsample.en-us.lg b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/language-generation/en-us/todorecognizersetsample.en-us.lg
similarity index 90%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/language-generation/en-us/todorecognizersetsample.en-us.lg
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/language-generation/en-us/todorecognizersetsample.en-us.lg
index 0bbd049164..5e8a5e0918 100644
--- a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/language-generation/en-us/todorecognizersetsample.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/language-generation/en-us/todorecognizersetsample.en-us.lg
@@ -1,7 +1,7 @@
[import](common.lg)
# SendActivity_696707
--${help()}
+-${WelcomeUser()}
# SendActivity_157674()
- Hi! I'm a ToDo bot. Say "add a todo named first" to get started.
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/language-understanding/en-us/todorecognizersetsample.en-us.lu b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/language-understanding/en-us/todorecognizersetsample.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/language-understanding/en-us/todorecognizersetsample.en-us.lu
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/language-understanding/en-us/todorecognizersetsample.en-us.lu
diff --git a/Composer/packages/server/assets/projects/TodoRecognizerSetSample/todorecognizersetsample.dialog b/Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/todorecognizersetsample.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoRecognizerSetSample/todorecognizersetsample.dialog
rename to Composer/plugins/samples/assets/projects/TodoRecognizerSetSample/todorecognizersetsample.dialog
diff --git a/Composer/packages/server/assets/projects/TodoSample/dialogs/addtodo/addtodo.dialog b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/addtodo/addtodo.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoSample/dialogs/addtodo/addtodo.dialog
rename to Composer/plugins/samples/assets/projects/TodoSample/dialogs/addtodo/addtodo.dialog
diff --git a/Composer/packages/server/assets/projects/TodoSample/dialogs/addtodo/language-generation/en-us/addtodo.en-us.lg b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/addtodo/language-generation/en-us/addtodo.en-us.lg
similarity index 95%
rename from Composer/packages/server/assets/projects/TodoSample/dialogs/addtodo/language-generation/en-us/addtodo.en-us.lg
rename to Composer/plugins/samples/assets/projects/TodoSample/dialogs/addtodo/language-generation/en-us/addtodo.en-us.lg
index a77a0bcc62..79c308875e 100644
--- a/Composer/packages/server/assets/projects/TodoSample/dialogs/addtodo/language-generation/en-us/addtodo.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/addtodo/language-generation/en-us/addtodo.en-us.lg
@@ -1,7 +1,7 @@
-[import](common.lg)
-
-# TextInput_Prompt_298897()
-- OK, please enter the title of your todo.
-
-# SendActivity_116673()
-- Successfully added a todo named ${dialog.todo}
+[import](common.lg)
+
+# TextInput_Prompt_298897()
+- OK, please enter the title of your todo.
+
+# SendActivity_116673()
+- Successfully added a todo named ${dialog.todo}
diff --git a/Composer/packages/server/assets/projects/TodoSample/dialogs/addtodo/language-understanding/en-us/addtodo.en-us.lu b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/addtodo/language-understanding/en-us/addtodo.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoSample/dialogs/addtodo/language-understanding/en-us/addtodo.en-us.lu
rename to Composer/plugins/samples/assets/projects/TodoSample/dialogs/addtodo/language-understanding/en-us/addtodo.en-us.lu
diff --git a/Composer/packages/server/assets/projects/TodoSample/dialogs/cleartodos/cleartodos.dialog b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/cleartodos/cleartodos.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoSample/dialogs/cleartodos/cleartodos.dialog
rename to Composer/plugins/samples/assets/projects/TodoSample/dialogs/cleartodos/cleartodos.dialog
diff --git a/Composer/packages/server/assets/projects/TodoSample/dialogs/cleartodos/language-generation/en-us/cleartodos.en-us.lg b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/cleartodos/language-generation/en-us/cleartodos.en-us.lg
similarity index 95%
rename from Composer/packages/server/assets/projects/TodoSample/dialogs/cleartodos/language-generation/en-us/cleartodos.en-us.lg
rename to Composer/plugins/samples/assets/projects/TodoSample/dialogs/cleartodos/language-generation/en-us/cleartodos.en-us.lg
index 6d54f2e709..93778492c9 100644
--- a/Composer/packages/server/assets/projects/TodoSample/dialogs/cleartodos/language-generation/en-us/cleartodos.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/cleartodos/language-generation/en-us/cleartodos.en-us.lg
@@ -1,7 +1,7 @@
-[import](common.lg)
-
-# SendActivity_983700()
-- You don't have any items in the Todo List.
-
-# SendActivity_832300()
-- Successfully cleared items in the Todo List.
+[import](common.lg)
+
+# SendActivity_983700()
+- You don't have any items in the Todo List.
+
+# SendActivity_832300()
+- Successfully cleared items in the Todo List.
diff --git a/Composer/packages/server/assets/projects/TodoSample/dialogs/cleartodos/language-understanding/en-us/cleartodos.en-us.lu b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/cleartodos/language-understanding/en-us/cleartodos.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoSample/dialogs/cleartodos/language-understanding/en-us/cleartodos.en-us.lu
rename to Composer/plugins/samples/assets/projects/TodoSample/dialogs/cleartodos/language-understanding/en-us/cleartodos.en-us.lu
diff --git a/Composer/packages/server/assets/projects/TodoSample/dialogs/deletetodo/deletetodo.dialog b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/deletetodo/deletetodo.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoSample/dialogs/deletetodo/deletetodo.dialog
rename to Composer/plugins/samples/assets/projects/TodoSample/dialogs/deletetodo/deletetodo.dialog
diff --git a/Composer/packages/server/assets/projects/TodoSample/dialogs/deletetodo/language-generation/en-us/deletetodo.en-us.lg b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/deletetodo/language-generation/en-us/deletetodo.en-us.lg
similarity index 96%
rename from Composer/packages/server/assets/projects/TodoSample/dialogs/deletetodo/language-generation/en-us/deletetodo.en-us.lg
rename to Composer/plugins/samples/assets/projects/TodoSample/dialogs/deletetodo/language-generation/en-us/deletetodo.en-us.lg
index d3c5f5775b..0b0b10f3f0 100644
--- a/Composer/packages/server/assets/projects/TodoSample/dialogs/deletetodo/language-generation/en-us/deletetodo.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/deletetodo/language-generation/en-us/deletetodo.en-us.lg
@@ -1,10 +1,10 @@
-[import](common.lg)
-
-# SendActivity_725469()
-- Successfully removed a todo named ${dialog.todo}
-
-# SendActivity_549600()
-- ${dialog.todo} is not in the Todo List
-
-# TextInput_Prompt_870620()
-- OK, please enter the title of the todo you want to remove.
+[import](common.lg)
+
+# SendActivity_725469()
+- Successfully removed a todo named ${dialog.todo}
+
+# SendActivity_549600()
+- ${dialog.todo} is not in the Todo List
+
+# TextInput_Prompt_870620()
+- OK, please enter the title of the todo you want to remove.
diff --git a/Composer/packages/server/assets/projects/TodoSample/dialogs/deletetodo/language-understanding/en-us/deletetodo.en-us.lu b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/deletetodo/language-understanding/en-us/deletetodo.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoSample/dialogs/deletetodo/language-understanding/en-us/deletetodo.en-us.lu
rename to Composer/plugins/samples/assets/projects/TodoSample/dialogs/deletetodo/language-understanding/en-us/deletetodo.en-us.lu
diff --git a/Composer/packages/server/assets/projects/TodoSample/dialogs/showtodos/language-generation/en-us/showtodos.en-us.lg b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/showtodos/language-generation/en-us/showtodos.en-us.lg
similarity index 93%
rename from Composer/packages/server/assets/projects/TodoSample/dialogs/showtodos/language-generation/en-us/showtodos.en-us.lg
rename to Composer/plugins/samples/assets/projects/TodoSample/dialogs/showtodos/language-generation/en-us/showtodos.en-us.lg
index aa3dbc7b5d..340ffaf7cf 100644
--- a/Composer/packages/server/assets/projects/TodoSample/dialogs/showtodos/language-generation/en-us/showtodos.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/showtodos/language-generation/en-us/showtodos.en-us.lg
@@ -1,7 +1,7 @@
-[import](common.lg)
-
-# SendActivity_339580()
-- You have no todos.
-
-# SendActivity_662084()
-- ${ShowTodo()}
+[import](common.lg)
+
+# SendActivity_339580()
+- You have no todos.
+
+# SendActivity_662084()
+- ${ShowTodo()}
diff --git a/Composer/packages/server/assets/projects/TodoSample/dialogs/showtodos/language-understanding/en-us/showtodos.en-us.lu b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/showtodos/language-understanding/en-us/showtodos.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoSample/dialogs/showtodos/language-understanding/en-us/showtodos.en-us.lu
rename to Composer/plugins/samples/assets/projects/TodoSample/dialogs/showtodos/language-understanding/en-us/showtodos.en-us.lu
diff --git a/Composer/packages/server/assets/projects/TodoSample/dialogs/showtodos/showtodos.dialog b/Composer/plugins/samples/assets/projects/TodoSample/dialogs/showtodos/showtodos.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoSample/dialogs/showtodos/showtodos.dialog
rename to Composer/plugins/samples/assets/projects/TodoSample/dialogs/showtodos/showtodos.dialog
diff --git a/Composer/packages/server/assets/projects/TodoSample/language-generation/en-us/common.en-us.lg b/Composer/plugins/samples/assets/projects/TodoSample/language-generation/en-us/common.en-us.lg
similarity index 98%
rename from Composer/packages/server/assets/projects/TodoSample/language-generation/en-us/common.en-us.lg
rename to Composer/plugins/samples/assets/projects/TodoSample/language-generation/en-us/common.en-us.lg
index 951d3595ca..a4e6b0982d 100644
--- a/Composer/packages/server/assets/projects/TodoSample/language-generation/en-us/common.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/TodoSample/language-generation/en-us/common.en-us.lg
@@ -33,7 +33,7 @@ ${join(foreach(user.todos, x, showSingleTodo(x)), '\n')}
- ELSE:
- Your most recent ${count(user.todos)} tasks are
-# help
+# WelcomeUser
-I can add a todo, show todos, remove a todo, and clear all todos
-I can help you yes I can
-Help, we don't need no stinkin' help!
\ No newline at end of file
diff --git a/Composer/packages/server/assets/projects/TodoSample/language-generation/en-us/todosample.en-us.lg b/Composer/plugins/samples/assets/projects/TodoSample/language-generation/en-us/todosample.en-us.lg
similarity index 90%
rename from Composer/packages/server/assets/projects/TodoSample/language-generation/en-us/todosample.en-us.lg
rename to Composer/plugins/samples/assets/projects/TodoSample/language-generation/en-us/todosample.en-us.lg
index 0bbd049164..5e8a5e0918 100644
--- a/Composer/packages/server/assets/projects/TodoSample/language-generation/en-us/todosample.en-us.lg
+++ b/Composer/plugins/samples/assets/projects/TodoSample/language-generation/en-us/todosample.en-us.lg
@@ -1,7 +1,7 @@
[import](common.lg)
# SendActivity_696707
--${help()}
+-${WelcomeUser()}
# SendActivity_157674()
- Hi! I'm a ToDo bot. Say "add a todo named first" to get started.
diff --git a/Composer/packages/server/assets/projects/TodoSample/language-understanding/en-us/todosample.en-us.lu b/Composer/plugins/samples/assets/projects/TodoSample/language-understanding/en-us/todosample.en-us.lu
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoSample/language-understanding/en-us/todosample.en-us.lu
rename to Composer/plugins/samples/assets/projects/TodoSample/language-understanding/en-us/todosample.en-us.lu
diff --git a/Composer/packages/server/assets/projects/TodoSample/todosample.dialog b/Composer/plugins/samples/assets/projects/TodoSample/todosample.dialog
similarity index 100%
rename from Composer/packages/server/assets/projects/TodoSample/todosample.dialog
rename to Composer/plugins/samples/assets/projects/TodoSample/todosample.dialog
diff --git a/Composer/plugins/samples/assets/shared/README.md b/Composer/plugins/samples/assets/shared/README.md
new file mode 100644
index 0000000000..28a32949b7
--- /dev/null
+++ b/Composer/plugins/samples/assets/shared/README.md
@@ -0,0 +1,77 @@
+This folder contains a Bot Project created with Bot Framework Composer.
+
+The full documentation for Composer lives here:
+https://github.com/microsoft/botframework-composer
+
+To test this bot locally, open this folder in Composer, then click "Start Bot"
+
+## Provision Azure Resources to Host Bot
+
+This project includes a script that can be used to provision the resources necessary to run your bot in the Azure cloud. Running this script will create all of the necessary resources and return a publishing profile in the form of a JSON object. This JSON object can be imported into Composer's "Publish" tab and used to deploy the bot.
+
+* From this project folder, navigate to the scripts/ folder
+* Run `npm install`
+* Run `node provisionComposer.js --subscriptionId= --name= --appPassword= --environment=`
+* You will be asked to login to the Azure portal in your browser.
+* You will see progress indicators as the provision process runs. Note that it will take roughly 10 minutes to fully provision the resources.
+
+It will look like this:
+```
+{
+ "publishName": "",
+ "location": "westus",
+ "subscriptionID": "",
+ "appPassword": "",
+ "luisAuthoringRegion": "westus",
+ "environment": "",
+ "provision": {
+ "applicationInsights": {
+ "InstrumentationKey": ""
+ },
+ "cosmosDb": {
+ "cosmosDBEndpoint": "",
+ "authKey": "",
+ "databaseId": "botstate-db",
+ "collectionId": "botstate-collection",
+ "containerId": "botstate-container"
+ },
+ "blobStorage": {
+ "connectionString": "",
+ "container": "transcripts"
+ },
+ "luis": {
+ "endpointKey": "",
+ "authoringKey": "",
+ "region": "westus"
+ },
+ "MicrosoftAppId": "",
+ "MicrosoftAppPassword": ""
+ },
+ "accessToken": ""
+}```
+
+When completed, you will see a message with a JSON "publishing profile" and instructions for using it in Composer.
+
+
+## Publish bot to Azure
+
+To publish your bot to a Azure resources provisioned using the process above:
+
+* Open your bot in Composer
+* Navigate to the "Publish" tab
+* Select "Add new profile" from the toolbar
+* In the resulting dialog box, choose "azurePublish" from the "Publish Destination Type" dropdown
+* Paste in the profile you received from the provisioning script
+
+When you are ready to publish your bot to Azure, select the newly created profile from the sidebar and click "Publish to selected profile" in the toolbar.
+
+## Refresh your Azure Token
+
+When publishing, you may encounter an error about your access token being expired. This happens when the access token used to provision your bot expires.
+
+To get a new token:
+
+* Open a terminal window
+* Run `az account get-access-token`
+* This will result in a JSON object printed to the console, containing a new `accessToken` field.
+* Copy the value of the accessToken from the terminal and into the publish `accessToken` field in the profile in Composer.
\ No newline at end of file
diff --git a/Composer/plugins/samples/package.json b/Composer/plugins/samples/package.json
new file mode 100644
index 0000000000..04529b2d39
--- /dev/null
+++ b/Composer/plugins/samples/package.json
@@ -0,0 +1,20 @@
+{
+ "name": "samples",
+ "version": "1.0.0",
+ "description": "providing samples to Composer core",
+ "main": "lib/index.js",
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "tsc",
+ "start": "node lib/index.js"
+ },
+ "extendsComposer": true,
+ "author": "",
+ "license": "ISC",
+ "dependencies": {
+ "path": "^0.12.7",
+ "portfinder": "^1.0.25",
+ "rimraf": "^3.0.2",
+ "uuid": "^7.0.1"
+ }
+}
diff --git a/Composer/plugins/samples/src/index.ts b/Composer/plugins/samples/src/index.ts
new file mode 100644
index 0000000000..2c6af3cfec
--- /dev/null
+++ b/Composer/plugins/samples/src/index.ts
@@ -0,0 +1,120 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import path from 'path';
+import fs from 'fs';
+
+const samplesDir = path.resolve(__dirname, '../assets/projects');
+const boilerplateDir = path.resolve(__dirname, '../assets/shared');
+
+const samplesRegitry = {
+ '*': { // base registry item, can be override by later specific entry
+ tags: ["Basic"],
+ support: ["C#", "JS"]
+ },
+ EchoBot: {
+ name: 'Echo Bot',
+ description: 'A bot that echoes and responds with whatever message the user entered',
+ index: 1,
+ },
+ EmptyBot: {
+ name: 'Empty Bot',
+ description: 'Basic bot template that is ready for your creativity',
+ index: 2,
+ },
+ TodoSample: {
+ name: 'Simple Todo',
+ description: 'A sample bot that allows you to add, list, and remove to do items.',
+ index: 3,
+ },
+ ToDoBotWithLuisSample: {
+ name: 'Todo with LUIS',
+ description: 'A sample bot that allows you to add, list, and remove to do items using Language Understanding',
+ index: 4,
+ },
+ RespondingWithCardsSample: {
+ name: 'Responding with Cards',
+ description: 'A sample bot that uses Language Generation to create cards.',
+ },
+ AskingQuestionsSample: {
+ name: 'Asking Questions',
+ description: 'A sample bot that shows how to ask questions and capture user input.',
+ },
+ InterruptionSample: {
+ name: 'Interruptions',
+ description: 'An advanced sample bot that shows how to handle context switching and interruption in a conversation.',
+ },
+ RespondingWithTextSample: {
+ name: 'Responding with Text',
+ description: 'A sample bot that uses Language Generation to create bot responses.',
+ },
+ ControllingConversationFlowSample: {
+ name: 'Controlling Conversation Flow',
+ description: 'A sample bot that shows how to control the flow of a conversation.',
+ },
+ ActionsSample: {
+ name: 'Dialog Actions',
+ description: 'A sample bot that shows how to use Dialog Actions.',
+ },
+ QnAMakerLUISSample: {
+ name: 'QnA Maker and LUIS',
+ description: 'A sample bot that demonstrates use of both QnA Maker & LUIS',
+ }
+}
+
+
+function getSamples(): any[] {
+ const subPaths = fs.readdirSync(samplesDir);
+ const samples = [];
+ for (const subPath of subPaths) {
+ const fullPath = samplesDir + "/" + subPath;
+ if (!fs.statSync(fullPath).isDirectory()) {
+ continue;
+ }
+
+ // only looking for directories
+ const dirname = subPath;
+ let sample = { id: dirname, name: dirname, description: dirname, path: fullPath, ...samplesRegitry['*'] };
+ if (samplesRegitry[sample.id]) {
+ sample = { ...sample, ...samplesRegitry[sample.id] };
+ }
+ samples.push(sample);
+ }
+ samples.sort((a, b) => {
+ if (a.index && b.index) {
+ return a.index - b.index;
+ }
+ if (a.index) {
+ return -1;
+ }
+ return 1;
+ })
+ return samples;
+}
+
+function getBoilerplates() {
+ return [
+ {
+ id: "boilerplate",
+ name: "boilerplate",
+ description: "base template for every bot template",
+ path: boilerplateDir,
+ tags: ["boilerplate"],
+ support: ["*"],
+ }
+ ]
+}
+
+const samples = getSamples();
+const boilerplates = getBoilerplates();
+
+export default async (composer: any): Promise => {
+ // register this publishing method with Composer
+ for (const temlate of samples) {
+ await composer.addBotTemplate(temlate);
+ }
+
+ for (const temlate of boilerplates) {
+ await composer.addBaseTemplate(temlate);
+ }
+};
\ No newline at end of file
diff --git a/Composer/plugins/samples/tsconfig.json b/Composer/plugins/samples/tsconfig.json
new file mode 100644
index 0000000000..d43fd5f5f0
--- /dev/null
+++ b/Composer/plugins/samples/tsconfig.json
@@ -0,0 +1,20 @@
+{
+ "compilerOptions": {
+ "target": "es6",
+ "module": "commonjs",
+ "declaration": true,
+ "sourceMap": true,
+ "esModuleInterop": true,
+ "outDir": "./lib",
+ "rootDir": "./src",
+ "types": [
+ "node"
+ ]
+ },
+ "include": [
+ "src/**/*"
+ ],
+ "exclude": [
+ "node_modules"
+ ]
+}
\ No newline at end of file
diff --git a/Composer/plugins/samples/yarn.lock b/Composer/plugins/samples/yarn.lock
new file mode 100644
index 0000000000..d7d2953978
--- /dev/null
+++ b/Composer/plugins/samples/yarn.lock
@@ -0,0 +1,157 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+async@^2.6.2:
+ version "2.6.3"
+ resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+ integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+ dependencies:
+ lodash "^4.17.14"
+
+balanced-match@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+ integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+brace-expansion@^1.1.7:
+ version "1.1.11"
+ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+ integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+ dependencies:
+ balanced-match "^1.0.0"
+ concat-map "0.0.1"
+
+concat-map@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+ integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+debug@^3.1.1:
+ version "3.2.6"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+ integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+ dependencies:
+ ms "^2.1.1"
+
+fs.realpath@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+ integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+glob@^7.1.3:
+ version "7.1.6"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+ integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^3.0.4"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
+inflight@^1.0.4:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+ integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+ dependencies:
+ once "^1.3.0"
+ wrappy "1"
+
+inherits@2:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+inherits@2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+ integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+lodash@^4.17.14:
+ version "4.17.15"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+ integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
+minimatch@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+ integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+ dependencies:
+ brace-expansion "^1.1.7"
+
+minimist@0.0.8:
+ version "0.0.8"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+ integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+
+mkdirp@^0.5.1:
+ version "0.5.1"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+ integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+ dependencies:
+ minimist "0.0.8"
+
+ms@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+ integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+once@^1.3.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+ integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+ dependencies:
+ wrappy "1"
+
+path-is-absolute@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+ integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path@^0.12.7:
+ version "0.12.7"
+ resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"
+ integrity sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=
+ dependencies:
+ process "^0.11.1"
+ util "^0.10.3"
+
+portfinder@^1.0.25:
+ version "1.0.25"
+ resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
+ integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
+ dependencies:
+ async "^2.6.2"
+ debug "^3.1.1"
+ mkdirp "^0.5.1"
+
+process@^0.11.1:
+ version "0.11.10"
+ resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+ integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+rimraf@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+ integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+ dependencies:
+ glob "^7.1.3"
+
+util@^0.10.3:
+ version "0.10.4"
+ resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+ integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
+ dependencies:
+ inherits "2.0.3"
+
+uuid@^7.0.1:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.1.tgz#95ed6ff3d8c881cbf85f0f05cc3915ef994818ef"
+ integrity sha512-yqjRXZzSJm9Dbl84H2VDHpM3zMjzSJQ+hn6C4zqd5ilW+7P4ZmLEEqwho9LjP+tGuZlF4xrHQXT0h9QZUS/pWA==
+
+wrappy@1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+ integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
diff --git a/Composer/yarn.lock b/Composer/yarn.lock
index ec93e9ada8..6ada943164 100644
--- a/Composer/yarn.lock
+++ b/Composer/yarn.lock
@@ -132,20 +132,6 @@
uuid "^3.2.1"
xml2js "^0.4.19"
-"@azure/ms-rest-js@^1.8.7":
- version "1.8.12"
- resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.8.12.tgz#f7760a1addfd3eddddb4ec3515f2c21eff515423"
- integrity sha512-1jHF1jHDXHKgdql+3uEh7798WXap3J9CefltYvH6iRypua4tu1C6mN1LFkaSUY/+OtOvkzTZkL83cxAfQPP8QA==
- dependencies:
- "@types/tunnel" "0.0.0"
- axios "^0.19.0"
- form-data "^2.3.2"
- tough-cookie "^2.4.3"
- tslib "^1.9.2"
- tunnel "0.0.6"
- uuid "^3.2.1"
- xml2js "^0.4.19"
-
"@azure/ms-rest-js@^2.0.3", "@azure/ms-rest-js@^2.0.4":
version "2.0.5"
resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@azure/ms-rest-js/-/@azure/ms-rest-js-2.0.5.tgz#7ac1043b7b8c99bb8c5b09ada96b858b02db8e75"
@@ -162,6 +148,22 @@
uuid "^3.3.2"
xml2js "^0.4.19"
+"@azure/ms-rest-js@^2.0.6":
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-2.0.6.tgz#236f3acdae72f3eb9ce4468f601921985fad3e26"
+ integrity sha512-Llp4/tN3SNoHFZ03JBc1g+doPa90rRkyR3WnbRUUAUiso2a70iWlruANgT6LgE4RxIvB4GGaCkAUnrXQtA4UIA==
+ dependencies:
+ "@types/node-fetch" "^2.3.7"
+ "@types/tunnel" "0.0.1"
+ abort-controller "^3.0.0"
+ form-data "^2.5.0"
+ node-fetch "^2.6.0"
+ tough-cookie "^3.0.1"
+ tslib "^1.10.0"
+ tunnel "0.0.6"
+ uuid "^3.3.2"
+ xml2js "^0.4.19"
+
"@azure/ms-rest-nodeauth@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.0.3.tgz#e485b9c960da718d0476115e9f0ec550ccbba561"
@@ -4399,13 +4401,6 @@ alphanum-sort@^1.0.0:
resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
-ansi-align@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
- integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=
- dependencies:
- string-width "^2.0.0"
-
ansi-align@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
@@ -4503,7 +4498,7 @@ anymatch@^2.0.0:
micromatch "^3.1.4"
normalize-path "^2.1.1"
-anymatch@^3.0.3:
+anymatch@^3.0.3, anymatch@~3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
@@ -4897,12 +4892,12 @@ aws4@^1.8.0:
integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
axios@^0.18.0:
- version "0.18.0"
- resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
- integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=
+ version "0.18.1"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
+ integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==
dependencies:
- follow-redirects "^1.3.0"
- is-buffer "^1.1.5"
+ follow-redirects "1.5.10"
+ is-buffer "^2.0.2"
axios@^0.19.0:
version "0.19.0"
@@ -4912,6 +4907,13 @@ axios@^0.19.0:
follow-redirects "1.5.10"
is-buffer "^2.0.2"
+axios@^0.19.2:
+ version "0.19.2"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
+ integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+ dependencies:
+ follow-redirects "1.5.10"
+
axobject-query@^2.0.2:
version "2.1.1"
resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.1.tgz#2a3b1271ec722d48a4cd4b3fcc20c853326a49a7"
@@ -5260,6 +5262,11 @@ binary-extensions@^1.0.0:
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz#9523e001306a32444b907423f1de2164222f6ab1"
integrity sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==
+binary-extensions@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
+ integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
+
bl@^1.0.0:
version "1.2.2"
resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
@@ -5374,19 +5381,6 @@ botbuilder-lg@^4.9.0-preview-119754:
path "^0.12.7"
uuid "^3.3.3"
-boxen@^1.2.1:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
- integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==
- dependencies:
- ansi-align "^2.0.0"
- camelcase "^4.0.0"
- chalk "^2.0.1"
- cli-boxes "^1.0.0"
- string-width "^2.0.0"
- term-size "^1.2.0"
- widest-line "^2.0.0"
-
boxen@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
@@ -5425,7 +5419,7 @@ braces@^2.3.1, braces@^2.3.2:
split-string "^3.0.2"
to-regex "^3.0.1"
-braces@^3.0.1:
+braces@^3.0.1, braces@~3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -5527,7 +5521,17 @@ browserslist@4.4.1:
electron-to-chromium "^1.3.103"
node-releases "^1.1.3"
-browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.3.5, browserslist@^4.4.2, browserslist@^4.5.1, browserslist@^4.5.4, browserslist@^4.7.3:
+browserslist@^4.0.0:
+ version "4.12.0"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
+ integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
+ dependencies:
+ caniuse-lite "^1.0.30001043"
+ electron-to-chromium "^1.3.413"
+ node-releases "^1.1.53"
+ pkg-up "^2.0.0"
+
+browserslist@^4.3.4, browserslist@^4.3.5, browserslist@^4.4.2, browserslist@^4.5.1, browserslist@^4.5.4, browserslist@^4.7.3:
version "4.7.3"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.3.tgz#02341f162b6bcc1e1028e30624815d4924442dc3"
integrity sha512-jWvmhqYpx+9EZm/FxcZSbUZyDEvDTLDi3nSAKbzEkyWvtI0mNSmUosey+5awDW1RUlrgXbQb5A6qY1xQH9U6MQ==
@@ -5797,7 +5801,7 @@ camel-case@3.0.x, camel-case@^3.0.0:
no-case "^2.2.0"
upper-case "^1.1.1"
-camelcase@^4.0.0, camelcase@^4.1.0:
+camelcase@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
@@ -5827,7 +5831,12 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000918, caniuse-lite@^1.0.30000947:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001043:
+ version "1.0.30001051"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001051.tgz#8e944abf9c796bc7ea0bec3c3688a250561fc9ac"
+ integrity sha512-sw8UUnTlRevawTMZKN7vpfwSjCBVoiMPlYd8oT2VwNylyPCBdMAUmLGUApnYYTtIm5JXsQegUAY7GPHqgfDzjw==
+
+caniuse-lite@^1.0.30000918, caniuse-lite@^1.0.30000947:
version "1.0.30000951"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000951.tgz#c7c2fd4d71080284c8677dd410368df8d83688fe"
integrity sha512-eRhP+nQ6YUkIcNQ6hnvdhMkdc7n3zadog0KXNRxAZTT2kHjUb1yGn71OrPhSn8MOvlX97g5CR97kGVj8fMsXWg==
@@ -5859,11 +5868,6 @@ capture-exit@^2.0.0:
dependencies:
rsvp "^4.8.4"
-capture-stack-trace@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
- integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
-
cardinal@^2.1.1:
version "2.1.1"
resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505"
@@ -5937,11 +5941,6 @@ chardet@^0.7.0:
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-charenc@~0.0.1:
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
- integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
check-more-types@2.24.0:
version "2.24.0"
resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
@@ -5971,25 +5970,6 @@ chokidar@^2.0.2, chokidar@^2.0.3:
optionalDependencies:
fsevents "^1.2.7"
-chokidar@^2.1.5:
- version "2.1.5"
- resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
- integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
- dependencies:
- anymatch "^2.0.0"
- async-each "^1.0.1"
- braces "^2.3.2"
- glob-parent "^3.1.0"
- inherits "^2.0.3"
- is-binary-path "^1.0.0"
- is-glob "^4.0.0"
- normalize-path "^3.0.0"
- path-is-absolute "^1.0.0"
- readdirp "^2.2.1"
- upath "^1.1.1"
- optionalDependencies:
- fsevents "^1.2.7"
-
chokidar@^2.1.8:
version "2.1.8"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -6009,6 +5989,21 @@ chokidar@^2.1.8:
optionalDependencies:
fsevents "^1.2.7"
+chokidar@^3.2.2:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
+ integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
+ dependencies:
+ anymatch "~3.1.1"
+ braces "~3.0.2"
+ glob-parent "~5.1.0"
+ is-binary-path "~2.1.0"
+ is-glob "~4.0.1"
+ normalize-path "~3.0.0"
+ readdirp "~3.4.0"
+ optionalDependencies:
+ fsevents "~2.1.2"
+
chownr@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
@@ -6031,11 +6026,6 @@ chromium-pickle-js@^0.2.0:
resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=
-ci-info@^1.5.0:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
- integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
-
ci-info@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -6089,11 +6079,6 @@ clean-webpack-plugin@^3.0.0:
"@types/webpack" "^4.4.31"
del "^4.1.1"
-cli-boxes@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
- integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
-
cli-boxes@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
@@ -6324,9 +6309,9 @@ color-string@^1.5.2:
simple-swizzle "^0.2.2"
color@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/color/-/color-3.1.0.tgz#d8e9fb096732875774c84bf922815df0308d0ffc"
- integrity sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg==
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10"
+ integrity sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==
dependencies:
color-convert "^1.9.1"
color-string "^1.5.2"
@@ -6475,18 +6460,6 @@ config-chain@^1.1.11:
ini "^1.3.4"
proto-list "~1.2.1"
-configstore@^3.0.0:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
- integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==
- dependencies:
- dot-prop "^4.1.0"
- graceful-fs "^4.1.2"
- make-dir "^1.0.0"
- unique-string "^1.0.0"
- write-file-atomic "^2.0.0"
- xdg-basedir "^3.0.0"
-
configstore@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
@@ -6695,7 +6668,17 @@ cosmiconfig@^4.0.0:
parse-json "^4.0.0"
require-from-string "^2.0.1"
-cosmiconfig@^5.0.0, cosmiconfig@^5.0.2, cosmiconfig@^5.0.5, cosmiconfig@^5.0.7:
+cosmiconfig@^5.0.0:
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+ integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
+ dependencies:
+ import-fresh "^2.0.0"
+ is-directory "^0.3.1"
+ js-yaml "^3.13.1"
+ parse-json "^4.0.0"
+
+cosmiconfig@^5.0.2, cosmiconfig@^5.0.5, cosmiconfig@^5.0.7:
version "5.1.0"
resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf"
integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==
@@ -6754,13 +6737,6 @@ create-ecdh@^4.0.0:
bn.js "^4.1.0"
elliptic "^6.0.0"
-create-error-class@^3.0.0:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
- integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
- dependencies:
- capture-stack-trace "^1.0.0"
-
create-hash@^1.1.0, create-hash@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
@@ -6845,11 +6821,6 @@ cross-spawn@^7.0.0:
shebang-command "^2.0.0"
which "^2.0.1"
-crypt@~0.0.1:
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
- integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
crypto-browserify@^3.11.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -6867,11 +6838,6 @@ crypto-browserify@^3.11.0:
randombytes "^2.0.0"
randomfill "^1.0.3"
-crypto-random-string@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
- integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
-
crypto-random-string@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
@@ -7002,10 +6968,21 @@ css-tree@1.0.0-alpha.29:
mdn-data "~1.1.0"
source-map "^0.5.3"
-css-unit-converter@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
- integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=
+css-tree@1.0.0-alpha.37:
+ version "1.0.0-alpha.37"
+ resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
+ integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==
+ dependencies:
+ mdn-data "2.0.4"
+ source-map "^0.6.1"
+
+css-tree@1.0.0-alpha.39:
+ version "1.0.0-alpha.39"
+ resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz#2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"
+ integrity sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==
+ dependencies:
+ mdn-data "2.0.6"
+ source-map "^0.6.1"
css-url-regex@^1.1.0:
version "1.1.0"
@@ -7122,6 +7099,13 @@ csso@^3.5.1:
dependencies:
css-tree "1.0.0-alpha.29"
+csso@^4.0.2:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz#0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"
+ integrity sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==
+ dependencies:
+ css-tree "1.0.0-alpha.39"
+
cssom@^0.4.1:
version "0.4.4"
resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
@@ -8152,13 +8136,6 @@ domutils@^1.5.1, domutils@^1.7.0:
dom-serializer "0"
domelementtype "1"
-dot-prop@^4.1.0, dot-prop@^4.1.1:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
- integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
- dependencies:
- is-obj "^1.0.0"
-
dot-prop@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
@@ -8290,6 +8267,11 @@ electron-to-chromium@^1.3.390:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.413.tgz#9c457a4165c7b42e59d66dff841063eb9bfe5614"
integrity sha512-Jm1Rrd3siqYHO3jftZwDljL2LYQafj3Kki5r+udqE58d0i91SkjItVJ5RwlJn9yko8i7MOcoidVKjQlgSdd1hg==
+electron-to-chromium@^1.3.413:
+ version "1.3.428"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.428.tgz#9afec8766dbe3cab825817f77e3ed0e63467b71a"
+ integrity sha512-u3+5jEfgLKq/hGO96YfAoOAM1tgFnRDTCD5mLuev44tttcXix+INtVegAkmGzUcfDsnzkPt51XXurXZLLwXt0w==
+
electron-updater@4.2.5:
version "4.2.5"
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.2.5.tgz#dbced8da6f8c6fc2dc662f2776131f5a49ce018d"
@@ -9411,7 +9393,7 @@ follow-redirects@1.5.10:
dependencies:
debug "=3.1.0"
-follow-redirects@^1.0.0, follow-redirects@^1.3.0:
+follow-redirects@^1.0.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
@@ -9637,6 +9619,11 @@ fsevents@^2.1.2:
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
+fsevents@~2.1.2:
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+ integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+
function-bind@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -9766,6 +9753,13 @@ glob-parent@^5.0.0, glob-parent@^5.1.0:
dependencies:
is-glob "^4.0.1"
+glob-parent@~5.1.0:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+ integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+ dependencies:
+ is-glob "^4.0.1"
+
glob-to-regexp@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@@ -9980,23 +9974,6 @@ globby@^6.1.0:
pify "^2.0.0"
pinkie-promise "^2.0.0"
-got@^6.7.1:
- version "6.7.1"
- resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
- integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
- dependencies:
- create-error-class "^3.0.0"
- duplexer3 "^0.1.4"
- get-stream "^3.0.0"
- is-redirect "^1.0.0"
- is-retry-allowed "^1.0.0"
- is-stream "^1.0.0"
- lowercase-keys "^1.0.0"
- safe-buffer "^5.0.1"
- timed-out "^4.0.0"
- unzip-response "^2.0.1"
- url-parse-lax "^1.0.0"
-
got@^8.3.1:
version "8.3.2"
resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
@@ -10833,7 +10810,14 @@ is-binary-path@^1.0.0:
dependencies:
binary-extensions "^1.0.0"
-is-buffer@^1.0.2, is-buffer@^1.1.5, is-buffer@~1.1.1:
+is-binary-path@~2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+ integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+ dependencies:
+ binary-extensions "^2.0.0"
+
+is-buffer@^1.0.2, is-buffer@^1.1.5:
version "1.1.6"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -10855,13 +10839,6 @@ is-ci@2.0.0, is-ci@^2.0.0:
dependencies:
ci-info "^2.0.0"
-is-ci@^1.0.10:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
- integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
- dependencies:
- ci-info "^1.5.0"
-
is-color-stop@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
@@ -10969,14 +10946,14 @@ is-glob@^4.0.0:
dependencies:
is-extglob "^2.1.1"
-is-glob@^4.0.1:
+is-glob@^4.0.1, is-glob@~4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
dependencies:
is-extglob "^2.1.1"
-is-installed-globally@0.1.0, is-installed-globally@^0.1.0:
+is-installed-globally@0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
@@ -10992,11 +10969,6 @@ is-installed-globally@^0.3.1:
global-dirs "^2.0.1"
is-path-inside "^3.0.1"
-is-npm@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
- integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
-
is-npm@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
@@ -11014,7 +10986,7 @@ is-number@^7.0.0:
resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-is-obj@^1.0.0, is-obj@^1.0.1:
+is-obj@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
@@ -11089,11 +11061,6 @@ is-promise@^2.1.0:
resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
-is-redirect@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
- integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
-
is-regex@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@@ -11111,7 +11078,7 @@ is-resolvable@^1.0.0:
resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
-is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
+is-retry-allowed@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
@@ -11121,7 +11088,7 @@ is-root@2.0.0:
resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.0.0.tgz#838d1e82318144e5a6f77819d90207645acc7019"
integrity sha512-F/pJIk8QD6OX5DNhRB7hWamLsUilmkDGho48KbgZ6xg/lmAZXHxzXQ91jzB3yRSw5kdQGGGc4yz8HYhTYIMWPg==
-is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.0.1, is-stream@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
@@ -11989,13 +11956,6 @@ last-call-webpack-plugin@^3.0.0:
lodash "^4.17.5"
webpack-sources "^1.1.0"
-latest-version@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
- integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=
- dependencies:
- package-json "^4.0.0"
-
latest-version@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-4.0.0.tgz#9542393ac55a585861a4c4ebc02389a0b4a9c332"
@@ -12386,7 +12346,7 @@ lodash.union@^4.6.0:
lodash.uniq@^4.5.0:
version "4.5.0"
- resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+ resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
lodash@4.17.15, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15:
@@ -12394,7 +12354,7 @@ lodash@4.17.15, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15:
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-"lodash@>=3.5 <5", lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5:
+"lodash@>=3.5 <5", lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5:
version "4.17.11"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -12541,13 +12501,6 @@ luis-apis@2.5.1:
tslib "^1.9.3"
window-size "^1.1.0"
-make-dir@^1.0.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
- integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
- dependencies:
- pify "^3.0.0"
-
make-dir@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -12630,14 +12583,15 @@ md5.js@^1.3.4:
inherits "^2.0.1"
safe-buffer "^5.1.2"
-md5@^2.1.0:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
- integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
- dependencies:
- charenc "~0.0.1"
- crypt "~0.0.1"
- is-buffer "~1.1.1"
+mdn-data@2.0.4:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
+ integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
+
+mdn-data@2.0.6:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz#852dc60fcaa5daa2e8cf6c9189c440ed3e042978"
+ integrity sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==
mdn-data@~1.1.0:
version "1.1.4"
@@ -12858,21 +12812,11 @@ minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4:
dependencies:
brace-expansion "^1.1.7"
-minimist@0.0.8:
- version "0.0.8"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
- integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@1.2.5, minimist@^1.2.5:
+minimist@1.2.5, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-minimist@^1.1.1, minimist@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
- integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
minipass-collect@^1.0.2:
version "1.0.2"
resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
@@ -12948,40 +12892,14 @@ mixin-object@^2.0.1:
for-in "^0.1.3"
is-extendable "^0.1.1"
-mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
- integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
- dependencies:
- minimist "0.0.8"
-
-mkdirp@^0.5.4:
+mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.2, mkdirp@^0.5.4, mkdirp@~0.5.1:
version "0.5.5"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
dependencies:
minimist "^1.2.5"
-mocha-junit-reporter@^1.22.0:
- version "1.22.0"
- resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.22.0.tgz#4eee2f3318398bf424a64b7594ca7a39d924479c"
- integrity sha512-nRBCVxzYYhOqQr2XlByLRj5MAAy7djArRkGUSx9dGc+B9NMu4yCeo74uXKALAnMhXjuLmtAL9F8WGe3wQV30IA==
- dependencies:
- debug "^2.2.0"
- md5 "^2.1.0"
- mkdirp "~0.5.1"
- strip-ansi "^4.0.0"
- xml "^1.0.0"
-
-mocha-multi-reporters@^1.1.7:
- version "1.1.7"
- resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
- integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
- dependencies:
- debug "^3.1.0"
- lodash "^4.16.4"
-
-mocha@5.2.0, mocha@^5.2.0:
+mocha@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
@@ -13265,21 +13183,21 @@ node-releases@^1.1.53:
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
-nodemon@^1.18.11:
- version "1.18.11"
- resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.11.tgz#d836ab663776e7995570b963da5bfc807e53f6b8"
- integrity sha512-KdN3tm1zkarlqNo4+W9raU3ihM4H15MVMSE/f9rYDZmFgDHAfAJsomYrHhApAkuUemYjFyEeXlpCOQ2v5gtBEw==
+nodemon@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.3.tgz#e9c64df8740ceaef1cb00e1f3da57c0a93ef3714"
+ integrity sha512-lLQLPS90Lqwc99IHe0U94rDgvjo+G9I4uEIxRG3evSLROcqQ9hwc0AxlSHKS4T1JW/IMj/7N5mthiN58NL/5kw==
dependencies:
- chokidar "^2.1.5"
- debug "^3.1.0"
+ chokidar "^3.2.2"
+ debug "^3.2.6"
ignore-by-default "^1.0.1"
minimatch "^3.0.4"
- pstree.remy "^1.1.6"
- semver "^5.5.0"
- supports-color "^5.2.0"
+ pstree.remy "^1.1.7"
+ semver "^5.7.1"
+ supports-color "^5.5.0"
touch "^3.1.0"
undefsafe "^2.0.2"
- update-notifier "^2.5.0"
+ update-notifier "^4.0.0"
noms@0.0.0:
version "0.0.0"
@@ -13321,7 +13239,7 @@ normalize-path@^2.0.0, normalize-path@^2.1.1:
dependencies:
remove-trailing-separator "^1.0.1"
-normalize-path@^3.0.0:
+normalize-path@^3.0.0, normalize-path@~3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -13625,7 +13543,7 @@ opn@^5.5.0:
dependencies:
is-wsl "^1.1.0"
-optimize-css-assets-webpack-plugin@5.0.3:
+optimize-css-assets-webpack-plugin@^5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz#e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572"
integrity sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA==
@@ -13842,16 +13760,6 @@ p-try@^2.0.0:
resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.1.0.tgz#c1a0f1030e97de018bb2c718929d2af59463e505"
integrity sha512-H2RyIJ7+A3rjkwKC2l5GGtU4H1vkxKCAGsWasNVd0Set+6i4znxbWy6/j16YDPJDWxhsgZiKAstMEP8wCdSpjA==
-package-json@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
- integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
- dependencies:
- got "^6.7.1"
- registry-auth-token "^3.0.1"
- registry-url "^3.0.3"
- semver "^5.1.0"
-
package-json@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/package-json/-/package-json-5.0.0.tgz#a7dbe2725edcc7dc9bcee627672275e323882433"
@@ -14244,14 +14152,13 @@ postcss-attribute-case-insensitive@^4.0.0:
postcss-selector-parser "^5.0.0"
postcss-calc@^7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436"
- integrity sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz#504efcd008ca0273120568b0792b16cdcde8aac1"
+ integrity sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==
dependencies:
- css-unit-converter "^1.1.1"
- postcss "^7.0.5"
- postcss-selector-parser "^5.0.0-rc.4"
- postcss-value-parser "^3.3.1"
+ postcss "^7.0.27"
+ postcss-selector-parser "^6.0.2"
+ postcss-value-parser "^4.0.2"
postcss-color-functional-notation@^2.0.1:
version "2.0.1"
@@ -14814,11 +14721,11 @@ postcss-selector-not@^4.0.0:
postcss "^7.0.2"
postcss-selector-parser@^3.0.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
- integrity sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"
+ integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==
dependencies:
- dot-prop "^4.1.1"
+ dot-prop "^5.2.0"
indexes-of "^1.0.1"
uniq "^1.0.1"
@@ -14869,6 +14776,11 @@ postcss-value-parser@^4.0.0:
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
+postcss-value-parser@^4.0.2:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+ integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
+
postcss-values-parser@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
@@ -14878,7 +14790,7 @@ postcss-values-parser@^2.0.0:
indexes-of "^1.0.1"
uniq "^1.0.1"
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6:
+postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6:
version "7.0.14"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
@@ -14887,6 +14799,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.5,
source-map "^0.6.1"
supports-color "^6.1.0"
+postcss@^7.0.1, postcss@^7.0.27:
+ version "7.0.29"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz#d3a903872bd52280b83bce38cdc83ce55c06129e"
+ integrity sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==
+ dependencies:
+ chalk "^2.4.2"
+ source-map "^0.6.1"
+ supports-color "^6.1.0"
+
postcss@^7.0.16, postcss@^7.0.17:
version "7.0.21"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17"
@@ -14901,7 +14822,7 @@ prelude-ls@~1.1.2:
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-prepend-http@^1.0.0, prepend-http@^1.0.1:
+prepend-http@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
@@ -15085,10 +15006,10 @@ psl@^1.1.24, psl@^1.1.28:
resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
-pstree.remy@^1.1.6:
- version "1.1.6"
- resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz#73a55aad9e2d95814927131fbf4dc1b62d259f47"
- integrity sha512-NdF35+QsqD7EgNEI5mkI/X+UwaxVEbQaz9f4IooEmMUv6ZPmlTQYGjBPJGgrlzNdjSvIy4MWMg6Q6vCgBO2K+w==
+pstree.remy@^1.1.7:
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.7.tgz#c76963a28047ed61542dc361aa26ee55a7fa15f3"
+ integrity sha512-xsMgrUwRpuGskEzBFkH8NmTimbZ5PcPup0LA8JJkHIm2IMUbQcpo3yeLNWVrufEYjh8YwtSVh0xz6UeWc5Oh5A==
public-encrypt@^4.0.0:
version "4.0.3"
@@ -15529,6 +15450,13 @@ readdirp@^2.2.1:
micromatch "^3.1.10"
readable-stream "^2.0.2"
+readdirp@~3.4.0:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
+ integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==
+ dependencies:
+ picomatch "^2.2.1"
+
readline-sync@^1.4.9:
version "1.4.9"
resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda"
@@ -15667,7 +15595,7 @@ regexpu-core@^4.7.0:
unicode-match-property-ecmascript "^1.0.4"
unicode-match-property-value-ecmascript "^1.2.0"
-registry-auth-token@^3.0.1, registry-auth-token@^3.3.2:
+registry-auth-token@^3.3.2:
version "3.4.0"
resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
@@ -15682,7 +15610,7 @@ registry-auth-token@^4.0.0:
dependencies:
rc "^1.2.8"
-registry-url@^3.0.3, registry-url@^3.1.0:
+registry-url@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
@@ -16222,13 +16150,6 @@ semver-compare@^1.0.0:
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
-semver-diff@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
- integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=
- dependencies:
- semver "^5.0.3"
-
semver-diff@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
@@ -16251,11 +16172,16 @@ semver@7.3.2:
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
-semver@^5.0.1, semver@^5.0.3, semver@^5.1.0:
+semver@^5.0.1:
version "5.7.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+semver@^5.7.1:
+ version "5.7.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+ integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
semver@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
@@ -17157,7 +17083,7 @@ supports-color@^4.5.0:
dependencies:
has-flag "^2.0.0"
-supports-color@^5.0.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.5.0:
+supports-color@^5.0.0, supports-color@^5.3.0, supports-color@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -17180,7 +17106,26 @@ supports-hyperlinks@^2.0.0:
has-flag "^4.0.0"
supports-color "^7.0.0"
-svgo@^1.0.0, svgo@^1.1.1:
+svgo@^1.0.0:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
+ integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==
+ dependencies:
+ chalk "^2.4.1"
+ coa "^2.0.2"
+ css-select "^2.0.0"
+ css-select-base-adapter "^0.1.1"
+ css-tree "1.0.0-alpha.37"
+ csso "^4.0.2"
+ js-yaml "^3.13.1"
+ mkdirp "~0.5.1"
+ object.values "^1.1.0"
+ sax "~1.2.4"
+ stable "^0.1.8"
+ unquote "~1.1.1"
+ util.promisify "~1.0.0"
+
+svgo@^1.1.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.0.tgz#305a8fc0f4f9710828c65039bb93d5793225ffc3"
integrity sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw==
@@ -17282,13 +17227,6 @@ temp@^0.9.0:
dependencies:
rimraf "~2.6.2"
-term-size@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
- integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
- dependencies:
- execa "^0.7.0"
-
term-size@^2.1.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753"
@@ -17396,7 +17334,7 @@ thunky@^1.0.2:
resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
-timed-out@^4.0.0, timed-out@^4.0.1:
+timed-out@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
@@ -17902,13 +17840,6 @@ unique-slug@^2.0.0:
dependencies:
imurmurhash "^0.1.4"
-unique-string@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
- integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
- dependencies:
- crypto-random-string "^1.0.0"
-
unique-string@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -17954,33 +17885,12 @@ untildify@4.0.0:
resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
-unzip-response@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
- integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
-
upath@^1.1.0, upath@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
-update-notifier@^2.5.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
- integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==
- dependencies:
- boxen "^1.2.1"
- chalk "^2.0.1"
- configstore "^3.0.0"
- import-lazy "^2.1.0"
- is-ci "^1.0.10"
- is-installed-globally "^0.1.0"
- is-npm "^1.0.0"
- latest-version "^3.0.0"
- semver-diff "^2.0.0"
- xdg-basedir "^3.0.0"
-
-update-notifier@^4.1.0:
+update-notifier@^4.0.0, update-notifier@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz#4866b98c3bc5b5473c020b1250583628f9a328f3"
integrity sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==
@@ -18034,13 +17944,6 @@ url-loader@^1.1.2:
mime "^2.0.3"
schema-utils "^1.0.0"
-url-parse-lax@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
- integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
- dependencies:
- prepend-http "^1.0.1"
-
url-parse-lax@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
@@ -18192,9 +18095,9 @@ vary@~1.1.2:
integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
vendors@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"
- integrity sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
+ integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
verror@1.10.0:
version "1.10.0"
@@ -18672,7 +18575,7 @@ wide-align@^1.1.0:
dependencies:
string-width "^1.0.2 || 2"
-widest-line@^2.0.0, widest-line@^2.0.1:
+widest-line@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==
@@ -18894,15 +18797,6 @@ wrappy@1:
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-write-file-atomic@^2.0.0:
- version "2.4.2"
- resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
- integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==
- dependencies:
- graceful-fs "^4.1.11"
- imurmurhash "^0.1.4"
- signal-exit "^3.0.2"
-
write-file-atomic@^3.0.0:
version "3.0.3"
resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
@@ -18965,11 +18859,6 @@ x-is-string@^0.1.0:
resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
-xdg-basedir@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
- integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
-
xdg-basedir@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
@@ -18995,11 +18884,6 @@ xml2js@^0.4.19:
sax ">=0.6.0"
xmlbuilder "~9.0.1"
-xml@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
- integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
-
xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
version "9.0.7"
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 43c0f8bb76..8692317c90 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -66,3 +66,23 @@ jobs:
condition: always()
continueOnError: true
workingDirectory: Composer
+ - job: security
+ displayName: Security Analysis
+ steps:
+ - task: UseDotNet@2
+ inputs:
+ version: '3.1.x'
+ packageType: runtime
+ - task: DotNetCoreCLI@2
+ displayName: 'dotnet build'
+ inputs:
+ projects: runtime/dotnet
+ - task: ComponentGovernanceComponentDetection@0
+ displayName: Component Detection
+ inputs:
+ scanType: 'Register'
+ verbosity: 'Verbose'
+ alertWarningLevel: 'High'
+
+
+
diff --git a/docker-compose.yml b/docker-compose.yml
index 1700bec26e..bf82d33b90 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,12 +7,12 @@ services:
- "3979-5000:3979-5000"
volumes:
- ~/Documents/Composer:/Bots
- - ./BotProject:/BotProject
+ - ./BotProject:/runtime
- ./.appdata:/appdata
- ./Composer/plugins/localPublish/hostedBots:/app/Composer/plugins/localPublish/hostedBots
environment:
COMPOSER_BOTS_FOLDER: /Bots
- COMPOSER_RUNTIME_FOLDER: /BotProject/Templates
+ COMPOSER_RUNTIME_FOLDER: /runtime
COMPOSER_APP_DATA: /appdata/data.json
PORT: 3000
BOT_ENDPOINT: http://0.0.0.0:3979
diff --git a/docs/Deploying-Composer.md b/docs/Deploying-Composer.md
index 8ea1121fd7..c13bd79032 100644
--- a/docs/Deploying-Composer.md
+++ b/docs/Deploying-Composer.md
@@ -73,7 +73,7 @@ If you made some changes after first run and you would like to rebuild the image
If you are developing some components and you want fast iteraction without re-building container images on every change, please refer to the document to each component for setup instuctions
- [Designer App](https://github.com/microsoft/BotFramework-Designer/tree/master/Composer)
-- [Bot Runtime](https://github.com/microsoft/BotFramework-Composer/tree/master/BotProject/CSharp)
+- [Bot Runtime](https://github.com/microsoft/BotFramework-Composer/tree/master/runtime/dotnet/azurewebapp)
## Build the Composer project and run it locally
@@ -106,7 +106,7 @@ This command builds the Composer app. The build process can take few minutes.
```
yarn start
```
-This command starts the Composer authoring application and the CSharp Bot runtime which is running on http://localhost:3979/api/messages.
+This command starts the Composer authoring application and the dotnet Azure WebApp Bot runtime which is running on http://localhost:3979/api/messages.
To use Composer, open a browser and navigate to http://localhost:3000
@@ -114,5 +114,5 @@ Alternatively you can use one command to start both the Composer and the Bot run
```
yarn startall
```
-This command starts the Composer authoring application and the CSharp Bot runtime.
+This command starts the Composer authoring application and the dotnet Azure WebApp Bot runtime.
diff --git a/docs/architecure/architecure.md b/docs/architecure/architecure.md
index 3f1f22bdf6..08bf6b8523 100644
--- a/docs/architecure/architecure.md
+++ b/docs/architecure/architecure.md
@@ -36,11 +36,17 @@ The bot's assets are the source of truth for the bot at any given time. The Appl
Here is a overview of a potential folder structure
- BotLauncher
- |____CSharp
- | |____runtime.cs
- |____Node
- | |____runtime.js
+ runtime
+ |____dotnet
+ | |____core
+ | |____azurefunctions
+ | |____azurewebapp
+ | |____
+ |____js
+ | |____core
+ | |____azurefunctions
+ | |____azurewebapp
+ | |____
Composer
|____pacakges
@@ -112,8 +118,8 @@ server is api server of Composer web app, which is also the component that work
// each type of connector knows how to invoke and talk to certain type of bot launcher
// it's not the concern of the composer
"launcherConnector": {
- "type": "CSharp",
- "path": "../BotLauncher/CSharp"
+ "type": "azurewebapp",
+ "path": "../runtime/dotnet/azurewebapp"
}
}
```
diff --git a/docs/olddocs/07-11-2019-Hack.md b/docs/olddocs/07-11-2019-Hack.md
index 62fcbbb35f..6c4cdda5ef 100644
--- a/docs/olddocs/07-11-2019-Hack.md
+++ b/docs/olddocs/07-11-2019-Hack.md
@@ -39,7 +39,7 @@ After installing the Composer, open a browser and navigate to http://localhost:
To test a bot from Composer, you need to ensure the Bot Project is running. If you are using dockers to run Composer you are good. If you are building and running Composer yourself (using Yarn), you will need to run the bot project manually.
> Note: only if not running Composer using docker.
-Open a new terminal window. Navigate to the Bot Framework Composer repo. In the repo, navigate to the **BotProject\csharp** folder. Run the following command:
+Open a new terminal window. Navigate to the Bot Framework Composer repo. In the repo, navigate to the **runtime/dotnet/azurewebapp** folder. Run the following command:
```
dotnet run
```
diff --git a/docs/olddocs/architecure/architecure.md b/docs/olddocs/architecure/architecure.md
index 3f1f22bdf6..08bf6b8523 100644
--- a/docs/olddocs/architecure/architecure.md
+++ b/docs/olddocs/architecure/architecure.md
@@ -36,11 +36,17 @@ The bot's assets are the source of truth for the bot at any given time. The Appl
Here is a overview of a potential folder structure
- BotLauncher
- |____CSharp
- | |____runtime.cs
- |____Node
- | |____runtime.js
+ runtime
+ |____dotnet
+ | |____core
+ | |____azurefunctions
+ | |____azurewebapp
+ | |____
+ |____js
+ | |____core
+ | |____azurefunctions
+ | |____azurewebapp
+ | |____
Composer
|____pacakges
@@ -112,8 +118,8 @@ server is api server of Composer web app, which is also the component that work
// each type of connector knows how to invoke and talk to certain type of bot launcher
// it's not the concern of the composer
"launcherConnector": {
- "type": "CSharp",
- "path": "../BotLauncher/CSharp"
+ "type": "azurewebapp",
+ "path": "../runtime/dotnet/azurewebapp"
}
}
```
diff --git a/docs/tutorial/tutorial-get-weather.md b/docs/tutorial/tutorial-get-weather.md
index 013d79a050..1f54ae263f 100644
--- a/docs/tutorial/tutorial-get-weather.md
+++ b/docs/tutorial/tutorial-get-weather.md
@@ -65,11 +65,11 @@ Before you can get the weather forecast you need to know the desired location. Y
2. In the **Unrecognized Prompt** field, enter:
- **Sorry, I do not understand '@{this.value}'. Please specify a zip code in the form 12345**
+ **Sorry, I do not understand '${this.value}'. Please specify a zip code in the form 12345**
3. In the **Invalid Prompt** field, enter:
- **Sorry, '@{this.value}' is not valid. I'm looking for a 5 digit number as zip code. Please specify a zip code in the form 12345**
+ **Sorry, '${this.value}' is not valid. I'm looking for a 5 digit number as zip code. Please specify a zip code in the form 12345**
4. In the **Validation Rules** field, enter:
@@ -99,9 +99,9 @@ The entire process of adding an HTTP request, capturing the results into a prope
- Enter the following in the **Url** field:
- **http://weatherbot-ignite-2019.azurewebsites.net/api/getWeather?zipcode=@{user.zipcode}**
+ **http://weatherbot-ignite-2019.azurewebsites.net/api/getWeather?zipcode=${user.zipcode}**
- This will enable the bot to make an HTTP request to the specified URL. The reference to **@{user.zipcode}** will be replaced by the value from the bots' **user.zipcode** property.
+ This will enable the bot to make an HTTP request to the specified URL. The reference to **${user.zipcode}** will be replaced by the value from the bots' **user.zipcode** property.
@@ -133,7 +133,7 @@ The entire process of adding an HTTP request, capturing the results into a prope
7. Next, enter the following in the **Value** field:
- **dialog.api_response.content**
+ **=dialog.api_response.content**
@@ -141,7 +141,7 @@ The entire process of adding an HTTP request, capturing the results into a prope
9. In the **Properties panel** on the right, enter the following response to send:
- `The weather is @{dialog.weather.weather} and the temp is @{dialog.weather.temp}°`
+ `The weather is ${dialog.weather.weather} and the temp is ${dialog.weather.temp}°`
The flow should now appear in the **Authoring canvas** as follows:
@@ -151,7 +151,7 @@ You will now tell the bot what to do in the event that the [statusCode](https://
10. Select the **+** button in the **False** branch, then select **Send a response** and set the text of the message to:
- **I got an error: @{dialog.api_response.content.message}**
+ **I got an error: ${dialog.api_response.content.message}**
11. For the purposes of this tutorial we will assume that if you are in this branch, it is because the zip code is invalid, and if it is invalid it should be removed so that the invalid value does not persist in the **user.zipcode** property. To remove the invalid value from this property, select the **+** button that follows the **Send a response** action you created in the previous step, then select **Delete a property** from the **Manage properties** menu.
diff --git a/runtime/dotnet/ComposerRuntime.sln b/runtime/dotnet/ComposerRuntime.sln
new file mode 100644
index 0000000000..f39a16131b
--- /dev/null
+++ b/runtime/dotnet/ComposerRuntime.sln
@@ -0,0 +1,43 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29920.165
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.BotFramework.Composer.WebApp", "azurewebapp\Microsoft.BotFramework.Composer.WebApp.csproj", "{80ACF5BE-4A04-46F8-A83E-530FB21948D5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.BotFramework.Composer.Tests", "tests\Microsoft.BotFramework.Composer.Tests.csproj", "{5AFADEA2-A18F-46DF-8080-2CA418880318}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.BotFramework.Composer.Core", "core\Microsoft.BotFramework.Composer.Core.csproj", "{35E20444-438D-4241-833C-804A24E9CB4F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.BotFramework.Composer.Functions", "azurefunctions\Microsoft.BotFramework.Composer.Functions.csproj", "{9FC308C1-F0EC-41BE-90FD-9DC00DA7B80B}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {80ACF5BE-4A04-46F8-A83E-530FB21948D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {80ACF5BE-4A04-46F8-A83E-530FB21948D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {80ACF5BE-4A04-46F8-A83E-530FB21948D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {80ACF5BE-4A04-46F8-A83E-530FB21948D5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5AFADEA2-A18F-46DF-8080-2CA418880318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5AFADEA2-A18F-46DF-8080-2CA418880318}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5AFADEA2-A18F-46DF-8080-2CA418880318}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5AFADEA2-A18F-46DF-8080-2CA418880318}.Release|Any CPU.Build.0 = Release|Any CPU
+ {35E20444-438D-4241-833C-804A24E9CB4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {35E20444-438D-4241-833C-804A24E9CB4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {35E20444-438D-4241-833C-804A24E9CB4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {35E20444-438D-4241-833C-804A24E9CB4F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9FC308C1-F0EC-41BE-90FD-9DC00DA7B80B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9FC308C1-F0EC-41BE-90FD-9DC00DA7B80B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9FC308C1-F0EC-41BE-90FD-9DC00DA7B80B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9FC308C1-F0EC-41BE-90FD-9DC00DA7B80B}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {B13FC467-1A63-4C8F-A29E-43B2D8B79B17}
+ EndGlobalSection
+EndGlobal
diff --git a/BotProject/Templates/CSharp/NuGet.Config b/runtime/dotnet/NuGet.Config
similarity index 100%
rename from BotProject/Templates/CSharp/NuGet.Config
rename to runtime/dotnet/NuGet.Config
diff --git a/runtime/dotnet/README.md b/runtime/dotnet/README.md
new file mode 100644
index 0000000000..f41b1a16da
--- /dev/null
+++ b/runtime/dotnet/README.md
@@ -0,0 +1,7 @@
+# DotNet bot runtime
+
+# Folder structure
+
+- **core**: Includes all core JavaScript runtime logic, independent of hosting technology.
+- **technology specific folders**: Each hosting technology has one folder in this directory. For example, for Azure Functions, there is an `azurefunction` folder
+ - **tests**: Javascript runtime tests
diff --git a/runtime/dotnet/azurefunctions/.gitignore b/runtime/dotnet/azurefunctions/.gitignore
new file mode 100644
index 0000000000..ff5b00c506
--- /dev/null
+++ b/runtime/dotnet/azurefunctions/.gitignore
@@ -0,0 +1,264 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# Azure Functions localsettings file
+local.settings.json
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+#*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
\ No newline at end of file
diff --git a/runtime/dotnet/azurefunctions/MessagesTrigger.cs b/runtime/dotnet/azurefunctions/MessagesTrigger.cs
new file mode 100644
index 0000000000..f431149953
--- /dev/null
+++ b/runtime/dotnet/azurefunctions/MessagesTrigger.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Microsoft.Bot.Builder.Integration.AspNet.Core;
+using Microsoft.Bot.Builder;
+using System.Web.Http;
+
+namespace Microsoft.BotFramework.Composer.Functions
+{
+ public class MessagesTrigger
+ {
+ private readonly IBotFrameworkHttpAdapter _adapter;
+ private readonly IBot _bot;
+
+ public MessagesTrigger(IBotFrameworkHttpAdapter adapter, IBot bot)
+ {
+ this._adapter = adapter ?? throw new ArgumentNullException(nameof(adapter));
+ this._bot = bot ?? throw new ArgumentNullException(nameof(bot));
+ }
+
+ [FunctionName("messages")]
+ public async Task Run(
+ [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequest req,
+ ILogger log)
+ {
+ log.LogInformation($"Messages endpoint triggered.");
+
+ // Delegate the processing of the HTTP POST to the adapter.
+ // The adapter will invoke the bot.
+ await _adapter.ProcessAsync(req, req.HttpContext.Response, _bot);
+
+ return new OkResult();
+ }
+ }
+}
diff --git a/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.FunctionTemplate.csproj b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.FunctionTemplate.csproj
new file mode 100644
index 0000000000..88a550947e
--- /dev/null
+++ b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.FunctionTemplate.csproj
@@ -0,0 +1,4 @@
+
+
+
\ No newline at end of file
diff --git a/BotProject/Templates/CSharp/BotProject.ruleset b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.FunctionTemplate.ruleset
similarity index 100%
rename from BotProject/Templates/CSharp/BotProject.ruleset
rename to runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.FunctionTemplate.ruleset
diff --git a/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
new file mode 100644
index 0000000000..9e9bddff65
--- /dev/null
+++ b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
@@ -0,0 +1,70 @@
+
+
+
+ netcoreapp3.0
+ v3
+ 2eb1c70c-5cd2-4c08-8aab-df989c347067
+
+
+ ..\core\Microsoft.BotFramework.Composer.Core.ruleset
+
+
+ ..\core\Microsoft.BotFramework.Composer.Core.ruleset
+
+
+
+
+
+
+
+ Always
+
+
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+
\ No newline at end of file
diff --git a/runtime/dotnet/azurefunctions/Settings/ActivitySerializationSettings.cs b/runtime/dotnet/azurefunctions/Settings/ActivitySerializationSettings.cs
new file mode 100644
index 0000000000..645665ecaa
--- /dev/null
+++ b/runtime/dotnet/azurefunctions/Settings/ActivitySerializationSettings.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.Rest.Serialization;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.BotFramework.Composer.Functions.Settings
+{
+ internal class ActivitySerializationSettings
+ {
+ internal static readonly JsonSerializerSettings Default = new JsonSerializerSettings
+ {
+ NullValueHandling = NullValueHandling.Ignore,
+ Formatting = Formatting.Indented,
+ DateFormatHandling = DateFormatHandling.IsoDateFormat,
+ DateTimeZoneHandling = DateTimeZoneHandling.Utc,
+ ReferenceLoopHandling = ReferenceLoopHandling.Serialize,
+ ContractResolver = new ReadOnlyJsonContractResolver(),
+ Converters = new List { new Iso8601TimeSpanConverter() }
+ };
+
+ }
+}
diff --git a/runtime/dotnet/azurefunctions/SkillsTrigger.cs b/runtime/dotnet/azurefunctions/SkillsTrigger.cs
new file mode 100644
index 0000000000..30528b4cf3
--- /dev/null
+++ b/runtime/dotnet/azurefunctions/SkillsTrigger.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Microsoft.Bot.Builder.Integration.AspNet.Core;
+using Microsoft.Bot.Builder;
+using System.Web.Http;
+using Microsoft.Bot.Builder.Skills;
+using Microsoft.Bot.Schema;
+using Microsoft.BotFramework.Composer.Functions.Settings;
+
+namespace Microsoft.BotFramework.Composer.Functions
+{
+ public class SkillsTrigger
+ {
+ private readonly SkillHandler _skillHandler;
+
+ public SkillsTrigger(SkillHandler skillHandler)
+ {
+ this._skillHandler = skillHandler ?? throw new ArgumentNullException(nameof(skillHandler));
+ }
+
+ [FunctionName("skills")]
+ public async Task ReplyToActivityAsync(
+ [HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = "v3/conversations/{conversationId}/activities/{activityId}")] HttpRequest req,
+ string conversationId, string activityId, ILogger log)
+ {
+ log.LogInformation($"Skill ReplyToActivityAsync endpoint triggered.");
+
+ var body = await req.ReadAsStringAsync();
+ var activity = JsonConvert.DeserializeObject(body, ActivitySerializationSettings.Default);
+ var result = await _skillHandler.HandleReplyToActivityAsync(req.Headers["Authorization"], conversationId, activityId, activity);
+
+ return new JsonResult(result, ActivitySerializationSettings.Default);
+ }
+
+
+ //[FunctionName("skills")]
+ //public async Task SendToConversationAsync(
+ // [HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = "v3/conversations/{conversationId}/activities")] HttpRequest req,
+ // string conversationId, string activityId, ILogger log)
+ //{
+ // log.LogInformation($"Skill ReplyToActivityAsync endpoint triggered.");
+
+ // var body = await req.ReadAsStringAsync();
+ // var activity = JsonConvert.DeserializeObject(body, ActivitySerializationSettings.Default);
+ // var result = await _skillHandler.HandleSendToConversationAsync(req.Headers["Authorization"], conversationId, activity);
+
+ // return new JsonResult(result, ActivitySerializationSettings.Default);
+ //}
+ }
+}
diff --git a/runtime/dotnet/azurefunctions/Startup.cs b/runtime/dotnet/azurefunctions/Startup.cs
new file mode 100644
index 0000000000..395a87cf58
--- /dev/null
+++ b/runtime/dotnet/azurefunctions/Startup.cs
@@ -0,0 +1,211 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.ApplicationInsights.Extensibility;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Azure.Functions.Extensions.DependencyInjection;
+using Microsoft.Bot.Builder;
+using Microsoft.Bot.Builder.AI.Luis;
+using Microsoft.Bot.Builder.Azure;
+using Microsoft.Bot.Builder.BotFramework;
+using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
+using Microsoft.Bot.Builder.Integration.ApplicationInsights.Core;
+using Microsoft.Bot.Builder.Integration.AspNet.Core;
+using Microsoft.Bot.Builder.Integration.AspNet.Core.Skills;
+using Microsoft.Bot.Builder.Skills;
+using Microsoft.Bot.Connector.Authentication;
+using Microsoft.BotFramework.Composer.Core;
+using Microsoft.BotFramework.Composer.Core.Settings;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Text;
+
+[assembly: FunctionsStartup(typeof(Microsoft.BotFramework.Composer.Functions.Startup))]
+
+namespace Microsoft.BotFramework.Composer.Functions
+{
+ public class Startup : FunctionsStartup
+ {
+ private IConfigurationRoot BuildConfiguration(string rootDirectory)
+ {
+ var config = new ConfigurationBuilder();
+
+ config
+ .SetBasePath(rootDirectory)
+ .AddJsonFile("ComposerDialogs/settings/appsettings.json", optional: true, reloadOnChange: true)
+ .UseLuisConfigAdapter()
+ .UseLuisSettings();
+
+ config.AddJsonFile("appsettings.deployment.json", optional: true, reloadOnChange: true);
+ if (Debugger.IsAttached)
+ {
+ // Local Debug
+ //config.AddJsonFile("appsettings.development.json", optional: true, reloadOnChange: true);
+ }
+ else
+ {
+ //Azure Deploy
+ //config.AddJsonFile("appsettings.deployment.json", optional: true, reloadOnChange: true);
+ config.AddUserSecrets();
+ }
+
+ config.AddEnvironmentVariables();
+
+ return config.Build();
+ }
+
+ public override void Configure(IFunctionsHostBuilder builder)
+ {
+ var binDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+ var rootDirectory = Directory.GetParent(binDirectory).FullName;
+
+ var rootConfiguration = BuildConfiguration(rootDirectory);
+
+ var settings = new BotSettings();
+ rootConfiguration.Bind(settings);
+
+ var services = builder.Services;
+
+ services.AddLogging();
+
+ // Create the credential provider to be used with the Bot Framework Adapter.
+ services.AddSingleton();
+ services.AddSingleton(sp => (BotFrameworkHttpAdapter)sp.GetService());
+
+ // Register AuthConfiguration to enable custom claim validation.
+ services.AddSingleton();
+
+ // Register the skills client and skills request handler.
+ services.AddSingleton();
+ services.AddHttpClient();
+ services.AddSingleton();
+
+ // Register telemetry client, initializers and middleware
+ services.AddApplicationInsightsTelemetry();
+ services.AddSingleton();
+ services.AddSingleton();
+ services.AddSingleton(sp =>
+ {
+ var telemetryClient = sp.GetService();
+ return new TelemetryLoggerMiddleware(telemetryClient, logPersonalInformation: settings.Telemetry.LogPersonalInformation);
+ });
+ services.AddSingleton(sp =>
+ {
+ var httpContextAccessor = sp.GetService();
+ var telemetryLoggerMiddleware = sp.GetService();
+ return new TelemetryInitializerMiddleware(httpContextAccessor, telemetryLoggerMiddleware, settings.Telemetry.LogActivities);
+ });
+
+ // Storage
+ IStorage storage;
+ if (settings.Feature.UseCosmosDbPersistentStorage && !string.IsNullOrEmpty(settings.CosmosDb.AuthKey))
+ {
+ storage = new CosmosDbPartitionedStorage(settings.CosmosDb);
+ }
+ else
+ {
+ storage = new MemoryStorage();
+ }
+
+ services.AddSingleton(storage);
+ var userState = new UserState(storage);
+ var conversationState = new ConversationState(storage);
+ services.AddSingleton(userState);
+ services.AddSingleton(conversationState);
+
+ // Resource explorer to track declarative assets
+ var resourceExplorer = new ResourceExplorer().AddFolder(Path.Combine(rootDirectory, "ComposerDialogs"));
+ services.AddSingleton(resourceExplorer);
+
+ // Adapter
+ services.AddSingleton(s =>
+ {
+ // Retrieve required dependencies
+ //IConfiguration configuration = s.GetService();
+ IStorage storage = s.GetService();
+ UserState userState = s.GetService();
+ ConversationState conversationState = s.GetService();
+
+ var adapter = new BotFrameworkHttpAdapter(new ConfigurationCredentialProvider(rootConfiguration));
+
+ adapter
+ .UseStorage(storage)
+ .UseState(userState, conversationState);
+
+ // Configure Middlewares
+ ConfigureTranscriptLoggerMiddleware(adapter, settings);
+ ConfigureInspectionMiddleWare(adapter, settings, s);
+ ConfigureShowTypingMiddleWare(adapter, settings);
+
+ adapter.OnTurnError = async (turnContext, exception) =>
+ {
+ await turnContext.SendActivityAsync(exception.Message).ConfigureAwait(false);
+ await conversationState.ClearStateAsync(turnContext).ConfigureAwait(false);
+ await conversationState.SaveChangesAsync(turnContext).ConfigureAwait(false);
+ };
+
+ return adapter;
+ });
+
+ var defaultLocale = rootConfiguration.GetValue("defaultLocale") ?? "en-us";
+
+ // Bot
+ services.AddSingleton(s =>
+ new ComposerBot(
+ s.GetService(),
+ s.GetService(),
+ s.GetService(),
+ s.GetService(),
+ s.GetService(),
+ s.GetService(),
+ GetRootDialog(Path.Combine(rootDirectory, settings.Bot)),
+ defaultLocale));
+ }
+
+ public void ConfigureTranscriptLoggerMiddleware(BotFrameworkHttpAdapter adapter, BotSettings settings)
+ {
+ if (settings.Feature.UseTranscriptLoggerMiddleware)
+ {
+ if (!string.IsNullOrEmpty(settings.BlobStorage.ConnectionString) && !string.IsNullOrEmpty(settings.BlobStorage.Container))
+ {
+ adapter.Use(new TranscriptLoggerMiddleware(new AzureBlobTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
+ }
+ }
+ }
+
+ public void ConfigureShowTypingMiddleWare(BotFrameworkAdapter adapter, BotSettings settings)
+ {
+ if (settings.Feature.UseShowTypingMiddleware)
+ {
+ adapter.Use(new ShowTypingMiddleware());
+ }
+ }
+
+ public void ConfigureInspectionMiddleWare(BotFrameworkAdapter adapter, BotSettings settings, IServiceProvider s)
+ {
+ if (settings.Feature.UseInspectionMiddleware)
+ {
+ adapter.Use(s.GetService());
+ }
+ }
+
+ private string GetRootDialog(string folderPath)
+ {
+ var dir = new DirectoryInfo(folderPath);
+ foreach (var f in dir.GetFiles())
+ {
+ if (f.Extension == ".dialog")
+ {
+ return f.Name;
+ }
+ }
+
+ throw new Exception($"Can't locate root dialog in {dir.FullName}");
+ }
+ }
+}
diff --git a/BotProject/Templates/CSharp/appsettings.Deployment.json b/runtime/dotnet/azurefunctions/appsettings.Deployment.json
similarity index 96%
rename from BotProject/Templates/CSharp/appsettings.Deployment.json
rename to runtime/dotnet/azurefunctions/appsettings.Deployment.json
index f242753bcb..5b9a266f9e 100644
--- a/BotProject/Templates/CSharp/appsettings.Deployment.json
+++ b/runtime/dotnet/azurefunctions/appsettings.Deployment.json
@@ -1,4 +1,4 @@
{
"bot": "ComposerDialogs",
"root": "ComposerDialogs"
-}
+}
\ No newline at end of file
diff --git a/BotProject/Templates/CSharp/appsettings.Development.json b/runtime/dotnet/azurefunctions/appsettings.Development.json
similarity index 100%
rename from BotProject/Templates/CSharp/appsettings.Development.json
rename to runtime/dotnet/azurefunctions/appsettings.Development.json
diff --git a/BotProject/Templates/CSharp/appsettings.json b/runtime/dotnet/azurefunctions/appsettings.json
similarity index 100%
rename from BotProject/Templates/CSharp/appsettings.json
rename to runtime/dotnet/azurefunctions/appsettings.json
diff --git a/runtime/dotnet/azurefunctions/host.json b/runtime/dotnet/azurefunctions/host.json
new file mode 100644
index 0000000000..903482d949
--- /dev/null
+++ b/runtime/dotnet/azurefunctions/host.json
@@ -0,0 +1,3 @@
+{
+ "version": "2.0"
+}
diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/.gitignore b/runtime/dotnet/azurewebapp/.gitignore
similarity index 100%
rename from Composer/packages/server/assets/projects/ToDoBotWithLuisSample/.gitignore
rename to runtime/dotnet/azurewebapp/.gitignore
diff --git a/BotProject/Templates/CSharp/Controllers/BotController.cs b/runtime/dotnet/azurewebapp/Controllers/BotController.cs
similarity index 90%
rename from BotProject/Templates/CSharp/Controllers/BotController.cs
rename to runtime/dotnet/azurewebapp/Controllers/BotController.cs
index 5085705abb..daaba0d810 100644
--- a/BotProject/Templates/CSharp/Controllers/BotController.cs
+++ b/runtime/dotnet/azurewebapp/Controllers/BotController.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
//
// Generated with Bot Builder V4 SDK Template for Visual Studio EchoBot v4.3.0
@@ -10,7 +10,7 @@
using Microsoft.Bot.Builder.Dialogs.Debugging;
using Microsoft.Bot.Builder.Integration.AspNet.Core;
-namespace Microsoft.Bot.Builder.ComposerBot.Json
+namespace Microsoft.BotFramework.Composer.WebAppTemplates.Controllers
{
// This ASP Controller is created to handle a request. Dependency Injection will provide the Adapter and IBot
// implementation at runtime. Multiple different IBot implementations running at different endpoints can be
diff --git a/BotProject/Templates/CSharp/Controllers/SkillController.cs b/runtime/dotnet/azurewebapp/Controllers/SkillController.cs
similarity index 90%
rename from BotProject/Templates/CSharp/Controllers/SkillController.cs
rename to runtime/dotnet/azurewebapp/Controllers/SkillController.cs
index 62b6390dd6..a8853db745 100644
--- a/BotProject/Templates/CSharp/Controllers/SkillController.cs
+++ b/runtime/dotnet/azurewebapp/Controllers/SkillController.cs
@@ -1,14 +1,15 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.Integration.AspNet.Core;
using Microsoft.Bot.Builder.Skills;
using Microsoft.Bot.Schema;
-namespace Microsoft.Bot.Builder.TestBot.Json.Controllers
+namespace Microsoft.BotFramework.Composer.WebAppTemplates.Controllers
{
///
/// A controller that handles skill replies to the bot.
diff --git a/BotProject/Templates/CSharp/BotProject.csproj b/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj
similarity index 81%
rename from BotProject/Templates/CSharp/BotProject.csproj
rename to runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj
index 0374abb22e..227626f290 100644
--- a/BotProject/Templates/CSharp/BotProject.csproj
+++ b/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj
@@ -4,16 +4,15 @@
netcoreapp3.1
-
+ Always
+
- BotProject.ruleset
+ ..\core\Microsoft.BotFramework.Composer.Core.ruleset
- BotProject.ruleset
+ ..\core\Microsoft.BotFramework.Composer.Core.ruleset
runtime; build; native; contentfiles; analyzers
+
+
\ No newline at end of file
diff --git a/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebAppTemplate.ruleset b/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebAppTemplate.ruleset
new file mode 100644
index 0000000000..3f028d9ac2
--- /dev/null
+++ b/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebAppTemplate.ruleset
@@ -0,0 +1,199 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/BotProject/Templates/CSharp/Program.cs b/runtime/dotnet/azurewebapp/Program.cs
similarity index 93%
rename from BotProject/Templates/CSharp/Program.cs
rename to runtime/dotnet/azurewebapp/Program.cs
index aba639fc91..e080ee0004 100644
--- a/BotProject/Templates/CSharp/Program.cs
+++ b/runtime/dotnet/azurewebapp/Program.cs
@@ -8,10 +8,11 @@
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Bot.Builder.AI.Luis;
+using Microsoft.BotFramework.Composer.Core;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
-namespace Microsoft.Bot.Builder.ComposerBot.Json
+namespace Microsoft.BotFramework.Composer.WebAppTemplates
{
public class Program
{
@@ -25,7 +26,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
.ConfigureAppConfiguration((hostingContext, builder) =>
{
var env = hostingContext.HostingEnvironment;
-
+
builder.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
if (env.IsDevelopment())
@@ -49,7 +50,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
builder.AddJsonFile("appsettings.deployment.json", optional: true, reloadOnChange: true);
}
- builder.UseLuisConfigAdaptor()
+ builder.UseLuisConfigAdapter()
.UseLuisSettings();
builder.AddEnvironmentVariables()
diff --git a/BotProject/Templates/CSharp/Properties/launchSettings.json b/runtime/dotnet/azurewebapp/Properties/launchSettings.json
similarity index 100%
rename from BotProject/Templates/CSharp/Properties/launchSettings.json
rename to runtime/dotnet/azurewebapp/Properties/launchSettings.json
diff --git a/runtime/dotnet/azurewebapp/README.md b/runtime/dotnet/azurewebapp/README.md
new file mode 100644
index 0000000000..356528b3d7
--- /dev/null
+++ b/runtime/dotnet/azurewebapp/README.md
@@ -0,0 +1,21 @@
+## Bot Project
+Bot project is the launcher project for the bots written in declarative form (JSON), using the Composer, for the Bot Framework SDK.
+
+## Instructions for setting up the Bot Project runtime
+The Bot Project is a regular Bot Framework SDK V4 project. Before you can launch it from the emulator, you need to make sure you can run the bot.
+
+### Prerequisite:
+* Install .Netcore 3.1
+
+### Commands:
+
+* from root folder
+* cd templates/dotnet/Microsoft.BotFramework.Composer.WebAppTemplate
+* dotnet user-secrets init // init the user secret id
+* dotnet build // build
+* dotnet run // start the bot
+* It will start a web server and listening at http://localhost:3979.
+
+### Test bot
+* You can set you emulator to connect to http://localhost:3979/api/messages.
+
diff --git a/BotProject/Templates/CSharp/Schemas/readme.md b/runtime/dotnet/azurewebapp/Schemas/readme.md
similarity index 100%
rename from BotProject/Templates/CSharp/Schemas/readme.md
rename to runtime/dotnet/azurewebapp/Schemas/readme.md
diff --git a/BotProject/Templates/CSharp/Schemas/sdk.schema b/runtime/dotnet/azurewebapp/Schemas/sdk.schema
similarity index 100%
rename from BotProject/Templates/CSharp/Schemas/sdk.schema
rename to runtime/dotnet/azurewebapp/Schemas/sdk.schema
diff --git a/BotProject/Templates/CSharp/Schemas/update.cmd b/runtime/dotnet/azurewebapp/Schemas/update.cmd
similarity index 100%
rename from BotProject/Templates/CSharp/Schemas/update.cmd
rename to runtime/dotnet/azurewebapp/Schemas/update.cmd
diff --git a/BotProject/Templates/CSharp/Scripts/build_runtime.ps1 b/runtime/dotnet/azurewebapp/Scripts/build_runtime.ps1
similarity index 100%
rename from BotProject/Templates/CSharp/Scripts/build_runtime.ps1
rename to runtime/dotnet/azurewebapp/Scripts/build_runtime.ps1
diff --git a/BotProject/Templates/CSharp/Scripts/build_runtime.sh b/runtime/dotnet/azurewebapp/Scripts/build_runtime.sh
similarity index 100%
rename from BotProject/Templates/CSharp/Scripts/build_runtime.sh
rename to runtime/dotnet/azurewebapp/Scripts/build_runtime.sh
diff --git a/BotProject/Templates/CSharp/Scripts/create.ps1 b/runtime/dotnet/azurewebapp/Scripts/create.ps1
similarity index 100%
rename from BotProject/Templates/CSharp/Scripts/create.ps1
rename to runtime/dotnet/azurewebapp/Scripts/create.ps1
diff --git a/BotProject/Templates/CSharp/Scripts/deploy.ps1 b/runtime/dotnet/azurewebapp/Scripts/deploy.ps1
similarity index 99%
rename from BotProject/Templates/CSharp/Scripts/deploy.ps1
rename to runtime/dotnet/azurewebapp/Scripts/deploy.ps1
index d2311ec804..3f510dfb8f 100644
--- a/BotProject/Templates/CSharp/Scripts/deploy.ps1
+++ b/runtime/dotnet/azurewebapp/Scripts/deploy.ps1
@@ -47,7 +47,7 @@ else {
# Check for existing deployment files
if (-not (Test-Path (Join-Path $projFolder '.deployment'))) {
# Add needed deployment files for az
- az bot prepare-deploy --lang Csharp --code-dir $projFolder --proj-file-path BotProject.csproj --output json | Out-Null
+ az bot prepare-deploy --lang Csharp --code-dir $projFolder --proj-file-path Microsoft.BotFramework.Composer.WebApp.csproj --output json | Out-Null
}
# Delete src zip, if it exists
diff --git a/BotProject/Templates/CSharp/Startup.cs b/runtime/dotnet/azurewebapp/Startup.cs
similarity index 97%
rename from BotProject/Templates/CSharp/Startup.cs
rename to runtime/dotnet/azurewebapp/Startup.cs
index 0b0a24315f..cb1cae6566 100644
--- a/BotProject/Templates/CSharp/Startup.cs
+++ b/runtime/dotnet/azurewebapp/Startup.cs
@@ -9,6 +9,7 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.ApplicationInsights;
using Microsoft.Bot.Builder.Azure;
using Microsoft.Bot.Builder.BotFramework;
@@ -18,10 +19,12 @@
using Microsoft.Bot.Builder.Integration.AspNet.Core.Skills;
using Microsoft.Bot.Builder.Skills;
using Microsoft.Bot.Connector.Authentication;
+using Microsoft.BotFramework.Composer.Core;
+using Microsoft.BotFramework.Composer.Core.Settings;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-namespace Microsoft.Bot.Builder.ComposerBot.Json
+namespace Microsoft.BotFramework.Composer.WebAppTemplates
{
public class Startup
{
diff --git a/runtime/dotnet/azurewebapp/appsettings.Deployment.json b/runtime/dotnet/azurewebapp/appsettings.Deployment.json
new file mode 100644
index 0000000000..5b9a266f9e
--- /dev/null
+++ b/runtime/dotnet/azurewebapp/appsettings.Deployment.json
@@ -0,0 +1,4 @@
+{
+ "bot": "ComposerDialogs",
+ "root": "ComposerDialogs"
+}
\ No newline at end of file
diff --git a/runtime/dotnet/azurewebapp/appsettings.Development.json b/runtime/dotnet/azurewebapp/appsettings.Development.json
new file mode 100644
index 0000000000..edb1022967
--- /dev/null
+++ b/runtime/dotnet/azurewebapp/appsettings.Development.json
@@ -0,0 +1,4 @@
+{
+ "bot": "../../",
+ "root": "../../"
+}
diff --git a/runtime/dotnet/azurewebapp/appsettings.json b/runtime/dotnet/azurewebapp/appsettings.json
new file mode 100644
index 0000000000..93b869b25c
--- /dev/null
+++ b/runtime/dotnet/azurewebapp/appsettings.json
@@ -0,0 +1,27 @@
+{
+ "feature": {
+ "UseTelementryLoggerMiddleware": false,
+ "UseTranscriptLoggerMiddleware": false,
+ "UseShowTypingMiddleware": false,
+ "UseInspectionMiddleware": false,
+ "UseCosmosDb": false
+ },
+ "microsoftAppId": "",
+ "cosmosDb": {
+ "authKey": "",
+ "collectionId": "botstate-collection",
+ "cosmosDBEndpoint": "",
+ "databaseId": "botstate-db"
+ },
+ "applicationInsights": {
+ "InstrumentationKey": ""
+ },
+ "telemetry": {
+ "logPersonalInformation": false,
+ "logActivities": true
+ },
+ "blobStorage": {
+ "connectionString": "",
+ "container": "transcripts"
+ }
+}
diff --git a/BotProject/Templates/CSharp/packages/packages.json b/runtime/dotnet/azurewebapp/packages/packages.json
similarity index 100%
rename from BotProject/Templates/CSharp/packages/packages.json
rename to runtime/dotnet/azurewebapp/packages/packages.json
diff --git a/BotProject/Templates/CSharp/wwwroot/default.htm b/runtime/dotnet/azurewebapp/wwwroot/default.htm
similarity index 100%
rename from BotProject/Templates/CSharp/wwwroot/default.htm
rename to runtime/dotnet/azurewebapp/wwwroot/default.htm
diff --git a/runtime/dotnet/core/.gitignore b/runtime/dotnet/core/.gitignore
new file mode 100644
index 0000000000..1557a3a3b1
--- /dev/null
+++ b/runtime/dotnet/core/.gitignore
@@ -0,0 +1,9 @@
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+
+!Properties/launchSettings.json
+!packages/packages.json
diff --git a/BotProject/Templates/CSharp/ComposerBot.cs b/runtime/dotnet/core/ComposerBot.cs
similarity index 93%
rename from BotProject/Templates/CSharp/ComposerBot.cs
rename to runtime/dotnet/core/ComposerBot.cs
index 09ab38a311..584bdbd50a 100644
--- a/BotProject/Templates/CSharp/ComposerBot.cs
+++ b/runtime/dotnet/core/ComposerBot.cs
@@ -5,6 +5,7 @@
using System.Security.Principal;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.Dialogs;
using Microsoft.Bot.Builder.Dialogs.Adaptive;
using Microsoft.Bot.Builder.Dialogs.Debugging;
@@ -13,7 +14,7 @@
using Microsoft.Bot.Builder.Skills;
using Microsoft.Bot.Connector.Authentication;
-namespace Microsoft.Bot.Builder.ComposerBot.Json
+namespace Microsoft.BotFramework.Composer.Core
{
public class ComposerBot : ActivityHandler
{
@@ -65,8 +66,12 @@ private void LoadRootDialogAsync()
this.dialogManager = new DialogManager(rootDialog)
.UseResourceExplorer(resourceExplorer)
.UseLanguageGeneration()
- .UseTelemetry(this.telemetryClient)
- .UseLanguagePolicy(new LanguagePolicy(defaultLocale));
+ .UseLanguagePolicy(new LanguagePolicy(defaultLocale));
+
+ if (telemetryClient != null)
+ {
+ dialogManager.UseTelemetry(this.telemetryClient);
+ }
}
}
}
diff --git a/BotProject/Templates/CSharp/LuisConfig.cs b/runtime/dotnet/core/LuisConfig.cs
similarity index 86%
rename from BotProject/Templates/CSharp/LuisConfig.cs
rename to runtime/dotnet/core/LuisConfig.cs
index 506d52e343..bc2ff6c834 100644
--- a/BotProject/Templates/CSharp/LuisConfig.cs
+++ b/runtime/dotnet/core/LuisConfig.cs
@@ -1,9 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System.Collections.Generic;
-namespace Microsoft.Bot.Builder.ComposerBot.Json
+namespace Microsoft.BotFramework.Composer.Core
{
public class LuisConfig
{
diff --git a/BotProject/Templates/CSharp/LuisConfigAdaptor.cs b/runtime/dotnet/core/LuisConfigAdapter.cs
similarity index 72%
rename from BotProject/Templates/CSharp/LuisConfigAdaptor.cs
rename to runtime/dotnet/core/LuisConfigAdapter.cs
index 6f23086f3b..c879fd1494 100644
--- a/BotProject/Templates/CSharp/LuisConfigAdaptor.cs
+++ b/runtime/dotnet/core/LuisConfigAdapter.cs
@@ -2,15 +2,13 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
-namespace Microsoft.Bot.Builder.ComposerBot.Json
+namespace Microsoft.BotFramework.Composer.Core
{
- public static class LuisConfigAdaptor
+ public static class LuisConfigAdapter
{
- public static IConfigurationBuilder UseLuisConfigAdaptor(this IConfigurationBuilder builder)
+ public static IConfigurationBuilder UseLuisConfigAdapter(this IConfigurationBuilder builder)
{
var configuration = builder.Build();
var settings = new Dictionary();
diff --git a/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj b/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
new file mode 100644
index 0000000000..4b0d8eb858
--- /dev/null
+++ b/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
@@ -0,0 +1,28 @@
+
+
+
+ netstandard2.0
+
+
+
+ Microsoft.BotFramework.Composer.Core.ruleset
+
+
+
+ Microsoft.BotFramework.Composer.Core.ruleset
+
+
+
+
+
+
diff --git a/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.ruleset b/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.ruleset
new file mode 100644
index 0000000000..3f028d9ac2
--- /dev/null
+++ b/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.ruleset
@@ -0,0 +1,199 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/BotProject/Templates/CSharp/BotSettings/BlobStorageConfiguration.cs b/runtime/dotnet/core/Settings/BlobStorageConfiguration.cs
similarity index 86%
rename from BotProject/Templates/CSharp/BotSettings/BlobStorageConfiguration.cs
rename to runtime/dotnet/core/Settings/BlobStorageConfiguration.cs
index abca25e5db..e6ab40402f 100644
--- a/BotProject/Templates/CSharp/BotSettings/BlobStorageConfiguration.cs
+++ b/runtime/dotnet/core/Settings/BlobStorageConfiguration.cs
@@ -6,7 +6,7 @@
using System.Linq;
using System.Threading.Tasks;
-namespace Microsoft.Bot.Builder.ComposerBot.Json
+namespace Microsoft.BotFramework.Composer.Core.Settings
{
public class BlobStorageConfiguration
{
diff --git a/BotProject/Templates/CSharp/BotSettings/BotFeatureSettings.cs b/runtime/dotnet/core/Settings/BotFeatureSettings.cs
similarity index 92%
rename from BotProject/Templates/CSharp/BotSettings/BotFeatureSettings.cs
rename to runtime/dotnet/core/Settings/BotFeatureSettings.cs
index 158d5ec1cd..deb3f289dc 100644
--- a/BotProject/Templates/CSharp/BotSettings/BotFeatureSettings.cs
+++ b/runtime/dotnet/core/Settings/BotFeatureSettings.cs
@@ -6,7 +6,7 @@
using System.Linq;
using System.Threading.Tasks;
-namespace Microsoft.Bot.Builder.ComposerBot.Json
+namespace Microsoft.BotFramework.Composer.Core.Settings
{
public class BotFeatureSettings
{
diff --git a/BotProject/Templates/CSharp/BotSettings/BotSettings.cs b/runtime/dotnet/core/Settings/BotSettings.cs
similarity index 95%
rename from BotProject/Templates/CSharp/BotSettings/BotSettings.cs
rename to runtime/dotnet/core/Settings/BotSettings.cs
index fee666d4f6..dcb6394ed3 100644
--- a/BotProject/Templates/CSharp/BotSettings/BotSettings.cs
+++ b/runtime/dotnet/core/Settings/BotSettings.cs
@@ -4,7 +4,7 @@
using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.Bot.Builder.Azure;
-namespace Microsoft.Bot.Builder.ComposerBot.Json
+namespace Microsoft.BotFramework.Composer.Core.Settings
{
public class BotSettings
{
diff --git a/BotProject/Templates/CSharp/SkillConversationIdFactory.cs b/runtime/dotnet/core/SkillConversationIdFactory.cs
similarity index 94%
rename from BotProject/Templates/CSharp/SkillConversationIdFactory.cs
rename to runtime/dotnet/core/SkillConversationIdFactory.cs
index 0e2f78ada8..dc1db5a1ce 100644
--- a/BotProject/Templates/CSharp/SkillConversationIdFactory.cs
+++ b/runtime/dotnet/core/SkillConversationIdFactory.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System.Collections.Concurrent;
@@ -8,7 +8,7 @@
using Microsoft.Bot.Schema;
using Newtonsoft.Json;
-namespace Microsoft.Bot.Builder.ComposerBot.Json
+namespace Microsoft.BotFramework.Composer.Core
{
///
/// A
+
+
+ netcoreapp3.1
+
+ false
+
+
+
+ ..\core\Microsoft.BotFramework.Composer.Core.ruleset
+
+
+
+ ..\core\Microsoft.BotFramework.Composer.Core.ruleset
+
+
+
+
+
+
+
+
+
diff --git a/BotProject/Templates/CSharp/Tests/ToDoBotTests.cs b/runtime/dotnet/tests/ToDoBotTests.cs
similarity index 98%
rename from BotProject/Templates/CSharp/Tests/ToDoBotTests.cs
rename to runtime/dotnet/tests/ToDoBotTests.cs
index a06646c334..e09471f527 100644
--- a/BotProject/Templates/CSharp/Tests/ToDoBotTests.cs
+++ b/runtime/dotnet/tests/ToDoBotTests.cs
@@ -20,7 +20,7 @@ public class ToDoBotTests
{
private static string getOsPath(string path) => Path.Combine(path.TrimEnd('\\').Split('\\'));
- private static readonly string samplesDirectory = getOsPath(@"..\..\..\..\..\..\..\Composer\packages\server\assets\projects");
+ private static readonly string samplesDirectory = getOsPath(@"..\..\..\..\..\..\Composer\plugins\samples\assets\projects");
private static ResourceExplorer resourceExplorer = new ResourceExplorer();
diff --git a/runtime/node/README.md b/runtime/node/README.md
new file mode 100644
index 0000000000..7d450c961c
--- /dev/null
+++ b/runtime/node/README.md
@@ -0,0 +1,7 @@
+# Node.js bot runtime
+
+# Folder structure
+
+- **core**: Includes all core Node.js runtime logic, independent of hosting technology.
+- **technology specific folders**: Each hosting technology has one folder in this directory. For example, for Azure Functions, there is an `azurefunction` folder
+ - **tests**: Node.js runtime tests
diff --git a/runtime/node/azurefunctions/README.md b/runtime/node/azurefunctions/README.md
new file mode 100644
index 0000000000..ae8da00d49
--- /dev/null
+++ b/runtime/node/azurefunctions/README.md
@@ -0,0 +1 @@
+# Node.js bot launcher for Azure Functions
diff --git a/runtime/node/azurewebapp/README.md b/runtime/node/azurewebapp/README.md
new file mode 100644
index 0000000000..6b88576592
--- /dev/null
+++ b/runtime/node/azurewebapp/README.md
@@ -0,0 +1 @@
+# Node.js bot launcher for Azure WebApp
\ No newline at end of file
diff --git a/runtime/node/core/README.md b/runtime/node/core/README.md
new file mode 100644
index 0000000000..8046cb557c
--- /dev/null
+++ b/runtime/node/core/README.md
@@ -0,0 +1 @@
+# Node.js core bot runtime logic
diff --git a/scripts/generate_runtime.ps1 b/scripts/generate_runtime.ps1
index 2a6771bacf..0667221ccb 100644
--- a/scripts/generate_runtime.ps1
+++ b/scripts/generate_runtime.ps1
@@ -2,7 +2,7 @@ Param(
[string] $destinationFolder,
[string] $luisAuthroingKey,
[SecureString] $appPassword,
- [string] $projFolder = $(Join-Path $(Get-Location) BotProject CSharp)
+ [string] $projFolder = $(Join-Path $(Get-Location) "runtime/dotnet")
)
$destinationFolder = $(Join-Path $destinationFolder BotRuntime)
{children}
);
diff --git a/Composer/packages/extensions/visual-designer/src/components/menus/EdgeMenu.tsx b/Composer/packages/extensions/visual-designer/src/components/menus/EdgeMenu.tsx
index b89118b961..7a7ce2a764 100644
--- a/Composer/packages/extensions/visual-designer/src/components/menus/EdgeMenu.tsx
+++ b/Composer/packages/extensions/visual-designer/src/components/menus/EdgeMenu.tsx
@@ -3,7 +3,7 @@
/** @jsx jsx */
import { jsx } from '@emotion/core';
-import { useCallback, useContext, useState } from 'react';
+import { useContext, useState } from 'react';
import classnames from 'classnames';
import formatMessage from 'format-message';
import { DefinitionSummary } from '@bfc/shared';
@@ -21,11 +21,11 @@ import { createActionMenu } from './createSchemaMenu';
interface EdgeMenuProps {
id: string;
+ forwardedRef?: (_: HTMLDivElement) => void;
onClick: (item: string | null) => void;
- addCoachMarkRef?: (ref: { [key: string]: HTMLDivElement }) => void;
}
-export const EdgeMenu: React.FC {
const conceptLabel = ConceptLabels[$kind];
return conceptLabel?.title || $kind;
@@ -128,7 +130,7 @@ const createPasteButtonItem = (
background: rgb(237, 235, 233);
}
`}
- onClick={() => onClick({ key: 'Paste' })}
+ onClick={() => onClick({ key: MenuEventTypes.Paste })}
>
object | void;
onResize: (boundary: Boundary, id?) => object | void;
- addCoachMarkRef?: (ref: { [key: string]: HTMLDivElement }) => void;
isRoot?: boolean;
}
diff --git a/Composer/packages/extensions/visual-designer/src/components/renderers/ElementWrapper.tsx b/Composer/packages/extensions/visual-designer/src/components/renderers/ElementWrapper.tsx
index 199fe15f36..5e7f845b56 100644
--- a/Composer/packages/extensions/visual-designer/src/components/renderers/ElementWrapper.tsx
+++ b/Composer/packages/extensions/visual-designer/src/components/renderers/ElementWrapper.tsx
@@ -3,9 +3,10 @@
/** @jsx jsx */
import { jsx, css } from '@emotion/core';
-import { FC, useContext, ReactNode, ReactElement } from 'react';
+import { FC, useCallback, useContext, ReactNode, ReactElement } from 'react';
import classnames from 'classnames';
import { generateSDKTitle } from '@bfc/shared';
+import { useShellApi } from '@bfc/extension';
import { AttrNames } from '../../constants/ElementAttributes';
import { NodeRendererContext } from '../../store/NodeRendererContext';
@@ -62,6 +63,11 @@ export const ElementWrapper: FC = ({ id, tab, titleInHeader
const nodeDoubleSelected = tab && nodeFocused && tab === focusedTab;
const nodeSelected = selectedIds.includes(id);
+ const { shellApi } = useShellApi();
+ const { addCoachMarkRef } = shellApi;
+
+ const addRef = useCallback((action: HTMLDivElement) => addCoachMarkRef({ action }), []);
+
const declareElementAttributes = (selectedId: string, id: string) => {
return {
[AttrNames.NodeElement]: true,
@@ -78,6 +84,7 @@ export const ElementWrapper: FC = ({ id, tab, titleInHeader
return (
);
diff --git a/Composer/packages/extensions/visual-designer/src/editors/StepEditor.tsx b/Composer/packages/extensions/visual-designer/src/editors/StepEditor.tsx
index e00403ee50..dce486745f 100644
--- a/Composer/packages/extensions/visual-designer/src/editors/StepEditor.tsx
+++ b/Composer/packages/extensions/visual-designer/src/editors/StepEditor.tsx
@@ -3,7 +3,8 @@
/** @jsx jsx */
import { jsx } from '@emotion/core';
-import { useState } from 'react';
+import { useState, useCallback } from 'react';
+import { useShellApi } from '@bfc/extension';
import { StepGroup } from '../components/groups';
import { OffsetContainer } from '../components/lib/OffsetContainer';
@@ -26,21 +27,24 @@ const TailSize = {
height: TerminatorSize.height + ElementInterval.y / 2 + 5,
};
-export const StepEditor = ({ id, data, onEvent, trigger, addCoachMarkRef }): JSX.Element => {
+export const StepEditor = ({ id, data, onEvent, trigger }): JSX.Element => {
const [stepGroupBoundary, setStepGroupBoundary] = useState(measureJsonBoundary(data));
+ const { shellApi } = useShellApi();
+ const { addCoachMarkRef } = shellApi;
+
+ const addRef = useCallback((action: HTMLDivElement) => addCoachMarkRef({ action }), []);
const hasNoSteps = !data || !Array.isArray(data.children) || data.children.length === 0;
const content = hasNoSteps ? (
onEvent(NodeEventTypes.Insert, { id, $kind, position: 0 })}
data-testid="StepGroupAdd"
id={`${id}[0]`}
- addCoachMarkRef={addCoachMarkRef}
/>
) : (
{
diff --git a/Composer/packages/extensions/visual-designer/src/editors/editorProps.ts b/Composer/packages/extensions/visual-designer/src/editors/editorProps.ts
index f102c1855a..2497e9081b 100644
--- a/Composer/packages/extensions/visual-designer/src/editors/editorProps.ts
+++ b/Composer/packages/extensions/visual-designer/src/editors/editorProps.ts
@@ -5,12 +5,10 @@ export interface EditorProps {
id: string;
data: any;
onEvent: (action, id) => object | void;
- addCoachMarkRef?: (ref: { [key: string]: HTMLDivElement }) => void;
}
export const defaultEditorProps = {
id: '',
data: {},
onEvent: () => {},
- addCoachMarkRef: () => {},
};
diff --git a/Composer/packages/extensions/visual-designer/src/index.tsx b/Composer/packages/extensions/visual-designer/src/index.tsx
index 0e7313021d..68acda9704 100644
--- a/Composer/packages/extensions/visual-designer/src/index.tsx
+++ b/Composer/packages/extensions/visual-designer/src/index.tsx
@@ -66,7 +66,6 @@ const VisualDesigner: React.FC = ({ schema }): JSX.Element
const data = dataCache.current;
const {
- addCoachMarkRef,
navTo,
onFocusEvent,
onFocusSteps,
@@ -137,7 +136,6 @@ const VisualDesigner: React.FC = ({ schema }): JSX.Element
undo={undo}
redo={redo}
announce={announce}
- addCoachMarkRef={addCoachMarkRef}
/>
diff --git a/Composer/packages/lib/bot-deploy/.gitignore b/Composer/packages/lib/bot-deploy/.gitignore
new file mode 100644
index 0000000000..1ccc52a7fb
--- /dev/null
+++ b/Composer/packages/lib/bot-deploy/.gitignore
@@ -0,0 +1,2 @@
+/node_modules
+/lib
\ No newline at end of file
diff --git a/Composer/packages/lib/bot-deploy/README.md b/Composer/packages/lib/bot-deploy/README.md
index 8766a7503f..bac3d47eee 100644
--- a/Composer/packages/lib/bot-deploy/README.md
+++ b/Composer/packages/lib/bot-deploy/README.md
@@ -35,7 +35,7 @@
// The ARM template file path, default is 'DeploymentTemplates/template-with-preexisting-rg.json'
templatePath?: string
- // Dotnet project path, default is 'BotProject.csproj'
+ // Dotnet project path, default is 'Microsoft.BotFramework.Composer.WebApp.csproj'
dotnetProjectPath?: string
// Lubuild generated folder path, default is 'generated'
diff --git a/Composer/packages/lib/bot-deploy/package.json b/Composer/packages/lib/bot-deploy/package.json
index 9ce5bd5305..0d099aec42 100644
--- a/Composer/packages/lib/bot-deploy/package.json
+++ b/Composer/packages/lib/bot-deploy/package.json
@@ -4,7 +4,8 @@
"description": "typescript version of bot deployment",
"main": "lib/index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "tsc"
},
"author": "",
"license": "MIT",
@@ -28,4 +29,4 @@
"request": "^2.88.2",
"request-promise": "^4.2.5"
}
-}
+}
\ No newline at end of file
diff --git a/Composer/packages/lib/bot-deploy/src/botProjectDeploy.ts b/Composer/packages/lib/bot-deploy/src/botProjectDeploy.ts
index 626c9c141f..4f6e472316 100644
--- a/Composer/packages/lib/bot-deploy/src/botProjectDeploy.ts
+++ b/Composer/packages/lib/bot-deploy/src/botProjectDeploy.ts
@@ -1,7 +1,9 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import { WebSiteManagementClient } from '@azure/arm-appservice-profile-2019-03-01-hybrid';
+import * as path from 'path';
+import * as util from 'util';
+
import { ResourceManagementClient } from '@azure/arm-resources';
import {
Deployment,
@@ -11,22 +13,24 @@ import {
ResourceGroupsCreateOrUpdateResponse,
} from '@azure/arm-resources/esm/models';
import { GraphRbacManagementClient } from '@azure/graph';
-import * as msRestNodeAuth from '@azure/ms-rest-nodeauth';
+import { DeviceTokenCredentials } from '@azure/ms-rest-nodeauth';
import * as fs from 'fs-extra';
-import * as path from 'path';
import * as rp from 'request-promise';
-import * as util from 'util';
+
import { BotProjectDeployConfig } from './botProjectDeployConfig';
-import archiver = require('archiver');
import { BotProjectDeployLoggerType } from './botProjectLoggerType';
+import archiver = require('archiver');
+
const exec = util.promisify(require('child_process').exec);
-const luBuild = require('@microsoft/bf-lu/lib/parser/lubuild/builder.js');
const { promisify } = require('util');
+
+const luBuild = require('@microsoft/bf-lu/lib/parser/lubuild/builder.js');
const readdir = promisify(fs.readdir);
export class BotProjectDeploy {
private subId: string;
- private creds: any;
+ private accessToken: string;
+ private creds: any; // credential from interactive login
private projPath: string;
private deploymentSettingsPath: string;
private deployFilePath: string;
@@ -44,17 +48,39 @@ export class BotProjectDeploy {
constructor(config: BotProjectDeployConfig) {
this.subId = config.subId;
this.logger = config.logger;
+ this.accessToken = config.accessToken;
this.creds = config.creds;
this.projPath = config.projPath;
+
+ // set path to .deployment file which points at the BotProject.csproj
this.deployFilePath = config.deployFilePath ?? path.join(this.projPath, '.deployment');
+
+ // path to the zipped assets
this.zipPath = config.zipPath ?? path.join(this.projPath, 'code.zip');
- this.publishFolder = config.publishFolder ?? path.join(this.projPath, 'bin\\Release\\netcoreapp3.1');
+
+ // path to the built, ready to deploy code assets
+ this.publishFolder = config.publishFolder ?? path.join(this.projPath, 'bin', 'Release', 'netcoreapp3.1');
+
+ // path to the source appsettings.deployment.json file
this.settingsPath = config.settingsPath ?? path.join(this.projPath, 'appsettings.deployment.json');
+
+ // path to the deployed settings file that contains additional luis information
this.deploymentSettingsPath =
config.deploymentSettingsPath ?? path.join(this.publishFolder, 'appsettings.deployment.json');
- this.templatePath = config.templatePath ?? path.join('DeploymentTemplates', 'template-with-preexisting-rg.json');
- this.dotnetProjectPath = config.dotnetProjectPath ?? path.join(this.projPath, 'BotProject.csproj');
+
+ // path to the ARM template
+ // this is currently expected to live in the code project
+ this.templatePath =
+ config.templatePath ?? path.join(this.projPath, 'DeploymentTemplates', 'template-with-preexisting-rg.json');
+
+ // path to the dotnet project file
+ this.dotnetProjectPath =
+ config.dotnetProjectPath ?? path.join(this.projPath, 'Microsoft.BotFramework.Composer.WebApp.csproj');
+
+ // path to the built, ready to deploy declarative assets
this.remoteBotPath = config.remoteBotPath ?? path.join(this.publishFolder, 'ComposerDialogs');
+
+ // path to the ready to deploy generated folder
this.generatedFolder = config.generatedFolder ?? path.join(this.remoteBotPath, 'generated');
}
@@ -64,12 +90,30 @@ export class BotProjectDeploy {
};
}
+ private unpackObject(output: any) {
+ const unpacked: any = {};
+ for (const key in output) {
+ const objValue = output[key];
+ if (objValue.value) {
+ unpacked[key] = objValue.value;
+ }
+ }
+ return unpacked;
+ }
+
+ /**
+ * Format the parameters
+ */
private getDeploymentTemplateParam(
appId: string,
appPwd: string,
location: string,
name: string,
- shouldCreateAuthoringResource: boolean
+ shouldCreateAuthoringResource: boolean,
+ shouldCreateLuisResource: boolean,
+ useAppInsights: boolean,
+ useCosmosDb: boolean,
+ useStorage: boolean
) {
return {
appId: this.pack(appId),
@@ -77,6 +121,10 @@ export class BotProjectDeploy {
appServicePlanLocation: this.pack(location),
botId: this.pack(name),
shouldCreateAuthoringResource: this.pack(shouldCreateAuthoringResource),
+ shouldCreateLuisResource: this.pack(shouldCreateLuisResource),
+ useAppInsights: this.pack(useAppInsights),
+ useCosmosDb: this.pack(useCosmosDb),
+ useStorage: this.pack(useStorage),
};
}
@@ -91,6 +139,13 @@ export class BotProjectDeploy {
});
}
+ /***********************************************************************************************
+ * Azure API accessors
+ **********************************************************************************************/
+
+ /**
+ * Use the Azure API to create a new resource group
+ */
private async createResourceGroup(
client: ResourceManagementClient,
location: string,
@@ -107,6 +162,9 @@ export class BotProjectDeploy {
return await client.resourceGroups.createOrUpdate(resourceGroupName, param);
}
+ /**
+ * Validate the deployment using the Azure API
+ */
private async validateDeployment(
client: ResourceManagementClient,
templatePath: string,
@@ -130,6 +188,9 @@ export class BotProjectDeploy {
return await client.deployments.validate(resourceGroupName, deployName, deployParam);
}
+ /**
+ * Using an ARM template, provision a bunch of resources
+ */
private async createDeployment(
client: ResourceManagementClient,
templatePath: string,
@@ -170,19 +231,10 @@ export class BotProjectDeploy {
return createRes;
}
- private unpackObject(output: any) {
- let unpakced: any = {};
- for (const key in output) {
- const objValue = output[key];
- if (objValue.value) {
- unpakced[key] = objValue.value;
- }
- }
- return unpakced;
- }
-
+ /**
+ * Write updated settings back to the settings file
+ */
private async updateDeploymentJsonFile(
- settingsPath: string,
client: ResourceManagementClient,
resourceGroupName: string,
deployName: string,
@@ -190,28 +242,20 @@ export class BotProjectDeploy {
appPwd: string
): Promise {
};
};
-export const AdaptiveDialogEditor: FC = ({ id, data, onEvent, addCoachMarkRef }): JSX.Element | null => {
+export const AdaptiveDialogEditor: FC = ({ id, data, onEvent }): JSX.Element | null => {
const nodeMap = useMemo(() => calculateNodeMap(id, data), [id, data]);
const { ruleGroup } = nodeMap;
@@ -50,13 +50,7 @@ export const AdaptiveDialogEditor: FC = ({ id, data, onEvent, addCo
const activeEventData = queryNode(data, focusedEvent);
const eventActions = activeEventData ? (
- = ({
undo,
redo,
announce,
- addCoachMarkRef,
}): JSX.Element | null => {
let divRef;
@@ -104,7 +104,7 @@ export const ObiEditor: FC = ({
break;
case NodeEventTypes.Insert:
trackActionChange(eventData.id);
- if (eventData.$kind === 'PASTE') {
+ if (eventData.$kind === MenuEventTypes.Paste) {
handler = e => {
insertActions(path, data, e.id, e.position, clipboardActions).then(dialog => {
onChange(dialog);
@@ -314,7 +314,7 @@ export const ObiEditor: FC = ({
dispatchEvent(NodeEventTypes.Insert, {
id: arrayPath,
position: arrayIndex,
- $kind: 'PASTE',
+ $kind: MenuEventTypes.Paste,
});
}
break;
@@ -377,7 +377,6 @@ export const ObiEditor: FC = ({
divRef.focus({ preventScroll: true });
dispatchEvent(eventName, eventData);
}}
- addCoachMarkRef={addCoachMarkRef}
/>
@@ -400,7 +399,6 @@ ObiEditor.defaultProps = {
undo: () => {},
redo: () => {},
announce: (message: string) => {},
- addCoachMarkRef: () => {},
};
interface ObiEditorProps {
@@ -419,5 +417,4 @@ interface ObiEditorProps {
undo?: () => any;
redo?: () => any;
announce: (message: string) => any;
- addCoachMarkRef?: (ref: { [key: string]: HTMLDivElement }) => void;
}
diff --git a/Composer/packages/extensions/visual-designer/src/editors/RuleEditor.tsx b/Composer/packages/extensions/visual-designer/src/editors/RuleEditor.tsx
index a2b15bb49e..2ba9cee676 100644
--- a/Composer/packages/extensions/visual-designer/src/editors/RuleEditor.tsx
+++ b/Composer/packages/extensions/visual-designer/src/editors/RuleEditor.tsx
@@ -29,7 +29,7 @@ const calculateNodeMap = (ruleId, data): { [id: string]: GraphNode } => {
* `Rule` means a single element stored in the array `AdaptiveDialog.rules`.
* Usually, a Rule may contain a series of steps.
*/
-export const RuleEditor = ({ id, data, onEvent, addCoachMarkRef }): JSX.Element => {
+export const RuleEditor = ({ id, data, onEvent }): JSX.Element => {
const outlineCache = useRef();
const outlineVersion = useRef(0);
@@ -66,7 +66,6 @@ export const RuleEditor = ({ id, data, onEvent, addCoachMarkRef }): JSX.Element
data={stepGroup.data}
onEvent={onEvent}
trigger={