Fix file imports to enable Webpack support

.travis.yml

@@ -2,9 +2,9 @@ language: node_js
 sudo: false
 
 node_js:
+  - 12
+  - 10
   - 8
-  - 6
-  - 4
 
 install:
   - npm install

gulpfile.js

@@ -23,9 +23,9 @@ function generate(locales, set, minify, filename) {
 
   if (set) {
     if (set.constructor !== Array) { set = [set]; }
-    append = "\n//! Set default locales\n(function() {\n  var moment = (typeof require !== 'undefined' && require !== null) && !require.amd ? require('moment') : this.moment;";
+    append = "\n//! Set default locales\n(function (global, factory) {\n  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('moment')) :\n  typeof define === 'function' && define.amd ? define(['moment'], factory) :\n  (global = global || self, factory(global.moment));\n}(this, (function (moment) {\n  moment = moment && moment.hasOwnProperty('default') ? moment['default'] : moment;";
     set.forEach(function(l){ append += '\n  moment.modifyHolidays.add("' + l + '");'; });
-    append += '\n}).call(this);';
+    append += '\n  return moment;\n})));';
   }
 
   return gulp.src(files)
@@ -38,11 +38,12 @@ function generate(locales, set, minify, filename) {
     .pipe(gulp.dest('build/'));
 }
 
-gulp.task('default', function() {
+gulp.task('default', function(done) {
   generate(argv.locale, argv.set, argv.min, argv.name);
+  done();
 });
 
-gulp.task('build', function() {
+gulp.task('build', function(done) {
   var locales = [];
   var localePath = require('path').join(__dirname, 'locale');
   require('fs').readdirSync(localePath).forEach(function(file){
@@ -51,6 +52,11 @@ gulp.task('build', function() {
   });
 
   generate(null, null, true, 'moment-holiday.js');
+  generate(null, null, false, 'moment-holiday.js');
+  generate(['Argentina', 'Easter'], 'Argentina', true, 'moment-holiday-ar.js');
+  generate(['Argentina', 'Easter'], 'Argentina', false, 'moment-holiday-ar.js');
   generate(['United States', 'Easter'], 'United States', true, 'moment-holiday-us.js');
   generate(locales, 'United States', true, 'moment-holiday-pkg.js');
+
+  done();
 });

locale/argentina.js

@@ -2,8 +2,13 @@
 //! locale : Argentina
 //! author : NahuelOvejero : https://github.com/NahuelOvejero
 
-(function() {
-  var moment = (typeof require !== 'undefined' && require !== null) && !require.amd ? require('moment') : this.moment;
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('moment')) :
+  typeof define === 'function' && define.amd ? define(['moment'], factory) :
+  (global = global || self, factory(global.moment)); // jshint ignore:line
+}(this, (function (moment) {
+
+  moment = moment && moment.hasOwnProperty('default') ? moment['default'] : moment;
 
   moment.holidays.argentina = {
     "Año Nuevo": {
@@ -71,5 +76,6 @@
     }
   };
 
-  if ((typeof module !== 'undefined' && module !== null ? module.exports : void 0) != null) { module.exports = moment; }
-}).call(this);
+  return moment;
+
+})));

locale/canada.js

@@ -16,8 +16,13 @@
       SK : Saskatchewan
 */
 
-(function() {
-  var moment = (typeof require !== 'undefined' && require !== null) && !require.amd ? require('moment') : this.moment;
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('moment')) :
+  typeof define === 'function' && define.amd ? define(['moment'], factory) :
+  (global = global || self, factory(global.moment)); // jshint ignore:line
+}(this, (function (moment) {
+
+  moment = moment && moment.hasOwnProperty('default') ? moment['default'] : moment;
 
   moment.holidays.canada = {
     "New Year's Day": {
@@ -109,5 +114,6 @@
     }
   };
 
-  if ((typeof module !== 'undefined' && module !== null ? module.exports : void 0) != null) { module.exports = moment; }
-}).call(this);
+  return moment;
+
+})));

locale/colombia.js

@@ -1,5 +1,10 @@
-(function() {
-  var moment = (typeof require !== 'undefined' && require !== null) && !require.amd ? require('moment') : this.moment;
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('moment')) :
+  typeof define === 'function' && define.amd ? define(['moment'], factory) :
+  (global = global || self, factory(global.moment)); // jshint ignore:line
+}(this, (function (moment) {
+
+  moment = moment && moment.hasOwnProperty('default') ? moment['default'] : moment;
 
   moment.holidays.colombia = {
     "Día de los Reyes Magos": {
@@ -47,7 +52,7 @@
     "Todos los Santos ": {
       date: '11/6',
       keywords: ['festividad', 'cristiana']
-    }, 
+    },
     "Independencia de Cartagena":{
     	date: '11/13'
     },
@@ -58,7 +63,9 @@
     "Día de Navidad ": {
       date: '12/8',
       keywords: ['christmas', 'navidad', 'merryxmas']
-   }    
+   }
   };
-  if ((typeof module !== 'undefined' && module !== null ? module.exports : void 0) != null) { module.exports = moment; }
-}).call(this);
+
+  return moment;
+
+})));

locale/croatia.js

@@ -2,8 +2,13 @@
 //! locale : Croatia / Hrvatska
 //! author : diomed : https://github.com/diomed
 
-(function() {
-  var moment = (typeof require !== 'undefined' && require !== null) && !require.amd ? require('moment') : this.moment;
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('moment')) :
+  typeof define === 'function' && define.amd ? define(['moment'], factory) :
+  (global = global || self, factory(global.moment)); // jshint ignore:line
+}(this, (function (moment) {
+
+  moment = moment && moment.hasOwnProperty('default') ? moment['default'] : moment;
 
   moment.holidays.croatia = {
     "Nova Godina": {
@@ -63,5 +68,6 @@
     }
   };
 
-  if ((typeof module !== 'undefined' && module !== null ? module.exports : void 0) != null) { module.exports = moment; }
-}).call(this);
+  return moment;
+
+})));