From: Ben Newman <ben@meteor.com>
Date: Thu, 27 Oct 2016 18:48:54 +0000 (-0700)
Subject: Publish Meteor package from meteor directory to fix #3531.
X-Git-Tag: 2.16.0~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc9a07dc479f7b1acc50b4ad1d6ce1b424afc31a;p=thirdparty%2Fmoment.git

Publish Meteor package from meteor directory to fix #3531.
---

diff --git a/Gruntfile.js b/Gruntfile.js
index 4e97299e7..652121166 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -159,24 +159,15 @@ module.exports = function (grunt) {
         },
         exec: {
             'meteor-init': {
-                command: [
-                    // Make sure Meteor is installed, per https://meteor.com/install.
-                    // The curl'ed script is safe; takes 2 minutes to read source & check.
-                    'type meteor >/dev/null 2>&1 || { curl https://install.meteor.com/ | sh; }',
-                    // Meteor expects package.js to be in the root directory of
-                    // the checkout, but we already have a package.js for Dojo
-                    'mv package.js package.dojo && cp meteor/package.js .'
-                ].join(';')
-            },
-            'meteor-cleanup': {
-                // remove build files and restore Dojo's package.js
-                command: 'rm -rf ".build.*" versions.json; mv package.dojo package.js'
+                // Make sure Meteor is installed, per https://meteor.com/install.
+                // The curl'ed script is safe; takes 2 minutes to read source & check.
+                command: 'type meteor >/dev/null 2>&1 || { curl https://install.meteor.com/ | sh; }'
             },
             'meteor-test': {
-                command: 'spacejam --mongo-url mongodb:// test-packages ./'
+                command: 'spacejam --mongo-url mongodb:// test-packages ./meteor'
             },
             'meteor-publish': {
-                command: 'meteor publish'
+                command: 'cd meteor && meteor publish'
             },
             'typescript-test': {
                 command: 'node_modules/.bin/tsc --project typing-tests'
diff --git a/meteor/moment.js b/meteor/moment.js
new file mode 120000
index 000000000..2c0c3f286
--- /dev/null
+++ b/meteor/moment.js
@@ -0,0 +1 @@
+../moment.js
\ No newline at end of file
diff --git a/meteor/package.js b/meteor/package.js
index 3b8af061e..14b01537b 100644
--- a/meteor/package.js
+++ b/meteor/package.js
@@ -6,7 +6,7 @@ var packageName = 'momentjs:moment';  // https://atmospherejs.com/momentjs/momen
 Package.describe({
   name: packageName,
   summary: 'Moment.js (official): parse, validate, manipulate, and display dates - official Meteor packaging',
-  version: '2.15.2',
+  version: '2.15.3',
   git: 'https://github.com/moment/moment.git'
 });
 
@@ -15,7 +15,7 @@ Package.onUse(function (api) {
   api.export('moment');
   api.addFiles([
     'moment.js',
-    'meteor/export.js'
+    'export.js'
   ]);
 });
 
@@ -23,5 +23,5 @@ Package.onTest(function (api) {
   api.use(packageName);
   api.use('tinytest');
 
-  api.addFiles('meteor/test.js');
+  api.addFiles('test.js');
 });