ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update instui and media-capture versions, reprise 

instui -> 6.24.0
@instructure/media-capture -> 7.1.0

the update to @instructure/media-capture is necessary to
fix the audio recording bug described in LA-859.  This change
required a bump to INSTUI's version. Both updates are rolled
into this change.

closes LA-595
flag=none

test plan:
For the audio recording part:
prereq: have notorious running. you must be loading canvas
from localhost unless using https in order to enable
the mic and webcam.
  - create or edit something with the rce
  - select Media > Upload/Record media
  - change to the Record tab
  - click on the "WebCam" button and select "No video"
  - record some audio and save
  > expect the audio to be uploaded and appear in the RCE

  - go to the speedgrader for a graded object
  - click on  the Media Comment button
  - click on the "WebCam" button and select "No video"
  - record some audio and save
  > expec the audio comment to be uploaded and playable

For the instui upgrade part:
  - make sure everything still works as expected
  - check with instui changelog for changes since 6.21 for guidance

This commit reverts commit 7ede798549,
which reverted 81d493b722
which was prematurely merged.

Reason for revert: get the oritinal patchset back in the queue,
but hold off merging until after beta is cut from master. This
will give the INSTUI change a chance to soak in dev for longer
than the weekend before being deployed

Change-Id: Iada67ee10a796e4b4b967b27a64f3e527e78249a
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/233037
Reviewed-by: Charley Kline <ckline@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
This commit is contained in:
Ed Schiebel 2020-04-17 14:13:46 +00:00
parent e8039c65c7
commit 9e73b30345
5 changed files with 1059 additions and 1101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/jsx/developer_keys/__tests__/ScopesMethod.test.js
View File

