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

Upgrade InstUI to latest minor / patch versions 

This change aims to fix tree-shaking issues introduced in InstUI 7 by
the addition of `"type": "module"` to the packages' package.json
files. It updates the following major versions to their latest minor /
patch versions:

* 7 -> 7.4.4
* 6 -> 6.27.0

It also updates @instructure/ui-icons from v6 to v7, since nothing has
changed between those versions except the addition of new icons and a
slight tweak to the "add" and "x" icons to make them more closely
match product designs.

It also updates @babel/core, @babel/runtime, and
@babel/runtime-corejs3 to latest (7.13.10) to fix this babel issue:
https://github.com/babel/babel/issues/12854.

The dependency changes also shuffled around the webpack build a bit--
the assignment_edit bundle is now (slightly) over the max asset size
limit, while quizzes_bundle and screenreader_gradebook are not any
more.

fixes LS-2016
flag = none

Test plan:
  - Ensure everything in canvas still works and looks the same

Change-Id: I262012c9b752cec617f425c57e8c276bc7870b21
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/260391
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ahmad Amireh <ahmad@instructure.com>
QA-Review: Ahmad Amireh <ahmad@instructure.com>
Product-Review: Ahmad Amireh <ahmad@instructure.com>
This commit is contained in:
Jeff Largent 2021-03-10 14:57:44 -05:00
parent ef67a32f3c
commit 141c0c5b9b
7 changed files with 1855 additions and 1721 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/jsx/actAs/__tests__/__snapshots__/ActAsModal.test.js.snap
View File

