Move es6 files to src, add transpile and qtest grunt tasks

cyrke · Mar 25, 2015 · 92c28cb · 92c28cb
1 parent 5fb4720
commit 92c28cb
Show file tree

Hide file tree

Showing 129 changed files with 77 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,4 @@ sauce_connect.log
 .sauce-labs.creds
 npm-debug.log
 .build*
-temp
+build
diff --git a/package.json b/package.json
@@ -47,6 +47,7 @@
         "broccoli-funnel": "^0.1.6",
         "broccoli-merge-trees": "^0.2.1",
         "broccoli-uglify-js": "^0.1.3",
+        "es6-promise": "latest",
         "grunt": "latest",
         "nodeunit": "latest",
         "benchmark": "latest",

diff --git a/lib/create/check-overflow.js → src/lib/create/check-overflow.js b/lib/create/check-overflow.js → src/lib/create/check-overflow.js
diff --git a/lib/create/date-from-array.js → src/lib/create/date-from-array.js b/lib/create/date-from-array.js → src/lib/create/date-from-array.js
diff --git a/lib/create/default-parsing-flags.js → src/lib/create/default-parsing-flags.js b/lib/create/default-parsing-flags.js → src/lib/create/default-parsing-flags.js
diff --git a/lib/create/from-anything.js → src/lib/create/from-anything.js b/lib/create/from-anything.js → src/lib/create/from-anything.js
diff --git a/lib/create/from-array.js → src/lib/create/from-array.js b/lib/create/from-array.js → src/lib/create/from-array.js
diff --git a/lib/create/from-object.js → src/lib/create/from-object.js b/lib/create/from-object.js → src/lib/create/from-object.js
diff --git a/lib/create/from-string-and-array.js → src/lib/create/from-string-and-array.js b/lib/create/from-string-and-array.js → src/lib/create/from-string-and-array.js
diff --git a/lib/create/from-string-and-format.js → src/lib/create/from-string-and-format.js b/lib/create/from-string-and-format.js → src/lib/create/from-string-and-format.js
diff --git a/lib/create/from-string.js → src/lib/create/from-string.js b/lib/create/from-string.js → src/lib/create/from-string.js
diff --git a/lib/create/local.js → src/lib/create/local.js b/lib/create/local.js → src/lib/create/local.js
diff --git a/lib/create/utc.js → src/lib/create/utc.js b/lib/create/utc.js → src/lib/create/utc.js
diff --git a/lib/create/valid.js → src/lib/create/valid.js b/lib/create/valid.js → src/lib/create/valid.js
diff --git a/lib/duration/abs.js → src/lib/duration/abs.js b/lib/duration/abs.js → src/lib/duration/abs.js
diff --git a/lib/duration/add-subtract.js → src/lib/duration/add-subtract.js b/lib/duration/add-subtract.js → src/lib/duration/add-subtract.js
diff --git a/lib/duration/as.js → src/lib/duration/as.js b/lib/duration/as.js → src/lib/duration/as.js
diff --git a/lib/duration/bubble.js → src/lib/duration/bubble.js b/lib/duration/bubble.js → src/lib/duration/bubble.js
diff --git a/lib/duration/constructor.js → src/lib/duration/constructor.js b/lib/duration/constructor.js → src/lib/duration/constructor.js
diff --git a/lib/duration/create.js → src/lib/duration/create.js b/lib/duration/create.js → src/lib/duration/create.js
diff --git a/lib/duration/duration.js → src/lib/duration/duration.js b/lib/duration/duration.js → src/lib/duration/duration.js
diff --git a/lib/duration/get.js → src/lib/duration/get.js b/lib/duration/get.js → src/lib/duration/get.js
diff --git a/lib/duration/humanize.js → src/lib/duration/humanize.js b/lib/duration/humanize.js → src/lib/duration/humanize.js
diff --git a/lib/duration/iso-string.js → src/lib/duration/iso-string.js b/lib/duration/iso-string.js → src/lib/duration/iso-string.js
diff --git a/lib/duration/prototype.js → src/lib/duration/prototype.js b/lib/duration/prototype.js → src/lib/duration/prototype.js
diff --git a/lib/format/format.js → src/lib/format/format.js b/lib/format/format.js → src/lib/format/format.js
diff --git a/lib/locale/calendar.js → src/lib/locale/calendar.js b/lib/locale/calendar.js → src/lib/locale/calendar.js
diff --git a/lib/locale/constructor.js → src/lib/locale/constructor.js b/lib/locale/constructor.js → src/lib/locale/constructor.js
diff --git a/lib/locale/en.js → src/lib/locale/en.js b/lib/locale/en.js → src/lib/locale/en.js
diff --git a/lib/locale/formats.js → src/lib/locale/formats.js b/lib/locale/formats.js → src/lib/locale/formats.js
diff --git a/lib/locale/invalid.js → src/lib/locale/invalid.js b/lib/locale/invalid.js → src/lib/locale/invalid.js
diff --git a/lib/locale/lists.js → src/lib/locale/lists.js b/lib/locale/lists.js → src/lib/locale/lists.js
diff --git a/lib/locale/locale.js → src/lib/locale/locale.js b/lib/locale/locale.js → src/lib/locale/locale.js
diff --git a/lib/locale/locales.js → src/lib/locale/locales.js b/lib/locale/locales.js → src/lib/locale/locales.js
diff --git a/lib/locale/ordinal.js → src/lib/locale/ordinal.js b/lib/locale/ordinal.js → src/lib/locale/ordinal.js
diff --git a/lib/locale/pre-post-format.js → src/lib/locale/pre-post-format.js b/lib/locale/pre-post-format.js → src/lib/locale/pre-post-format.js
diff --git a/lib/locale/prototype.js → src/lib/locale/prototype.js b/lib/locale/prototype.js → src/lib/locale/prototype.js
diff --git a/lib/locale/relative.js → src/lib/locale/relative.js b/lib/locale/relative.js → src/lib/locale/relative.js
diff --git a/lib/locale/set.js → src/lib/locale/set.js b/lib/locale/set.js → src/lib/locale/set.js
diff --git a/lib/moment/add-subtract.js → src/lib/moment/add-subtract.js b/lib/moment/add-subtract.js → src/lib/moment/add-subtract.js
diff --git a/lib/moment/calendar.js → src/lib/moment/calendar.js b/lib/moment/calendar.js → src/lib/moment/calendar.js
diff --git a/lib/moment/clone.js → src/lib/moment/clone.js b/lib/moment/clone.js → src/lib/moment/clone.js
diff --git a/lib/moment/compare.js → src/lib/moment/compare.js b/lib/moment/compare.js → src/lib/moment/compare.js
diff --git a/lib/moment/constructor.js → src/lib/moment/constructor.js b/lib/moment/constructor.js → src/lib/moment/constructor.js
diff --git a/lib/moment/diff.js → src/lib/moment/diff.js b/lib/moment/diff.js → src/lib/moment/diff.js
diff --git a/lib/moment/format.js → src/lib/moment/format.js b/lib/moment/format.js → src/lib/moment/format.js
diff --git a/lib/moment/from.js → src/lib/moment/from.js b/lib/moment/from.js → src/lib/moment/from.js
diff --git a/lib/moment/get-set.js → src/lib/moment/get-set.js b/lib/moment/get-set.js → src/lib/moment/get-set.js
diff --git a/lib/moment/locale.js → src/lib/moment/locale.js b/lib/moment/locale.js → src/lib/moment/locale.js
diff --git a/lib/moment/min-max.js → src/lib/moment/min-max.js b/lib/moment/min-max.js → src/lib/moment/min-max.js
diff --git a/lib/moment/moment.js → src/lib/moment/moment.js b/lib/moment/moment.js → src/lib/moment/moment.js
diff --git a/lib/moment/prototype.js → src/lib/moment/prototype.js b/lib/moment/prototype.js → src/lib/moment/prototype.js
diff --git a/lib/moment/start-end-of.js → src/lib/moment/start-end-of.js b/lib/moment/start-end-of.js → src/lib/moment/start-end-of.js
diff --git a/lib/moment/to-type.js → src/lib/moment/to-type.js b/lib/moment/to-type.js → src/lib/moment/to-type.js
diff --git a/lib/moment/valid.js → src/lib/moment/valid.js b/lib/moment/valid.js → src/lib/moment/valid.js
diff --git a/lib/parse/regex.js → src/lib/parse/regex.js b/lib/parse/regex.js → src/lib/parse/regex.js
diff --git a/lib/parse/token.js → src/lib/parse/token.js b/lib/parse/token.js → src/lib/parse/token.js
diff --git a/lib/units/aliases.js → src/lib/units/aliases.js b/lib/units/aliases.js → src/lib/units/aliases.js
diff --git a/lib/units/constants.js → src/lib/units/constants.js b/lib/units/constants.js → src/lib/units/constants.js
diff --git a/lib/units/day-of-month.js → src/lib/units/day-of-month.js b/lib/units/day-of-month.js → src/lib/units/day-of-month.js
diff --git a/lib/units/day-of-week.js → src/lib/units/day-of-week.js b/lib/units/day-of-week.js → src/lib/units/day-of-week.js
diff --git a/lib/units/day-of-year.js → src/lib/units/day-of-year.js b/lib/units/day-of-year.js → src/lib/units/day-of-year.js
diff --git a/lib/units/hour.js → src/lib/units/hour.js b/lib/units/hour.js → src/lib/units/hour.js
diff --git a/lib/units/millisecond.js → src/lib/units/millisecond.js b/lib/units/millisecond.js → src/lib/units/millisecond.js
diff --git a/lib/units/minute.js → src/lib/units/minute.js b/lib/units/minute.js → src/lib/units/minute.js
diff --git a/lib/units/month.js → src/lib/units/month.js b/lib/units/month.js → src/lib/units/month.js
diff --git a/lib/units/offset.js → src/lib/units/offset.js b/lib/units/offset.js → src/lib/units/offset.js
diff --git a/lib/units/quarter.js → src/lib/units/quarter.js b/lib/units/quarter.js → src/lib/units/quarter.js
diff --git a/lib/units/second.js → src/lib/units/second.js b/lib/units/second.js → src/lib/units/second.js
diff --git a/lib/units/timestamp.js → src/lib/units/timestamp.js b/lib/units/timestamp.js → src/lib/units/timestamp.js
diff --git a/lib/units/timezone.js → src/lib/units/timezone.js b/lib/units/timezone.js → src/lib/units/timezone.js
diff --git a/lib/units/units.js → src/lib/units/units.js b/lib/units/units.js → src/lib/units/units.js
diff --git a/lib/units/week-year.js → src/lib/units/week-year.js b/lib/units/week-year.js → src/lib/units/week-year.js
diff --git a/lib/units/week.js → src/lib/units/week.js b/lib/units/week.js → src/lib/units/week.js
diff --git a/lib/units/year.js → src/lib/units/year.js b/lib/units/year.js → src/lib/units/year.js
diff --git a/lib/utils/abs-floor.js → src/lib/utils/abs-floor.js b/lib/utils/abs-floor.js → src/lib/utils/abs-floor.js
diff --git a/lib/utils/compare-arrays.js → src/lib/utils/compare-arrays.js b/lib/utils/compare-arrays.js → src/lib/utils/compare-arrays.js
diff --git a/lib/utils/defaults.js → src/lib/utils/defaults.js b/lib/utils/defaults.js → src/lib/utils/defaults.js
diff --git a/lib/utils/deprecate.js → src/lib/utils/deprecate.js b/lib/utils/deprecate.js → src/lib/utils/deprecate.js
diff --git a/lib/utils/extend.js → src/lib/utils/extend.js b/lib/utils/extend.js → src/lib/utils/extend.js
diff --git a/lib/utils/has-own-prop.js → src/lib/utils/has-own-prop.js b/lib/utils/has-own-prop.js → src/lib/utils/has-own-prop.js
diff --git a/lib/utils/hooks.js → src/lib/utils/hooks.js b/lib/utils/hooks.js → src/lib/utils/hooks.js
diff --git a/lib/utils/is-array.js → src/lib/utils/is-array.js b/lib/utils/is-array.js → src/lib/utils/is-array.js
diff --git a/lib/utils/is-date.js → src/lib/utils/is-date.js b/lib/utils/is-date.js → src/lib/utils/is-date.js
diff --git a/lib/utils/map.js → src/lib/utils/map.js b/lib/utils/map.js → src/lib/utils/map.js
diff --git a/lib/utils/to-int.js → src/lib/utils/to-int.js b/lib/utils/to-int.js → src/lib/utils/to-int.js
diff --git a/lib/utils/zero-fill.js → src/lib/utils/zero-fill.js b/lib/utils/zero-fill.js → src/lib/utils/zero-fill.js
diff --git a/lib/moment.js → src/moment.js b/lib/moment.js → src/moment.js
@@ -4,7 +4,7 @@
 //! license : MIT
 //! momentjs.com
 
