fix: Updates regular expressions naming in recognizer types

.github/workflows/main.yml

@@ -25,15 +25,17 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 12.13.0
-      - name: Restore yarn cache
-        uses: actions/cache@preview
-        with:
-          path: ~/.cache/yarn
-          key: ${{ runner.os }}-yarn-${{ hashFiles(format('{0}{1}', github.workspace, '/Composer/yarn.lock')) }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: yarn install
-        run: yarn
+      #- name: Restore yarn cache
+      #  uses: actions/cache@v2.1.2
+      #  with:
+      #    path: ~/.cache/yarn
+      #    key: ${{ runner.os }}-yarn-new-${{ hashFiles(format('{0}{1}', github.workspace, '/Composer/yarn.lock')) }}
+      #    restore-keys: |
+      #      ${{ runner.os }}-yarn-new-
+      - name: Clear global yarn cache
+        run: yarn cache clean
+      - name: yarn --update-checksums
+        run: yarn --update-checksums
       - name: yarn build:dev
         run: yarn build:dev
       - name: yarn lint

.vscode/snippets.json.code-snippets

@@ -1,26 +1,26 @@
 {
-	// Place your BotFramework-Composer workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
-	// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
-	// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
-	// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
-	// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
-	// Placeholders with the same ids are connected.
-	"React component test scaffolding": {
-		"prefix": "rct",
-		"body": [
-			"import React from 'react';",
-      "import { render } from '@bfc/test-utils';",
+  // Place your BotFramework-Composer workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
+  // description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
+  // is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
+  // used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
+  // $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
+  // Placeholders with the same ids are connected.
+  "React component test scaffolding": {
+    "prefix": "rct",
+    "body": [
+      "import React from 'react';",
+      "import { render } from '@botframework-composer/test-utils';",
       "import assign from 'lodash/assign';\n",
       "import { $1 } from '$2';\n",
       "const defaultProps = {\n  $3\n};\n",
       "function renderSubject(overrides = {}) {",
       "  const props = assign({}, defaultProps, overrides);",
       "  return render(<$1 {...props} />);",
       "}\n",
-			"describe('<$1 />', () => {",
-			"  it.todo('$0');",
-			"});\n"
-		],
-		"description": "React component test scaffolding"
-	}
+      "describe('<$1 />', () => {",
+      "  it.todo('$0');",
+      "});\n"
+    ],
+    "description": "React component test scaffolding"
+  }
 }

Composer/.eslintrc.js

@@ -105,6 +105,7 @@ module.exports = {
         '@typescript-eslint/no-non-null-assertion': 'off',
         '@typescript-eslint/no-object-literal-type-assertion': 'off',
         '@typescript-eslint/unbound-method': 'off',
+        '@typescript-eslint/no-explicit-any': 'off',
 
         'security/detect-buffer-noassert': 'off',
         'security/detect-child-process': 'off',

Composer/.npmrc

@@ -1,2 +1 @@
-@bfcomposer:registry=https://botbuilder.myget.org/F/botbuilder-declarative/npm/
 scripts-prepend-node-path=true

Composer/cypress/integration/LGPage.spec.ts

@@ -13,7 +13,7 @@ context('LG Page', () => {
     cy.contains('TodoSample');
     cy.contains('All');
 
-    cy.get('.toggleEditMode button').as('switchButton');
+    cy.findByTestId('showcode').as('switchButton');
 
     // by default is table view
     cy.findByTestId('LGPage').findByTestId('table-view').should('exist');

Composer/cypress/integration/LUPage.spec.ts

@@ -13,7 +13,7 @@ context('LU Page', () => {
     cy.contains('__TestToDoBotWithLuisSample');
     cy.contains('All');
 
-    cy.get('.toggleEditMode button').should('not.exist');
+    cy.findByTestId('showcode').should('not.exist');
 
     // by default it goes to table view
     cy.findByTestId('LUPage').findByTestId('table-view').should('exist');
@@ -25,7 +25,7 @@ context('LU Page', () => {
     cy.findByTestId('ProjectTree').within(() => {
       cy.findByText('__TestToDoBotWithLuisSample').click('left');
     });
-    cy.get('.toggleEditMode button').as('switchButton');
+    cy.findByTestId('showcode').as('switchButton');
     // goto edit-mode
     cy.get('@switchButton').click();
     cy.findByTestId('LUPage').get('.monaco-editor').should('exist');

Composer/cypress/integration/NotificationPage.spec.ts

@@ -9,8 +9,7 @@ context('Notification Page', () => {
   it('can show lg syntax error ', () => {
     cy.visitPage('Bot Responses');
 
-    cy.get('.toggleEditMode button').as('switchButton');
-    cy.get('@switchButton').click();
+    cy.findByTestId('showcode').click();
     cy.get('textarea').type('#', { delay: 200 });
 
     cy.findByTestId('LeftNav-CommandBarButtonNotifications').click();
@@ -29,7 +28,7 @@ context('Notification Page', () => {
       cy.findByText('__TestToDoBotWithLuisSample').click();
     });
 
-    cy.get('.toggleEditMode button').click();
+    cy.findByTestId('showcode').click();
     cy.get('textarea').type('t', { delay: 200 });
 
     cy.findByTestId('LeftNav-CommandBarButtonNotifications').click();

Composer/cypress/integration/TriggerCreation.spec.ts

@@ -10,7 +10,7 @@ context('Creating a new trigger', () => {
   it('can create different kinds of triggers ', () => {
     cy.visitPage('Design');
     cy.findByTestId('recognizerTypeDropdown').click();
-    cy.findByText('Regular Expression').click();
+    cy.findByText('Regular expression recognizer').click();
 
     //onintent trigger
     cy.findByTestId('AddFlyout').click();

Composer/package.json

@@ -12,7 +12,8 @@
     "mkdirp": "^0.5.2",
     "selfsigned": "1.10.8",
     "serialize-javascript": "^3.1.0",
-    "set-value": "^3.0.2"
+    "set-value": "^3.0.2",
+    "terser-webpack-plugin": "^2.3.7"
   },
   "engines": {
     "node": ">=12"
@@ -24,33 +25,29 @@
     "packages/electron-server",
     "packages/extension",
     "packages/extension-client",
+    "packages/form-dialogs",
     "packages/intellisense",
-    "packages/lib",
     "packages/lib/*",
     "packages/server",
     "packages/test-utils",
-    "packages/tools",
     "packages/tools/built-in-functions",
-    "packages/tools/language-servers",
     "packages/tools/language-servers/*",
+    "packages/types",
     "packages/ui-plugins/*"
   ],
   "scripts": {
-    "build": "node scripts/begin.js && yarn build:prod",
-    "build:prod": "yarn build:dev && yarn build:server && yarn build:client && yarn build:electron",
-    "build:dev": "yarn build:test && yarn build:lib && yarn build:tools && yarn build:extensions && yarn build:plugins && yarn l10n",
-    "build:test": "yarn workspace @bfc/test-utils build",
-    "build:lib": "yarn workspace @bfc/libs build:all",
+    "build": "node scripts/begin.js && yarn build:prod && yarn l10n",
+    "build:prod": "yarn build:dev && yarn build:client && yarn build:server && yarn build:electron",
+    "build:dev": "wsrun -ltm -x @bfc/electron-server -x @bfc/client -x @bfc/server -p @botframework-composer/* -p @bfc/* -c build && yarn build:plugins",
     "build:electron": "yarn workspace @bfc/electron-server build && yarn workspace @bfc/electron-server l10n",
-    "build:extensions": "wsrun -lt -p @bfc/extension @bfc/intellisense @bfc/extension-client @bfc/adaptive-form @bfc/adaptive-flow @bfc/ui-plugin-*  -c build",
     "build:server": "yarn workspace @bfc/server build",
     "build:client": "yarn workspace @bfc/client build",
-    "build:tools": "yarn workspace @bfc/tools build:all",
-    "build:plugins": "yarn build:plugins:localpublish && yarn build:plugins:samples && yarn build:plugins:azurePublish && yarn build:plugins:runtimes",
+    "build:plugins": "yarn build:plugins:localpublish && yarn build:plugins:samples && yarn build:plugins:azurePublish && yarn build:plugins:runtimes && yarn build:plugins:vacore",
     "build:plugins:localpublish": "cd plugins/localPublish && yarn install && yarn build",
     "build:plugins:samples": "cd plugins/samples && yarn install && yarn build",
     "build:plugins:azurePublish": "cd plugins/azurePublish && yarn install && yarn build",
     "build:plugins:runtimes": "cd plugins/runtimes && yarn install && yarn build",
+    "build:plugins:vacore": "cd plugins/vacore && yarn install && yarn build",
     "start": "cross-env NODE_ENV=production PORT=3000 yarn start:server",
     "startall": "yarn start",
     "start:dev": "concurrently  \"npm:start:client\" \"npm:start:server:dev\"",

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/AdaptiveFlowEditor.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { render } from '@bfc/test-utils';
+import { render } from '@botframework-composer/test-utils';
 import { EditorExtensionContext } from '@bfc/extension-client';
 
 import AdaptiveFlowEditor from '../../src/adaptive-flow-editor/AdaptiveFlowEditor';

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/components/IconMenu.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { render, fireEvent, findByText } from '@bfc/test-utils';
+import { render, fireEvent, findByText } from '@botframework-composer/test-utils';
 
 import { IconMenu } from '../../../src/adaptive-flow-editor/components/IconMenu';
 

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/components/KeyboardZone.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { render, fireEvent } from '@bfc/test-utils';
+import { render, fireEvent } from '@botframework-composer/test-utils';
 
 import { enableKeyboardCommandAttributes } from '../../../src/adaptive-flow-editor/components/KeyboardZone';
 

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/contexts/NodeRendererContext.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React, { useContext } from 'react';
-import { render } from '@bfc/test-utils';
+import { render } from '@botframework-composer/test-utils';
 import { DialogFactory } from '@bfc/shared';
 
 import { NodeRendererContext } from '../../../src/adaptive-flow-editor/contexts/NodeRendererContext';

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/contexts/SelectionContext.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React, { useContext } from 'react';
-import { render } from '@bfc/test-utils';
+import { render } from '@botframework-composer/test-utils';
 
 import { SelectionContext } from '../../../src/adaptive-flow-editor/contexts/SelectionContext';
 

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/hooks/useEditorEventApi.test.ts

@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { renderHook } from '@bfc/test-utils/lib/hooks';
+import { renderHook } from '@botframework-composer/test-utils/lib/hooks';
 
 import { useEditorEventApi } from '../../../src/adaptive-flow-editor/hooks/useEditorEventApi';
 import { ShellApiStub } from '../stubs/ShellApiStub';
 import { defaultRendererContextValue } from '../../../src/adaptive-flow-editor/contexts/NodeRendererContext';
 import { defaultSelectionContextValue } from '../../../src/adaptive-flow-editor/contexts/SelectionContext';
 import { NodeEventTypes } from '../../../src/adaptive-flow-renderer/constants/NodeEventTypes';
 
-describe('useSelectionEffect', () => {
+describe('useEditorEventApi', () => {
   const hook = renderHook(() =>
     useEditorEventApi(
       {

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/EdgeMenu.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { render } from '@bfc/test-utils';
+import { render } from '@botframework-composer/test-utils';
 import { DialogGroup } from '@bfc/shared';
 
 import { EdgeMenu } from '../../../src/adaptive-flow-editor/renderers/EdgeMenu';

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/ElementWrapper.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { render } from '@bfc/test-utils';
+import { render } from '@botframework-composer/test-utils';
 
 import { ElementWrapper } from '../../../src/adaptive-flow-editor/renderers/ElementWrapper';
 

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeMenu.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { render, fireEvent, findAllByText } from '@bfc/test-utils';
+import { render, fireEvent, findAllByText } from '@botframework-composer/test-utils';
 
 import { NodeMenu } from '../../../src/adaptive-flow-editor/renderers/NodeMenu';
 import { NodeEventTypes } from '../../../src/adaptive-flow-renderer/constants/NodeEventTypes';

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/renderers/NodeWrapper.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { render, fireEvent } from '@bfc/test-utils';
+import { render, fireEvent } from '@botframework-composer/test-utils';
 import { EditorExtensionContext } from '@bfc/extension-client';
 
 import { ActionNodeWrapper } from '../../../src/adaptive-flow-editor/renderers/NodeWrapper';

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/stubs/ShellApiStub.ts

@@ -21,11 +21,16 @@ export const ShellApiStub: ShellApi = {
   updateLgTemplate: fnPromise,
   removeLgTemplate: fnPromise,
   removeLgTemplates: fnPromise,
+  updateLgFile: fnPromise,
+  debouncedUpdateLgTemplate: fnPromise,
   getLuIntent: fn,
   getLuIntents: fnList,
   addLuIntent: fnPromise,
   updateLuIntent: fnPromise,
   removeLuIntent: fn,
+  updateLuFile: fnPromise,
+  debouncedUpdateLuIntent: fnPromise,
+  renameLuIntent: fnPromise,
   updateRegExIntent: fn,
   createDialog: fnPromise,
   addCoachMarkRef: fn,
@@ -36,6 +41,21 @@ export const ShellApiStub: ShellApi = {
   addSkillDialog: fnPromise,
   announce: fn,
   displayManifestModal: fn,
+  constructAction: fnPromise,
+  constructActions: fnPromise,
+  copyAction: fnPromise,
+  copyActions: fnPromise,
+  deleteAction: fnPromise,
+  deleteActions: fnPromise,
+  actionsContainLuIntent: fn,
+  updateQnaContent: fnPromise,
+  renameRegExIntent: fnPromise,
+  updateIntentTrigger: fnPromise,
+  commitChanges: fnPromise,
+  updateDialogSchema: fnPromise,
+  createTrigger: fnPromise,
+  updateSkillSetting: fnPromise,
+  updateFlowZoomRate: fnPromise,
 };
 
 describe('ShellApiStub', () => {

Composer/packages/adaptive-flow/__tests__/adaptive-flow-editor/utils/getCustomSchema.test.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { OBISchema } from '@bfc/shared';
+import { JSONSchema7 } from '@bfc/shared';
 
 import { getCustomSchema } from '../../../src/adaptive-flow-editor/utils/getCustomSchema';
 
@@ -23,7 +23,7 @@ describe('getCustomSchema', () => {
           description: 'Send an activity.',
         },
       },
-    } as OBISchema;
+    } as JSONSchema7;
     expect(getCustomSchema({ oneOf: [], definitions: {} }, ejected)).toEqual({
       actions: {
         oneOf: [
@@ -59,7 +59,7 @@ describe('getCustomSchema', () => {
           description: 'My Trigger.',
         },
       },
-    } as OBISchema;
+    } as JSONSchema7;
     expect(getCustomSchema({ oneOf: [], definitions: {} }, ejected)).toEqual({
       actions: {
         oneOf: [

Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveDialog.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { render } from '@bfc/test-utils';
+import { render } from '@botframework-composer/test-utils';
 
 import { AdaptiveKinds } from '../../../src/adaptive-flow-renderer/constants/AdaptiveKinds';
 import { AdaptiveDialog } from '../../../src/adaptive-flow-renderer/adaptive/AdaptiveDialog';

Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/adaptive/AdaptiveTrigger.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { render } from '@bfc/test-utils';
+import { render } from '@botframework-composer/test-utils';
 
 import { AdaptiveTrigger } from '../../../src/adaptive-flow-renderer/adaptive/AdaptiveTrigger';
 import { SchemaContext } from '../../../src/adaptive-flow-renderer/contexts/SchemaContext';

Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/ArrowLine.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { render } from '@bfc/test-utils';
+import { render } from '@botframework-composer/test-utils';
 
 import { ArrowLine } from '../../../src/adaptive-flow-renderer/components/ArrowLine';
 

Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/Diamond.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { render } from '@bfc/test-utils';
+import { render } from '@botframework-composer/test-utils';
 
 import { Diamond } from '../../../src/adaptive-flow-renderer/components/Diamond';
 

Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/components/ElementMeasurer.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-import { render } from '@bfc/test-utils';
+import { render } from '@botframework-composer/test-utils';
 
 import { ElementMeasurer } from '../../../src/adaptive-flow-renderer/components/ElementMeasurer';