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

make it so it works with yarn 1.3.2 (frd) 

closes: CORE-675

test plan:
* while running yarn 0.27,
* run `yarn`
* it should work and there should only be one jquery in node_modules
* brew upgrade yarn (or whatever else you do to upgrade yarn to 1.3.2)
* run `yarn`
* it should not log any warning about unpacking jquery to the same
  location as something else
* it should work and not make any changes to yarn.lock or node_modules
* load the calendar page, there should not be any errors

Change-Id: I08a1b8ceddf31cae59720270f870516ad213b87d
Reviewed-on: https://gerrit.instructure.com/133548
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
This commit is contained in:
Ryan Shaw 2017-11-21 16:09:15 -07:00
parent 4699895c9d
commit 2e2dadbd1b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -156,5 +156,8 @@
"jspec": "./spec/jspec.sh",
"jspec-watch": "./spec/jspec.sh --watch",
"a11y-report": "./spec/jspec.sh --a11y"
},
"resolutions": {
"jquery": "https://github.com/ryankshaw/jquery.git#a755a3e9c99d5a70d8ea570836f94ae1ba56046d"
}
}