[Pkg-javascript-commits] [node-moment] 01/06: New upstream version 2.15.1+ds
Julien Puydt
julien.puydt at laposte.net
Wed Sep 28 16:43:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
jpuydt-guest pushed a commit to branch master
in repository node-moment.
commit 6132c1e4850d49e5567378a0eb969ca9de36287b
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Wed Sep 28 17:01:54 2016 +0200
New upstream version 2.15.1+ds
---
CHANGELOG.md | 4 ++++
Moment.js.nuspec | 12 ++++--------
bower.json | 1 +
component.json | 2 +-
meteor/package.js | 4 +---
min/moment-with-locales.js | 8 ++++----
moment.js | 8 ++++----
package.json | 2 +-
src/lib/locale/locales.js | 4 ++--
src/moment.js | 4 ++--
tasks/bump_version.js | 15 ++++++++++++++-
11 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a63845f..d53a561 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
Changelog
=========
+### 2.15.1
+* Release Sept 20, 2016
+* [3438] [bugfix] Fix locale autoload, revert #3344
+
### 2.15.0 [See full changelog](https://gist.github.com/ichernev/10e1c5bf647545c72ca30e9628a09ed3)
- Release Sept 12, 2016
diff --git a/Moment.js.nuspec b/Moment.js.nuspec
index 1dbb8f7..d6382a8 100644
--- a/Moment.js.nuspec
+++ b/Moment.js.nuspec
@@ -2,17 +2,13 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Moment.js</id>
- <version>2.15.0</version>
- <authors>Tim Wood</authors>
+ <version>2.15.1</version>
+ <authors>Tim Wood, Iskren Chernev, Moment.js contributors</authors>
<owners>Cory Deppen, Iskren Chernev</owners>
<description>A lightweight javascript date library for parsing, manipulating, and formatting dates.</description>
<releaseNotes>
- - Add LTS localised format that includes seconds
- - Added formatToken 'x' for unix offset in milliseconds #1938
- - Support 24:00:00.000 to mean next day, at midnight.
- - Accept 'date' key when creating moment with object
- - Use native toISOString when we can
- - Some bugfixes and language improvements
+ * Release Sept 20, 2016
+ * [3438] [bugfix] Fix locale autoload, revert #3344
</releaseNotes>
<projectUrl>http://momentjs.com/</projectUrl>
<iconUrl>http://pbs.twimg.com/profile_images/482670411402858496/Xrtdc94q_normal.png</iconUrl>
diff --git a/bower.json b/bower.json
index d9f47e8..c0d6e3e 100644
--- a/bower.json
+++ b/bower.json
@@ -1,5 +1,6 @@
{
"name": "moment",
+ "license": "MIT",
"main": "moment.js",
"ignore": [
"**/.*",
diff --git a/component.json b/component.json
index 2585104..3c4a67f 100644
--- a/component.json
+++ b/component.json
@@ -1,6 +1,6 @@
{
"name": "moment",
- "version": "2.15.0",
+ "version": "2.15.1",
"main": "moment.js",
"description": "Parse, validate, manipulate, and display dates in JavaScript.",
"files": [
diff --git a/meteor/package.js b/meteor/package.js
index 42fe09b..75b98fb 100644
--- a/meteor/package.js
+++ b/meteor/package.js
@@ -3,12 +3,10 @@
var packageName = 'momentjs:moment'; // https://atmospherejs.com/momentjs/moment
-var packageJson = JSON.parse(Npm.require("fs").readFileSync('package.json'));
-
Package.describe({
name: packageName,
summary: 'Moment.js (official): parse, validate, manipulate, and display dates - official Meteor packaging',
- version: packageJson.version,
+ version: '2.15.1',
git: 'https://github.com/moment/moment.git'
});
diff --git a/min/moment-with-locales.js b/min/moment-with-locales.js
index e6afacc..1388ae6 100644
--- a/min/moment-with-locales.js
+++ b/min/moment-with-locales.js
@@ -1,5 +1,5 @@
//! moment.js
-//! version : 2.15.0
+//! version : 2.15.1
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
//! license : MIT
//! momentjs.com
@@ -1791,10 +1791,10 @@
var oldLocale = null;
// TODO: Find a better way to register and load all the locales in Node
if (!locales[name] && (typeof module !== 'undefined') &&
- module && module.require) {
+ module && module.exports) {
try {
oldLocale = globalLocale._abbr;
- module.require('./locale/' + name);
+ require('./locale/' + name);
// because defineLocale currently also sets the global locale, we
// want to undo that for lazy loaded locales
locale_locales__getSetGlobalLocale(oldLocale);
@@ -4197,7 +4197,7 @@
;
- utils_hooks__hooks.version = '2.15.0';
+ utils_hooks__hooks.version = '2.15.1';
setHookCallback(local__createLocal);
diff --git a/moment.js b/moment.js
index 7d0fef9..b78115b 100644
--- a/moment.js
+++ b/moment.js
@@ -1,5 +1,5 @@
//! moment.js
-//! version : 2.15.0
+//! version : 2.15.1
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
//! license : MIT
//! momentjs.com
@@ -1791,10 +1791,10 @@
var oldLocale = null;
// TODO: Find a better way to register and load all the locales in Node
if (!locales[name] && (typeof module !== 'undefined') &&
- module && module.require) {
+ module && module.exports) {
try {
oldLocale = globalLocale._abbr;
- module.require('./locale/' + name);
+ require('./locale/' + name);
// because defineLocale currently also sets the global locale, we
// want to undo that for lazy loaded locales
locale_locales__getSetGlobalLocale(oldLocale);
@@ -4195,7 +4195,7 @@
// Side effect imports
- utils_hooks__hooks.version = '2.15.0';
+ utils_hooks__hooks.version = '2.15.1';
setHookCallback(local__createLocal);
diff --git a/package.json b/package.json
index 21c4ddb..cc66d64 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "moment",
- "version": "2.15.0",
+ "version": "2.15.1",
"description": "Parse, validate, manipulate, and display dates",
"homepage": "http://momentjs.com",
"author": "Iskren Ivov Chernev <iskren.chernev at gmail.com> (https://github.com/ichernev)",
diff --git a/src/lib/locale/locales.js b/src/lib/locale/locales.js
index ba64626..abdafce 100644
--- a/src/lib/locale/locales.js
+++ b/src/lib/locale/locales.js
@@ -48,10 +48,10 @@ function loadLocale(name) {
var oldLocale = null;
// TODO: Find a better way to register and load all the locales in Node
if (!locales[name] && (typeof module !== 'undefined') &&
- module && module.require) {
+ module && module.exports) {
try {
oldLocale = globalLocale._abbr;
- module.require('./locale/' + name);
+ require('./locale/' + name);
// because defineLocale currently also sets the global locale, we
// want to undo that for lazy loaded locales
getSetGlobalLocale(oldLocale);
diff --git a/src/moment.js b/src/moment.js
index 93df7c8..4151e33 100644
--- a/src/moment.js
+++ b/src/moment.js
@@ -1,12 +1,12 @@
//! moment.js
-//! version : 2.15.0
+//! version : 2.15.1
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
//! license : MIT
//! momentjs.com
import { hooks as moment, setHookCallback } from './lib/utils/hooks';
-moment.version = '2.15.0';
+moment.version = '2.15.1';
import {
min,
diff --git a/tasks/bump_version.js b/tasks/bump_version.js
index f3dea31..7919fe0 100644
--- a/tasks/bump_version.js
+++ b/tasks/bump_version.js
@@ -55,11 +55,24 @@ module.exports = function (grunt) {
}
});
+ grunt.config('string-replace.meteor-package-js', {
+ files: {'meteor/package.js': 'meteor/package.js'},
+ options: {
+ replacements: [
+ {
+ pattern: /version: .*/,
+ replacement: 'version: \'' + version + '\','
+ }
+ ]
+ }
+ });
+
grunt.task.run([
'string-replace:moment-js',
'string-replace:package-json',
'string-replace:component-json',
- 'string-replace:moment-js-nuspec'
+ 'string-replace:moment-js-nuspec',
+ 'string-replace:meteor-package-js'
]);
});
};
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-moment.git
More information about the Pkg-javascript-commits
mailing list