From d4da2957a9bed15969fe4953a3f3aa0304687cbe Mon Sep 17 00:00:00 2001 From: SEKE Date: Wed, 10 Feb 2016 12:11:02 +0100 Subject: [PATCH] Rename separated minifiers to singular name and use separate versions from 1.3 onwards. --- History.md | 4 ++-- packages/less/README.md | 2 +- .../{minifiers-css => minifier-css}/.gitignore | 0 .../.npm/package/.gitignore | 0 .../.npm/package/README | 0 .../.npm/package/npm-shrinkwrap.json | 0 .../{minifiers-css => minifier-css}/README.md | 0 .../minification.js | 0 .../minifier-tests.js} | 2 +- .../minifiers.js => minifier-css/minifier.js} | 0 .../{minifiers-css => minifier-css}/package.js | 8 ++++---- .../urlrewriting-tests.js | 4 ++-- packages/{minifiers-js => minifier-js}/.gitignore | 0 .../.npm/package/.gitignore | 0 .../.npm/package/README | 0 .../.npm/package/npm-shrinkwrap.json | 0 packages/{minifiers-js => minifier-js}/README.md | 0 .../beautify-tests.js | 2 +- .../minifiers.js => minifier-js/minifier.js} | 0 packages/{minifiers-js => minifier-js}/package.js | 6 +++--- packages/spacebars-compiler/compile_tests.js | 2 +- packages/spacebars-compiler/compiler.js | 4 ++-- packages/spacebars-compiler/package.js | 6 +++--- .../.npm/plugin/minifyStd/.gitignore | 0 .../.npm/plugin/minifyStd/README | 0 .../.npm/plugin/minifyStd/npm-shrinkwrap.json | 0 .../.npm/plugin/minifyStdCSS/.gitignore | 0 .../.npm/plugin/minifyStdCSS/README | 0 .../.npm/plugin/minifyStdCSS/npm-shrinkwrap.json | 0 .../README.md | 2 +- .../package.js | 6 +++--- .../plugin/minify-css.js | 0 .../.npm/plugin/minifyStd/.gitignore | 0 .../.npm/plugin/minifyStd/README | 0 .../.npm/plugin/minifyStd/npm-shrinkwrap.json | 0 .../README.md | 2 +- .../package.js | 6 +++--- .../plugin/minify-js.js | 0 packages/standard-minifiers/package.js | 2 +- packages/templating-tools/package.js | 4 ++-- packages/templating/package.js | 2 +- tools/static-assets/skel/.meteor/packages | 3 ++- tools/tool-testing/selftest.js | 3 ++- tools/upgraders.js | 15 +++++++++++++++ 44 files changed, 51 insertions(+), 34 deletions(-) rename packages/{minifiers-css => minifier-css}/.gitignore (100%) rename packages/{minifiers-css => minifier-css}/.npm/package/.gitignore (100%) rename packages/{minifiers-css => minifier-css}/.npm/package/README (100%) rename packages/{minifiers-css => minifier-css}/.npm/package/npm-shrinkwrap.json (100%) rename packages/{minifiers-css => minifier-css}/README.md (100%) rename packages/{minifiers-css => minifier-css}/minification.js (100%) rename packages/{minifiers-css/minifiers-tests.js => minifier-css/minifier-tests.js} (94%) rename packages/{minifiers-css/minifiers.js => minifier-css/minifier.js} (100%) rename packages/{minifiers-css => minifier-css}/package.js (70%) rename packages/{minifiers-css => minifier-css}/urlrewriting-tests.js (96%) rename packages/{minifiers-js => minifier-js}/.gitignore (100%) rename packages/{minifiers-js => minifier-js}/.npm/package/.gitignore (100%) rename packages/{minifiers-js => minifier-js}/.npm/package/README (100%) rename packages/{minifiers-js => minifier-js}/.npm/package/npm-shrinkwrap.json (100%) rename packages/{minifiers-js => minifier-js}/README.md (100%) rename packages/{minifiers-js => minifier-js}/beautify-tests.js (90%) rename packages/{minifiers-js/minifiers.js => minifier-js/minifier.js} (100%) rename packages/{minifiers-js => minifier-js}/package.js (75%) rename packages/{standard-minifiers-css => standard-minifier-css}/.npm/plugin/minifyStd/.gitignore (100%) rename packages/{standard-minifiers-css => standard-minifier-css}/.npm/plugin/minifyStd/README (100%) rename packages/{standard-minifiers-css => standard-minifier-css}/.npm/plugin/minifyStd/npm-shrinkwrap.json (100%) rename packages/{standard-minifiers-css => standard-minifier-css}/.npm/plugin/minifyStdCSS/.gitignore (100%) rename packages/{standard-minifiers-css => standard-minifier-css}/.npm/plugin/minifyStdCSS/README (100%) rename packages/{standard-minifiers-css => standard-minifier-css}/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json (100%) rename packages/{standard-minifiers-css => standard-minifier-css}/README.md (85%) rename packages/{standard-minifiers-css => standard-minifier-css}/package.js (74%) rename packages/{standard-minifiers-css => standard-minifier-css}/plugin/minify-css.js (100%) rename packages/{standard-minifiers-js => standard-minifier-js}/.npm/plugin/minifyStd/.gitignore (100%) rename packages/{standard-minifiers-js => standard-minifier-js}/.npm/plugin/minifyStd/README (100%) rename packages/{standard-minifiers-js => standard-minifier-js}/.npm/plugin/minifyStd/npm-shrinkwrap.json (100%) rename packages/{standard-minifiers-js => standard-minifier-js}/README.md (87%) rename packages/{standard-minifiers-js => standard-minifier-js}/package.js (69%) rename packages/{standard-minifiers-js => standard-minifier-js}/plugin/minify-js.js (100%) diff --git a/History.md b/History.md index 3521bd22ff..3047761482 100644 --- a/History.md +++ b/History.md @@ -6,8 +6,8 @@ * Improve minimongo performance on updating documents when there are many active observes. #5627 -* Split up `standard-minifiers` in separate CSS (`standard-minifiers-css`) and JS - minifiers(`standard-minifiers-js`). `standard-minifiers` now acts as an umbrella package for these +* Split up `standard-minifiers` in separate CSS (`standard-minifier-css`) and JS + minifiers(`standard-minifier-js`). `standard-minifiers` now acts as an umbrella package for these 2 minifiers. * Move `DDPRateLimiter` to the server only, since it won't work if it is called from the client. It diff --git a/packages/less/README.md b/packages/less/README.md index 8263417d5d..067fe7908f 100644 --- a/packages/less/README.md +++ b/packages/less/README.md @@ -41,7 +41,7 @@ or to allow your package to provide several components which your package's users can opt into one by one. Each compiled source file produces a separate CSS file. (The -`standard-minifiers` package merges them into one file afterwards.) +`standard-minifier-css` package merges them into one file afterwards.) ## Importing diff --git a/packages/minifiers-css/.gitignore b/packages/minifier-css/.gitignore similarity index 100% rename from packages/minifiers-css/.gitignore rename to packages/minifier-css/.gitignore diff --git a/packages/minifiers-css/.npm/package/.gitignore b/packages/minifier-css/.npm/package/.gitignore similarity index 100% rename from packages/minifiers-css/.npm/package/.gitignore rename to packages/minifier-css/.npm/package/.gitignore diff --git a/packages/minifiers-css/.npm/package/README b/packages/minifier-css/.npm/package/README similarity index 100% rename from packages/minifiers-css/.npm/package/README rename to packages/minifier-css/.npm/package/README diff --git a/packages/minifiers-css/.npm/package/npm-shrinkwrap.json b/packages/minifier-css/.npm/package/npm-shrinkwrap.json similarity index 100% rename from packages/minifiers-css/.npm/package/npm-shrinkwrap.json rename to packages/minifier-css/.npm/package/npm-shrinkwrap.json diff --git a/packages/minifiers-css/README.md b/packages/minifier-css/README.md similarity index 100% rename from packages/minifiers-css/README.md rename to packages/minifier-css/README.md diff --git a/packages/minifiers-css/minification.js b/packages/minifier-css/minification.js similarity index 100% rename from packages/minifiers-css/minification.js rename to packages/minifier-css/minification.js diff --git a/packages/minifiers-css/minifiers-tests.js b/packages/minifier-css/minifier-tests.js similarity index 94% rename from packages/minifiers-css/minifiers-tests.js rename to packages/minifier-css/minifier-tests.js index cdb176a75a..763d12b8ea 100644 --- a/packages/minifiers-css/minifiers-tests.js +++ b/packages/minifier-css/minifier-tests.js @@ -1,5 +1,5 @@ -Tinytest.add("minifiers-css - simple css minification", function (test) { +Tinytest.add("minifier-css - simple css minification", function (test) { var t = function (css, expected, desc) { test.equal(CssTools.minifyCss(css), [expected], desc); } diff --git a/packages/minifiers-css/minifiers.js b/packages/minifier-css/minifier.js similarity index 100% rename from packages/minifiers-css/minifiers.js rename to packages/minifier-css/minifier.js diff --git a/packages/minifiers-css/package.js b/packages/minifier-css/package.js similarity index 70% rename from packages/minifiers-css/package.js rename to packages/minifier-css/package.js index 8ee33df719..63c995fb68 100644 --- a/packages/minifiers-css/package.js +++ b/packages/minifier-css/package.js @@ -1,5 +1,5 @@ Package.describe({ - summary: "JavaScript and CSS minifiers", + summary: "CSS minifier", version: "1.1.7" }); @@ -16,15 +16,15 @@ Npm.strip({ Package.onUse(function (api) { api.use('underscore', 'server'); api.export(['CssTools']); - api.addFiles(['minification.js', 'minifiers.js'], 'server'); + api.addFiles(['minification.js', 'minifier.js'], 'server'); }); Package.onTest(function (api) { - api.use('minifiers-css', 'server'); + api.use('minifier-css', 'server'); api.use('tinytest'); api.addFiles([ - 'minifiers-tests.js', + 'minifier-tests.js', 'urlrewriting-tests.js' ], 'server'); }); diff --git a/packages/minifiers-css/urlrewriting-tests.js b/packages/minifier-css/urlrewriting-tests.js similarity index 96% rename from packages/minifiers-css/urlrewriting-tests.js rename to packages/minifier-css/urlrewriting-tests.js index 520a37ea22..ae9a3b1170 100644 --- a/packages/minifiers-css/urlrewriting-tests.js +++ b/packages/minifier-css/urlrewriting-tests.js @@ -1,5 +1,5 @@ -Tinytest.add("minifiers - url rewriting when merging", function (test) { +Tinytest.add("minifier-css - url rewriting when merging", function (test) { var stylesheet = function(backgroundPath) { return "body { color: green; background: top center url(" + backgroundPath + ") black, bottom center url(" + backgroundPath + "); }" }; @@ -45,7 +45,7 @@ Tinytest.add("minifiers - url rewriting when merging", function (test) { }); -Tinytest.add("minifiers - url rewriting with media queries (ast rule recursion)", function (test) { +Tinytest.add("minifier-css - url rewriting with media queries (ast rule recursion)", function (test) { var stylesheet = function(backgroundPath) { return "@media (min--moz-device-pixel-ratio: 1.5),\n\ (-o-min-device-pixel-ratio: 3/2),\n\ diff --git a/packages/minifiers-js/.gitignore b/packages/minifier-js/.gitignore similarity index 100% rename from packages/minifiers-js/.gitignore rename to packages/minifier-js/.gitignore diff --git a/packages/minifiers-js/.npm/package/.gitignore b/packages/minifier-js/.npm/package/.gitignore similarity index 100% rename from packages/minifiers-js/.npm/package/.gitignore rename to packages/minifier-js/.npm/package/.gitignore diff --git a/packages/minifiers-js/.npm/package/README b/packages/minifier-js/.npm/package/README similarity index 100% rename from packages/minifiers-js/.npm/package/README rename to packages/minifier-js/.npm/package/README diff --git a/packages/minifiers-js/.npm/package/npm-shrinkwrap.json b/packages/minifier-js/.npm/package/npm-shrinkwrap.json similarity index 100% rename from packages/minifiers-js/.npm/package/npm-shrinkwrap.json rename to packages/minifier-js/.npm/package/npm-shrinkwrap.json diff --git a/packages/minifiers-js/README.md b/packages/minifier-js/README.md similarity index 100% rename from packages/minifiers-js/README.md rename to packages/minifier-js/README.md diff --git a/packages/minifiers-js/beautify-tests.js b/packages/minifier-js/beautify-tests.js similarity index 90% rename from packages/minifiers-js/beautify-tests.js rename to packages/minifier-js/beautify-tests.js index b519b19a9b..05eca60ddb 100644 --- a/packages/minifiers-js/beautify-tests.js +++ b/packages/minifier-js/beautify-tests.js @@ -2,7 +2,7 @@ // The UglifyJSMinify API can also be used for beautification. Test that it // behaves as expected. -Tinytest.add('minifiers - uglify beautify', function (test) { +Tinytest.add('minifier-js - uglify beautify', function (test) { // See and // for the API we're calling. test.equal(UglifyJSMinify('one = function () { return 1; };', diff --git a/packages/minifiers-js/minifiers.js b/packages/minifier-js/minifier.js similarity index 100% rename from packages/minifiers-js/minifiers.js rename to packages/minifier-js/minifier.js diff --git a/packages/minifiers-js/package.js b/packages/minifier-js/package.js similarity index 75% rename from packages/minifiers-js/package.js rename to packages/minifier-js/package.js index 150928587e..584d0b57c0 100644 --- a/packages/minifiers-js/package.js +++ b/packages/minifier-js/package.js @@ -1,5 +1,5 @@ Package.describe({ - summary: "JavaScript minifiers", + summary: "JavaScript minifier", version: "1.1.7" }); @@ -14,11 +14,11 @@ Npm.strip({ Package.onUse(function (api) { api.use('underscore', 'server'); api.export(['UglifyJSMinify', 'UglifyJS']); - api.addFiles(['minifiers.js'], 'server'); + api.addFiles(['minifier.js'], 'server'); }); Package.onTest(function (api) { - api.use('minifiers-js', 'server'); + api.use('minifier-js', 'server'); api.use('tinytest'); api.addFiles([ diff --git a/packages/spacebars-compiler/compile_tests.js b/packages/spacebars-compiler/compile_tests.js index 4f1d9f8ca2..5560a7922f 100644 --- a/packages/spacebars-compiler/compile_tests.js +++ b/packages/spacebars-compiler/compile_tests.js @@ -20,7 +20,7 @@ Tinytest.add("spacebars-compiler - compiler output", function (test) { var postProcess = function (string) { // remove initial and trailing parens string = string.replace(/^\(([\S\s]*)\)$/, '$1'); - if (! (Package['minifiers-js'] && Package['minifiers-js'].UglifyJSMinify)) { + if (! (Package['minifier-js'] && Package['minifier-js'].UglifyJSMinify)) { // these tests work a lot better with access to beautification, // but let's at least do some sort of test without it. // These regexes may have to be adjusted if new tests are added. diff --git a/packages/spacebars-compiler/compiler.js b/packages/spacebars-compiler/compiler.js index 807f752014..602d585bfd 100644 --- a/packages/spacebars-compiler/compiler.js +++ b/packages/spacebars-compiler/compiler.js @@ -95,8 +95,8 @@ SpacebarsCompiler.codeGen = function (parseTree, options) { }; SpacebarsCompiler._beautify = function (code) { - if (Package['minifiers-js'] && Package['minifiers-js'].UglifyJSMinify) { - var result = Package['minifiers-js'].UglifyJSMinify( + if (Package['minifier-js'] && Package['minifier-js'].UglifyJSMinify) { + var result = Package['minifier-js'].UglifyJSMinify( code, { fromString: true, mangle: false, diff --git a/packages/spacebars-compiler/package.js b/packages/spacebars-compiler/package.js index 786a537b8f..32b071c28d 100644 --- a/packages/spacebars-compiler/package.js +++ b/packages/spacebars-compiler/package.js @@ -11,10 +11,10 @@ Package.onUse(function (api) { api.use('blaze-tools'); api.use('underscore'); - // The templating plugin will pull in minifiers-js, so that generated code will + // The templating plugin will pull in minifier-js, so that generated code will // be beautified. But it's a weak dependency so that eg boilerplate-generator - // doesn't pull in minifiers. - api.use('minifiers-js', ['server'], { weak: true }); + // doesn't pull in the minifier. + api.use('minifier-js', ['server'], { weak: true }); api.addFiles(['templatetag.js', 'optimizer.js', 'react.js', diff --git a/packages/standard-minifiers-css/.npm/plugin/minifyStd/.gitignore b/packages/standard-minifier-css/.npm/plugin/minifyStd/.gitignore similarity index 100% rename from packages/standard-minifiers-css/.npm/plugin/minifyStd/.gitignore rename to packages/standard-minifier-css/.npm/plugin/minifyStd/.gitignore diff --git a/packages/standard-minifiers-css/.npm/plugin/minifyStd/README b/packages/standard-minifier-css/.npm/plugin/minifyStd/README similarity index 100% rename from packages/standard-minifiers-css/.npm/plugin/minifyStd/README rename to packages/standard-minifier-css/.npm/plugin/minifyStd/README diff --git a/packages/standard-minifiers-css/.npm/plugin/minifyStd/npm-shrinkwrap.json b/packages/standard-minifier-css/.npm/plugin/minifyStd/npm-shrinkwrap.json similarity index 100% rename from packages/standard-minifiers-css/.npm/plugin/minifyStd/npm-shrinkwrap.json rename to packages/standard-minifier-css/.npm/plugin/minifyStd/npm-shrinkwrap.json diff --git a/packages/standard-minifiers-css/.npm/plugin/minifyStdCSS/.gitignore b/packages/standard-minifier-css/.npm/plugin/minifyStdCSS/.gitignore similarity index 100% rename from packages/standard-minifiers-css/.npm/plugin/minifyStdCSS/.gitignore rename to packages/standard-minifier-css/.npm/plugin/minifyStdCSS/.gitignore diff --git a/packages/standard-minifiers-css/.npm/plugin/minifyStdCSS/README b/packages/standard-minifier-css/.npm/plugin/minifyStdCSS/README similarity index 100% rename from packages/standard-minifiers-css/.npm/plugin/minifyStdCSS/README rename to packages/standard-minifier-css/.npm/plugin/minifyStdCSS/README diff --git a/packages/standard-minifiers-css/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json b/packages/standard-minifier-css/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json similarity index 100% rename from packages/standard-minifiers-css/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json rename to packages/standard-minifier-css/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json diff --git a/packages/standard-minifiers-css/README.md b/packages/standard-minifier-css/README.md similarity index 85% rename from packages/standard-minifiers-css/README.md rename to packages/standard-minifier-css/README.md index b3d7e2ca80..0bc7e76b92 100644 --- a/packages/standard-minifiers-css/README.md +++ b/packages/standard-minifier-css/README.md @@ -1,4 +1,4 @@ -Standard Minifiers for CSS +Standard Minifier for CSS === This package provides a minifier plugin used for Meteor apps by default. diff --git a/packages/standard-minifiers-css/package.js b/packages/standard-minifier-css/package.js similarity index 74% rename from packages/standard-minifiers-css/package.js rename to packages/standard-minifier-css/package.js index 54586ae9aa..9facda5786 100644 --- a/packages/standard-minifiers-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,14 +1,14 @@ Package.describe({ - name: 'standard-minifiers-css', + name: 'standard-minifier-css', version: '1.0.2', - summary: 'Standard css minifiers used with Meteor apps by default.', + summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); Package.registerBuildPlugin({ name: "minifyStdCSS", use: [ - 'minifiers-css' + 'minifier-css' ], npmDependencies: { "source-map": "0.4.2" diff --git a/packages/standard-minifiers-css/plugin/minify-css.js b/packages/standard-minifier-css/plugin/minify-css.js similarity index 100% rename from packages/standard-minifiers-css/plugin/minify-css.js rename to packages/standard-minifier-css/plugin/minify-css.js diff --git a/packages/standard-minifiers-js/.npm/plugin/minifyStd/.gitignore b/packages/standard-minifier-js/.npm/plugin/minifyStd/.gitignore similarity index 100% rename from packages/standard-minifiers-js/.npm/plugin/minifyStd/.gitignore rename to packages/standard-minifier-js/.npm/plugin/minifyStd/.gitignore diff --git a/packages/standard-minifiers-js/.npm/plugin/minifyStd/README b/packages/standard-minifier-js/.npm/plugin/minifyStd/README similarity index 100% rename from packages/standard-minifiers-js/.npm/plugin/minifyStd/README rename to packages/standard-minifier-js/.npm/plugin/minifyStd/README diff --git a/packages/standard-minifiers-js/.npm/plugin/minifyStd/npm-shrinkwrap.json b/packages/standard-minifier-js/.npm/plugin/minifyStd/npm-shrinkwrap.json similarity index 100% rename from packages/standard-minifiers-js/.npm/plugin/minifyStd/npm-shrinkwrap.json rename to packages/standard-minifier-js/.npm/plugin/minifyStd/npm-shrinkwrap.json diff --git a/packages/standard-minifiers-js/README.md b/packages/standard-minifier-js/README.md similarity index 87% rename from packages/standard-minifiers-js/README.md rename to packages/standard-minifier-js/README.md index 22aadcd856..0990186a14 100644 --- a/packages/standard-minifiers-js/README.md +++ b/packages/standard-minifier-js/README.md @@ -1,4 +1,4 @@ -Standard Minifiers for JS +Standard Minifier for JS === This package provides a minifier plugin used for Meteor apps by default. diff --git a/packages/standard-minifiers-js/package.js b/packages/standard-minifier-js/package.js similarity index 69% rename from packages/standard-minifiers-js/package.js rename to packages/standard-minifier-js/package.js index 7064e7c781..b3317dc2b0 100644 --- a/packages/standard-minifiers-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,14 +1,14 @@ Package.describe({ - name: 'standard-minifiers-js', + name: 'standard-minifier-js', version: '1.0.2', - summary: 'Standard javascript minifiers used with Meteor apps by default.', + summary: 'Standard javascript minifier used with Meteor apps by default.', documentation: 'README.md' }); Package.registerBuildPlugin({ name: "minifyStdJS", use: [ - 'minifiers-js' + 'minifier-js' ], sources: [ 'plugin/minify-js.js' diff --git a/packages/standard-minifiers-js/plugin/minify-js.js b/packages/standard-minifier-js/plugin/minify-js.js similarity index 100% rename from packages/standard-minifiers-js/plugin/minify-js.js rename to packages/standard-minifier-js/plugin/minify-js.js diff --git a/packages/standard-minifiers/package.js b/packages/standard-minifiers/package.js index ed14b07bec..3754c12e8a 100644 --- a/packages/standard-minifiers/package.js +++ b/packages/standard-minifiers/package.js @@ -6,7 +6,7 @@ Package.describe({ }); Package.onUse(function(api) { - api.imply(['standard-minifiers-css','standard-minifiers-js']); + api.imply(['standard-minifier-css','standard-minifier-js']); }); Package.onTest(function(api) { diff --git a/packages/templating-tools/package.js b/packages/templating-tools/package.js index 4751695c65..fbb4a1bf72 100644 --- a/packages/templating-tools/package.js +++ b/packages/templating-tools/package.js @@ -16,13 +16,13 @@ Package.onUse(function(api) { 'ecmascript', 'spacebars-compiler', - // minifiers-js is a weak dependency of spacebars-compiler; adding it here + // minifier-js is a weak dependency of spacebars-compiler; adding it here // ensures that the output is minified. (Having it as a weak dependency means // that we don't ship uglify etc with built apps just because // boilerplate-generator uses spacebars-compiler.) // XXX maybe uglify should be applied by this plugin instead of via magic // weak dependency. - 'minifiers-js' + 'minifier-js' ]); api.addFiles([ diff --git a/packages/templating/package.js b/packages/templating/package.js index 706444226a..0baf4cc0d7 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -10,7 +10,7 @@ Package.describe({ Package.registerBuildPlugin({ name: "compileTemplatesBatch", - // minifiers-js is a weak dependency of spacebars-compiler; adding it here + // minifier-js is a weak dependency of spacebars-compiler; adding it here // ensures that the output is minified. (Having it as a weak dependency means // that we don't ship uglify etc with built apps just because // boilerplate-generator uses spacebars-compiler.) diff --git a/tools/static-assets/skel/.meteor/packages b/tools/static-assets/skel/.meteor/packages index a9f8340d51..1c72c47fc2 100644 --- a/tools/static-assets/skel/.meteor/packages +++ b/tools/static-assets/skel/.meteor/packages @@ -12,7 +12,8 @@ session # Client-side reactive dictionary for your app jquery # Helpful client-side library tracker # Meteor's client-side reactive programming library -standard-minifiers # JS/CSS minifiers run for production mode +standard-minifier-css # CSS minifier run for production mode +standard-minifier-js # JS minifier run for production mode es5-shim # ECMAScript 5 compatibility for older browsers. ecmascript # Enable ECMAScript2015+ syntax in app code diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js index 3feade6b9a..0340384521 100644 --- a/tools/tool-testing/selftest.js +++ b/tools/tool-testing/selftest.js @@ -128,7 +128,8 @@ var ROOT_PACKAGES_TO_BUILD_IN_SANDBOX = [ 'tracker', "autopublish", "insecure", - "standard-minifiers", + "standard-minifier-css", + "standard-minifier-js", "es5-shim" ]; diff --git a/tools/upgraders.js b/tools/upgraders.js index db042ed124..8e0e28b00f 100644 --- a/tools/upgraders.js +++ b/tools/upgraders.js @@ -210,6 +210,21 @@ the guide about breaking changes here:`, ); }, + "1.3.0-split-minifiers-package": function (projectContext) { + // Minifiers are extracted into a new package called "standard-minifiers" + + if (packagesFile.getConstraint('standard-minifiers')) { + packagesFile.removePackages(['standard-minifiers']); + + packagesFile.addPackages([ + // These packages replace meteor-platform in newly created apps + 'standard-minifier-css', + 'standard-minifier-js', + ]); + } + projectContext.projectConstraintsFile.writeIfModified(); + }, + //////////// // PLEASE. When adding new upgraders that print mesasges, follow the // examples for 0.9.0 and 0.9.1 above. Specifically, formatting