Commit Graph

3514 Commits

Author SHA1 Message Date
David Glasser
a1237ba1a8 fix typo 2014-11-22 11:17:21 -08:00
David Glasser
e281442835 Fix meteor update --patch.
Broken in d90511128b which is in 1.0 but not 0.9.4. So we should
not create any explicitly-marked-as-patch releases against 1.0.
2014-11-18 14:28:28 -08:00
David Glasser
f404f28275 Use simpler query for getSortedVersions
The old one read and parsed JSON blobs from sqlite instead of just using
pre-existing columns.
2014-11-18 14:02:07 -08:00
David Greenspan
917ccbe967 Improve LocalCatalog comment 2014-11-17 08:42:29 -08:00
David Glasser
a11c8d8e09 Revert part of 8f3966fb
It looks wrong to see `Deploying to http://foo` without the
meteor.com.  (The "Now serving" message gets the full site name from the
server and is fine.)

Original commit was from #2770.
2014-11-16 17:50:52 -08:00
Sashko Stubailo
14735344f4 Revert "Change all uses of word elide to omit"
This reverts commit 442274f266.
2014-11-14 10:49:37 -08:00
Sashko Stubailo
442274f266 Change all uses of word elide to omit 2014-11-14 10:21:34 -08:00
David Glasser
399681e04f move sha1 from Builder to watch
since watch actually uses it and Builder doesn't
2014-11-12 17:13:41 -08:00
David Glasser
d320f9c134 Escape package names for paths in in tropohouse 2014-11-12 15:41:26 -08:00
Sashko Stubailo
be644e474e Improve name of escape function for package names 2014-11-12 15:31:10 -08:00
Sashko Stubailo
d2881cfea2 Add functions for escaping and unescaping package names for FS 2014-11-12 15:28:44 -08:00
David Glasser
3f4cf649b1 Use underscore correctly in package-version-parser 2014-11-12 14:18:42 -08:00
David Glasser
4aa33782fa New Console.withProgressDisplayVisible function
This replaces the pattern of turning two flags on and off by hand.

Also, avoid calling _updateProgressDisplay unless you're actually
changing values.
2014-11-11 17:28:30 -08:00
David Glasser
352af3b8e0 Show build-under-source warning for --directory
Don't look up cordova platforms for (deprecated) "meteor bundle".
2014-11-11 16:48:19 -08:00
David Glasser
8b0a745d30 Clean up parsing/writing of cordovaDependencies
As far as I understand, cordovaDependencies exist in these places:

- On an entire package (not an individual unibuild), as stored in the
  main JSON blob (isopack.json)
- On a target (combination of many packages), as stored in the star

This commit removes some stray code where they show up in other places:

- A field (which is never written) is read from the individual unibuild
  JSON file and passed to the Unibuild constructor, which does not
  expect it.
- A field (which is never read) is written to the buildinfo.json file.

