Merge branch 'master' into ExportToExcelDocRevision

coveo · Feb 14, 2017 · 23ac07c · 23ac07c
2 parents 13fafb9 + 1bbd863
commit 23ac07c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
   ],
   "homepage": "https://github.com/coveo/coveo.search.js#readme",
   "engines": {
-    "node": "4.2.2"
+    "node": "6.9.2"
   },
   "devDependencies": {
     "@salesforce-ux/design-system": "2.0.3",

diff --git a/webpackConfigFiles/webpack.common.config.js b/webpackConfigFiles/webpack.common.config.js
@@ -12,12 +12,14 @@ if (minimize) {
   plugins.push(new webpack.optimize.UglifyJsPlugin());
 }
 
+let globalizePath = __dirname + '/../lib/globalize/globalize.min.js';
+
 module.exports = {
   resolve: {
     extensions: ['', '.ts', '.js'],
     alias: {
       'l10n': __dirname + '/../lib/l10n/l10n.min.js',
-      'globalize': __dirname + '/../lib/globalize/globalize.min.js',
+      'globalize': globalizePath,
       'modal-box': __dirname + '/../node_modules/modal-box/bin/ModalBox.min.js',
       'magic-box': __dirname + '/../node_modules/coveomagicbox/bin/MagicBox.min.js',
       'default-language': __dirname + '/../src/strings/DefaultLanguage.js',
@@ -28,6 +30,10 @@ module.exports = {
   module: {
     loaders: [
       {test: /\.ts$/, loader: 'ts-loader'},
+      {
+        test: require.resolve(globalizePath),
+        loader: 'expose-loader?Globalize'
+      },
       {
         test: /underscore-min.js/,
         loader: 'string-replace-loader',