diff --git a/Composer/packages/adaptive-flow/package.json b/Composer/packages/adaptive-flow/package.json index a0b00ce5e9..adde0e7f0e 100644 --- a/Composer/packages/adaptive-flow/package.json +++ b/Composer/packages/adaptive-flow/package.json @@ -42,7 +42,7 @@ }, "peerDependencies": { "format-message": "^6.2.3", - "react": "16.13.0" + "react": "16.13.1" }, "devDependencies": { "@bfc/test-utils": "*", @@ -50,8 +50,8 @@ "@types/react": "16.9.23", "format-message": "^6.2.3", "json-loader": "^0.5.7", - "react": "16.13.0", - "react-dom": "16.13.0", + "react": "16.13.1", + "react-dom": "16.13.1", "ts-loader": "7.0.4", "tsconfig-paths-webpack-plugin": "^3.2.0" }, diff --git a/Composer/packages/adaptive-form/package.json b/Composer/packages/adaptive-form/package.json index 50c4f1ab2d..2a91119915 100644 --- a/Composer/packages/adaptive-form/package.json +++ b/Composer/packages/adaptive-form/package.json @@ -26,8 +26,8 @@ "@uifabric/styling": "^7.7.4", "format-message": "^6.2.3", "office-ui-fabric-react": "^7.71.0", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/code-editor": "*", @@ -37,8 +37,8 @@ "@types/lodash": "^4.14.149", "@types/react": "16.9.23", "format-message": "^6.2.3", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "dependencies": { "@emotion/core": "^10.0.27", diff --git a/Composer/packages/client/__tests__/components/CreationFlow/DefineConversation/index.test.tsx b/Composer/packages/client/__tests__/components/CreationFlow/DefineConversation/index.test.tsx index 40dfbd0912..edebf38a00 100644 --- a/Composer/packages/client/__tests__/components/CreationFlow/DefineConversation/index.test.tsx +++ b/Composer/packages/client/__tests__/components/CreationFlow/DefineConversation/index.test.tsx @@ -45,7 +45,7 @@ describe('', () => { onSubmit={onSubmitMock} />, ({ set }) => { - set(focusedStorageFolderState, ''); + set(focusedStorageFolderState, {} as StorageFolder); set(storagesState, [{ id: 'default' }]); } ); diff --git a/Composer/packages/client/__tests__/components/appSettings.test.tsx b/Composer/packages/client/__tests__/components/appSettings.test.tsx index ee9816e3a1..8bacba2443 100644 --- a/Composer/packages/client/__tests__/components/appSettings.test.tsx +++ b/Composer/packages/client/__tests__/components/appSettings.test.tsx @@ -20,6 +20,7 @@ describe(' & ', () => { it('should render the user settings page', () => { const { getByText, getAllByText } = renderWithRecoil(, ({ set }) => { set(onboardingState, { + coachMarkRefs: {}, complete: false, }); }); @@ -43,6 +44,7 @@ describe(' & ', () => { }, propertyEditorWidth: 400, dialogNavWidth: 180, + appLocale: 'en-US', }); }); getByText('Application Updates'); diff --git a/Composer/packages/client/package.json b/Composer/packages/client/package.json index 9f8aed2dc9..b9417f2435 100644 --- a/Composer/packages/client/package.json +++ b/Composer/packages/client/package.json @@ -51,13 +51,13 @@ "query-string": "^6.8.2", "react-measure": "^2.3.0", "re-resizable": "^6.3.2", - "react": "16.13.0", + "react": "16.13.1", "react-app-polyfill": "^0.2.1", "react-dev-utils": "^7.0.3", - "react-dom": "16.13.0", + "react-dom": "16.13.1", "react-frame-component": "^4.0.2", "react-timeago": "^4.4.0", - "recoil": "^0.0.10", + "recoil": "^0.0.13", "styled-components": "^4.1.3", "uuid": "^8.3.0", "webpack-bundle-analyzer": "^3.8.0" @@ -80,7 +80,6 @@ "@types/reach__router": "^1.2.4", "@types/react": "16.9.23", "@types/react-dom": "16.9.5", - "@types/recoil": "^0.0.1", "@types/webpack-env": "^1.15.2", "babel-core": "7.0.0-bridge.0", "babel-eslint": "10.1.0", diff --git a/Composer/packages/client/src/recoilModel/DispatcherWrapper.tsx b/Composer/packages/client/src/recoilModel/DispatcherWrapper.tsx index 055ec170e4..892e7b7455 100644 --- a/Composer/packages/client/src/recoilModel/DispatcherWrapper.tsx +++ b/Composer/packages/client/src/recoilModel/DispatcherWrapper.tsx @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import { useRef, useEffect, useState, Fragment } from 'react'; +import { useRef, useState, Fragment, useLayoutEffect } from 'react'; // eslint-disable-next-line @typescript-eslint/camelcase import { atom, useRecoilTransactionObserver_UNSTABLE, Snapshot, useRecoilState } from 'recoil'; import once from 'lodash/once'; @@ -72,7 +72,9 @@ const InitDispatcher = ({ onLoad }) => { const [currentDispatcherState, setDispatcher] = useRecoilState(dispatcherState); - useEffect(() => { + //The render order is different with 0.0.10, the local state will trigger a render before atom value + //so use the useLayoutEffect here + useLayoutEffect(() => { setDispatcher(dispatcherRef.current); prepareAxiosWithRecoil(currentDispatcherState); onLoad(true); diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/testUtils.ts b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/testUtils.ts index 7f09e63daa..5f9dfd17ca 100644 --- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/testUtils.ts +++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/testUtils.ts @@ -10,6 +10,7 @@ export const mockCallback: CallbackInterface = { reset: jest.fn(), gotoSnapshot: jest.fn(), snapshot: { + getID: jest.fn(), getLoadable: jest.fn(), getPromise: jest.fn(), map: jest.fn(), diff --git a/Composer/packages/extension-client/package.json b/Composer/packages/extension-client/package.json index f5e3f627db..0948d57580 100644 --- a/Composer/packages/extension-client/package.json +++ b/Composer/packages/extension-client/package.json @@ -11,14 +11,14 @@ "clean": "rimraf lib" }, "peerDependencies": { - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/test-utils": "*", "@types/react": "16.9.23", - "react": "16.13.0", - "react-dom": "16.13.0", + "react": "16.13.1", + "react-dom": "16.13.1", "rimraf": "^3.0.2", "typescript": "3.9.2" }, diff --git a/Composer/packages/intellisense/package.json b/Composer/packages/intellisense/package.json index 54b41edafb..0dcb7ef5b1 100644 --- a/Composer/packages/intellisense/package.json +++ b/Composer/packages/intellisense/package.json @@ -10,8 +10,8 @@ }, "peerDependencies": { "office-ui-fabric-react": "^7.71.0", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "dependencies": { "websocket": "^1.0.31", diff --git a/Composer/packages/lib/code-editor/package.json b/Composer/packages/lib/code-editor/package.json index 1b96048a19..9a149f06b9 100644 --- a/Composer/packages/lib/code-editor/package.json +++ b/Composer/packages/lib/code-editor/package.json @@ -24,8 +24,8 @@ "watch": "yarn build:ts --watch" }, "peerDependencies": { - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/test-utils": "*", @@ -42,8 +42,8 @@ "html-webpack-plugin": "^3.2.0", "mini-css-extract-plugin": "^0.6.0", "postcss-loader": "^3.0.0", - "react-dom": "16.13.0", - "react": "16.13.0", + "react-dom": "16.13.1", + "react": "16.13.1", "rimraf": "^2.6.3", "style-loader": "^0.23.1", "ts-loader": "7.0.4", diff --git a/Composer/packages/lib/shared/package.json b/Composer/packages/lib/shared/package.json index e660e90577..c9a10931f0 100644 --- a/Composer/packages/lib/shared/package.json +++ b/Composer/packages/lib/shared/package.json @@ -21,8 +21,8 @@ "watch": "yarn build:ts --watch" }, "peerDependencies": { - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/test-utils": "*", @@ -32,8 +32,8 @@ "autoprefixer": "^9.5.1", "copyfiles": "^2.1.0", "office-ui-fabric-react": "^7.88.1", - "react": "16.13.0", - "react-dom": "16.13.0", + "react": "16.13.1", + "react-dom": "16.13.1", "rimraf": "^2.6.3" }, "dependencies": { diff --git a/Composer/packages/lib/ui-shared/package.json b/Composer/packages/lib/ui-shared/package.json index 5ef946a1a3..5ad003d57b 100644 --- a/Composer/packages/lib/ui-shared/package.json +++ b/Composer/packages/lib/ui-shared/package.json @@ -24,8 +24,8 @@ "@emotion/core": "^10.0.27", "@emotion/styled": "^10.0.27", "@bfc/extension-client": "*", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/adaptive-form": "*", @@ -33,8 +33,8 @@ "@bfc/test-utils": "*", "@types/react": "16.9.23", "@types/react-dom": "16.9.5", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "dependencies": { "@bfc/shared": "*", diff --git a/Composer/packages/ui-plugins/composer/package.json b/Composer/packages/ui-plugins/composer/package.json index c00b527688..c59aa6fc15 100644 --- a/Composer/packages/ui-plugins/composer/package.json +++ b/Composer/packages/ui-plugins/composer/package.json @@ -24,8 +24,8 @@ "@uifabric/icons": "^7.3.0", "@uifabric/styling": "^7.7.4", "office-ui-fabric-react": "^7.71.0", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/adaptive-form": "*", @@ -36,8 +36,8 @@ "@types/react": "16.9.23", "@types/react-dom": "16.9.5", "format-message-cli": "^6.2.3", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "dependencies": { "lodash": "^4.17.19" diff --git a/Composer/packages/ui-plugins/cross-trained/package.json b/Composer/packages/ui-plugins/cross-trained/package.json index 382601c127..d60cf9b9b6 100644 --- a/Composer/packages/ui-plugins/cross-trained/package.json +++ b/Composer/packages/ui-plugins/cross-trained/package.json @@ -22,16 +22,16 @@ "peerDependencies": { "@bfc/adaptive-form": "*", "@bfc/extension-client": "*", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/adaptive-form": "*", "@bfc/extension-client": "*", "@types/react": "16.9.23", "@types/react-dom": "16.9.5", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "dependencies": { "@bfc/shared": "*", diff --git a/Composer/packages/ui-plugins/example/package.json b/Composer/packages/ui-plugins/example/package.json index 2cf4bf54e3..3322fbc7c6 100644 --- a/Composer/packages/ui-plugins/example/package.json +++ b/Composer/packages/ui-plugins/example/package.json @@ -23,8 +23,8 @@ "@uifabric/icons": "^7.3.0", "@uifabric/styling": "^7.7.4", "office-ui-fabric-react": "^7.71.0", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/adaptive-form": "*", @@ -33,8 +33,8 @@ "@emotion/core": "^10.0.27", "@types/react": "16.9.23", "@types/react-dom": "16.9.5", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "dependencies": { } diff --git a/Composer/packages/ui-plugins/lg/package.json b/Composer/packages/ui-plugins/lg/package.json index e5586a41ef..142e105925 100644 --- a/Composer/packages/ui-plugins/lg/package.json +++ b/Composer/packages/ui-plugins/lg/package.json @@ -23,8 +23,8 @@ "peerDependencies": { "@bfc/adaptive-form": "*", "@bfc/extension-client": "*", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/adaptive-form": "*", @@ -32,8 +32,8 @@ "@bfc/test-utils": "*", "@types/react": "16.9.23", "@types/react-dom": "16.9.5", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "dependencies": { "@bfc/shared": "*", diff --git a/Composer/packages/ui-plugins/luis/package.json b/Composer/packages/ui-plugins/luis/package.json index e979418ea7..6eeb2588bf 100644 --- a/Composer/packages/ui-plugins/luis/package.json +++ b/Composer/packages/ui-plugins/luis/package.json @@ -24,8 +24,8 @@ "@bfc/adaptive-form": "*", "@bfc/extension-client": "*", "@bfc/shared": "*", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/adaptive-form": "*", @@ -33,8 +33,8 @@ "@bfc/test-utils": "*", "@types/react": "16.9.23", "@types/react-dom": "16.9.5", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "dependencies": { "@bfc/shared": "*", diff --git a/Composer/packages/ui-plugins/prompts/package.json b/Composer/packages/ui-plugins/prompts/package.json index 803e95ff08..8d4d6e0840 100644 --- a/Composer/packages/ui-plugins/prompts/package.json +++ b/Composer/packages/ui-plugins/prompts/package.json @@ -28,8 +28,8 @@ "@uifabric/styling": "^7.7.4", "format-message": "^6.2.3", "office-ui-fabric-react": "^7.71.0", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/extension-client": "*", @@ -39,8 +39,8 @@ "@types/react-dom": "16.9.5", "format-message": "^6.2.3", "format-message-cli": "^6.2.3", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "dependencies": { "@bfc/shared": "*", diff --git a/Composer/packages/ui-plugins/schema-editor/package.json b/Composer/packages/ui-plugins/schema-editor/package.json index ce440bd681..caee894f71 100644 --- a/Composer/packages/ui-plugins/schema-editor/package.json +++ b/Composer/packages/ui-plugins/schema-editor/package.json @@ -24,8 +24,8 @@ "@bfc/adaptive-form": "*", "@bfc/code-editor": "*", "format-message": "^6.2.3", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/extension-client": "*", @@ -34,8 +34,8 @@ "@types/react": "16.9.23", "@types/react-dom": "16.9.5", "format-message": "^6.2.3", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "dependencies": { "@emotion/core": "^10.0.27" diff --git a/Composer/packages/ui-plugins/select-dialog/package.json b/Composer/packages/ui-plugins/select-dialog/package.json index fded97e09a..b507dac159 100644 --- a/Composer/packages/ui-plugins/select-dialog/package.json +++ b/Composer/packages/ui-plugins/select-dialog/package.json @@ -28,8 +28,8 @@ "@uifabric/styling": "^7.7.4", "format-message": "^6.2.3", "office-ui-fabric-react": "^7.71.0", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/extension-client": "*", @@ -39,8 +39,8 @@ "@types/react-dom": "16.9.5", "format-message": "^6.2.3", "format-message-cli": "6.2.3", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "dependencies": { "@emotion/core": "^10.0.27" diff --git a/Composer/packages/ui-plugins/select-skill-dialog/package.json b/Composer/packages/ui-plugins/select-skill-dialog/package.json index 3128f70498..c05e3d53fe 100644 --- a/Composer/packages/ui-plugins/select-skill-dialog/package.json +++ b/Composer/packages/ui-plugins/select-skill-dialog/package.json @@ -28,8 +28,8 @@ "@uifabric/styling": "^7.7.4", "format-message": "^6.2.3", "office-ui-fabric-react": "^7.71.0", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "devDependencies": { "@bfc/adaptive-form": "*", @@ -39,8 +39,8 @@ "@types/react-dom": "16.9.5", "format-message": "^6.2.3", "format-message-cli": "^6.2.3", - "react": "16.13.0", - "react-dom": "16.13.0" + "react": "16.13.1", + "react-dom": "16.13.1" }, "dependencies": { "@emotion/core": "^10.0.27" diff --git a/Composer/yarn.lock b/Composer/yarn.lock index 7dc835e529..bee4dd509f 100644 --- a/Composer/yarn.lock +++ b/Composer/yarn.lock @@ -3851,13 +3851,6 @@ "@types/prop-types" "*" csstype "^2.2.0" -"@types/recoil@^0.0.1": - version "0.0.1" - resolved "https://registry.yarnpkg.com/@types/recoil/-/recoil-0.0.1.tgz#c69efee4871e0e3fc4fe19ba15a6bfc35f9b6bf1" - integrity sha512-pRrS1aizm7GqM9NciOSPGoQ7K56rhyMcha6/Zewkwnb/H1dmz7VbDs+RIE/QZOx9CBHqdFBAU4x6LYt+qJZV8A== - dependencies: - "@types/react" "*" - "@types/rimraf@^2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e" @@ -15960,15 +15953,15 @@ react-dev-utils@^7.0.3: strip-ansi "5.0.0" text-table "0.2.0" -react-dom@16.13.0: - version "16.13.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.0.tgz#cdde54b48eb9e8a0ca1b3dc9943d9bb409b81866" - integrity sha512-y09d2c4cG220DzdlFkPTnVvGTszVvNpC73v+AaLGLHbkpy3SSgvYq8x0rNwPJ/Rk/CicTNgk0hbHNw1gMEZAXg== +react-dom@16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f" + integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.19.0" + scheduler "^0.19.1" react-error-boundary@^1.2.5: version "1.2.5" @@ -16025,10 +16018,10 @@ react-timeago@^4.4.0: resolved "https://botbuilder.myget.org/F/botbuilder-tools-daily/npm/react-timeago/-/react-timeago-4.4.0.tgz#4520dd9ba63551afc4d709819f52b14b9343ba2b" integrity sha1-RSDdm6Y1Ua/E1wmBn1KxS5NDuis= -react@16.13.0: - version "16.13.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.13.0.tgz#d046eabcdf64e457bbeed1e792e235e1b9934cf7" - integrity sha512-TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ== +react@16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e" + integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -16208,10 +16201,10 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" -recoil@^0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/recoil/-/recoil-0.0.10.tgz#679ab22306f559f8a63c46fd5ff5241539f9248f" - integrity sha512-+9gRqehw3yKETmoZbhSnWu4GO10HDb5xYf1CjLF1oXGK2uT6GX5Lu9mfTXwjxV/jXxEKx8MIRUUbgPxvbJ8SEw== +recoil@^0.0.13: + version "0.0.13" + resolved "https://registry.yarnpkg.com/recoil/-/recoil-0.0.13.tgz#23e6d63135c07d8defbd91aaa35dca94ec5c15a6" + integrity sha512-2OToaQ8GR//KsdKdaEhMi04QKStLGRpk3qjC58iBpZpUtsByZ4dUy2UJtRcYuhnVlltGZ8HNwcEQRdFOS864SQ== reconnecting-websocket@^3.2.2: version "3.2.2" @@ -16856,7 +16849,7 @@ saxes@^5.0.0: dependencies: xmlchars "^2.2.0" -scheduler@^0.19.0, scheduler@^0.19.1: +scheduler@^0.19.1: version "0.19.1" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==