@ -37,7 +37,7 @@ it('renders the correct method', () => {
it('allows setting a margin', () => {
const wrapper = mount(<DeveloperKeyScopesMethod {...props} />)
expect(wrapper.html()).toContain('style="margin: 1rem 1rem 1.5rem 2.25rem;"')
expect(wrapper.html()).toContain('style="margin: 0.75rem 0.75rem 1.5rem 2.25rem;"')
})
describe('variant map', () => {

107
package.json
View File

@ -22,65 +22,66 @@
},
"dependencies": {
"@instructure/canvas-rce-old": "4.1.5",
"@instructure/canvas-theme": "~6.21.0",
"@instructure/debounce": "~6.21.0",
"@instructure/canvas-theme": "~6.24.0",
"@instructure/debounce": "~6.24.0",
"@instructure/js-utils": ">=1",
"@instructure/media-capture": "^5.54.0",
"@instructure/media-capture": "~7.1.0",
"@instructure/outcomes-ui": "^1.1.0",
"@instructure/react-crop": "^5.0.1",
"@instructure/reactour": "https://github.com/instructure/reactour#master",
"@instructure/ready": ">=1",
"@instructure/ui-a11y": "~6.21.0",
"@instructure/ui-alerts": "~6.21.0",
"@instructure/ui-avatar": "~6.21.0",
"@instructure/ui-billboard": "~6.21.0",
"@instructure/ui-breadcrumb": "~6.21.0",
"@instructure/ui-buttons": "~6.21.0",
"@instructure/ui-calendar": "~6.21.0",
"@instructure/ui-checkbox": "~6.21.0",
"@instructure/ui-a11y": "~6.24.0",
"@instructure/ui-alerts": "~6.24.0",
"@instructure/ui-avatar": "~6.24.0",
"@instructure/ui-billboard": "~6.24.0",
"@instructure/ui-breadcrumb": "~6.24.0",
"@instructure/ui-buttons": "~6.24.0",
"@instructure/ui-calendar": "~6.24.0",
"@instructure/ui-checkbox": "~6.24.0",
"@instructure/ui-core": "^5",
"@instructure/ui-date-input": "~6.21.0",
"@instructure/ui-decorator": "~6.21.0",
"@instructure/ui-editable": "~6.21.0",
"@instructure/ui-elements": "~6.21.0",
"@instructure/ui-file-drop": "~6.21.0",
"@instructure/ui-focusable": "~6.21.0",
"@instructure/ui-form-field": "~6.21.0",
"@instructure/ui-forms": "~6.21.0",
"@instructure/ui-grid": "~6.21.0",
"@instructure/ui-heading": "~6.21.0",
"@instructure/ui-i18n": "~6.21.0",
"@instructure/ui-icons": "~6.21.0",
"@instructure/ui-img": "~6.21.0",
"@instructure/ui-layout": "~6.21.0",
"@instructure/ui-link": "~6.21.0",
"@instructure/ui-date-input": "~6.24.0",
"@instructure/ui-decorator": "~6.24.0",
"@instructure/ui-editable": "~6.24.0",
"@instructure/ui-elements": "~6.24.0",
"@instructure/ui-file-drop": "~6.24.0",
"@instructure/ui-focusable": "~6.24.0",
"@instructure/ui-form-field": "~6.24.0",
"@instructure/ui-forms": "~6.24.0",
"@instructure/ui-grid": "~6.24.0",
"@instructure/ui-heading": "~6.24.0",
"@instructure/ui-i18n": "~6.24.0",
"@instructure/ui-icons": "~6.24.0",
"@instructure/ui-img": "~6.24.0",
"@instructure/ui-layout": "~6.24.0",
"@instructure/ui-link": "~6.24.0",
"@instructure/ui-list": "~6.24.0",
"@instructure/ui-media-player": "^5.54.0",
"@instructure/ui-menu": "~6.21.0",
"@instructure/ui-modal": "~6.21.0",
"@instructure/ui-motion": "~6.21.0",
"@instructure/ui-number-input": "~6.21.0",
"@instructure/ui-overlays": "~6.21.0",
"@instructure/ui-pagination": "~6.21.0",
"@instructure/ui-portal": "~6.21.0",
"@instructure/ui-progress": "~6.21.0",
"@instructure/ui-radio-input": "~6.21.0",
"@instructure/ui-react-utils": "~6.21.0",
"@instructure/ui-responsive": "~6.21.0",
"@instructure/ui-select": "~6.21.0",
"@instructure/ui-spinner": "~6.21.0",
"@instructure/ui-svg-images": "~6.21.0",
"@instructure/ui-table": "~6.21.0",
"@instructure/ui-tabs": "~6.21.0",
"@instructure/ui-tag": "~6.21.0",
"@instructure/ui-text": "~6.21.0",
"@instructure/ui-text-area": "~6.21.0",
"@instructure/ui-text-input": "~6.21.0",
"@instructure/ui-themeable": "~6.21.0",
"@instructure/ui-themes": "~6.21.0",
"@instructure/ui-toggle-details": "~6.21.0",
"@instructure/ui-tree-browser": "~6.21.0",
"@instructure/ui-view": "~6.21.0",
"@instructure/uid": "~6.21.0",
"@instructure/ui-menu": "~6.24.0",
"@instructure/ui-modal": "~6.24.0",
"@instructure/ui-motion": "~6.24.0",
"@instructure/ui-number-input": "~6.24.0",
"@instructure/ui-overlays": "~6.24.0",
"@instructure/ui-pagination": "~6.24.0",
"@instructure/ui-portal": "~6.24.0",
"@instructure/ui-progress": "~6.24.0",
"@instructure/ui-radio-input": "~6.24.0",
"@instructure/ui-react-utils": "~6.24.0",
"@instructure/ui-responsive": "~6.24.0",
"@instructure/ui-select": "~6.24.0",
"@instructure/ui-spinner": "~6.24.0",
"@instructure/ui-svg-images": "~6.24.0",
"@instructure/ui-table": "~6.24.0",
"@instructure/ui-tabs": "~6.24.0",
"@instructure/ui-tag": "~6.24.0",
"@instructure/ui-text": "~6.24.0",
"@instructure/ui-text-area": "~6.24.0",
"@instructure/ui-text-input": "~6.24.0",
"@instructure/ui-themeable": "~6.24.0",
"@instructure/ui-themes": "~6.24.0",
"@instructure/ui-toggle-details": "~6.24.0",
"@instructure/ui-tree-browser": "~6.24.0",
"@instructure/ui-view": "~6.24.0",
"@instructure/uid": "~6.24.0",
"@microsoft/immersive-reader-sdk": "^0.0.3",
"apollo-cache": "^1.3.2",
"apollo-cache-inmemory": "^1.3.10",
@ -164,7 +165,7 @@
"@babel/plugin-proposal-optional-chaining": "^7",
"@babel/plugin-transform-react-inline-elements": "^7.2.0",
"@instructure/browserslist-config-canvas-lms": ">=2",
"@instructure/ui-babel-preset": "~6.21.0",
"@instructure/ui-babel-preset": "~6.24.0",
"@prettier/plugin-ruby": "^0.15.0",
"@sentry/webpack-plugin": "^1.5.2",
"@sheerun/mutationobserver-shim": "0.3.2",

2
packages/canvas-media/package.json
View File

@ -24,7 +24,7 @@
"dependencies": {
"@instructure/canvas-theme": "6",
"@instructure/k5uploader": "^1.0.0",
"@instructure/media-capture": "^5",
"@instructure/media-capture": "~7.1.0",
"@instructure/ui-a11y": "6",
"@instructure/ui-alerts": "6",
"@instructure/ui-billboard": "6",

61
packages/canvas-rce/package.json
View File

@ -53,38 +53,37 @@
},
"dependencies": {
"@instructure/canvas-media": ">=1.0.0",
"@instructure/canvas-theme": "~6.21.0",
"@instructure/canvas-theme": "6",
"@instructure/k5uploader": ">=1",
"@instructure/media-capture": "^5.54.0",
"@instructure/ui-a11y": "~6.21.0",
"@instructure/ui-a11y-content": "~6.21.0",
"@instructure/ui-alerts": "~6.21.0",
"@instructure/ui-billboard": "~6.21.0",
"@instructure/ui-buttons": "~6.21.0",
"@instructure/ui-color-utils": "~6.21.0",
"@instructure/ui-elements": "~6.21.0",
"@instructure/ui-flex": "~6.21.0",
"@instructure/ui-focusable": "~6.21.0",
"@instructure/ui-form-field": "~6.21.0",
"@instructure/ui-forms": "~6.21.0",
"@instructure/ui-icons": "~6.21.0",
"@instructure/ui-layout": "~6.21.0",
"@instructure/media-capture": "~7.1.0",
"@instructure/ui-a11y": "6",
"@instructure/ui-alerts": "6",
"@instructure/ui-billboard": "6",
"@instructure/ui-buttons": "6",
"@instructure/ui-color-utils": "6",
"@instructure/ui-elements": "6",
"@instructure/ui-flex": "6",
"@instructure/ui-focusable": "6",
"@instructure/ui-form-field": "6",
"@instructure/ui-forms": "6",
"@instructure/ui-icons": "6",
"@instructure/ui-layout": "6",
"@instructure/ui-media-player": "^5.54.0",
"@instructure/ui-motion": "~6.21.0",
"@instructure/ui-overlays": "~6.21.0",
"@instructure/ui-pagination": "~6.21.0",
"@instructure/ui-react-utils": "~6.21.0",
"@instructure/ui-svg-images": "~6.21.0",
"@instructure/ui-tabs": "~6.21.0",
"@instructure/ui-text": "~6.21.0",
"@instructure/ui-text-input": "~6.21.0",
"@instructure/ui-themeable": "~6.21.0",
"@instructure/ui-themes": "~6.21.0",
"@instructure/ui-toggle-details": "~6.21.0",
"@instructure/ui-tree-browser": "~6.21.0",
"@instructure/ui-utils": "~6.21.0",
"@instructure/ui-view": "~6.21.0",
"@instructure/uid": "~6.21.0",
"@instructure/ui-motion": "6",
"@instructure/ui-overlays": "6",
"@instructure/ui-pagination": "6",
"@instructure/ui-react-utils": "6",
"@instructure/ui-svg-images": "6",
"@instructure/ui-tabs": "6",
"@instructure/ui-text": "6",
"@instructure/ui-text-input": "6",
"@instructure/ui-themeable": "6",
"@instructure/ui-themes": "6",
"@instructure/ui-toggle-details": "6",
"@instructure/ui-tree-browser": "6",
"@instructure/ui-utils": "6",
"@instructure/ui-view": "6",
"@instructure/uid": "6",
"@sheerun/mutationobserver-shim": "^0.3.2",
"@tinymce/tinymce-react": "^3.0.1",
"aphrodite": "^2",
@ -117,7 +116,7 @@
"@babel/core": "^7",
"@babel/register": "7",
"@instructure/browserslist-config-canvas-lms": ">=2",
"@instructure/ui-babel-preset": "~6.21.0",
"@instructure/ui-babel-preset": "6",
"@testing-library/dom": "^6",
"@testing-library/react": "^9",
"@testing-library/user-event": "^4.2.0",

1988
yarn.lock
View File

File diff suppressed because it is too large Load Diff