@ -145,6 +145,7 @@ exports[`ActAsModal renders with panda svgs, user avatar, table, and proceed but
<Row>
<ColHeader
id="actasmodal-category"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -156,6 +157,7 @@ exports[`ActAsModal renders with panda svgs, user avatar, table, and proceed but
</ColHeader>
<ColHeader
id="actasmodal-userinfo"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -304,6 +306,7 @@ exports[`ActAsModal renders with panda svgs, user avatar, table, and proceed but
<Row>
<ColHeader
id="actasmodal-category"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -315,6 +318,7 @@ exports[`ActAsModal renders with panda svgs, user avatar, table, and proceed but
</ColHeader>
<ColHeader
id="actasmodal-userinfo"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -436,6 +440,7 @@ exports[`ActAsModal renders with panda svgs, user avatar, table, and proceed but
<Row>
<ColHeader
id="actasmodal-category"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -447,6 +452,7 @@ exports[`ActAsModal renders with panda svgs, user avatar, table, and proceed but
</ColHeader>
<ColHeader
id="actasmodal-userinfo"
scope="col"
sortDirection="none"
textAlign="start"
>

57
app/jsx/rubrics/__tests__/__snapshots__/Rubric.test.js.snap
View File

@ -19,6 +19,7 @@ exports[`the Rubric component hides the score total when needed 1`] = `
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -27,6 +28,7 @@ exports[`the Rubric component hides the score total when needed 1`] = `
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -35,6 +37,7 @@ exports[`the Rubric component hides the score total when needed 1`] = `
<ColHeader
id="table-heading-points"
key="TableHeadingPoints"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -45,6 +48,7 @@ exports[`the Rubric component hides the score total when needed 1`] = `
<ColHeader
colSpan={3}
id="rubric-title"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -55,6 +59,7 @@ exports[`the Rubric component hides the score total when needed 1`] = `
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -63,6 +68,7 @@ exports[`the Rubric component hides the score total when needed 1`] = `
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -71,6 +77,7 @@ exports[`the Rubric component hides the score total when needed 1`] = `
<ColHeader
id="table-heading-points"
key="TableHeadingPoints"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -229,6 +236,7 @@ exports[`the Rubric component points column does have a points column if points
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -237,6 +245,7 @@ exports[`the Rubric component points column does have a points column if points
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -245,6 +254,7 @@ exports[`the Rubric component points column does have a points column if points
<ColHeader
id="table-heading-points"
key="TableHeadingPoints"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -255,6 +265,7 @@ exports[`the Rubric component points column does have a points column if points
<ColHeader
colSpan={3}
id="rubric-title"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -265,6 +276,7 @@ exports[`the Rubric component points column does have a points column if points
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -273,6 +285,7 @@ exports[`the Rubric component points column does have a points column if points
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -281,6 +294,7 @@ exports[`the Rubric component points column does have a points column if points
<ColHeader
id="table-heading-points"
key="TableHeadingPoints"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -439,6 +453,7 @@ exports[`the Rubric component points column does not have a points column if poi
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -447,6 +462,7 @@ exports[`the Rubric component points column does not have a points column if poi
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -457,6 +473,7 @@ exports[`the Rubric component points column does not have a points column if poi
<ColHeader
colSpan={2}
id="rubric-title"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -467,6 +484,7 @@ exports[`the Rubric component points column does not have a points column if poi
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -475,6 +493,7 @@ exports[`the Rubric component points column does not have a points column if poi
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -633,6 +652,7 @@ exports[`the Rubric component points column does not have a points column if poi
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -641,6 +661,7 @@ exports[`the Rubric component points column does not have a points column if poi
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -651,6 +672,7 @@ exports[`the Rubric component points column does not have a points column if poi
<ColHeader
colSpan={2}
id="rubric-title"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -661,6 +683,7 @@ exports[`the Rubric component points column does not have a points column if poi
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -669,6 +692,7 @@ exports[`the Rubric component points column does not have a points column if poi
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -823,6 +847,7 @@ exports[`the Rubric component points column does not have a points column in sum
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -831,6 +856,7 @@ exports[`the Rubric component points column does not have a points column in sum
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -841,6 +867,7 @@ exports[`the Rubric component points column does not have a points column in sum
<ColHeader
colSpan={2}
id="rubric-title"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -851,6 +878,7 @@ exports[`the Rubric component points column does not have a points column in sum
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -859,6 +887,7 @@ exports[`the Rubric component points column does not have a points column in sum
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1043,6 +1072,7 @@ exports[`the Rubric component points column has a points column if points visibl
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1051,6 +1081,7 @@ exports[`the Rubric component points column has a points column if points visibl
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1059,6 +1090,7 @@ exports[`the Rubric component points column has a points column if points visibl
<ColHeader
id="table-heading-points"
key="TableHeadingPoints"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1069,6 +1101,7 @@ exports[`the Rubric component points column has a points column if points visibl
<ColHeader
colSpan={3}
id="rubric-title"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1079,6 +1112,7 @@ exports[`the Rubric component points column has a points column if points visibl
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1087,6 +1121,7 @@ exports[`the Rubric component points column has a points column if points visibl
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1095,6 +1130,7 @@ exports[`the Rubric component points column has a points column if points visibl
<ColHeader
id="table-heading-points"
key="TableHeadingPoints"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1279,6 +1315,7 @@ exports[`the Rubric component renders as expected 1`] = `
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1287,6 +1324,7 @@ exports[`the Rubric component renders as expected 1`] = `
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1295,6 +1333,7 @@ exports[`the Rubric component renders as expected 1`] = `
<ColHeader
id="table-heading-points"
key="TableHeadingPoints"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1305,6 +1344,7 @@ exports[`the Rubric component renders as expected 1`] = `
<ColHeader
colSpan={3}
id="rubric-title"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1315,6 +1355,7 @@ exports[`the Rubric component renders as expected 1`] = `
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1323,6 +1364,7 @@ exports[`the Rubric component renders as expected 1`] = `
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1331,6 +1373,7 @@ exports[`the Rubric component renders as expected 1`] = `
<ColHeader
id="table-heading-points"
key="TableHeadingPoints"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1515,6 +1558,7 @@ exports[`the Rubric component renders properly with no assessment 1`] = `
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1523,6 +1567,7 @@ exports[`the Rubric component renders properly with no assessment 1`] = `
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1531,6 +1576,7 @@ exports[`the Rubric component renders properly with no assessment 1`] = `
<ColHeader
id="table-heading-points"
key="TableHeadingPoints"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1541,6 +1587,7 @@ exports[`the Rubric component renders properly with no assessment 1`] = `
<ColHeader
colSpan={3}
id="rubric-title"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1551,6 +1598,7 @@ exports[`the Rubric component renders properly with no assessment 1`] = `
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1559,6 +1607,7 @@ exports[`the Rubric component renders properly with no assessment 1`] = `
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1567,6 +1616,7 @@ exports[`the Rubric component renders properly with no assessment 1`] = `
<ColHeader
id="table-heading-points"
key="TableHeadingPoints"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1720,6 +1770,7 @@ exports[`the Rubric component updates the total score when an individual criteri
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1728,6 +1779,7 @@ exports[`the Rubric component updates the total score when an individual criteri
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1736,6 +1788,7 @@ exports[`the Rubric component updates the total score when an individual criteri
<ColHeader
id="table-heading-points"
key="TableHeadingPoints"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1746,6 +1799,7 @@ exports[`the Rubric component updates the total score when an individual criteri
<ColHeader
colSpan={3}
id="rubric-title"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1756,6 +1810,7 @@ exports[`the Rubric component updates the total score when an individual criteri
<ColHeader
id="table-heading-criteria"
key="TableHeadingCriteria"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1764,6 +1819,7 @@ exports[`the Rubric component updates the total score when an individual criteri
<ColHeader
id="table-heading-ratings"
key="TableHeadingRatings"
scope="col"
sortDirection="none"
textAlign="start"
>
@ -1772,6 +1828,7 @@ exports[`the Rubric component updates the total score when an individual criteri
<ColHeader
id="table-heading-points"
key="TableHeadingPoints"
scope="col"
sortDirection="none"
textAlign="start"
>

1
app/jsx/shared/rce/__tests__/__snapshots__/FileBrowser.test.js.snap
View File

@ -26,6 +26,7 @@ exports[`FileBrowser renders 1`] = `
}
}
defaultExpanded={Array []}
getItemProps={[Function]}
itemIcon={[Function]}
items={Object {}}
onCollectionClick={[Function]}

25
frontend_build/baseWebpackConfig.js
View File

@ -73,11 +73,7 @@ module.exports = {
'canvas-rce-async-chunk',
'canvas-rce-old-async-chunk',
'permissions_index',
'screenreader_gradebook',
// This bundle got pushed over the limit by translations being added and
// the simplest fix was to ignore it at the moment, to unblock selenium
// tests for everyone. CORE-3106 will resolve this.
'quizzes_bundle'
'assignment_edit'
]
return (
assetFilename.endsWith('.js') &&
@ -139,7 +135,9 @@ module.exports = {
devtool: skipSourcemaps
? false
: process.env.NODE_ENV === 'production' || process.env.COVERAGE === '1' || process.env.SENTRY_DSN
: process.env.NODE_ENV === 'production' ||
process.env.COVERAGE === '1' ||
process.env.SENTRY_DSN
? 'source-map'
: 'eval',
@ -195,10 +193,13 @@ module.exports = {
jst: path.resolve(__dirname, '../app/views/jst'),
jqueryui: path.resolve(__dirname, '../public/javascripts/vendor/jqueryui'),
coffeescripts: path.resolve(__dirname, '../app/coffeescripts'),
'lodash.underscore$': path.resolve(__dirname, '../public/javascripts/vendor/lodash.underscore.js'),
'lodash.underscore$': path.resolve(
__dirname,
'../public/javascripts/vendor/lodash.underscore.js'
),
jsx: path.resolve(__dirname, '../app/jsx'),
'jquery.qtip$': path.resolve(__dirname, '../public/javascripts/vendor/jquery.qtip.js'),
'jquery.qtip$': path.resolve(__dirname, '../public/javascripts/vendor/jquery.qtip.js')
},
modules: [
@ -218,7 +219,7 @@ module.exports = {
/node_modules\/jquery\//,
/vendor\/md5/,
/tinymce\/tinymce$/, // has 'require' and 'define' but they are from it's own internal closure
/i18nliner\/dist\/lib\/i18nliner/, // i18nLiner has a `require('fs')` that it doesn't actually need, ignore it.
/i18nliner\/dist\/lib\/i18nliner/ // i18nLiner has a `require('fs')` that it doesn't actually need, ignore it.
],
rules: [
{
@ -283,7 +284,7 @@ module.exports = {
plugins: [
// return a non-zero exit code if there are any warnings so we don't continue compiling assets if webpack fails
function() {
function () {
this.plugin('done', ({compilation}) => {
if (compilation.warnings && compilation.warnings.length) {
console.error(compilation.warnings)
@ -323,8 +324,8 @@ module.exports = {
// allow plugins to extend source files
new SourceFileExtensionsPlugin({
context: root,
include: glob.sync(path.join(root, 'gems/plugins/*/package.json'), { absolute: true }),
tmpDir: path.join(root, 'tmp/webpack-source-file-extensions'),
include: glob.sync(path.join(root, 'gems/plugins/*/package.json'), {absolute: true}),
tmpDir: path.join(root, 'tmp/webpack-source-file-extensions')
}),
new WebpackHooks(),

2
package.json
View File

@ -50,7 +50,7 @@
"@instructure/ui-grid": "6",
"@instructure/ui-heading": "6",
"@instructure/ui-i18n": "6",
"@instructure/ui-icons": "6",
"@instructure/ui-icons": "7",
"@instructure/ui-img": "6",
"@instructure/ui-layout": "6",
"@instructure/ui-link": "6",

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

@ -37,7 +37,7 @@
"@instructure/ui-elements": "6",
"@instructure/ui-flex": "6",
"@instructure/ui-forms": "6",
"@instructure/ui-icons": "6",
"@instructure/ui-icons": "7",
"@instructure/ui-heading": "6",
"@instructure/ui-layout": "6",
"@instructure/ui-media-player": "^7",

3483
yarn.lock
View File

File diff suppressed because it is too large Load Diff