MAGETWO-51628: Update JS bundling configuration and re-measure end-2-…

…end KPIs to ensure similar performance to 2.0 GA - Update exclude list
magento · Apr 18, 2016 · 034fcd6 · 034fcd6
1 parent ef01788
commit 034fcd6
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 22 deletions.
diff --git a/app/code/Magento/Swatches/view/adminhtml/layout/catalog_product_attribute_edit.xml b/app/code/Magento/Swatches/view/adminhtml/layout/catalog_product_attribute_edit.xml
@@ -9,7 +9,6 @@
     <head>
         <css src="Magento_Swatches::css/swatches.css"/>
         <css src="jquery/colorpicker/css/colorpicker.css"/>
-        <link src="jquery/colorpicker/js/colorpicker.js"/>
     </head>
     <body>
         <referenceContainer name="main">

diff --git a/app/code/Magento/Swatches/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml b/app/code/Magento/Swatches/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml
@@ -9,7 +9,6 @@
     <head>
         <css src="Magento_Swatches::css/swatches.css"/>
         <css src="jquery/colorpicker/css/colorpicker.css"/>
-        <link src="jquery/colorpicker/js/colorpicker.js"/>
     </head>
     <body>
         <referenceContainer name="form">

diff --git a/app/code/Magento/Swatches/view/adminhtml/layout/catalog_product_form.xml b/app/code/Magento/Swatches/view/adminhtml/layout/catalog_product_form.xml
@@ -9,6 +9,5 @@
     <head>
         <css src="Magento_Swatches::css/swatches.css"/>
         <css src="jquery/colorpicker/css/colorpicker.css"/>
