Commit Graph

399 Commits

Author SHA1 Message Date
David Greenspan
1e854ebb31 Merge branch 'linker' into shark 2013-06-25 15:18:42 -07:00
David Glasser
f04df9262e * tools/packages.js: change an array to an object, since that's how it's used. 2013-06-25 09:55:23 -07:00
Emily Stark
210f5f8539 Don't exit logs command when we want to keep tunnel open 2013-06-20 11:41:50 -07:00
David Glasser
974bc116be Refactor coffeescript export support: move CS-specific parsing
into CS package.
2013-06-20 11:06:33 -07:00
David Glasser
18ce0c63e9 coffeescript munging: If the line contains an assignment, assume it contains no
declarations instead of possibly munging inside some function.
2013-06-20 08:50:35 -07:00
David Glasser
d40ff521ef Support @export in CoffeeScript.
You must declare your @exports using single-line ### comments:

   ### @export x ###
   x = 5

This involves some ugly and not 100% correct low-level source hackery, making
some assumptions about the format that CoffeeScript generates.
2013-06-19 23:14:58 -07:00
David Glasser
a38f19ad05 Parse @export/etc lines in /*comments*/ too. 2013-06-19 12:33:01 -07:00
Emily Stark
e66ad0a182 Avoid making Asset calls before Meteor is loaded, might need to revisit 2013-06-19 12:22:39 -07:00
Emily Stark
7a0c3b7ad8 Include files with no extension handlers as server assets.
Also some miscellaneous test cleanup.
2013-06-18 17:58:06 -07:00
Emily Stark
a97138f04f Don't allow .. in Assets inputs 2013-06-18 17:13:06 -07:00
Emily Stark
3ca046729a Make Assets API usable from unipackage; use it for dev-bundle-fetcher.
This involves saving the source directory (not just the bundle location) for
static assets so that they can be loaded when unipackages are run.
2013-06-18 13:55:28 -07:00
David Glasser
ed6adc370a When removing the last NPM dependency, delete the NPM directory too.
Apply this to the current tree, which deletes the unused .npm directory from the
ctl package.

