Remove xmodule_js prefix from paths of edx-ui-toolkit, edx-pattern-library and common.

cms/static/coffee/spec/main.coffee

@@ -27,9 +27,9 @@ requirejs.config({
         "moment": "xmodule_js/common_static/js/vendor/moment.min",
         "moment-with-locales": "xmodule_js/common_static/js/vendor/moment-with-locales.min",
         "text": "xmodule_js/common_static/js/vendor/requirejs/text",
-        "underscore": "xmodule_js/common_static/common/js/vendor/underscore",
-        "underscore.string": "xmodule_js/common_static/common/js/vendor/underscore.string",
-        "backbone": "xmodule_js/common_static/common/js/vendor/backbone",
+        "underscore": "common/js/vendor/underscore",
+        "underscore.string": "common/js/vendor/underscore.string",
+        "backbone": "common/js/vendor/backbone",
         "backbone.associations": "xmodule_js/common_static/js/vendor/backbone-associations-min",
         "backbone.paginator": "xmodule_js/common_static/js/vendor/backbone.paginator.min",
         "backbone-relational": "xmodule_js/common_static/js/vendor/backbone-relational.min",
@@ -48,9 +48,9 @@ requirejs.config({
         "domReady": "xmodule_js/common_static/js/vendor/domReady",
         "URI": "xmodule_js/common_static/js/vendor/URI.min",
         "mock-ajax": "xmodule_js/common_static/js/vendor/mock-ajax",
-        "modernizr": "xmodule_js/common_static/edx-pattern-library/js/modernizr-custom",
-        "afontgarde": "xmodule_js/common_static/edx-pattern-library/js/afontgarde",
-        "edxicons": "xmodule_js/common_static/edx-pattern-library/js/edx-icons",
+        "modernizr": "edx-pattern-library/js/modernizr-custom",
+        "afontgarde": "edx-pattern-library/js/afontgarde",
+        "edxicons": "edx-pattern-library/js/edx-icons",
 
         "mathjax": "//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_SVG&delayStartupUntil=configured",
         "youtube": "//www.youtube.com/player_api?noext",

cms/static/coffee/spec/main_squire.coffee

@@ -26,7 +26,7 @@ requirejs.config({
         "text": "xmodule_js/common_static/js/vendor/requirejs/text",
         "underscore": "common/js/vendor/underscore",
         "underscore.string": "common/js/vendor/underscore.string",
-        "backbone": "xmodule_js/common_static/common/js/vendor/backbone",
+        "backbone": "common/js/vendor/backbone",
         "backbone.associations": "xmodule_js/common_static/js/vendor/backbone-associations-min",
         "backbone.paginator": "xmodule_js/common_static/js/vendor/backbone.paginator.min",
         "tinymce": "xmodule_js/common_static/js/vendor/tinymce/js/tinymce/tinymce.full.min",
@@ -38,9 +38,9 @@ requirejs.config({
         "utility": "xmodule_js/common_static/js/src/utility",
         "sinon": "xmodule_js/common_static/js/vendor/sinon-1.17.0",
         "squire": "xmodule_js/common_static/js/vendor/Squire",
-        "modernizr": "xmodule_js/common_static/edx-pattern-library/js/modernizr-custom",
-        "afontgarde": "xmodule_js/common_static/edx-pattern-library/js/afontgarde",
-        "edxicons": "xmodule_js/common_static/edx-pattern-library/js/edx-icons",
+        "modernizr": "edx-pattern-library/js/modernizr-custom",
+        "afontgarde": "edx-pattern-library/js/afontgarde",
+        "edxicons": "edx-pattern-library/js/edx-icons",
         "draggabilly": "xmodule_js/common_static/js/vendor/draggabilly",
         "domReady": "xmodule_js/common_static/js/vendor/domReady",
         "URI": "xmodule_js/common_static/js/vendor/URI.min",

cms/static/karma_cms.conf.js

@@ -9,12 +9,12 @@ var configModule = require(path.join(__dirname, '../../common/static/common/js/k
 
 var files = {
     libraryFiles: [
+        {pattern: 'common/js/vendor/**/*.js'},
         {pattern: 'edx-pattern-library/js/**/*.js'},
         {pattern: 'edx-ui-toolkit/js/**/*.js'},
         {pattern: 'xmodule_js/common_static/coffee/src/**/*.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/**/*.js'},
         {pattern: 'xmodule_js/common_static/js/**/*.js'},
-        {pattern: 'xmodule_js/src/xmodule.js'},
+        {pattern: 'xmodule_js/src/xmodule.js'}
     ],
 
     sourceFiles: [

cms/static/karma_cms_squire.conf.js

@@ -9,12 +9,12 @@ var configModule = require(path.join(__dirname, '../../common/static/common/js/k
 
 var files = {
     libraryFiles: [
+        {pattern: 'common/js/vendor/**/*.js'},
         {pattern: 'edx-pattern-library/js/**/*.js'},
         {pattern: 'edx-ui-toolkit/js/**/*.js'},
         {pattern: 'xmodule_js/common_static/coffee/src/**/*.js'},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/**/*.js'},
         {pattern: 'xmodule_js/common_static/js/**/*.js'},
-        {pattern: 'xmodule_js/src/**/*.js'},
+        {pattern: 'xmodule_js/src/**/*.js'}
     ],
 
     sourceFiles: [

lms/static/js/spec/main.js

@@ -33,7 +33,7 @@
             'text': 'xmodule_js/common_static/js/vendor/requirejs/text',
             'underscore': 'common/js/vendor/underscore',
             'underscore.string': 'common/js/vendor/underscore.string',
-            'backbone': 'xmodule_js/common_static/common/js/vendor/backbone',
+            'backbone': 'common/js/vendor/backbone',
             'backbone.associations': 'xmodule_js/common_static/js/vendor/backbone-associations-min',
             'backbone.paginator': 'xmodule_js/common_static/js/vendor/backbone.paginator.min',
             'backbone-super': 'js/vendor/backbone-super',
@@ -66,9 +66,9 @@
             'MathJaxProcessor': 'coffee/src/customwmd',
             'picturefill': 'common/js/vendor/picturefill',
             'draggabilly': 'xmodule_js/common_static/js/vendor/draggabilly',
-            'modernizr': 'xmodule_js/common_static/edx-pattern-library/js/modernizr-custom',
-            'afontgarde': 'xmodule_js/common_static/edx-pattern-library/js/afontgarde',
-            'edxicons': 'xmodule_js/common_static/edx-pattern-library/js/edx-icons',
+            'modernizr': 'edx-pattern-library/js/modernizr-custom',
+            'afontgarde': 'edx-pattern-library/js/afontgarde',
+            'edxicons': 'edx-pattern-library/js/edx-icons',
 
             // Manually specify LMS files that are not converted to RequireJS
             'history': 'js/vendor/history',
@@ -101,7 +101,7 @@
             'annotator_1.2.9': 'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min',
 
             // Common edx utils
-            'common/js/utils/edx.utils.validate': 'xmodule_js/common_static/common/js/utils/edx.utils.validate',
+            'common/js/utils/edx.utils.validate': 'common/js/utils/edx.utils.validate',
             'slick.core': 'xmodule_js/common_static/js/vendor/slick.core',
             'slick.grid': 'xmodule_js/common_static/js/vendor/slick.grid'
         },

lms/static/karma_lms.conf.js

@@ -11,7 +11,7 @@ var files = {
     libraryFilesToInclude: [
         {pattern: 'xmodule_js/common_static/js/vendor/jquery.event.drag-2.2.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/slick.core.js', included: true},
-        {pattern: 'xmodule_js/common_static/js/vendor/slick.grid.js', included: true},
+        {pattern: 'xmodule_js/common_static/js/vendor/slick.grid.js', included: true}
     ],
 
     libraryFiles: [
@@ -20,7 +20,6 @@ var files = {
         {pattern: 'edx-ui-toolkit/js/**/*.js'},
         {pattern: 'js/RequireJS-namespace-undefine.js'},
         {pattern: 'xmodule_js/common_static/coffee/src/**/*.js'},
-        {pattern: 'xmodule_js/common_static/common/js/**/*.js'},
         {pattern: 'xmodule_js/common_static/js/**/*.js'},
         {pattern: 'xmodule_js/src/capa/*.js'},
         {pattern: 'xmodule_js/src/video/*.js'},
@@ -32,7 +31,7 @@ var files = {
         {pattern: 'js/**/!(*spec|djangojs).js'},
         {pattern: 'support/js/**/!(*spec).js'},
         {pattern: 'teams/js/**/!(*spec).js'},
-        {pattern: 'xmodule_js/common_static/coffee/**/!(*spec).js'},
+        {pattern: 'xmodule_js/common_static/coffee/**/!(*spec).js'}
     ],
 
     specFiles: [

lms/static/karma_lms_coffee.conf.js

@@ -15,8 +15,8 @@ var files = {
 
         {pattern: 'js/RequireJS-namespace-undefine.js', included: true},
         {pattern: 'xmodule_js/common_static/coffee/src/ajax_prefix.js', included: true},
-        {pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js', included: true},
-        {pattern: 'xmodule_js/common_static/edx-ui-toolkit/js/utils/global-loader.js', included: true},
+        {pattern: 'common/js/vendor/underscore.js', included: true},
+        {pattern: 'edx-ui-toolkit/js/utils/global-loader.js', included: true},
         {pattern: 'xmodule_js/common_static/js/src/logger.js', included: true},
         {pattern: 'xmodule_js/common_static/js/test/i18n.js', included: true},
         {pattern: 'xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js', included: true},