Bumps clean-css dependency to version 5.0.

jakubpawlowicz · jakubpawlowicz · commit 3622dcbf6d72 · 2021-02-04T18:06:34.000+01:00
diff --git a/History.md b/History.md
@@ -1,3 +1,8 @@
+[5.0.0 / 2021-xx-xx](https://github.com/jakubpawlowicz/clean-css-cli/compare/4.3...HEAD)
+==================
+
+* Bumps clean-css dependency to 5.0.
+
 [4.3.0 / 2019-04-06](https://github.com/jakubpawlowicz/clean-css-cli/compare/4.2...v4.3.0)
 ==================
 
diff --git a/README.md b/README.md
@@ -20,6 +20,7 @@ Previously a part of clean-css it's a separate package since clean-css 4.0.
 - [Node.js version support](#nodejs-version-support)
 - [Install](#install)
 - [Use](#use)
+  * [What's new in version 5.0](#whats-new-in-version-50)
   * [Important: 4.0 breaking changes](#important-40-breaking-changes)
   * [What's new in version 4.1](#whats-new-in-version-41)
   * [What's new in version 4.2](#whats-new-in-version-42)
@@ -59,6 +60,14 @@ Note: Global install via -g option is recommended unless you want to execute the
 cleancss -o one.min.css one.css
 ```
 
+## What's new in version 5.0
+
+clean-css-cli 5.0 introduces the following changes / features:
+
+* clean-css 5.0 with loads of bugfixes;
+* `--skip-rebase` option has been removed as rebasing URLs is disabled by default now
+* `--with-rebase` option is added if you really want URLs rebasing
+
 ## Important: 4.0 breaking changes
 
 clean-css-cli 4.0 introduces some breaking changes:
@@ -227,7 +236,7 @@ or a fine-grained configuration given via a string.
 
 Please note that level 1 optimization options are generally safe while level 2 optimizations should be safe for most users.
 
-Important: The `-O` option is using the capital letter O (as in "Oscar"), not the number zero. 
+Important: The `-O` option is using the capital letter O (as in "Oscar"), not the number zero.
 
 ### Level 0 optimizations
 
diff --git a/index.js b/index.js
@@ -32,7 +32,7 @@ function cli(process, beforeMinifyCallback) {
     .option('--inline [rules]', 'Enables inlining for listed sources (defaults to `local`)')
     .option('--inline-timeout [seconds]', 'Per connection timeout when fetching remote stylesheets (defaults to 5 seconds)', parseFloat)
     .option('--remove-inlined-files', 'Remove files inlined in <source-file ...> or via `@import` statements')
-    .option('--skip-rebase', 'Disable URLs rebasing')
+    .option('--with-rebase', 'Enable URLs rebasing')
     .option('--source-map', 'Enables building input\'s source map')
     .option('--source-map-inline-sources', 'Enables inlining sources inside source maps')
     .option('--input-source-map [file]', 'Specifies the path of the input source map file');
@@ -49,16 +49,17 @@ function cli(process, beforeMinifyCallback) {
     console.log('    %> cleancss --format keep-breaks one.css');
     console.log('    %> cleancss --format \'indentBy:1;indentWith:tab\' one.css');
     console.log('    %> cleancss --format \'breaks:afterBlockBegins=on;spaces:aroundSelectorRelation=on\' one.css');
+    console.log('    %> cleancss --format \'breaks:afterBlockBegins=2;spaces:aroundSelectorRelation=on\' one.css');
     console.log('    %> # `breaks` controls where to insert breaks');
-    console.log('    %> #   `afterAtRule` controls if a line break comes after an at-rule; e.g. `@charset`; defaults to `off` (alias to `false`)');
-    console.log('    %> #   `afterBlockBegins` controls if a line break comes after a block begins; e.g. `@media`; defaults to `off`');
-    console.log('    %> #   `afterBlockEnds` controls if a line break comes after a block ends, defaults to `off`');
-    console.log('    %> #   `afterComment` controls if a line break comes after a comment; defaults to `off`');
-    console.log('    %> #   `afterProperty` controls if a line break comes after a property; defaults to `off`');
-    console.log('    %> #   `afterRuleBegins` controls if a line break comes after a rule begins; defaults to `off`');
-    console.log('    %> #   `afterRuleEnds` controls if a line break comes after a rule ends; defaults to `off`');
-    console.log('    %> #   `beforeBlockEnds` controls if a line break comes before a block ends; defaults to `off`');
-    console.log('    %> #   `betweenSelectors` controls if a line break comes between selectors; defaults to `off`');
+    console.log('    %> #   `afterAtRule` controls if a line break comes after an at-rule; e.g. `@charset`; defaults to `off` (alias to `false`); accepts number of line breaks as an argument too');
+    console.log('    %> #   `afterBlockBegins` controls if a line break comes after a block begins; e.g. `@media`; defaults to `off`; accepts number of line breaks as an argument too');
+    console.log('    %> #   `afterBlockEnds` controls if a line break comes after a block ends, defaults to `off`; accepts number of line breaks as an argument too');
+    console.log('    %> #   `afterComment` controls if a line break comes after a comment; defaults to `off`; accepts number of line breaks as an argument too');
+    console.log('    %> #   `afterProperty` controls if a line break comes after a property; defaults to `off`; accepts number of line breaks as an argument too');
+    console.log('    %> #   `afterRuleBegins` controls if a line break comes after a rule begins; defaults to `off`; accepts number of line breaks as an argument too');
+    console.log('    %> #   `afterRuleEnds` controls if a line break comes after a rule ends; defaults to `off`; accepts number of line breaks as an argument too');
+    console.log('    %> #   `beforeBlockEnds` controls if a line break comes before a block ends; defaults to `off`; accepts number of line breaks as an argument too');
+    console.log('    %> #   `betweenSelectors` controls if a line break comes between selectors; defaults to `off`; accepts number of line breaks as an argument too');
     console.log('    %> # `indentBy` controls number of characters to indent with; defaults to `0`');
     console.log('    %> # `indentWith` controls a character to indent with, can be `space` or `tab`; defaults to `space`');
     console.log('    %> # `spaces` controls where to insert spaces');
@@ -153,8 +154,8 @@ function cli(process, beforeMinifyCallback) {
       { '0': commands.O0, '1': commands.O1, '2': commands.O2 } :
       undefined,
     output: commands.output,
-    rebase: commands.skipRebase ? false : true,
-    rebaseTo: ('output' in commands) && commands.output.length > 0 ? path.dirname(path.resolve(commands.output)) : process.cwd(),
+    rebase: commands.withRebase ? true : false,
+    rebaseTo: ('output' in commands) && commands.output.length > 0 ? path.dirname(path.resolve(commands.output)) : (commands.withRebase ? process.cwd() : undefined),
     sourceMap: commands.sourceMap,
     sourceMapInlineSources: commands.sourceMapInlineSources
   };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
   ],
   "homepage": "https://github.com/jakubpawlowicz/clean-css-cli#readme",
   "dependencies": {
-    "clean-css": "^4.2.1",
+    "clean-css": "^5.0.1",
     "commander": "^2.20.3",
     "glob": "^7.1.6"
   },
diff --git a/test/binary-test.js b/test/binary-test.js
@@ -236,7 +236,7 @@ vows.describe('cleancss')
     'relative image paths': {
       'no output': binaryContext('./test/fixtures/partials-relative/base.css', {
         'should leave paths': function (error, stdout) {
-          assert.equal(stdout, 'a{background:url(test/fixtures/partials/extra/down.gif) 0 0 no-repeat}');
+          assert.equal(stdout, 'a{background:url(../partials/extra/down.gif) 0 0 no-repeat}');
         }
       }),
       'output': binaryContext('-o ./base1-min.css ./test/fixtures/partials-relative/base.css', {
@@ -269,14 +269,14 @@ vows.describe('cleancss')
   })
   .addBatch({
     'complex import and url rebasing': {
-      'absolute': binaryContext('./test/fixtures/rebasing/assets/ui.css', {
+      'absolute': binaryContext('--with-rebase ./test/fixtures/rebasing/assets/ui.css', {
         'should rebase urls correctly': function (error, stdout) {
           assert.include(stdout, 'url(test/fixtures/rebasing/components/bootstrap/images/glyphs.gif)');
           assert.include(stdout, 'url(test/fixtures/rebasing/components/jquery-ui/images/prev.gif)');
           assert.include(stdout, 'url(test/fixtures/rebasing/components/jquery-ui/images/next.gif)');
         }
       }),
-      'relative': binaryContext('-o test/ui.bundled.css ./test/fixtures/rebasing/assets/ui.css', {
+      'relative': binaryContext('--with-rebasing -o test/ui.bundled.css ./test/fixtures/rebasing/assets/ui.css', {
         'should rebase urls correctly': function () {
           var minimized = fs.readFileSync('test/ui.bundled.css', 'utf-8');
           assert.include(minimized, 'url(fixtures/rebasing/components/bootstrap/images/glyphs.gif)');
@@ -291,7 +291,7 @@ vows.describe('cleancss')
   })
   .addBatch({
     'complex import and skipped url rebasing': {
-      'absolute': binaryContext('--skip-rebase ./test/fixtures/rebasing/assets/ui.css', {
+      'absolute': binaryContext('./test/fixtures/rebasing/assets/ui.css', {
         'should rebase urls correctly': function (error, stdout) {
           assert.isNull(error);
           assert.include(stdout, 'url(../images/glyphs.gif)');
@@ -416,7 +416,7 @@ vows.describe('cleancss')
       }),
       'custom': pipedContext('div{width:0.00051px}', '-O1 roundingPrecision:4', {
         'should keep 4 decimal places': function (error, stdout) {
-          assert.equal(stdout, 'div{width:.0005px}');
+          assert.equal(stdout, 'div{width:0.0005px}');
         }
       }),
       'zero': pipedContext('div{width:1.5051px}', '-O1 roundingPrecision:0', {
diff --git a/test/custom-cli/custom-cleancss b/test/custom-cli/custom-cleancss
@@ -1,10 +1,19 @@
 #!/usr/bin/env node
 
 var cleanCssCli = require('../../index');
-return cleanCssCli(process, function (cleanCss) {
-  cleanCss.options.level['1'].transform = function (propertyName, propertyValue) {
-    if (propertyName == 'background-image' && propertyValue.indexOf('../valid/path/to') == -1) {
-      return propertyValue.replace('url(', 'url(../valid/path/to/');
+
+var customPlugin = {
+  level1: {
+    value: function (propertyName, propertyValue, options) {
+      if (propertyName == 'background-image' && propertyValue.indexOf('../valid/path/to') == -1) {
+        return propertyValue.replace('url(', 'url(../valid/path/to/');
+      } else {
+        return propertyValue;
+      }
     }
   }
+}
+
+return cleanCssCli(process, function (cleanCss) {
+  cleanCss.options.plugins.level1Value.push(customPlugin.level1.value);
 });
