diff --git a/examples/clock/.meteor/.gitignore b/examples/clock/.meteor/.gitignore index 4083037423..b3e2268c57 100644 --- a/examples/clock/.meteor/.gitignore +++ b/examples/clock/.meteor/.gitignore @@ -1 +1,2 @@ local +identifier diff --git a/examples/leaderboard/.meteor/.gitignore b/examples/leaderboard/.meteor/.gitignore index 4083037423..b3e2268c57 100644 --- a/examples/leaderboard/.meteor/.gitignore +++ b/examples/leaderboard/.meteor/.gitignore @@ -1 +1,2 @@ local +identifier diff --git a/examples/leaderboard/.meteor/versions b/examples/leaderboard/.meteor/versions new file mode 100644 index 0000000000..abc7ecbd7b --- /dev/null +++ b/examples/leaderboard/.meteor/versions @@ -0,0 +1,41 @@ +application-configuration@1.0.0 +autopublish@1.0.0 +autoupdate@1.0.1 +binary-heap@1.0.0 +blaze-tools@1.0.0 +blaze@1.0.1 +callback-hook@1.0.0 +check@1.0.0 +ctl-helper@1.0.0 +ctl@1.0.0 +deps@1.0.0 +ejson@1.0.0 +follower-livedata@1.0.0 +geojson-utils@1.0.0 +html-tools@1.0.0 +htmljs@1.0.0 +id-map@1.0.0 +insecure@1.0.0 +jquery@1.0.0 +json@1.0.0 +livedata@1.0.1 +logging@1.0.0 +meteor@1.0.2 +minifiers@1.0.0 +minimongo@1.0.1 +mongo-livedata@1.0.0 +observe-sequence@1.0.1 +ordered-dict@1.0.0 +random@1.0.0 +reactive-dict@1.0.0 +reload@1.0.0 +retry@1.0.0 +routepolicy@1.0.0 +session@1.0.0 +spacebars-compiler@1.0.1 +spacebars@1.0.0 +standard-app-packages@1.0.0 +templating@1.0.2 +ui@1.0.0 +underscore@1.0.0 +webapp@1.0.0 diff --git a/examples/parties/.meteor/.gitignore b/examples/parties/.meteor/.gitignore index 4083037423..b3e2268c57 100644 --- a/examples/parties/.meteor/.gitignore +++ b/examples/parties/.meteor/.gitignore @@ -1 +1,2 @@ local +identifier diff --git a/examples/parties/.meteor/versions b/examples/parties/.meteor/versions new file mode 100644 index 0000000000..1b85deb031 --- /dev/null +++ b/examples/parties/.meteor/versions @@ -0,0 +1,62 @@ +accounts-base@1.0.0 +accounts-facebook@1.0.0 +accounts-oauth@1.0.0 +accounts-password@1.0.0 +accounts-twitter@1.0.0 +accounts-ui-unstyled@1.0.0 +accounts-ui@1.0.0 +application-configuration@1.0.0 +audit-argument-checks@1.0.0 +autoupdate@1.0.1 +binary-heap@1.0.0 +blaze-tools@1.0.0 +blaze@1.0.1 +bootstrap@1.0.0 +callback-hook@1.0.0 +check@1.0.0 +ctl-helper@1.0.0 +ctl@1.0.0 +d3@1.0.0 +deps@1.0.0 +ejson@1.0.0 +email@1.0.0 +facebook@1.0.0 +follower-livedata@1.0.0 +geojson-utils@1.0.0 +html-tools@1.0.0 +htmljs@1.0.0 +http@1.0.0 +id-map@1.0.0 +jquery@1.0.0 +json@1.0.0 +less@1.0.2 +livedata@1.0.1 +localstorage@1.0.0 +logging@1.0.0 +meteor@1.0.2 +minifiers@1.0.0 +minimongo@1.0.1 +mongo-livedata@1.0.0 +npm-bcrypt@0.7.7 +oauth1@1.0.0 +oauth2@1.0.0 +oauth@1.0.0 +observe-sequence@1.0.1 +ordered-dict@1.0.0 +random@1.0.0 +reactive-dict@1.0.0 +reload@1.0.0 +retry@1.0.0 +routepolicy@1.0.0 +service-configuration@1.0.0 +session@1.0.0 +sha@1.0.0 +spacebars-compiler@1.0.1 +spacebars@1.0.0 +srp@1.0.0 +standard-app-packages@1.0.0 +templating@1.0.2 +twitter@1.0.0 +ui@1.0.0 +underscore@1.0.0 +webapp@1.0.0 diff --git a/examples/todos/.meteor/.gitignore b/examples/todos/.meteor/.gitignore index 4083037423..b3e2268c57 100644 --- a/examples/todos/.meteor/.gitignore +++ b/examples/todos/.meteor/.gitignore @@ -1 +1,2 @@ local +identifier diff --git a/examples/todos/.meteor/versions b/examples/todos/.meteor/versions new file mode 100644 index 0000000000..4b6d54ffbd --- /dev/null +++ b/examples/todos/.meteor/versions @@ -0,0 +1,42 @@ +application-configuration@1.0.0 +autoupdate@1.0.1 +backbone@1.0.0 +binary-heap@1.0.0 +blaze-tools@1.0.0 +blaze@1.0.1 +callback-hook@1.0.0 +check@1.0.0 +ctl-helper@1.0.0 +ctl@1.0.0 +deps@1.0.0 +ejson@1.0.0 +follower-livedata@1.0.0 +geojson-utils@1.0.0 +html-tools@1.0.0 +htmljs@1.0.0 +id-map@1.0.0 +insecure@1.0.0 +jquery@1.0.0 +json@1.0.0 +livedata@1.0.1 +logging@1.0.0 +meteor@1.0.2 +minifiers@1.0.0 +minimongo@1.0.1 +mongo-livedata@1.0.0 +observe-sequence@1.0.1 +ordered-dict@1.0.0 +random@1.0.0 +reactive-dict@1.0.0 +reload@1.0.0 +retry@1.0.0 +routepolicy@1.0.0 +session@1.0.0 +spacebars-compiler@1.0.1 +spacebars@1.0.0 +spiderable@1.0.1 +standard-app-packages@1.0.0 +templating@1.0.2 +ui@1.0.0 +underscore@1.0.0 +webapp@1.0.0 diff --git a/examples/wordplay/.meteor/.gitignore b/examples/wordplay/.meteor/.gitignore index 4083037423..b3e2268c57 100644 --- a/examples/wordplay/.meteor/.gitignore +++ b/examples/wordplay/.meteor/.gitignore @@ -1 +1,2 @@ local +identifier diff --git a/examples/wordplay/.meteor/versions b/examples/wordplay/.meteor/versions new file mode 100644 index 0000000000..9f3158058e --- /dev/null +++ b/examples/wordplay/.meteor/versions @@ -0,0 +1,40 @@ +application-configuration@1.0.0 +autoupdate@1.0.1 +binary-heap@1.0.0 +blaze-tools@1.0.0 +blaze@1.0.1 +callback-hook@1.0.0 +check@1.0.0 +ctl-helper@1.0.0 +ctl@1.0.0 +deps@1.0.0 +ejson@1.0.0 +follower-livedata@1.0.0 +geojson-utils@1.0.0 +html-tools@1.0.0 +htmljs@1.0.0 +id-map@1.0.0 +insecure@1.0.0 +jquery@1.0.0 +json@1.0.0 +livedata@1.0.1 +logging@1.0.0 +meteor@1.0.2 +minifiers@1.0.0 +minimongo@1.0.1 +mongo-livedata@1.0.0 +observe-sequence@1.0.1 +ordered-dict@1.0.0 +random@1.0.0 +reactive-dict@1.0.0 +reload@1.0.0 +retry@1.0.0 +routepolicy@1.0.0 +session@1.0.0 +spacebars-compiler@1.0.1 +spacebars@1.0.0 +standard-app-packages@1.0.0 +templating@1.0.2 +ui@1.0.0 +underscore@1.0.0 +webapp@1.0.0 diff --git a/tools/commands.js b/tools/commands.js index cb2ad41c47..ab6f5330bd 100644 --- a/tools/commands.js +++ b/tools/commands.js @@ -371,6 +371,14 @@ main.registerCommand({ files.cp_r(path.join(exampleDir, options.example), appPath, { ignore: [/^local$/] }); + // We try not to check the identifier into git, but it might still + // accidentally exist and get added (if running from checkout, for + // example). To be on the safe side, explicitly remove the identifier from + // example apps. + var idf = path.join(appPath, '.meteor', 'identifier'); + if (fs.existsSync(idf)) { + fs.unlinkSync(idf); + } } } else { files.cp_r(path.join(__dirname, 'skel'), appPath, { @@ -394,6 +402,7 @@ main.registerCommand({ project.setMuted(true); project.writeMeteorReleaseVersion( release.current.isCheckout() ? "none" : release.current.name); + var messages = buildmessage.capture(function () { project._ensureDepsUpToDate(); });