mirror of
https://github.com/meteor/meteor.git
synced 2026-05-02 03:01:46 -04:00
Merge branch 'devel' into release-1.6.1
This commit is contained in:
@@ -2,9 +2,9 @@
|
||||
"lockfileVersion": 1,
|
||||
"dependencies": {
|
||||
"coffeescript": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.0.2.tgz",
|
||||
"integrity": "sha512-/bCMyzu7KSJPF2gRNYWpbEmfPkNL8AzXs78ktxhPTpSXlKetZRl7kIYGqU055UqUVnkKRJK4eUkUhRHQpvdilA=="
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.0.3.tgz",
|
||||
"integrity": "sha512-iIfUN+71IyI2FQABXh1luzZeQgqwUPeWh6lDovJatQQs+30bvyGnBY0r4BnD0hoMAasNuZVHlL1U09Oy1ZfSeg=="
|
||||
},
|
||||
"source-map": {
|
||||
"version": "0.5.7",
|
||||
|
||||
@@ -13,11 +13,11 @@ Package.describe({
|
||||
summary: 'Compiler for CoffeeScript code, supporting the coffeescript package',
|
||||
// This version of NPM `coffeescript` module, with _1, _2 etc.
|
||||
// If you change this, make sure to also update ../coffeescript/package.js to match.
|
||||
version: '2.0.2_1'
|
||||
version: '2.0.3_1'
|
||||
});
|
||||
|
||||
Npm.depends({
|
||||
'coffeescript': '2.0.2',
|
||||
'coffeescript': '2.0.3',
|
||||
'source-map': '0.5.7'
|
||||
});
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ Package.describe({
|
||||
});
|
||||
|
||||
Package.onUse(function (api) {
|
||||
api.use('coffeescript@2.0.2_1', ['client', 'server']);
|
||||
api.use('coffeescript@2.0.3_1', ['client', 'server']);
|
||||
api.export('COFFEESCRIPT_EXPORTED');
|
||||
api.export('COFFEESCRIPT_EXPORTED_ONE_MORE');
|
||||
api.export('COFFEESCRIPT_EXPORTED_WITH_BACKTICKS');
|
||||
|
||||
@@ -6,12 +6,12 @@ Package.describe({
|
||||
// so bumping the version of this package will be how they get newer versions
|
||||
// of `coffeescript-compiler`. If you change this, make sure to also update
|
||||
// ../coffeescript-compiler/package.js to match.
|
||||
version: '2.0.2_1'
|
||||
version: '2.0.3_1'
|
||||
});
|
||||
|
||||
Package.registerBuildPlugin({
|
||||
name: 'compile-coffeescript',
|
||||
use: ['caching-compiler@1.1.9', 'ecmascript@0.8.3', 'coffeescript-compiler@=2.0.2_1'],
|
||||
use: ['caching-compiler@1.1.9', 'ecmascript@0.8.3', 'coffeescript-compiler@=2.0.3_1'],
|
||||
sources: ['compile-coffeescript.js']
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user