[WIP] Update the packages' dependents

Composer/packages/client/package.json

@@ -15,6 +15,7 @@
     "@bfc/extensions": "*",
     "@bfc/indexers": "*",
     "@bfc/shared": "*",
+    "@bfcomposer/botbuilder-lg": "4.7.1",
     "@bfcomposer/monaco-editor-webpack-plugin": "^1.7.2",
     "@emotion/core": "^10.0.7",
     "@reach/router": "^1.2.1",
@@ -26,7 +27,6 @@
     "babel-plugin-named-asset-import": "^0.3.1",
     "babel-preset-react-app": "^7.0.1",
     "bfj": "6.1.1",
-    "botbuilder-lg": "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-lg/-/4.7.0-preview0.tgz",
     "case-sensitive-paths-webpack-plugin": "2.2.0",
     "codemirror": "^5.45.0",
     "css-loader": "1.0.0",

Composer/packages/client/src/utils/dialogUtil.ts

@@ -3,7 +3,7 @@
 
 import { ConceptLabels, DialogGroup, SDKTypes, dialogGroups, seedNewDialog } from '@bfc/shared';
 import { cloneDeep, get, set } from 'lodash';
-import { ExpressionEngine } from 'botbuilder-expression-parser';
+import { ExpressionEngine } from '@bfcomposer/botframework-expressions';
 import { IDropdownOption } from 'office-ui-fabric-react';
 import { DialogInfo } from '@bfc/shared';
 

Composer/packages/client/src/utils/lgUtil.ts

@@ -1,7 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { LGParser, StaticChecker, DiagnosticSeverity, ImportResolver, Diagnostic, LGTemplate } from 'botbuilder-lg';
+import {
+  LGParser,
+  StaticChecker,
+  DiagnosticSeverity,
+  ImportResolver,
+  Diagnostic,
+  LGTemplate,
+} from '@bfcomposer/botbuilder-lg';
 import { get } from 'lodash';
 
 const lgStaticChecker = new StaticChecker();

Composer/packages/extensions/obiformeditor/demo/src/index.tsx

@@ -5,7 +5,7 @@ import { PrimaryButton, DefaultButton, DirectionalHint } from 'office-ui-fabric-
 import debounce from 'lodash.debounce';
 import nanoid from 'nanoid';
 import { initializeIcons } from '@uifabric/icons';
-import { ExpressionEngine } from 'botbuilder-expression-parser';
+import { ExpressionEngine } from '@bfcomposer/botframework-expressions';
 import { seedNewDialog } from '@bfc/shared';
 
 import Example from '../../src';

Composer/packages/extensions/obiformeditor/package.json

@@ -27,6 +27,7 @@
     "@bfc/code-editor": "*",
     "@bfc/shared": "*",
     "@bfcomposer/react-jsonschema-form": "1.6.5",
+    "@bfcomposer/botframework-expressions": "4.7.1",
     "@emotion/core": "^10.0.17",
     "@uifabric/fluent-theme": "7.1.4",
     "@uifabric/styling": "7.7.1",
@@ -68,7 +69,6 @@
     "@types/react": "16.9.0",
     "@types/react-dom": "16.9.0",
     "autoprefixer": "^9.5.1",
-    "botbuilder-expression-parser": "^4.5.9",
     "codemirror": "^5.44.0",
     "copyfiles": "^2.1.0",
     "css-loader": "^2.1.1",

Composer/packages/lib/indexers/package.json

