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

100 lines
2.6 KiB
Plaintext
Raw Normal View History

js bundle extensions for plugins, bugfixes and DRYification allows plugins to have a bundle get auto-loaded with a corresponding canvas bundle. uses require.js' include mechanism in build.js (when optimized) and a rails helper tweak (when not optimized). this happens automatically based on the path, e.g. the foo plugin's "bundles/extensions/bar" will get automagically included whenever the regular "bar" bundle is required. removes the need for a plugin-level build.js, and auto-generates bundle module definitions in canvas' build.js (via erb). this handles all regular bundles both from canvas and plugins. also fixes plugins so that bundle dependencies get optimized. plugin paths are created automatically, so this means we can remove things like this from plugin bundles and specs: require.config paths: myplugin: "/plugins/myplugin/javascripts" test plan: 1. use canvas in development mode, it should work 2. use canvas in optimized JS mode, it should work i. confirm that all scripts are optimized 3. use canvas in development mode with plugins w/ JS, it should work 4. use canvas in optimized JS mode with plugins w/ JS, it should work i. confirm that all scripts are optimized 5. add a bundle extension in a plugin (e.g. create bundles/extensions/conversations in plugin foo) i. confirm that the extension code runs in development mode ii. confirm that the extension code runs in optimized JS mode Change-Id: If8507afdbabab4ae8966f7db79d9b0e2284034db Reviewed-on: https://gerrit.instructure.com/11238 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Jacob Fugal <jacob@instructure.com>
2012-06-02 07:13:53 +08:00
({
// file optimizations
upgraded requirejs to 2.1.10 - upgraded raphaël to 2.1.2 - upgraded FileAPI to 2.0.4 - amd-ified files - removed unnecessary shims - removed "use!" usage - removed "order" requirejs plugin - using new shim configuration format - replace deprecated require.resourcesDone with !window.requirejs.s.contexts._.defQueue.length - using UglifyJS separate from r.js - added keep_trying_until in selenium specs to fix timing issue - fix race condition in take_quiz.js with .file-upload-question-holder Change-Id: I8c205ef4c80115fa0cbd662c184490f1b9626336 Reviewed-on: https://gerrit.instructure.com/29683 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Ryan Florence <ryanf@instructure.com> QA-Review: Nathan Rogowski <nathan@instructure.com> Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com> Tested-by: Aaron Shafovaloff <ashafovaloff@instructure.com>
2014-02-06 05:39:14 +08:00
optimize: "none",
js bundle extensions for plugins, bugfixes and DRYification allows plugins to have a bundle get auto-loaded with a corresponding canvas bundle. uses require.js' include mechanism in build.js (when optimized) and a rails helper tweak (when not optimized). this happens automatically based on the path, e.g. the foo plugin's "bundles/extensions/bar" will get automagically included whenever the regular "bar" bundle is required. removes the need for a plugin-level build.js, and auto-generates bundle module definitions in canvas' build.js (via erb). this handles all regular bundles both from canvas and plugins. also fixes plugins so that bundle dependencies get optimized. plugin paths are created automatically, so this means we can remove things like this from plugin bundles and specs: require.config paths: myplugin: "/plugins/myplugin/javascripts" test plan: 1. use canvas in development mode, it should work 2. use canvas in optimized JS mode, it should work i. confirm that all scripts are optimized 3. use canvas in development mode with plugins w/ JS, it should work 4. use canvas in optimized JS mode with plugins w/ JS, it should work i. confirm that all scripts are optimized 5. add a bundle extension in a plugin (e.g. create bundles/extensions/conversations in plugin foo) i. confirm that the extension code runs in development mode ii. confirm that the extension code runs in optimized JS mode Change-Id: If8507afdbabab4ae8966f7db79d9b0e2284034db Reviewed-on: https://gerrit.instructure.com/11238 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Jacob Fugal <jacob@instructure.com>
2012-06-02 07:13:53 +08:00
// continue to let Jammit do its thing
optimizeCss: "none",
// where to place optimized javascript, relative to this file
dir: "../public/optimized",
// where the "app" is, relative to this file
appDir: "../public/javascripts",
// base path for modules, relative to appDir
baseUrl: "./",
translate: true,
paths: <%= paths %>,
introduced bower to manage js dependencies also updated ic-ajax closes CNVS-9979, CNVS-9981 Change-Id: I9cdfa997ea0df8de4b2900eac17c438369f92f2d Reviewed-on: https://gerrit.instructure.com/27316 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Jason Madsen <jmadsen@instructure.com> Product-Review: Ryan Florence <ryanf@instructure.com> QA-Review: Ryan Florence <ryanf@instructure.com>
2013-12-12 06:47:17 +08:00
packages: <%= packages %>,
js bundle extensions for plugins, bugfixes and DRYification allows plugins to have a bundle get auto-loaded with a corresponding canvas bundle. uses require.js' include mechanism in build.js (when optimized) and a rails helper tweak (when not optimized). this happens automatically based on the path, e.g. the foo plugin's "bundles/extensions/bar" will get automagically included whenever the regular "bar" bundle is required. removes the need for a plugin-level build.js, and auto-generates bundle module definitions in canvas' build.js (via erb). this handles all regular bundles both from canvas and plugins. also fixes plugins so that bundle dependencies get optimized. plugin paths are created automatically, so this means we can remove things like this from plugin bundles and specs: require.config paths: myplugin: "/plugins/myplugin/javascripts" test plan: 1. use canvas in development mode, it should work 2. use canvas in optimized JS mode, it should work i. confirm that all scripts are optimized 3. use canvas in development mode with plugins w/ JS, it should work 4. use canvas in optimized JS mode with plugins w/ JS, it should work i. confirm that all scripts are optimized 5. add a bundle extension in a plugin (e.g. create bundles/extensions/conversations in plugin foo) i. confirm that the extension code runs in development mode ii. confirm that the extension code runs in optimized JS mode Change-Id: If8507afdbabab4ae8966f7db79d9b0e2284034db Reviewed-on: https://gerrit.instructure.com/11238 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Jacob Fugal <jacob@instructure.com>
2012-06-02 07:13:53 +08:00
// non-amd shims
upgraded requirejs to 2.1.10 - upgraded raphaël to 2.1.2 - upgraded FileAPI to 2.0.4 - amd-ified files - removed unnecessary shims - removed "use!" usage - removed "order" requirejs plugin - using new shim configuration format - replace deprecated require.resourcesDone with !window.requirejs.s.contexts._.defQueue.length - using UglifyJS separate from r.js - added keep_trying_until in selenium specs to fix timing issue - fix race condition in take_quiz.js with .file-upload-question-holder Change-Id: I8c205ef4c80115fa0cbd662c184490f1b9626336 Reviewed-on: https://gerrit.instructure.com/29683 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Ryan Florence <ryanf@instructure.com> QA-Review: Nathan Rogowski <nathan@instructure.com> Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com> Tested-by: Aaron Shafovaloff <ashafovaloff@instructure.com>
2014-02-06 05:39:14 +08:00
shim: <%= shims %>,
js bundle extensions for plugins, bugfixes and DRYification allows plugins to have a bundle get auto-loaded with a corresponding canvas bundle. uses require.js' include mechanism in build.js (when optimized) and a rails helper tweak (when not optimized). this happens automatically based on the path, e.g. the foo plugin's "bundles/extensions/bar" will get automagically included whenever the regular "bar" bundle is required. removes the need for a plugin-level build.js, and auto-generates bundle module definitions in canvas' build.js (via erb). this handles all regular bundles both from canvas and plugins. also fixes plugins so that bundle dependencies get optimized. plugin paths are created automatically, so this means we can remove things like this from plugin bundles and specs: require.config paths: myplugin: "/plugins/myplugin/javascripts" test plan: 1. use canvas in development mode, it should work 2. use canvas in optimized JS mode, it should work i. confirm that all scripts are optimized 3. use canvas in development mode with plugins w/ JS, it should work 4. use canvas in optimized JS mode with plugins w/ JS, it should work i. confirm that all scripts are optimized 5. add a bundle extension in a plugin (e.g. create bundles/extensions/conversations in plugin foo) i. confirm that the extension code runs in development mode ii. confirm that the extension code runs in optimized JS mode Change-Id: If8507afdbabab4ae8966f7db79d9b0e2284034db Reviewed-on: https://gerrit.instructure.com/11238 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Jacob Fugal <jacob@instructure.com>
2012-06-02 07:13:53 +08:00
client app: canvas_quiz_statistics This commit brings in canvas_quiz_statistics, a client app that can be embedded in Canvas. Closes CNVS-14781, CNVS-14846, CNVS-14847, CNVS-14850 > What's done - full build integration, meaning the app runs with ?optimized_js=1: + JavaScript "built" source gets piped into the r.js build pipeline like any other Canvas JS source in public/javascripts/* + SCSS sources get picked up by the sass-compiler like Canvas style sources and they get compiled from the grounds-up + I18n: phrases are extracted properly, with default values and options, by our i18n rake tasks - new rake task js:build_client_apps that builds client apps and injects them as input to the rest of the JS build process - support for using Canvas JS packages, like d3, jQuery, and Backbone - support for using Canvas SASS variables & helpers - super i18n support: use raw I18n.t() calls like you are in Canvas, with development-time interpolation, as well as super new Handlebars-like block-style translations in React, perfect for very long phrases (mini-articles) > Docs and References The code was originally developed in its own github repository. While I won't be pushing code to that repo anymore, the Wiki will still house the docs until we find a better place. - Repo: https://github.com/amireh/canvas_quiz_statistics - Development guide: http://bit.ly/1sNOhER - Integration guide: http://bit.ly/1m9kA9V > TESTING - login as a teacher - go to /courses/:course_id/quizzes/:quiz_id/statistics_cqs + make sure you see something that looks like the Ember stats + click one of those little "?" help icons, you get a dialog: - verify the contents within the dialog are actual English text, not code gibberish - there's also a link at the end of that dialog, click it and verify it takes you to an Instructure help article - build the assets: `bundle exec rake canvas:compile_assets` then: + add ?optimized_js=1 to the URL and reload the page: - verify the app still works Change-Id: Ic474650dfb06a1c22869ed9680dd04d1ca0f651d Reviewed-on: https://gerrit.instructure.com/39105 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Hannah Bottalla <hannah@instructure.com> Reviewed-by: Adam Ard <aard@instructure.com> QA-Review: Trevor deHaan <tdehaan@instructure.com> Product-Review: Ahmad Amireh <ahmad@instructure.com>
2014-08-06 15:04:23 +08:00
// client app maps
map: <%= map %>,
UI for quiz submission logs Closes CNVS-17020 Adds a small app for browsing quiz submission events for a student's submission. Re-architectures the previous canvas_quiz_statistics client app to now host more than 1 app. Common code between the two apps is factored out into /apps/common/{css,js,test}. Also: - a feature flag for quiz log auditing - renamed previous QuizSubmissionEventsController to an Api one - an API endpoint + controller action for retrieving/viewing events - "canvas_quiz_statistics" merged with the new client app "canvas_quizzes" TEST PLAN ---- ---- Make sure you build the assets by running `bundle exec rake canvas:compile_assets` before doing any of this. Now: - take a quiz as a student - as a teacher, view the student's attempt - click on the big "View Log" link + verify the page loads and you can browse around in it We also need to test stats, because the commit affects it: - turn on the new stats feature flag - go to stats: + verify the page loads and looks OK Try both pages another time with the ?optimized_js=1 parameter added to the URL to make sure nothing went wrong when they were optimized. Change-Id: I5a30cb0db05e80084d1ddd595b53f9aa3cf336eb Reviewed-on: https://gerrit.instructure.com/44576 Reviewed-by: Derek DeVries <ddevries@instructure.com> Tested-by: Jenkins <jenkins@instructure.com> QA-Review: Trevor deHaan <tdehaan@instructure.com> Product-Review: Ahmad Amireh <ahmad@instructure.com>
2014-11-18 11:52:39 +08:00
// client app bundles
bundles: <%= bundles %>,
js bundle extensions for plugins, bugfixes and DRYification allows plugins to have a bundle get auto-loaded with a corresponding canvas bundle. uses require.js' include mechanism in build.js (when optimized) and a rails helper tweak (when not optimized). this happens automatically based on the path, e.g. the foo plugin's "bundles/extensions/bar" will get automagically included whenever the regular "bar" bundle is required. removes the need for a plugin-level build.js, and auto-generates bundle module definitions in canvas' build.js (via erb). this handles all regular bundles both from canvas and plugins. also fixes plugins so that bundle dependencies get optimized. plugin paths are created automatically, so this means we can remove things like this from plugin bundles and specs: require.config paths: myplugin: "/plugins/myplugin/javascripts" test plan: 1. use canvas in development mode, it should work 2. use canvas in optimized JS mode, it should work i. confirm that all scripts are optimized 3. use canvas in development mode with plugins w/ JS, it should work 4. use canvas in optimized JS mode with plugins w/ JS, it should work i. confirm that all scripts are optimized 5. add a bundle extension in a plugin (e.g. create bundles/extensions/conversations in plugin foo) i. confirm that the extension code runs in development mode ii. confirm that the extension code runs in optimized JS mode Change-Id: If8507afdbabab4ae8966f7db79d9b0e2284034db Reviewed-on: https://gerrit.instructure.com/11238 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Jacob Fugal <jacob@instructure.com>
2012-06-02 07:13:53 +08:00
// which modules should have their dependencies concatenated into them
modules: [
// non "app" bundles, should be careful not to try to have too many of these
{
name: "compiled/tinymce",
// this stuff is already in common, should be able to make this a smaller
// list since some things depend on others in the list, yes, its a bit crazy
// this is the intersection of common and tinymce, we need to script this
// config file...
exclude: [
'i18n',
'str/escapeRegex',
'vendor/date',
'jquery',
'str/pluralize',
'INST',
'str/htmlEscape',
'i18nObj',
'vendor/jquery.scrollTo',
'vendor/jqueryui/core',
'vendor/jqueryui/widget',
'vendor/jqueryui/mouse',
'vendor/jqueryui/position',
'translations/instructure',
'i18n!instructure',
'compiled/util/objectCollection',
'vendor/spin',
'vendor/jquery.spin',
'jquery.google-analytics',
'vendor/jquery.ba-hashchange',
'vendor/jqueryui/effects/drop',
restyle flash messages and unauthorized-style pages, fixes #9466 test plan: 1. go to a course page when not logged in 1. you should see the unauthorized message 2. it should be styled correctly 2. go to a course page when logged in that you are not enrolled in 1. you should see the unauthorized message 2. it should be styled correctly 3. perform an action that generates a flash notice (e.g. send a message in conversations) 1. the notice should appear and should overlap the header 2. it should disappear when clicked (or after a few seconds) 4. perform an action that generates a flash error message 1. the error should appear and should overlap the header 2. it should disappear when clicked (or after a few seconds) 5. go to a page that has an initial flash notice (e.g. view course you've been invited to) 1. the notice should appear and should shift all content down 2. it should only disappear if clicked 6. go to a page that has an initial flash error 1. the error should appear and should shift all content down 2. it should only disappear if clicked Change-Id: I3a1ca8f44e9f36bc7ce191392a7bf8922eb4fcc4 Reviewed-on: https://gerrit.instructure.com/12324 Reviewed-by: Ryan Shaw <ryan@instructure.com> Tested-by: Jenkins <jenkins@instructure.com>
2012-07-18 14:24:09 +08:00
'compiled/jquery.rails_flash_notifications',
js bundle extensions for plugins, bugfixes and DRYification allows plugins to have a bundle get auto-loaded with a corresponding canvas bundle. uses require.js' include mechanism in build.js (when optimized) and a rails helper tweak (when not optimized). this happens automatically based on the path, e.g. the foo plugin's "bundles/extensions/bar" will get automagically included whenever the regular "bar" bundle is required. removes the need for a plugin-level build.js, and auto-generates bundle module definitions in canvas' build.js (via erb). this handles all regular bundles both from canvas and plugins. also fixes plugins so that bundle dependencies get optimized. plugin paths are created automatically, so this means we can remove things like this from plugin bundles and specs: require.config paths: myplugin: "/plugins/myplugin/javascripts" test plan: 1. use canvas in development mode, it should work 2. use canvas in optimized JS mode, it should work i. confirm that all scripts are optimized 3. use canvas in development mode with plugins w/ JS, it should work 4. use canvas in optimized JS mode with plugins w/ JS, it should work i. confirm that all scripts are optimized 5. add a bundle extension in a plugin (e.g. create bundles/extensions/conversations in plugin foo) i. confirm that the extension code runs in development mode ii. confirm that the extension code runs in optimized JS mode Change-Id: If8507afdbabab4ae8966f7db79d9b0e2284034db Reviewed-on: https://gerrit.instructure.com/11238 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Jacob Fugal <jacob@instructure.com>
2012-06-02 07:13:53 +08:00
'jquery.dropdownList',
'vendor/jqueryui/progressbar',
'translations/media_comments',
'i18n!media_comments',
'vendor/jqueryui/button',
'vendor/jqueryui/draggable',
'jqueryui/draggable',
'vendor/jqueryui/resizable',
'vendor/jqueryui/dialog',
'jquery.instructure_jquery_patches',
'vendor/jqueryui/datepicker',
'vendor/jqueryui/sortable',
'jquery.scrollToVisible',
'vendor/jqueryui/tabs',
'jquery.disableWhileLoading',
'jquery.keycodes',
'jquery.instructure_date_and_time',
'jquery.instructure_misc_plugins',
'tinymce.editor_box',
'jquery.instructure_forms',
'jquery.ajaxJSON',
'jquery.instructure_misc_helpers',
'media_comments'
]
},
fix i18n js issues, fixes #10456 ensure that translations don't get overridden due to the locale being in the translation hash twice (symbol and string) also ensure _core translations (date/time/number formats) are always included test plan: 1. use canvas w/ optimized js 2. switch to another language (e.g. spanish) 3. go to the web conferences page 4. click to delete a conference 5. the confirmation dialog should be translated Change-Id: I73cb94a34a4acc2fe80b01148b950240bbd26d94 Reviewed-on: https://gerrit.instructure.com/13580 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Mark Ericksen <marke@instructure.com>
2012-09-11 00:53:29 +08:00
{ name: "common", include: ['translations/_core'] },
js bundle extensions for plugins, bugfixes and DRYification allows plugins to have a bundle get auto-loaded with a corresponding canvas bundle. uses require.js' include mechanism in build.js (when optimized) and a rails helper tweak (when not optimized). this happens automatically based on the path, e.g. the foo plugin's "bundles/extensions/bar" will get automagically included whenever the regular "bar" bundle is required. removes the need for a plugin-level build.js, and auto-generates bundle module definitions in canvas' build.js (via erb). this handles all regular bundles both from canvas and plugins. also fixes plugins so that bundle dependencies get optimized. plugin paths are created automatically, so this means we can remove things like this from plugin bundles and specs: require.config paths: myplugin: "/plugins/myplugin/javascripts" test plan: 1. use canvas in development mode, it should work 2. use canvas in optimized JS mode, it should work i. confirm that all scripts are optimized 3. use canvas in development mode with plugins w/ JS, it should work 4. use canvas in optimized JS mode with plugins w/ JS, it should work i. confirm that all scripts are optimized 5. add a bundle extension in a plugin (e.g. create bundles/extensions/conversations in plugin foo) i. confirm that the extension code runs in development mode ii. confirm that the extension code runs in optimized JS mode Change-Id: If8507afdbabab4ae8966f7db79d9b0e2284034db Reviewed-on: https://gerrit.instructure.com/11238 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Jacob Fugal <jacob@instructure.com>
2012-06-02 07:13:53 +08:00
// "apps"
<%= app_bundles %>
]
})