mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Lock requirejs w/ yarn, remove from committed staged libs. Minor version update.
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -10,11 +10,8 @@ module.exports = function( grunt ){
|
||||
|
||||
// where to move fetched bower components into the build structure (libName: [ bower-location, libs-location ])
|
||||
libraryLocations = {
|
||||
'backbone': [ 'backbone.js', 'backbone.js' ],
|
||||
'requirejs': [ 'require.js', 'require.js' ],
|
||||
'd3': [ 'd3.js', 'd3.js' ],
|
||||
'bib2json': [ 'Parser.js', 'bibtex.js' ],
|
||||
|
||||
'farbtastic': [ 'src/farbtastic.js', 'farbtastic.js' ],
|
||||
'jQTouch': [ 'src/reference/jqtouch.js', 'jquery/jqtouch.js' ],
|
||||
'bootstrap-tour': [ 'build/js/bootstrap-tour.js', 'bootstrap-tour.js' ],
|
||||
|
||||
@@ -24,6 +24,7 @@ var paths = {
|
||||
'jquery': ['dist/jquery.js', 'jquery/jquery.js'],
|
||||
'jquery-migrate': [ 'dist/jquery-migrate.js', 'jquery/jquery.migrate.js' ],
|
||||
'raven-js': ['dist/raven.js', 'raven.js'],
|
||||
'requirejs': [ 'require.js', 'require.js' ],
|
||||
'underscore': [ 'underscore.js', 'underscore.js' ],
|
||||
},
|
||||
libs: ['galaxy/scripts/libs/**/*.js']
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
"jquery-migrate": "~1.4",
|
||||
"jshint": "^2.9.4",
|
||||
"raven-js": "^3.17.0",
|
||||
"requirejs": "2",
|
||||
"underscore": "^1.8.3",
|
||||
"webpack": "^3.5.5"
|
||||
},
|
||||
|
||||
@@ -3975,6 +3975,10 @@ require-main-filename@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
|
||||
|
||||
requirejs@2:
|
||||
version "2.3.5"
|
||||
resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.5.tgz#617b9acbbcb336540ef4914d790323a8d4b861b0"
|
||||
|
||||
resolve-dir@^0.1.0:
|
||||
version "0.1.1"
|
||||
resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user