grunt-ts - npm Package Compare versions

Comparing version 6.0.0-beta.1 to 6.0.0-beta.2

CHANGELOG.md

@@ -7,5 +7,6 @@ # Releases
 
-## v6.0.0-beta.1
+## v6.0.0-beta.2
 * CHORE: Update definition files used inside grunt-ts.  Thanks @vvakame!
 * CHORE: Move `typescript` to a peer dependency.
+* FIX: Loosened warnings on bad config that isn't actually bad config.  Thanks for the report, @0815fox (#364)!
 
@@ -12,0 +13,0 @@ ## v5.5.1

package.json

@@ -5,3 +5,3 @@ {
   "description": "Compile and manage your TypeScript project",
-  "version": "6.0.0-beta.1",
+  "version": "6.0.0-beta.2",
   "homepage": "https://github.com/TypeStrong/grunt-ts",
@@ -8,0 +8,0 @@ "repository": {

tasks/modules/optionsResolver.js

@@ -172,3 +172,4 @@ /// <reference path="../../defs/tsd.d.ts"/>
                 if (propertiesFromTarget.indexOf(propertyName) === -1 && propertyName !== 'options') {
-                    if (propertiesFromTargetOptions.indexOf(propertyName) > -1) {
+                    if (propertiesFromTargetOptions.indexOf(propertyName) > -1 &&
+                        !_.isPlainObject(task[propertyName])) {
                         var warningText = ("Property \"" + propertyName + "\" in " + configName + " is possibly in the wrong place and will be ignored.  ") +
@@ -178,4 +179,5 @@ "It is expected on the options object.";
                     }
-                    else if (lowercaseTargetProps.indexOf(propertyName.toLocaleLowerCase()) === -1
-                        && lowercaseTargetOptionsProps.indexOf(propertyName.toLocaleLowerCase()) > -1) {
+                    else if (lowercaseTargetProps.indexOf(propertyName.toLocaleLowerCase()) === -1 &&
+                        lowercaseTargetOptionsProps.indexOf(propertyName.toLocaleLowerCase()) > -1 &&
+                        !_.isPlainObject(task[propertyName])) {
                         var index = lowercaseTargetOptionsProps.indexOf(propertyName.toLocaleLowerCase());
@@ -182,0 +184,0 @@ var correctPropertyName = propertiesFromTargetOptions[index];

tasks/modules/optionsResolver.ts

@@ -216,14 +216,17 @@ /// <reference path="../../defs/tsd.d.ts"/>
           if (propertiesFromTarget.indexOf(propertyName) === -1 && propertyName !== 'options') {
-            if (propertiesFromTargetOptions.indexOf(propertyName) > -1) {
-              let warningText = `Property "${propertyName}" in ${configName} is possibly in the wrong place and will be ignored.  ` +
-                `It is expected on the options object.`;
-              warnings.push(warningText);
-            } else if (lowercaseTargetProps.indexOf(propertyName.toLocaleLowerCase()) === -1
-              && lowercaseTargetOptionsProps.indexOf(propertyName.toLocaleLowerCase()) > -1) {
-              let index = lowercaseTargetOptionsProps.indexOf(propertyName.toLocaleLowerCase());
-              let correctPropertyName = propertiesFromTargetOptions[index];
+            if (propertiesFromTargetOptions.indexOf(propertyName) > -1 &&
+                !_.isPlainObject(task[propertyName])) {
+                let warningText = `Property "${propertyName}" in ${configName} is possibly in the wrong place and will be ignored.  ` +
+                  `It is expected on the options object.`;
+                warnings.push(warningText);
+            } else if (lowercaseTargetProps.indexOf(propertyName.toLocaleLowerCase()) === -1 &&
+               lowercaseTargetOptionsProps.indexOf(propertyName.toLocaleLowerCase()) > -1 &&
+               !_.isPlainObject(task[propertyName])) {
 
-              let warningText = `Property "${propertyName}" in ${configName} is possibly in the wrong place and will be ignored.  ` +
-                `It is expected on the options object.  It is also the wrong case and should be ${correctPropertyName}.`;
-              warnings.push(warningText);
+                let index = lowercaseTargetOptionsProps.indexOf(propertyName.toLocaleLowerCase());
+                let correctPropertyName = propertiesFromTargetOptions[index];
+
+                let warningText = `Property "${propertyName}" in ${configName} is possibly in the wrong place and will be ignored.  ` +
+                  `It is expected on the options object.  It is also the wrong case and should be ${correctPropertyName}.`;
+                warnings.push(warningText);
             }
@@ -230,0 +233,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

590607

increased by0.09%

Lines of code

6336

increased by0.06%

No dependency changes