Commit Graph

16577 Commits

Author SHA1 Message Date
Ben Newman
e2cbda30b0 Add version suffixes for 1.3.2.3 patch release. release/METEOR@1.3.2.3 2016-04-20 09:16:17 -04:00
Ben Newman
00929e8751 Revert "Merge pull request #5680 from mitar/batch-process-updates"
This reverts commit a06ff81de5, reversing
changes made to c5e7de42f6.

Today I learned you can revert an entire merge (not just the merge commit)
by doing `git revert -m n <merge commit hash>`, where `n` is the index of
the parent commit of the merge commit that you want to keep. In this case
the command was:

  git revert -m 1 a06ff81de5
2016-04-20 09:14:33 -04:00
Ben Newman
6af0dd7c19 Update banners to recommend 1.3.2.2. 2016-04-18 14:54:24 -04:00
Ben Newman
3e81cf89f0 Merge branch 'master' into devel 2016-04-18 14:51:23 -04:00
Ben Newman
f6df0e315a Merge branch 'release-1.3.2.2' 2016-04-18 14:50:57 -04:00
Ben Newman
af97b5b301 Bump versions for Meteor patch release 1.3.2.2. release/METEOR@1.3.2.2 2016-04-18 11:14:44 -04:00
Ben Newman
ccf4d9d940 Update History.md to reflect changes in release 1.3.2.2. 2016-04-18 11:14:40 -04:00
Ben Newman
12d2d4229d When testing, load test files in imports directories eagerly.
Fixes #6831.
2016-04-18 10:34:10 -04:00
Jamie Loberman
322d606b56 Remove handle.stop() after update (#6819)
Removed handle.stop() so that live query continues to run after the first code push, and newer versions continue to download.
2016-04-16 05:45:43 +02:00
Ben Newman
b66303c499 Improve formatting of History.md bullet point. 2016-04-15 21:00:23 -04:00
Ben Newman
8111eee00d Update History.md to reflect the one change in 1.3.2.1. 2016-04-15 20:55:38 -04:00
Ben Newman
eef363a399 Merge branch 'master' into devel 2016-04-15 20:36:04 -04:00
Ben Newman
8bdefec506 Merge branch 'release-1.3.2.1' 2016-04-15 20:34:53 -04:00
Ben Newman
7a6026516e Bump versions for Meteor patch release 1.3.2.1. release/METEOR@1.3.2.1 2016-04-15 17:10:41 -04:00
Ben Newman
6e792a7cf2 Normalize .sourcePath and .targetPath before comparing them.
Fixes https://github.com/meteor/meteor/issues/6806#issuecomment-210365603,
which was also affecting the todos example app.
2016-04-15 16:58:05 -04:00
Ben Newman
baa3f6a152 Merge branch 'master' into devel 2016-04-15 12:47:42 -04:00
Ben Newman
80a0cda066 Merge branch 'release-1.3.2' 2016-04-15 12:46:54 -04:00
Ben Newman
b0b42f4087 Set banner text for 1.3.2 release. 2016-04-15 12:20:11 -04:00
Ben Newman
83c2f7a790 Bump package versions for the official 1.3.2 release. release/METEOR@1.3.2 2016-04-15 11:05:16 -04:00
Ben Newman
afd851d7f7 Tweak to History.md. 2016-04-15 11:05:15 -04:00
Ben Newman
0fcf118798 Update History.md with changes in 1.3.2. 2016-04-15 10:49:34 -04:00
Sashko Stubailo
05d09edd12 Change parallelism to 4 for tests 2016-04-14 14:55:51 -07:00
Tom Coleman
a06ff81de5 Merge pull request #5680 from mitar/batch-process-updates
Process DDP updates in batches
2016-04-14 10:16:25 -07:00
Ben Newman
295e3d7819 Fix less plugin tests. 2016-04-14 12:45:50 -04:00
Ben Newman
f5ced99eb2 Bump package versions for 1.3.2-rc.6 release. release/METEOR@1.3.2-rc.6 2016-04-13 19:59:33 -04:00
Ben Newman
cd8bc10b1d Allow .less files in imports/ directories to be imported.
Because the files are in an imports/ directory, they are still considered
lazy, so they will not be applied to the document unless imported from JS.

Related: #6037
2016-04-13 19:52:20 -04:00
Ben Newman
f616b6bc81 Let multiple files have the same .sourcePath in the ImportScanner.
Importantly, the files can now differ with respect to their .lazy
properties, which fixes #6806 and related issues. Note that the files must
have different .targetPath values if they have the same .sourcePath.

This is a minor breaking change for code that relied on module.id being
based on the .sourcePath instead of the .targetPath.
2016-04-13 19:49:29 -04:00
Ben Newman
3a5e8da935 Make sure JS resources have a .targetPath property.
This path can be specified by calling addJavaScript({ path: ... }), and
defaults to being identical to the .sourcePath if no options.path is
provided.  The .targetPath may be different from the .sourcePath when a
compiler plugin calls addJavaScript multiple times for the same file,
using a different options.path each time, e.g. when a JSON configuration
file turns into multiple JS resources.
2016-04-13 19:26:33 -04:00
Ben Newman
8e9d0ab7ba Let ImportScanner resolve input files not on disk.
If we pass a file to ImportScanner#addInputFiles, and a module identifier
resolves to that file, it shouldn't matter if the file actually exists on
disk. A common example is a new file generated by a compiler plugin.
2016-04-13 16:34:58 -04:00
Zoltan Olah
7b1d879d98 Update Roadmap.md 2016-04-13 16:34:58 -04:00
Zoltan Olah
cbbcec0eee Update Roadmap.md 2016-04-13 16:34:57 -04:00
Zoltan Olah
eaac8f362d Update Roadmap.md 2016-04-13 16:34:57 -04:00
Zoltan Olah
206fe28c2d Update Roadmap.md 2016-04-13 16:34:56 -04:00
Zoltan Olah
c5e7de42f6 Update Roadmap.md 2016-04-13 11:24:34 -07:00
Zoltan Olah
527f9a0a96 Update Roadmap.md 2016-04-13 09:51:10 -07:00
Zoltan Olah
b02549fa0a Update Roadmap.md 2016-04-12 19:07:18 -07:00
Zoltan Olah
5d23708f9c Update Roadmap.md 2016-04-12 16:11:09 -07:00
Ben Newman
4826b323a1 Bump package versions for 1.3.2-rc.5 release. release/METEOR@1.3.2-rc.5 2016-04-12 12:29:05 -04:00
Ben Newman
1d31896564 Normalize node_modules directory names when cross-building.
Really fixes #6765.
2016-04-12 12:19:06 -04:00
Ben Newman
d8bed6d491 Bump package versions for 1.3.2-rc.4 release. release/METEOR@1.3.2-rc.4 2016-04-11 19:36:25 -04:00
Ben Newman
984e27e372 Better error message for _combineFiles lazy/bare mismatch. 2016-04-11 18:26:37 -04:00
Zoltan Olah
d1654ae0f8 First pass at an updated roadmap 2016-04-11 18:26:36 -04:00
Jesse Rosenberger
e59c7ebc8e Fix Match.Optional to work as it did previously in Meteor 1.2
`Match.Optional` is still only supposed to "pass" if the value is `null`
or the specified type.  The new `Match.Maybe` allows `undefined` or
`null` in addition to the specified types. `Match.Optional` is on the
track toward deprecation, however to not break existing code it was
*supposed* to stay working the same as before. (per #3876).

There weren't tests in place to make sure that `Match.Optional` kept
working the same, and the code didn't actually make it keep working the
same.  Hopefully extra tests will make this better.

`.Maybe` has some additional bugs, but should be addressed separately
(see #6271)

Fixes #6735
2016-04-11 18:26:35 -04:00
Ben Newman
787e7e129c Merge pull request #6736 from abernix/check-match-optional-fix
Fix `Match.Optional` to work as it did previously in Meteor 1.2
2016-04-11 18:24:51 -04:00
Zoltan Olah
2b1200b7d9 Merge pull request #6759 from zol/new-roadmap
First pass at an updated roadmap
2016-04-11 14:51:13 -07:00
Ben Newman
d287681868 Don't interfere with explicit sourceReadOptions.names.
Fixes #6787.
2016-04-11 17:02:10 -04:00
Ben Newman
865735a436 Tolerate malformed .meteor-portable files. 2016-04-11 17:02:10 -04:00
Ben Newman
901e4a5c01 Bump package versions for 1.3.1-rc.2 release. release/METEOR@1.3.2-rc.2 2016-04-11 13:59:22 -04:00
Ben Newman
1eb61a7aa9 Bump $BUNDLE_VERSION to 0.5.37 to improve dev_bundle/bin/npm.cmd.
Includes #6664.
Fixes #6679.
Fixes #6785.
2016-04-11 12:33:55 -04:00
Ben Newman
cf98e285ac Fix imports of tools/tool-env/isopackets.js.
Fixes #6778.
2016-04-11 12:33:16 -04:00