Merge pull request #328 from posthtml/milestone-0.7.7

Milestone 0.7.7

Author: Scrum

changelog.md

@@ -1,9 +1,20 @@
+## <small>0.7.7 (2020-10-12)</small>
+
+* test: incorrect resolve with root, issue #326 ([c4014d3](https://github.com/posthtml/posthtml-cli/commit/c4014d3)), closes [#326](https://github.com/posthtml/posthtml-cli/issues/326)
+* test: normalize expected path ([55b7845](https://github.com/posthtml/posthtml-cli/commit/55b7845))
+* docs: fix example with root ([8a86282](https://github.com/posthtml/posthtml-cli/commit/8a86282))
+* fix: resolve path with root, close #326 ([45a42ee](https://github.com/posthtml/posthtml-cli/commit/45a42ee)), closes [#326](https://github.com/posthtml/posthtml-cli/issues/326)
+
+
+
 ## <small>0.7.6 (2020-09-22)</small>
 
+* 0.7.6 ([0cc6ffe](https://github.com/posthtml/posthtml-cli/commit/0cc6ffe))
+* build: update changelog ([85c8caf](https://github.com/posthtml/posthtml-cli/commit/85c8caf))
+* build: update dep dev, close #312 ([0807b07](https://github.com/posthtml/posthtml-cli/commit/0807b07)), closes [#312](https://github.com/posthtml/posthtml-cli/issues/312)
 * test: fix for window os ([f657858](https://github.com/posthtml/posthtml-cli/commit/f657858))
 * ci: enable window test, close #316 ([c86172d](https://github.com/posthtml/posthtml-cli/commit/c86172d)), closes [#316](https://github.com/posthtml/posthtml-cli/issues/316)
 * ci: update config ([a4516bc](https://github.com/posthtml/posthtml-cli/commit/a4516bc))
-* build: update dep dev, close #312 ([0807b07](https://github.com/posthtml/posthtml-cli/commit/0807b07)), closes [#312](https://github.com/posthtml/posthtml-cli/issues/312)
 * fix: resolve path on window, close #323 ([2447d87](https://github.com/posthtml/posthtml-cli/commit/2447d87)), closes [#323](https://github.com/posthtml/posthtml-cli/issues/323)
 * docs: fix typo ([27c8748](https://github.com/posthtml/posthtml-cli/commit/27c8748))
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "posthtml-cli",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "CLI for posthtml",
   "license": "MIT",
   "repository": "posthtml/posthtml-cli",

package.json

@@ -41,7 +41,7 @@ $ posthtml --help
     $ posthtml input.html -o output.html -u posthtml-bem --posthtml-bem.elemPrefix __
     $ posthtml inputFolder/*.html -o outputFolder
     $ posthtml inputFolder/**/*.html -o outputFolder -a
-    $ posthtml inputFolder/**/*.html -o outputFolder -a -r inputFolder
+    $ posthtml '**/*.html' -o outputFolder -a -r inputFolder
 ```
 > ⚠️ Please note that when using patterns on the command line `*` and `!` escaping of characters is necessary. When using as **npm** scripts, you only need to screen the pattern `*`. [About the reasons](https://github.com/posthtml/posthtml-cli/issues/317#issuecomment-676330082)
 

readme.md

@@ -58,6 +58,10 @@ export default ({input, flags = {}}) => {
     ({config} = explorer.search());
   }
 
+  if (config?.root) {
+    root = config.root;
+  }
+
   input = []
     .concat(input && input.length > 0 ? input : config?.input)
     .filter(Boolean)

src/cfg-resolve.js

@@ -0,0 +1,3 @@
+{
+  'root': './src'
+}

test/config/.config-root

@@ -91,6 +91,19 @@ test('should return config options', t => {
   t.deepEqual(config.options, expected);
 });
 
+test('should return config root', t => {
+  const input = 'input.html';
+  const flags = {
+    config: 'test/config/.config-root'
+  };
+  const config = cfgResolve({input, flags});
+  const expectedRoot = './src';
+  const expectedInput = [normalizePath(path.join(process.cwd(), expectedRoot, input))];
+
+  t.is(config.root, expectedRoot);
+  t.deepEqual(config.input, expectedInput);
+});
+
 test('should return config with key config and use key', t => {
   const input = 'input.html';
   const flags = {