Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keeping project in sync with the head origin... #2

Open
wants to merge 27 commits into
base: master
Choose a base branch
from

Conversation

AlbinoGeek
Copy link

You have to keep your project in sync (mergable) with the base, if you want it to be merged back.
Some of these changes have to be manually edited, I opened this PR from the webUI so could not.

You can deal with the collisions manually, with git, or gitgui for Windows.

Orbyt and others added 27 commits May 31, 2015 16:44
deleted check for if name = "content"
Explicit targets when including packages and files (`server`, `client`, etc).
Resolves #168 and possibly #169

Minimum Meteor version bumped from `0.9.0` to `1.2.0.1`. Meteor 1.2 has breaking
changes so this is not compatible with versions lower than this. I'm not sure
how backwards compatibility should be handled.

Updated `versions.json` files with versions required by Meteor 1.2

Removed hardcoded versions in the build plugin. Rationale is to use the versions
used by Meteor 1.2 or versions set by the developer.

Added `underscore` and `jquery` to the tests as these are no longer global.

Bumped package version up to `0.4.4`
These versions numbers were removed in 236b20e and caused an error
during publication:

    $ meteor publish
    => Errors while publishing:

    While publishing the package:
    error: You must specify a version constraint for package blaze
    error: You must specify a version constraint for package underscore
    error: You must specify a version constraint for package htmljs
    error: You must specify a version constraint for package minifiers
    error: You must specify a version constraint for package spacebars-compiler

Note that the dependency version that will actually get includes will
be higher that the one we specified thanks to the Meteor constraints
solver.
Accept "content" as a valid template name
Highlight that jade impl. is not 100%
The implementation differs from #158 on caching management. In this
commit we simply sub-class the `CachingCompiler` instead of
re-implementing the caching logic ourselves.

This commit also start the transition to ES6 using the Meteor
'ecmascript' package.
We also change the Meteor packages testing command to remove the
`--test-app-path` option that seems to no longer work as before on
Meteor 1.2, and now `meteor test-packages packages/*` seems enough.
See commit 6da3e81 for complete history.
This badge was one of the winner of the Meteor 2015 hackathon, and it
is quite cool. So let’s use it!
Update readme with `=` syntax description
One of the main advantage of the new build plugin API introduced in
Meteor 1.2 was the possibility to define "incremental compilers" that
relies on caching to accelerate the build process.

Unfortunately 7734099 didn't implement this new caching mechanism
correctly, this commit should make it work.

The documentation for CachingCompiler is available at:

  https://github.com/meteor/meteor/tree/devel/packages/caching-compiler
The previous cache value we used was non-serializable we provoqued
bug #195 when the cache was used. We now follow the Meteor built-in
CachingHtmlCompiler model.
Meteor now exports the functions that generate the runtime code for
templates and the page body, so let's use that so that we don't break
in case these functions change in the future.
We need to recompile a file in the case is name changed (but not necessarly its
content) because some features of meteor-jade depends on the file name, for
instance the unwraped templates.

Fixes #199
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants