Merge pull request #88 from reactway/dev

Martynas Žilinskas · web-flow · commit 0ed347576d97 · 2020-03-19T13:52:18.000+02:00
Hotfix: Fix configuration check and update log message. (#86) (#87)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "scss-bundle",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "description": "Bundling SCSS files to one bundled file.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
diff --git a/src/cli/main.ts b/src/cli/main.ts
@@ -140,8 +140,8 @@ async function main(argv: string[]): Promise<void> {
             Log.info("Waiting for changes...");
         });
 
-        if (config.rootDir) {
-            Log.warn("rootDir property is missing, using cwd.");
+        if (!config.rootDir) {
+            Log.warn(`rootDir property is missing in config, using current working directory: ${process.cwd()}`);
         }
 
         const watchFolder = config.rootDir ?? process.cwd();

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "scss-bundle",`
`3`		`- "version": "3.1.0",`
	`3`	`+ "version": "3.1.1",`
`4`	`4`	`"description": "Bundling SCSS files to one bundled file.",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"types": "dist/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,8 @@ async function main(argv: string[]): Promise<void> {`
`140`	`140`	`Log.info("Waiting for changes...");`
`141`	`141`	`});`
`142`	`142`
`143`		`- if (config.rootDir) {`
`144`		`- Log.warn("rootDir property is missing, using cwd.");`
	`143`	`+ if (!config.rootDir) {`
	`144`	+ Log.warn(`rootDir property is missing in config, using current working directory: ${process.cwd()}`);
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`const watchFolder = config.rootDir ?? process.cwd();`