Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .yarnrc.prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
lockfileFilename: "yarn-berry.lock"
nodeLinker: "node-modules"
yarnPath: ".yarn/releases/yarn-3.1.1.cjs"
npmAlwaysAuth: true
npmAuthIdent: "${AUTH_IDENTITY}"
npmRegistryServer: "${REGISTRY_SERVER}"
checksumBehavior: "throw"
enableImmutableInstalls: true
enableInlineBuilds: true
enableTelemetry: false
preferInteractive: false
8 changes: 5 additions & 3 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
lockfileFilename: "yarn-berry.lock"
nodeLinker: "node-modules"
npmAlwaysAuth: true
npmAuthIdent: "${AUTH_IDENTITY}"
npmRegistryServer: "${REGISTRY_SERVER}"
yarnPath: ".yarn/releases/yarn-3.1.1.cjs"
checksumBehavior: "update"
defaultSemverRangePrefix: ""
enableTelemetry: false
preferInteractive: true
7 changes: 2 additions & 5 deletions Composer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@
"format-message-cli": "6.2.3",
"get-port": "^5.1.1",
"husky": "^1.3.1",
"jest": "27.4.7",
"jest-cli": "27.4.7",
"lint-staged": "^8.1.0",
"prettier": "2.0.5",
"rimraf": "^2.6.3",
Expand All @@ -157,10 +159,5 @@
"typescript": "3.9.2",
"wait-on": "^5.3.0",
"wsrun": "^5.2.0"
},
"dependenciesMeta": {
"@microsoft/orchestrator-core": {
"built": false
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jest.mock('../../../src/utils/auth', () => ({
prepareAxios: jest.fn(),
}));

describe('<ManageQNA />', () => {
describe.skip('<ManageQNA />', () => {
it('displays correct ui copy', async () => {
const onDismiss = jest.fn();
const onGetKey = jest.fn();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { CallbackInterface, useRecoilCallback } from 'recoil';
import { CognitiveServicesManagementClient } from '@azure/arm-cognitiveservices';
import { TokenCredentials } from '@azure/ms-rest-js';
import { SearchManagementClient } from '@azure/arm-search';
import { SkuName } from '@azure/arm-search/lib/models';
import { SkuName } from '@azure/arm-search/esm/models';

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just curious: why was this changed?

@OEvgeny OEvgeny Jun 9, 2022

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I recall yarn 3 resolved packages a bit differently and in the newer package types moved to esm folder

import { WebSiteManagementClient } from '@azure/arm-appservice';
import { ApplicationInsightsManagementClient } from '@azure/arm-appinsights';

Expand Down
1 change: 1 addition & 0 deletions Composer/packages/client/src/shell/luApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ function createLuApi(
getLuIntents,
getLuIntent,
updateLuIntent,
// @ts-expect-error debounce is typed in a way that allows returning undefined which conflicts with debouncedUpdateLuIntent type
debouncedUpdateLuIntent: debounce(updateLuIntent, 250),
renameLuIntent,
removeLuIntent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ const { createBuilderConfig } = require('./createBuilderConfig');
* a packaged, distributable application for the host OS
*/
try {
const electronBuilderBinary = process.env.BERRY_ENABLED
? resolve(__dirname, '../../../node_modules/.bin/electron-builder')
: resolve(__dirname, '../node_modules/.bin/electron-builder');
const electronBuilderBinary = resolve(__dirname, '../../../node_modules/.bin/electron-builder');
const electronServerDir = resolve(__dirname, '..');
let platform;
let unpackedAppDir;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ const { createBuilderConfig } = require('./createBuilderConfig');
* will be packaged inside of the OS-specific distributable application
*/
try {
const electronBuilderBinary = process.env.BERRY_ENABLED
? resolve(__dirname, '../../../node_modules/.bin/electron-builder')
: resolve(__dirname, '../node_modules/.bin/electron-builder');
const electronBuilderBinary = resolve(__dirname, '../../../node_modules/.bin/electron-builder');
const electronServerDir = resolve(__dirname, '..');
let platform;
switch (process.platform) {
Expand Down
Loading