// Cldr / Globalize removed from default theme

Shakarhaba · Mar 3, 2016 · 93129fb · 93129fb
1 parent 9f47775
commit 93129fb
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 23 deletions.
diff --git a/admin-dev/themes/default/package.json b/admin-dev/themes/default/package.json
@@ -14,14 +14,11 @@
     "babel-core": "^6.5.2",
     "babel-loader": "^6.2.2",
     "babel-preset-es2015": "^6.5.0",
-    "cldr-data": "^28.0.3",
-    "cldrjs": "^0.4.4",
     "css-loader": "^0.23.1",
     "exports-loader": "^0.6.3",
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.8.5",
-    "globalize": "^1.1.1",
     "imports-loader": "^0.6.5",
     "material-design-icons": "^2.1.3",
     "node-sass": "^3.4.2",

diff --git a/admin-dev/themes/default/public/3c3d0242794b4682460a3f7c7a2126ee.woff b/admin-dev/themes/default/public/3c3d0242794b4682460a3f7c7a2126ee.woff
diff --git a/admin-dev/themes/default/public/81025269949a562d06d5e316f733b140.woff2 b/admin-dev/themes/default/public/81025269949a562d06d5e316f733b140.woff2
diff --git a/...blic/9ac46d2eb22f2f00090a73ed943b9522.ttf → ...blic/a37b0c01c0baf1888ca812cc0508f6e2.ttf b/...blic/9ac46d2eb22f2f00090a73ed943b9522.ttf → ...blic/a37b0c01c0baf1888ca812cc0508f6e2.ttf
diff --git a/admin-dev/themes/default/public/bundle.js b/admin-dev/themes/default/public/bundle.js
diff --git a/admin-dev/themes/default/public/c58629e330eaf128316a142320407d74.woff2 b/admin-dev/themes/default/public/c58629e330eaf128316a142320407d74.woff2
diff --git a/admin-dev/themes/default/public/e2f35f2d8bb12d4d3407ebe3683adaa1.woff b/admin-dev/themes/default/public/e2f35f2d8bb12d4d3407ebe3683adaa1.woff
diff --git a/...blic/178d7a4dacfb885abee8e2d905b08524.eot → ...blic/e79bfd88537def476913f3ed52f4f4b3.eot b/...blic/178d7a4dacfb885abee8e2d905b08524.eot → ...blic/e79bfd88537def476913f3ed52f4f4b3.eot
diff --git a/admin-dev/themes/default/public/theme.css b/admin-dev/themes/default/public/theme.css
diff --git a/admin-dev/themes/default/webpack.config.js b/admin-dev/themes/default/webpack.config.js
@@ -4,16 +4,6 @@ var ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 module.exports = {
   entry: [
-    'cldrjs/dist/cldr.js',
-    'cldrjs/dist/cldr/event.js',
-    'cldrjs/dist/cldr/supplemental.js',
-    'globalize/dist/globalize.js',
-    'globalize/dist/globalize/message.js',
-    'globalize/dist/globalize/number.js',
-    'globalize/dist/globalize/plural.js',
-    'globalize/dist/globalize/date.js',
-    'globalize/dist/globalize/currency.js',
-    'globalize/dist/globalize/relative-time.js',
     './js/theme.js'
   ],
   output: {
@@ -22,12 +12,6 @@ module.exports = {
   },
   module: {
     loaders: [{
-      test: [
-        /cldrjs\/dist\/cldr/,
-        /globalize\/dist\/globalize/
-      ],
-      loader: 'imports?this=>window&exports=>false&module=>false&define=>false'
-    }, {
       test: path.join(__dirname, 'js'),
       loader: 'babel',
       query: {

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
@@ -2614,6 +2614,7 @@ public function setMedia($isNewTheme = false)
             _PS_JS_DIR_.'admin.js?v='._PS_VERSION_, // TODO: SEE IF REMOVABLE
             _PS_JS_DIR_.'cldr.js',
             _PS_JS_DIR_.'tools.js?v='._PS_VERSION_,
+            __PS_BASE_URI__.$this->admin_webpath.'/public/bundle.js',
         ));
 
         Media::addJsDef(array('host_mode' => (defined('_PS_HOST_MODE_') && _PS_HOST_MODE_)));