Specifically, this deletes the ".npm/package" or ".npm/plugin/foo" directory. We
don't attempt to also clean up the ".npm/plugin" or ".npm" directory, but a "git
clean -df" will do the trick if you really care.
2013-06-17 23:37:08 -07:00
David Glasser
7dcb53c4bd Merge branch 'devel' into linker 2013-06-17 18:19:39 -07:00
David Glasser
2e9aecdf84 Fix 'meteor test-packages --production onepackage'.
We were looking at "argv._" to find package names, where that was the argv that
was parsed at the top level, where we had no idea that "--production" was a
boolean, so it was pased as "--production=onepackage" and "onepackage" was not
included in argv._.
2013-06-17 18:02:38 -07:00
David Greenspan
dc75e8877b use spacebars for templating in build 2013-06-17 17:18:38 -07:00
Naomi Seyfer
a8910ffbf1 add port specification option to ssh tunnel url 2013-06-17 15:25:18 -07:00
Emily Stark
790deed8b4 Clean up mongo command 2013-06-14 17:01:47 -07:00
Emily Stark
df9ceed07e Change temp to temporary in meteor mongo 2013-06-14 16:30:47 -07:00
Emily Stark
985cea3277 Clean up (Avi's comments) 2013-06-14 15:30:25 -07:00
Emily Stark
c444451279 Galaxy version of meteor mongo 2013-06-14 15:30:25 -07:00
David Glasser
9bafe2f881 builder: create ".build" slightly more atomically.
Now there never is a moment where ".build" contains a fraction of a unipackage.
2013-06-14 14:04:55 -07:00
David Glasser
8f193b2cc0 In unipackages, move node_modules into npm/node_modules.
This makes them invisible from plugins.
2013-06-14 13:29:55 -07:00
David Glasser
6108cc298c Fix infinite loop caused by watcher fix. 2013-06-14 12:25:45 -07:00
David Glasser
ea82e7c4b4 Move PACKAGE/.npm/ to PACKAGE/.npm/package/
This is to isolate the NPM dependencies of the package at runtime from the NPM
dependencies of any build-time plugins in the package, which live in
PACKAGE/.npm/plugin/foo.

Before, plugins could see the node modules at PACKAGE/.npm/node_modules, which
was not isolated enough.

(One issue would be that if you happened to switch a package from having runtime
dependencies to having buildtime dependencies, the buildtime dependencies would
not get installed. This is partially an issue because we don't know to uninstall
all dependencies if they are all removed, but even if that is fixed it would
enforce an unnecessary ordering semantics on NPM updates.)
2013-06-14 11:12:31 -07:00
David Glasser
42e015d2c0 Remove extra log from assets test 2013-06-14 11:12:30 -07:00
estark37
b50a1bf12f Add server static assets and an API for retrieving them.
Server assets can be included in a bundle by putting them in the private/
directory of an application, or by registering a build plugin that calls
compileStep.addAsset with a server file. The Assets API (Assets.getText and
Assets.getBinary) allows an application or package to retrieve the contents of
its own server assets.
2013-06-13 22:53:25 -07:00
Naomi Seyfer
0ccba277cf oops accidentally delted half a line or something 2013-06-13 18:28:04 -07:00
Naomi Seyfer
6eeec29398 fix tests that rely on structure of bundled html generated 2013-06-13 18:05:05 -07:00
David Glasser
719e4c4700 Fix typo in buildinfo dependency serialization. 2013-06-13 17:44:15 -07:00
Naomi Seyfer
aa4fe7ec17 version check deduplication; resolved conflict wrong before 2013-06-13 16:24:08 -07:00
Naomi Seyfer
2e608e3abf Glasser comments on ssh-auth branch 2013-06-13 16:23:24 -07:00
Emily Stark
69d51abd4c Configure at /panel, not /proxy 2013-06-13 16:22:32 -07:00
Naomi Seyfer
66695a75d0 all things served on path prefix always 2013-06-13 16:22:32 -07:00
Naomi Seyfer
bd53fbe089 Rearrange proxying so that apps find their proxy themselves. 2013-06-13 16:22:32 -07:00
Naomi Seyfer
213cd94129 Add initial mechanics for serving an app on a path other than /
For now, this requires the ABSOLUTE_URL environment to be set to true.  More
considered ABI possibly coming.
2013-06-13 16:22:32 -07:00
David Greenspan
c5740b6c69 fix: excludes must be regexes (typo?) 2013-06-13 11:17:26 -07:00
David Glasser
f87a0ce09e Clean up commented-out code. 2013-06-10 22:44:16 -07:00
David Glasser
e838349cca Add missing var. 2013-06-10 22:21:07 -07:00
David Glasser
a578cb0c75 Fix symlinking bug revealed by parent commit.
With the precedence bug fixed, more directories are placed into
usedAsFile... enough to break nodeModulesMode=symlink. Fortunately bundler-test
did catch this.

The somewhat hacky fix is to look carefully for reserved empty directories and
replace them with symlinks. This may not be 100% correct; see the XXX comment.
2013-06-10 22:17:37 -07:00
David Glasser
b9e96ab2b7 Fix operator precedence bugs. 2013-06-10 20:55:37 -07:00
David Glasser
e07445cd75 Merge branch 'devel' into linker
This pulls the Node upgrade, which needs a different dev bundle version number
here

Conflicts:
	meteor
	tools/server/server.js
2013-06-10 16:58:03 -07:00
David Glasser
664fca93e2 New npm requires you to have a decent package.json when running shrinkwrap. 2013-06-10 16:22:08 -07:00
David Glasser
870b0c5065 Bump MIN_NODE_VERSION. 2013-06-10 15:52:30 -07:00
Avital Oliver
4ccc3ddf5b better prose 2013-06-06 22:21:24 -07:00
Avital Oliver
8c835c8207 prose 2013-06-06 22:18:08 -07:00
Slava Kim
fb159e270f Store galaxy url in context. 2013-06-04 10:57:02 -07:00
Slava Kim
9588e4002e Show different help message if logs use Galaxy. 2013-06-03 10:08:43 -07:00
Slava Kim
3b52f10e7a Fix error message on connection failure. 2013-06-03 10:04:02 -07:00
David Glasser
7d4ee2209e Add "bundle --for-deploy", to not include the node modules.
(On Galaxy, start.sh deletes node_modules anyway.)

Normally you wouldn't use bundle to create things meant to be deployed (you'd
use deploy!) but Galaxy development itself consists of building things with
"bundle" to be assembled into a Galaxy.
2013-05-31 11:28:26 -07:00
David Glasser
61327d97ce Initial implementation of tailable cursors.
They really only work well (ie, restart properly after reconnect) if they have
an increasing BSON Timestamp() field named ts.  Sorry, that's just how Mongo
works.

Use them for "meteor logs" in Galaxy mode.
2013-05-30 18:02:46 -07:00