@@ -27,8 +27,8 @@
     "ts-jest": "^24.0.2"
   },
   "dependencies": {
-    "botbuilder-expression-parser": "^4.5.11",
-    "botbuilder-lg": "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-lg/-/4.7.0-preview0.tgz",
+    "@bfcomposer/botframework-expressions":"4.7.1",
+    "@bfcomposer/botbuilder-lg": "4.7.1",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",
     "lodash.uniq": "^4.5.0",

Composer/packages/lib/indexers/src/lgIndexer.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { LGParser, StaticChecker, DiagnosticSeverity, Diagnostic } from 'botbuilder-lg';
+import { LGParser, StaticChecker, DiagnosticSeverity, Diagnostic } from '@bfcomposer/botbuilder-lg';
 import get from 'lodash.get';
 
 import { FileInfo, LgFile, LgTemplate } from './type';

Composer/packages/lib/indexers/src/type.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { Diagnostic as LGDiagnostic } from 'botbuilder-lg';
+import { Diagnostic as LGDiagnostic } from '@bfcomposer/botbuilder-lg';
 
 export interface FileInfo {
   name: string;

Composer/packages/lib/indexers/src/utils/dialogChecker.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import get from 'lodash.get';
-import { ExpressionEngine } from 'botbuilder-expression-parser';
+import { ExpressionEngine } from '@bfcomposer/botframework-expressions';
 
 const ExpressionParser = new ExpressionEngine();
 

Composer/packages/lib/shared/src/types/shell.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { Diagnostic as LGDiagnostic } from 'botbuilder-lg';
+import { Diagnostic as LGDiagnostic } from '@bfcomposer/botbuilder-lg';
 
 import { MicrosoftAdaptiveDialog } from './sdk';
 

Composer/packages/server/package.json

@@ -74,6 +74,7 @@
     "@azure/ms-rest-js": "^1.8.7",
     "@bfc/indexers": "*",
     "@bfc/shared": "*",
+    "@bfcomposer/lubuild": "1.0.6-preview",
     "@types/lru-cache": "^5.1.0",
     "@types/rimraf": "^2.0.2",
     "archiver": "^3.0.0",
@@ -91,14 +92,13 @@
     "immer": "^2.1.4",
     "jsonwebtoken": "^8.5.1",
     "jwks-rsa": "^1.6.0",
+    "lodash": "^4.17.11",
     "lodash.find": "^4.6.0",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",
     "lodash.isequal": "^4.5.0",
     "lodash.merge": "^4.6.2",
     "lodash.uniq": "^4.5.0",
-    "lodash": "^4.17.11",
-    "lubuild": "https://botbuilder.myget.org/F/botbuilder-declarative/npm/lubuild/-/1.0.3-preview.tgz",
     "luis-apis": "2.5.1",
     "minimatch": "^3.0.4",
     "morgan": "^1.9.1",

Composer/packages/server/src/models/bot/luPublisher.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import isEqual from 'lodash.isequal';
-import { runBuild } from 'lubuild';
+import { runBuild } from '@bfcomposer/lubuild';
 import { LuFile } from '@bfc/shared';
 
 import { Path } from './../../utility/path';

Composer/yarn.lock

@@ -1425,6 +1425,54 @@
     lodash "^4.17.11"
     to-fast-properties "^2.0.0"
 
+"@bfcomposer/botbuilder-lg@4.7.1":
+  version "4.7.1"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@bfcomposer/botbuilder-lg/-/@bfcomposer/botbuilder-lg-4.7.1.tgz#4cdf6f7c8ec0e8a3a90f970b9e578508fb396b36"
+  integrity sha1-TN9vfI7A6KOpD5cLnleFCPs5azY=
+  dependencies:
+    "@bfcomposer/botframework-expressions" "4.7.1"
+    antlr4ts "0.5.0-alpha.1"
+    lodash "^4.17.11"
+    uuid "^3.3.3"
+
+"@bfcomposer/botframework-expressions@4.7.1":
+  version "4.7.1"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@bfcomposer/botframework-expressions/-/@bfcomposer/botframework-expressions-4.7.1.tgz#e7c4b99f99975f9476a3aaea7cf6ca5c51eff9e8"
+  integrity sha1-58S5n5mXX5R2o6rqfPbKXFHv+eg=
+  dependencies:
+    "@microsoft/recognizers-text-data-types-timex-expression" "^1.1.4"
+    "@types/lru-cache" "^5.1.0"
+    antlr4ts "0.5.0-alpha.1"
+    jspath "^0.4.0"
+    lodash "^4.17.15"
+    lru-cache "^5.1.1"
+    moment "2.24.0"
+    moment-timezone "^0.5.25"
+    xml2js "^0.4.19"
+    xmldom "^0.1.27"
+    xpath "0.0.27"
+
+"@bfcomposer/lubuild@1.0.6-preview":
+  version "1.0.6-preview"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@bfcomposer/lubuild/-/@bfcomposer/lubuild-1.0.6-preview.tgz#2e73557b57eec0e4c5c20184f9818c103089f782"
+  integrity sha1-LnNVe1fuwOTFwgGE+YGMEDCJ94I=
+  dependencies:
+    "@azure/ms-rest-js" "1.7.0"
+    async-file "^2.0.2"
+    await-delay "^1.0.0"
+    chalk "^2.4.2"
+    cli-position "^1.0.1"
+    cli-table3 "^0.5.1"
+    fs-extra "^7.0.1"
+    latest-version "^5.1.0"
+    ludown "^1.3.4"
+    luis-apis "2.5.1"
+    minimist "^1.2.0"
+    read-text-file "^1.1.0"
+    semver "^6.0.0"
+    username "^4.1.0"
+    window-size "^1.1.1"
+
 "@bfcomposer/monaco-editor-webpack-plugin@^1.7.2":
   version "1.7.2"
   resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@bfcomposer/monaco-editor-webpack-plugin/-/@bfcomposer/monaco-editor-webpack-plugin-1.7.2.tgz#f00ac5cec496dc3d44713d9142956b3336033eab"
@@ -3920,74 +3968,6 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-botbuilder-expression-parser@^4.5.11:
-  version "4.5.11"
-  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-expression-parser/-/botbuilder-expression-parser-4.5.11.tgz#fcce377a2b2c1a2c2345b2c77d9cf4289e171f9f"
-  integrity sha1-/M43eissGiwjRbLHfZz0KJ4XH58=
-  dependencies:
-    antlr4ts "0.5.0-alpha.1"
-    botbuilder-expression "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-expression/-/4.5.11.tgz"
-
-botbuilder-expression-parser@^4.5.9:
-  version "4.5.9"
-  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-expression-parser/-/botbuilder-expression-parser-4.5.9.tgz#696643da5e1ff0bf20724999bc73a8e38acd9da7"
-  integrity sha1-aWZD2l4f8L8gckmZvHOo44rNnac=
-  dependencies:
-    antlr4ts "0.5.0-alpha.1"
-    botbuilder-expression "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-expression/-/4.5.9.tgz"
-
-"botbuilder-expression@https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-expression/-/4.5.11.tgz":
-  version "4.5.11"
-  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-expression/-/4.5.11.tgz#d15384417be9c0e17d46bf729fe707b81b66ef68"
-  dependencies:
-    "@microsoft/recognizers-text-data-types-timex-expression" "^1.1.4"
-    antlr4ts "0.5.0-alpha.1"
-    jspath "^0.4.0"
-    lru-cache "^5.1.1"
-    moment "2.24.0"
-    moment-timezone "^0.5.25"
-    xml2js "^0.4.19"
-    xmldom "^0.1.27"
-    xpath "0.0.27"
-
-"botbuilder-expression@https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-expression/-/4.5.9.tgz":
-  version "4.5.9"
-  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-expression/-/4.5.9.tgz#76c54ed691c4cdd5ab9bbe5bac69e0bc67588044"
-  dependencies:
-    "@microsoft/recognizers-text-data-types-timex-expression" "^1.1.4"
-    antlr4ts "0.5.0-alpha.1"
-    jspath "^0.4.0"
-    lru-cache "^5.1.1"
-    moment "2.24.0"
-    moment-timezone "^0.5.25"
-    xml2js "^0.4.19"
-    xmldom "^0.1.27"
-    xpath "0.0.27"
-
-"botbuilder-lg@https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-lg/-/4.7.0-preview0.tgz":
-  version "4.7.0-preview0"
-  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-lg/-/4.7.0-preview0.tgz#46ac6e53e44ba64ae56971ab8404c3f2f9ab239d"
-  dependencies:
-    antlr4ts "0.5.0-alpha.1"
-    botframework-expressions "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botframework-expressions/-/4.7.0-preview0.tgz"
-    lodash "^4.17.11"
-    uuid "^3.3.3"
-
-"botframework-expressions@https://botbuilder.myget.org/F/botbuilder-declarative/npm/botframework-expressions/-/4.7.0-preview0.tgz":
-  version "4.7.0-preview0"
-  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botframework-expressions/-/4.7.0-preview0.tgz#032f104222866c5dfbcf1e17b66a56cbf4a30707"
-  dependencies:
-    "@microsoft/recognizers-text-data-types-timex-expression" "^1.1.4"
-    antlr4ts "0.5.0-alpha.1"
-    jspath "^0.4.0"
-    lodash "^4.17.15"
-    lru-cache "^5.1.1"
-    moment "2.24.0"
-    moment-timezone "^0.5.25"
-    xml2js "^0.4.19"
-    xmldom "^0.1.27"
-    xpath "0.0.27"
-
 boxen@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
@@ -10563,42 +10543,6 @@ lru-memoizer@^1.12.0:
     lru-cache "~4.0.0"
     very-fast-args "^1.1.0"
 
-"lubuild@https://botbuilder.myget.org/F/botbuilder-declarative/npm/lubuild/-/1.0.3-preview.tgz":
-  version "1.0.3-preview"
-  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/lubuild/-/1.0.3-preview.tgz#7165f67d737dff6d07a79caaca0b477a78d58c47"
-  dependencies:
-    "@azure/ms-rest-js" "1.7.0"
-    async-file "^2.0.2"
-    await-delay "^1.0.0"
-    chalk "^2.4.2"
-    cli-position "^1.0.1"
-    cli-table3 "^0.5.1"
-    fs-extra "^7.0.1"
-    latest-version "^5.1.0"
-    ludown "^1.3.1"
-    luis-apis "2.5.1"
-    minimist "^1.2.0"
-    read-text-file "^1.1.0"
-    semver "^6.0.0"
-    username "^4.1.0"
-    window-size "^1.1.1"
-
-ludown@^1.3.1:
-  version "1.3.3"
-  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/ludown/-/ludown-1.3.3.tgz#ca41e204eace2747de4c1f31f9d7e8ccb46ddde5"
-  integrity sha1-ykHiBOrOJ0feTB8x+dfozLRt3eU=
-  dependencies:
-    chai "^4.1.2"
-    chalk "2.4.1"
-    commander "^2.15.1"
-    deep-equal "^1.0.1"
-    get-stdin "^6.0.0"
-    intercept-stdout "^0.1.2"
-    latest-version "^4.0.0"
-    mocha "^5.2.0"
-    node-fetch "^2.1.2"
-    semver "^5.5.1"
-
 ludown@^1.3.4:
   version "1.3.4"
   resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/ludown/-/ludown-1.3.4.tgz#1411e7f81a10b1e0901c69dc9b230d7f534b2145"