-import { hooks as moment, setHookCallback } from "./utils/hooks";
+import { hooks as moment, setHookCallback } from "./lib/utils/hooks";
 
 moment.version = '2.8.3';
 
@@ -18,7 +18,7 @@ import {
     createLocal     as local,
     createInvalid   as invalid,
     createInZone    as parseZone
-} from "./moment/moment";
+} from "./lib/moment/moment";
 
 import {
     defineLocale,
@@ -29,17 +29,17 @@ import {
     listWeekdays       as weekdays,
     listWeekdaysMin    as weekdaysMin,
     listWeekdaysShort  as weekdaysShort
-} from "./locale/locale";
+} from "./lib/locale/locale";
 
 import {
     isDuration,
     createDuration as duration,
     getSetRelativeTimeThreshold as relativeTimeThreshold
-} from "./duration/duration";
+} from "./lib/duration/duration";
 
-import { normalizeUnits } from "./units/units";
+import { normalizeUnits } from "./lib/units/units";
 
-import isDate from "./utils/is-date";
+import isDate from "./lib/utils/is-date";
 
 setHookCallback(local);
 

diff --git a/test/helpers/each.js → src/test/helpers/each.js b/test/helpers/each.js → src/test/helpers/each.js
diff --git a/test/moment/add_subtract.js → src/test/moment/add_subtract.js b/test/moment/add_subtract.js → src/test/moment/add_subtract.js
diff --git a/test/moment/create.js → src/test/moment/create.js b/test/moment/create.js → src/test/moment/create.js
diff --git a/test/moment/days_in_month.js → src/test/moment/days_in_month.js b/test/moment/days_in_month.js → src/test/moment/days_in_month.js
diff --git a/test/moment/diff.js → src/test/moment/diff.js b/test/moment/diff.js → src/test/moment/diff.js
diff --git a/test/moment/duration.js → src/test/moment/duration.js b/test/moment/duration.js → src/test/moment/duration.js
diff --git a/test/moment/duration_from_moments.js → src/test/moment/duration_from_moments.js b/test/moment/duration_from_moments.js → src/test/moment/duration_from_moments.js
diff --git a/test/moment/format.js → src/test/moment/format.js b/test/moment/format.js → src/test/moment/format.js
diff --git a/test/moment/getters_setters.js → src/test/moment/getters_setters.js b/test/moment/getters_setters.js → src/test/moment/getters_setters.js
diff --git a/test/moment/invalid.js → src/test/moment/invalid.js b/test/moment/invalid.js → src/test/moment/invalid.js
diff --git a/test/moment/is_after.js → src/test/moment/is_after.js b/test/moment/is_after.js → src/test/moment/is_after.js
diff --git a/test/moment/is_before.js → src/test/moment/is_before.js b/test/moment/is_before.js → src/test/moment/is_before.js
diff --git a/test/moment/is_between.js → src/test/moment/is_between.js b/test/moment/is_between.js → src/test/moment/is_between.js
diff --git a/test/moment/is_date.js → src/test/moment/is_date.js b/test/moment/is_date.js → src/test/moment/is_date.js
diff --git a/test/moment/is_moment.js → src/test/moment/is_moment.js b/test/moment/is_moment.js → src/test/moment/is_moment.js
diff --git a/test/moment/is_same.js → src/test/moment/is_same.js b/test/moment/is_same.js → src/test/moment/is_same.js
diff --git a/test/moment/is_valid.js → src/test/moment/is_valid.js b/test/moment/is_valid.js → src/test/moment/is_valid.js
diff --git a/test/moment/leapyear.js → src/test/moment/leapyear.js b/test/moment/leapyear.js → src/test/moment/leapyear.js
diff --git a/test/moment/listers.js → src/test/moment/listers.js b/test/moment/listers.js → src/test/moment/listers.js
diff --git a/test/moment/locale.js → src/test/moment/locale.js b/test/moment/locale.js → src/test/moment/locale.js
diff --git a/test/moment/min_max.js → src/test/moment/min_max.js b/test/moment/min_max.js → src/test/moment/min_max.js
diff --git a/test/moment/mutable.js → src/test/moment/mutable.js b/test/moment/mutable.js → src/test/moment/mutable.js
diff --git a/test/moment/normalize_units.js → src/test/moment/normalize_units.js b/test/moment/normalize_units.js → src/test/moment/normalize_units.js
diff --git a/test/moment/parsing_flags.js → src/test/moment/parsing_flags.js b/test/moment/parsing_flags.js → src/test/moment/parsing_flags.js
diff --git a/test/moment/preparse_postformat.js → src/test/moment/preparse_postformat.js b/test/moment/preparse_postformat.js → src/test/moment/preparse_postformat.js
diff --git a/test/moment/quarter.js → src/test/moment/quarter.js b/test/moment/quarter.js → src/test/moment/quarter.js
diff --git a/test/moment/relative_time.js → src/test/moment/relative_time.js b/test/moment/relative_time.js → src/test/moment/relative_time.js
diff --git a/test/moment/start_end_of.js → src/test/moment/start_end_of.js b/test/moment/start_end_of.js → src/test/moment/start_end_of.js
diff --git a/test/moment/string_prototype.js → src/test/moment/string_prototype.js b/test/moment/string_prototype.js → src/test/moment/string_prototype.js
diff --git a/test/moment/utc.js → src/test/moment/utc.js b/test/moment/utc.js → src/test/moment/utc.js
diff --git a/test/moment/utc_offset.js → src/test/moment/utc_offset.js b/test/moment/utc_offset.js → src/test/moment/utc_offset.js
diff --git a/test/moment/week_year.js → src/test/moment/week_year.js b/test/moment/week_year.js → src/test/moment/week_year.js
diff --git a/test/moment/weekday.js → src/test/moment/weekday.js b/test/moment/weekday.js → src/test/moment/weekday.js
diff --git a/test/moment/weeks.js → src/test/moment/weeks.js b/test/moment/weeks.js → src/test/moment/weeks.js
diff --git a/test/moment/weeks_in_year.js → src/test/moment/weeks_in_year.js b/test/moment/weeks_in_year.js → src/test/moment/weeks_in_year.js
diff --git a/test/moment/zone_switching.js → src/test/moment/zone_switching.js b/test/moment/zone_switching.js → src/test/moment/zone_switching.js
diff --git a/test/moment/zones.js → src/test/moment/zones.js b/test/moment/zones.js → src/test/moment/zones.js
diff --git a/test/qunit.js → src/test/qunit.js b/test/qunit.js → src/test/qunit.js
diff --git a/tasks/qtest.js b/tasks/qtest.js
@@ -0,0 +1,29 @@
+module.exports = function (grunt) {
+    grunt.task.registerTask("qtest", "run tests locally", function () {
+
+        var done = this.async();
+
+        var testrunner = require("qunit");
+
+        testrunner.options.log.assertions = false;
+        testrunner.options.log.tests = false;
+        testrunner.options.log.summary = false;
+        testrunner.options.log.testing = false;
+
+        testrunner.run({
+            code: "build/umd/moment.js",
+            tests: grunt.file.expand("build/umd/test/moment/*.js"),
+        }, function(err, report) {
+            if (err) {
+                done(err);
+                return;
+            }
+            var err = null;
+            if (report.failed !== 0) {
+                err = new Error(report.failed + " tests failed");
+            }
+            done(err);
+        });
+
+    });
+};
diff --git a/tasks/transpile.js b/tasks/transpile.js
@@ -0,0 +1,36 @@
+module.exports = function (grunt) {
+    var esperanto = require('esperanto');
+    var Promise = require('es6-promise').Promise;
+
+    grunt.task.registerTask('transpile', 'convert es6 to umd', function () {
+        var done = this.async();
+
+        grunt.file.delete("build");
+
+        esperanto.bundle({
+            base: 'src', // optional, defaults to current dir
+            entry: 'moment.js' // the '.js' is optional
+        }).then(function(bundle) {
+            var umd = bundle.toUmd({name: 'moment'});
+            grunt.file.write('build/umd/moment.js', umd.code);
+        }).then(function() {
+            var files = grunt.file.expand({cwd: 'src'}, "test/moment/*.js");
+            var header = grunt.file.read('templates/test-header.js');
+
+            return Promise.all(files.map(function (file) {
+                return esperanto.bundle({
+                    base: 'src',
+                    entry: file,
+                    skip: ['moment']
+                }).then(function (bundle) {
+                    var umd = bundle.toUmd({name: 'not_used'});
+                    var fixed = header + umd.code.split('\n').slice(5).join('\n');
+                    grunt.file.write('build/umd/' + file, fixed);
+                });
+            }));
+
+        }).catch(function() {
+        }).then(done);
+
+    });
+};
diff --git a/templates/test-header.js b/templates/test-header.js
@@ -0,0 +1,4 @@
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd && define(['../../moment'], factory);
+}(this, function (moment) { 'use strict';
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ sauce_connect.log @@
     .sauce-labs.creds
     npm-debug.log
     .build*
-    temp
+    build