Permalink
Browse files

Publish Meteor package from meteor directory to fix #3531.

  • Loading branch information...
1 parent eb1db7c commit cc9a07dc479f7b1acc50b4ad1d6ce1b424afc31a @benjamn benjamn committed with ichernev Oct 27, 2016
Showing with 9 additions and 17 deletions.
  1. +5 −14 Gruntfile.js
  2. +1 −0 meteor/moment.js
  3. +3 −3 meteor/package.js
View
@@ -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'
View
View
@@ -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,13 +15,13 @@ Package.onUse(function (api) {
api.export('moment');
api.addFiles([
'moment.js',
- 'meteor/export.js'
+ 'export.js'
]);
});
Package.onTest(function (api) {
api.use(packageName);
api.use('tinytest');
- api.addFiles('meteor/test.js');
+ api.addFiles('test.js');
});

0 comments on commit cc9a07d

Please sign in to comment.