Skip to content

Commit

Permalink
fix: use nightly build to replace the private bf-lu package (#2190)
Browse files Browse the repository at this point in the history
* use nightly build replace the private bf-lu

* replace all

* update the lock

Co-authored-by: Dong Lei <donglei@microsoft.com>
  • Loading branch information
lei9444 and boydc2014 committed Mar 7, 2020
1 parent a982001 commit 3eea821
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion Composer/packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@bfc/extensions": "*",
"@bfc/indexers": "*",
"@bfc/shared": "*",
"@bfcomposer/bf-lu": "^1.2.9",
"@microsoft/bf-lu": "4.8.0-preview.110925",
"@emotion/core": "^10.0.7",
"@reach/router": "^1.2.1",
"axios": "^0.18.0",
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/lib/indexers/__tests__/luUtil.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

import { sectionHandler } from '@bfcomposer/bf-lu/lib/parser';
import { sectionHandler } from '@microsoft/bf-lu/lib/parser';

import { updateIntent, addIntent, removeIntent } from '../src/utils/luUtil';

Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/lib/indexers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"dependencies": {
"@bfc/shared": "*",
"@bfcomposer/bf-lu": "^1.2.9",
"@microsoft/bf-lu": "4.8.0-preview.110925",
"botbuilder-lg": "^4.8.0-preview.106823",
"botframework-expressions": "^4.8.0-preview.106476",
"lodash": "^4.17.15"
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/lib/indexers/src/luIndexer.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

import { sectionHandler } from '@bfcomposer/bf-lu/lib/parser/composerindex';
import { sectionHandler } from '@microsoft/bf-lu/lib/parser/composerindex';
import get from 'lodash/get';
import { LuIntentSection } from '@bfc/shared';

Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/lib/indexers/src/types/bf-lu.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

declare module '@bfcomposer/bf-lu/lib/parser/composerindex' {
declare module '@microsoft/bf-lu/lib/parser/composerindex' {
namespace parser {
function parseFile(fileContent: any, log: any, locale: any): any;
function validateLUISBlob(LUISJSONBlob: any): any;
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/lib/indexers/src/utils/luUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* for more usage detail, please check client/__tests__/utils/luUtil.test.ts
*/

import { sectionHandler } from '@bfcomposer/bf-lu/lib/parser/composerindex';
import { sectionHandler } from '@microsoft/bf-lu/lib/parser/composerindex';
import isEmpty from 'lodash/isEmpty';
import { LuIntentSection } from '@bfc/shared';

Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@bfc/lg-languageserver": "*",
"@bfc/lu-languageserver": "*",
"@bfc/shared": "*",
"@bfcomposer/bf-lu": "^1.2.9",
"@microsoft/bf-lu": "4.8.0-preview.110925",
"archiver": "^3.0.0",
"axios": "^0.18.0",
"azure-storage": "^2.10.3",
Expand Down
4 changes: 2 additions & 2 deletions Composer/packages/server/src/models/bot/luPublisher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import { ILuisConfig } from './interface';
import log from './../../logger';

// eslint-disable-next-line @typescript-eslint/no-var-requires
const crossTrainer = require('@bfcomposer/bf-lu/lib/parser/cross-train/crossTrainer.js');
const crossTrainer = require('@microsoft/bf-lu/lib/parser/cross-train/crossTrainer.js');
// eslint-disable-next-line @typescript-eslint/no-var-requires
const luBuild = require('@bfcomposer/bf-lu/lib/parser/lubuild/builder.js');
const luBuild = require('@microsoft/bf-lu/lib/parser/lubuild/builder.js');

const DIALOGS_FOLDER = 'ComposerDialogs';
const GENERATEDFOLDER = 'generated';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@microsoft/bf-cli-command": "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@microsoft/bf-cli-command/-/@microsoft/bf-cli-command-1.0.1.tgz",
"@bfcomposer/bf-lu": "^1.2.9",
"@microsoft/bf-lu": "4.8.0-preview.110925",
"@types/node": "^12.0.4",
"express": "^4.15.2",
"monaco-editor-core": "^0.17.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
import { TextDocumentPositionParams, DocumentOnTypeFormattingParams } from 'vscode-languageserver-protocol';
import { updateIntent, isValid, checkSection } from '@bfc/indexers/lib/utils/luUtil';
import { luIndexer } from '@bfc/indexers';
import { parser } from '@bfcomposer/bf-lu/lib/parser';
import { parser } from '@microsoft/bf-lu/lib/parser';

import { EntityTypesObj, LineState } from './entityEnum';
import * as util from './matchingPattern';
Expand Down
42 changes: 21 additions & 21 deletions Composer/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2120,27 +2120,6 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"

"@bfcomposer/bf-lu@^1.2.9":
version "1.2.9"
resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@bfcomposer/bf-lu/-/@bfcomposer/bf-lu-1.2.9.tgz#b2fec0d8f1c3d4d0e526a5bdbf9e5c9b3ab5b71d"
integrity sha1-sv7A2PHD1NDlJqW9v55cmzq1tx0=
dependencies:
"@azure/cognitiveservices-luis-authoring" "3.0.1"
"@azure/ms-rest-azure-js" "2.0.1"
antlr4 "^4.7.2"
chalk "2.4.1"
console-stream "^0.1.1"
deep-equal "^1.0.1"
delay "^4.3.0"
fs-extra "^8.1.0"
get-stdin "^6.0.0"
globby "^10.0.1"
intercept-stdout "^0.1.2"
lodash "^4.17.15"
node-fetch "^2.1.2"
semver "^5.5.1"
tslib "^1.10.0"

"@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"
Expand Down Expand Up @@ -2735,6 +2714,27 @@
fs-extra "^7.0.1"
tslib "~1.10.0"

"@microsoft/bf-lu@4.8.0-preview.110925":
version "4.8.0-preview.110925"
uid "8905960d5858aa9f4d94c150fdc80ac4b6947e94"
resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@microsoft/bf-lu/-/@microsoft/bf-lu-4.8.0-preview.110925.tgz#8905960d5858aa9f4d94c150fdc80ac4b6947e94"
dependencies:
"@azure/cognitiveservices-luis-authoring" "3.0.1"
"@azure/ms-rest-azure-js" "2.0.1"
antlr4 "^4.7.2"
chalk "2.4.1"
console-stream "^0.1.1"
deep-equal "^1.0.1"
delay "^4.3.0"
fs-extra "^8.1.0"
get-stdin "^6.0.0"
globby "^10.0.1"
intercept-stdout "^0.1.2"
lodash "^4.17.15"
node-fetch "^2.1.2"
semver "^5.5.1"
tslib "^1.10.0"

"@microsoft/load-themed-styles@^1.7.13":
version "1.9.5"
resolved "https://registry.yarnpkg.com/@microsoft/load-themed-styles/-/load-themed-styles-1.9.5.tgz#b9f063bafa568e356b4d99a5b522d0bab60bda85"
Expand Down

0 comments on commit 3eea821

Please sign in to comment.