Fix moment-with-locales and customization and add locale parent checks

diff --git a/tasks/transpile.js b/tasks/transpile.js
index bc54b3241fbdaa8ae43c31ac598c6fecd5d9f692..5ab8dd5337603629000d6f93a3b0b4dce386a262 100644 (file)
--- a/tasks/transpile.js
+++ b/tasks/transpile.js
@@ -155,7 +155,8 @@ module.exports = function (grunt) {
     function generateLocales(target, localeFiles, opts) {
         var files = localeFiles,
             code = [
-                'import moment from "./moment";'
+                'import moment from "./moment";',
+                'export default moment;'
             ].concat(files.map(function (file) {
                 var identifier = path.basename(file, '.js').replace('-', '_');
                 return 'import ' + identifier + ' from "./' + file + '";';
@@ -169,8 +170,8 @@ module.exports = function (grunt) {
             code: code,
             target: target,
             skipMoment: opts.skipMoment,
-            headerFile: 'templates/locale-header.js',
-            skipLines: 7
+            headerFile: opts.skipMoment === true ? 'templates/locale-header.js' : 'templates/default.js',
+            skipLines: opts.skipMoment === true ? 7 : 5
         });
     }
 
@@ -278,6 +279,13 @@ module.exports = function (grunt) {
                 {skipMoment: false});
         }).then(function () {
             grunt.log.ok('build/umd/min/moment-with-locales.custom.js');
+        }).then(function () {
+            var moment = require('../build/umd/min/moment-with-locales.custom.js');
+            if (moment.locales().length != localeFiles.length) {
+                throw new Error(
+                    'You probably specified locales requiring ' +
+                    'parent locale, but didn\'t specify parent')
+            }
         }).then(done, function (e) {
             grunt.log.error('error transpiling-custom', e);
             done(e);