-        <link src="jquery/colorpicker/js/colorpicker.js"/>
     </head>
 </page>
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js b/app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js
@@ -12,6 +12,7 @@ define([
     'uiRegistry',
     'prototype',
     'Magento_Ui/js/form/element/abstract',
+    'jquery/colorpicker/js/colorpicker',
     'jquery/ui'
 ], function (_, jQuery, mageTemplate, rg, prototype, Abstract) {
     'use strict';

diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/visual.js b/app/code/Magento/Swatches/view/adminhtml/web/js/visual.js
@@ -9,6 +9,7 @@ define([
     'jquery',
     'mage/template',
     'uiRegistry',
+    'jquery/colorpicker/js/colorpicker',
     'prototype',
     'jquery/ui'
 ], function (jQuery, mageTemplate, rg) {

diff --git a/app/design/adminhtml/Magento/backend/etc/view.xml b/app/design/adminhtml/Magento/backend/etc/view.xml
@@ -36,7 +36,6 @@
         <item type="file">Lib::mage/list.js</item>
         <item type="file">Lib::mage/loader.js</item>
         <item type="file">Lib::mage/menu.js</item>
-        <item type="file">Lib::mage/popup-window.js</item>
         <item type="file">Lib::mage/redirect-url.js</item>
         <item type="file">Lib::mage/sticky.js</item>
         <item type="file">Lib::mage/terms.js</item>
@@ -49,21 +48,28 @@
         <item type="file">Lib::mage/validation/validation.js</item>
         <item type="file">Lib::mage/adminhtml/varienLoader.js</item>
         <item type="file">Lib::mage/adminhtml/tools.js</item>
+        <item type="file">Lib::mage/gallery/gallery.js</item>
+        <item type="file">Lib::mage/requirejs/mixins.js</item>
+        <item type="file">Lib::mage/requirejs/static.js</item>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery.parsequery.js</item>
         <item type="file">Lib::jquery/jquery.mobile.custom.js</item>
         <item type="file">Lib::jquery/jquery-ui.js</item>
         <item type="file">Lib::jquery/jquery-ui.min.js</item>
         <item type="file">Lib::matchMedia.js</item>
         <item type="file">Lib::requirejs/require.js</item>
+        <item type="file">Lib::requirejs/text.js</item>
         <item type="file">Lib::date-format-normalizer.js</item>
         <item type="file">Lib::varien/js.js</item>
         <item type="directory">Lib::css</item>
         <item type="directory">Lib::lib</item>
         <item type="directory">Lib::prototype</item>
         <item type="directory">Lib::scriptaculous</item>
+        <item type="directory">Lib::extjs</item>
+        <item type="directory">Lib::less</item>
+        <item type="directory">Lib::fotorama</item>
+        <item type="directory">Lib::magnifier</item>
         <item type="directory">Lib::tiny_mce</item>
-        <item type="directory">Lib::mage/requirejs</item>
         <item type="directory">Lib::tiny_mce/classes</item>
         <item type="directory">Lib::tiny_mce/langs</item>
         <item type="directory">Lib::tiny_mce/plugins</item>

diff --git a/app/design/frontend/Magento/blank/etc/view.xml b/app/design/frontend/Magento/blank/etc/view.xml
@@ -250,32 +250,40 @@
         <var name="bundle_size">1MB</var>
     </vars>
     <exclude>
+        <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
         <item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
         <item type="file">Lib::jquery/jquery.details.js</item>
         <item type="file">Lib::jquery/jquery.details.min.js</item>
         <item type="file">Lib::jquery/jquery.hoverIntent.js</item>
-        <item type="file">Lib::jquery/jquery.min.js</item>
+        <item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
+        <item type="file">Lib::requirejs/require.js</item>
+        <item type="file">Lib::requirejs/text.js</item>
+        <item type="file">Lib::date-format-normalizer.js</item>
+        <item type="file">Lib::legacy-build.min.js</item>
         <item type="file">Lib::mage/captcha.js</item>
         <item type="file">Lib::mage/dropdown_old.js</item>
         <item type="file">Lib::mage/list.js</item>
         <item type="file">Lib::mage/loader_old.js</item>
         <item type="file">Lib::mage/webapi.js</item>
-        <item type="file">Lib::requirejs/require.js</item>
-        <item type="file">Lib::date-format-normalizer.js</item>
-        <item type="file">Lib::legacy-build.min.js</item>
-        <item type="file">Lib::less/less.min.js</item>
         <item type="file">Lib::mage/zoom.js</item>
+        <item type="file">Lib::mage/translate-inline-vde.js</item>
+        <item type="file">Lib::mage/requirejs/mixins.js</item>
+        <item type="file">Lib::mage/requirejs/static.js</item>
         <item type="file">Magento_Customer::js/zxcvbn.js</item>
+        <item type="file">Magento_Catalog::js/zoom.js</item>
         <item type="file">Magento_Ui::js/lib/step-wizard.js</item>
-        <item type="file">Magento_Ui::js/form/components/insert-listing.js</item>
         <item type="file">Magento_Ui::js/form/element/ui-select.js</item>
+        <item type="file">Magento_Ui::js/form/element/file-uploader.js</item>
+        <item type="file">Magento_Ui::js/form/components/insert.js</item>
+        <item type="file">Magento_Ui::js/form/components/insert-listing.js</item>
         <item type="directory">Magento_Ui::js/timeline</item>
         <item type="directory">Magento_Ui::js/grid</item>
         <item type="directory">Magento_Ui::js/dynamic-rows</item>
         <item type="directory">Magento_Ui::templates/timeline</item>
         <item type="directory">Magento_Ui::templates/grid</item>
         <item type="directory">Magento_Ui::templates/dynamic-rows</item>
+        <item type="directory">Magento_Swagger::swagger-ui</item>
         <item type="directory">Lib::modernizr</item>
         <item type="directory">Lib::tiny_mce</item>
         <item type="directory">Lib::varien</item>
@@ -287,9 +295,8 @@
         <item type="directory">Lib::extjs</item>
         <item type="directory">Lib::prototype</item>
         <item type="directory">Lib::scriptaculous</item>
-        <item type="directory">Lib::mage/requirejs</item>
+        <item type="directory">Lib::less</item>
         <item type="directory">Lib::mage/adminhtml</item>
         <item type="directory">Lib::mage/backend</item>
-        <item type="directory">Magento_Swagger::swagger-ui</item>
     </exclude>
 </view>
diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
@@ -263,32 +263,40 @@
         <var name="bundle_size">1MB</var>
     </vars>
     <exclude>
+        <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
         <item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
         <item type="file">Lib::jquery/jquery.details.js</item>
         <item type="file">Lib::jquery/jquery.details.min.js</item>
         <item type="file">Lib::jquery/jquery.hoverIntent.js</item>
-        <item type="file">Lib::jquery/jquery.min.js</item>
+        <item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
+        <item type="file">Lib::requirejs/require.js</item>
+        <item type="file">Lib::requirejs/text.js</item>
+        <item type="file">Lib::date-format-normalizer.js</item>
+        <item type="file">Lib::legacy-build.min.js</item>
         <item type="file">Lib::mage/captcha.js</item>
         <item type="file">Lib::mage/dropdown_old.js</item>
         <item type="file">Lib::mage/list.js</item>
         <item type="file">Lib::mage/loader_old.js</item>
         <item type="file">Lib::mage/webapi.js</item>
-        <item type="file">Lib::requirejs/require.js</item>
-        <item type="file">Lib::date-format-normalizer.js</item>
-        <item type="file">Lib::legacy-build.min.js</item>
-        <item type="file">Lib::less/less.min.js</item>
         <item type="file">Lib::mage/zoom.js</item>
+        <item type="file">Lib::mage/translate-inline-vde.js</item>
+        <item type="file">Lib::mage/requirejs/mixins.js</item>
+        <item type="file">Lib::mage/requirejs/static.js</item>
         <item type="file">Magento_Customer::js/zxcvbn.js</item>
+        <item type="file">Magento_Catalog::js/zoom.js</item>
         <item type="file">Magento_Ui::js/lib/step-wizard.js</item>
-        <item type="file">Magento_Ui::js/form/components/insert-listing.js</item>
         <item type="file">Magento_Ui::js/form/element/ui-select.js</item>
+        <item type="file">Magento_Ui::js/form/element/file-uploader.js</item>
+        <item type="file">Magento_Ui::js/form/components/insert.js</item>
+        <item type="file">Magento_Ui::js/form/components/insert-listing.js</item>
         <item type="directory">Magento_Ui::js/timeline</item>
         <item type="directory">Magento_Ui::js/grid</item>
         <item type="directory">Magento_Ui::js/dynamic-rows</item>
         <item type="directory">Magento_Ui::templates/timeline</item>
         <item type="directory">Magento_Ui::templates/grid</item>
         <item type="directory">Magento_Ui::templates/dynamic-rows</item>
+        <item type="directory">Magento_Swagger::swagger-ui</item>
         <item type="directory">Lib::modernizr</item>
         <item type="directory">Lib::tiny_mce</item>
         <item type="directory">Lib::varien</item>
@@ -300,9 +308,8 @@
         <item type="directory">Lib::extjs</item>
         <item type="directory">Lib::prototype</item>
         <item type="directory">Lib::scriptaculous</item>
-        <item type="directory">Lib::mage/requirejs</item>
+        <item type="directory">Lib::less</item>
         <item type="directory">Lib::mage/adminhtml</item>
         <item type="directory">Lib::mage/backend</item>
-        <item type="directory">Magento_Swagger::swagger-ui</item>
     </exclude>
 </view>
diff --git a/lib/web/jquery/colorpicker/js/colorpicker.js b/lib/web/jquery/colorpicker/js/colorpicker.js
@@ -7,7 +7,7 @@
  * 
  */
 
-require([
+define([
 	"jquery",
 ], function ($) {
 	var ColorPicker = function () {