Also, an assignment to Isopack.cordovaDependencies is pulled out of a
loop.
2014-11-11 11:59:38 -08:00
David Glasser
96bae0e077 Use correct error-printing Console function
Changes

  { [Error: Network error: wss://packages.meteor.com/websocket: Hostname/IP doesn't match certificate's altnames] stack: [Getter] }

into

  Network error: wss://packages.meteor.com/websocket: Hostname/IP doesn't match certificate's altnames
2014-11-10 16:25:14 -08:00
David Glasser
3444b9a6d3 Remove support for earliestCompatibleVersion
This was an undocumented and entirely unused feature (only two dummy
packages on the package server have this set to a non-default value).

No attempt is being made to remove the field from existing isopacks or
catalog entries. To continue to support existing clients, the package
server has been modified to ignore any provided
earliestCompatibleVersion and instead always write the default ECV to
the catalog.
2014-11-10 13:33:41 -08:00
David Glasser
d6b3da53ab getForgottenECVs only returns forgotten ECVs 2014-11-07 19:10:11 -08:00
David Glasser
4fa5ae7bcb style: space after bang 2014-11-07 16:45:59 -08:00
David Glasser
807d61c63f Clarify that we build isopackets in order 2014-11-07 16:45:59 -08:00
David Glasser
d2d857090f Ignore .build.* dirs when building isopackets
Neither read from them nor write to them.

Yes, this means that when running from a checkout, rebuilding an
isopacket (eg because you modified ddp or something) is a little
slower. But it's more correct --- having a single cache in the source
tree that's shared between apps (which run in catalog.complete mode) and
isopackets has some serious correctness issues.  And the common case
where no isopackets have to be rebuilt is still fast (./meteor --version
takes about 0.24 seconds).
2014-11-07 16:45:59 -08:00
David Glasser
a845e234a2 Work around legacy constraint solver calls 2014-11-07 16:45:59 -08:00
David Glasser
3e985a83c7 isopacket docs 2014-11-07 16:45:58 -08:00
David Glasser
4079c2276f ServiceConnection directly loads ddp
Caching works fine here.
2014-11-07 16:45:58 -08:00
David Glasser
170c0acad7 Rename unibuild everywhere to isopackets 2014-11-07 16:45:58 -08:00
David Glasser
97f6a0236e get rid of catalog.uniload
There is no longer a uniload catalog when running from a release, since
the release contains whole isopackets (programs) not
isopacks (packages).

We only need a uniload-specific catalog when we're actually rebuilding
isopackets (not in order to load them), so we now have it as a local
variable in the two places that build isopackets.

The deleted code in package-loader.js was specific to the prebuilt
uniload package which no longer exists.
2014-11-07 16:45:58 -08:00
David Glasser
f2bac4b7d4 Stop having a ddp-and-mongo isopacket 2014-11-07 16:45:58 -08:00
David Glasser
6f9d9475cd uniload from isopackets! 2014-11-07 16:45:58 -08:00
David Glasser
4000dfb993 from-checkout builds isopackets on startup
Nothing actually LOADS from isopackets yet.
2014-11-07 16:45:58 -08:00
David Glasser
acdf9d9c67 Built tool saves isopackets instead of packages 2014-11-07 16:45:57 -08:00
David Glasser
9cab094f18 uniload now works via named "isopackets"
You can only request a named set of packages, not a random assortment.

In future commits, we will pre-build these packages into JsImages and
load them from that. Building packages for uniload will eventually not
involve the .build.foo directories at all.  (All saved packages will be
built in app context, eventually.)
2014-11-07 16:45:57 -08:00
David Glasser
12eb34debd Ensure that Npm.strip is applied in all cases
An Isopack object can be created in one of two ways: by parsing a built
isopack from disk, or by compiling a PackageSource (which may or may not
get written to disk).

In the former case, its nodeModulesPath field will be something like
"npm/node_modules", referring to the node_modules directory inside the
built isopack, which has already had Npm.strip applied to it.

In the latter case, its nodeModulesPath field is actually the
pre-stripped node modules directory (eg '.npm/package/node_modules'). So
if we were to use such an Isopack object inside a bundler operation, we
would need to actually apply the strip operation at bundle time.

As far as I can tell it may not actually be possible to trigger this bug
yet, because for some reason we never quite seem to use the built
Isopack in bundler without cycling it through disk. But I've managed to
trigger it on the isopackets branch, and it's certainly a goal to use
our in-memory caches better (and not require unnecessary write/read
cycles).
2014-11-06 14:28:38 -08:00
ekatek
3ef483621e Merge pull request #3032 from meteor/little-package-cache-fixes
Little package cache fixes
2014-11-06 13:48:10 -08:00
David Glasser
5bb36203f3 Cache files.inCheckout 2014-11-06 12:43:52 -08:00
David Glasser
2539e7dd95 catalog.complete should only have one PackageCache
Part of #3006.
2014-11-06 11:12:11 -08:00
David Glasser
ed7a5823cd Don't refresh the package cache on the first run
Part of #3006.
2014-11-06 11:12:02 -08:00
David Glasser
130bf77957 add XXX comment about downloading package message 2014-11-05 18:02:37 -08:00
David Glasser
30499812e7 use bindEnvironment in forkJoin 2014-11-05 17:53:16 -08:00
David Glasser
d072249bdf Use util.format for Console print functions
Should be basically backwards compatible (they both join on spaces) but
has the following advantages:

- Objects are printed with util.inspect rather than toString, which
  means no more [object Object].  (We shouldn't be passing objects to
  end-user messages, but they can be useful in Console.debug.)

- The first string can optionally be a printf-style format string, if
  that's a better fit for your message.
2014-11-05 17:09:43 -08:00
David Glasser
cf271511cb document unicode characters 2014-11-05 17:09:43 -08:00
David Glasser
06b5c1fb6b console: use utils.sleepMs 2014-11-05 17:09:43 -08:00
David Glasser
e5380d06b7 console: missing vars 2014-11-05 17:09:42 -08:00
Slava Kim
f881b02f58 Check for the downloaded tarball plugin matching the requested name
Hackily parse XML with a regex (omg, never do this again) and check the plugin
id declared with id requested.

Should fix #2862.
2014-11-05 15:50:01 -08:00
David Glasser
6720d1c850 Revert "console: avoid division by zero"
This reverts commit 2d83bad8f3.

Whoops, that's not how division by zero works in JS! The existing
isFinite check is fine.
2014-11-05 12:25:23 -08:00
David Glasser
2d83bad8f3 console: avoid division by zero 2014-11-05 12:23:18 -08:00
David Glasser
02637a10ef progress: remove duplicate assignment 2014-11-05 12:04:30 -08:00
David Glasser
4b2d0d5174 de-globalize console.js constants 2014-11-05 11:30:14 -08:00
David Glasser
5e1086775d Remove more unnecessary buildmessage.captures
Part of #3003.
2014-11-04 17:34:54 -08:00
David Glasser
fb4655dbea drop unnecessary dangerous buildmessage.capture
unnecessary: because dontRunConstraintSolver now means we don't need to
be in a buildmessage.capture

dangerous: because if you don't check the result of
buildmessage.capture, you leak errors.
2014-11-04 17:13:27 -08:00
David Glasser
1a2249d159 Get rid of many calls to doOrDie/doOrThrow
The things they wrap no longer make buildmessages.
2014-11-04 16:43:38 -08:00