fix: validation schema (`schema-utils`) #527

alexander-akait · 2017-06-06T19:16:08Z

Fixes #524

We can avoid using $schema as we can do in webpack (https://github.com/webpack/webpack/tree/master/schemas)

codecov · 2017-06-06T19:16:10Z

Codecov Report

Merging #527 into master will decrease coverage by 0.27%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #527      +/-   ##
==========================================
- Coverage   90.38%   90.11%   -0.28%     
==========================================
  Files           6        4       -2     
  Lines         364      354      -10     
  Branches       77       76       -1     
==========================================
- Hits          329      319      -10     
  Misses         35       35

Impacted Files	Coverage Δ
index.js	`90.95% <100%> (-0.09%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d0e88d0...541ab86. Read the comment docs.

joshwiens · 2017-06-06T19:24:12Z

@bebraw - Wouldn't it just make more sense to migrate this to schema utils and maintain the ajv dependency there?

bebraw · 2017-06-06T19:29:31Z

@d3viant0ne Agreed.

@evilebottnawi Can you make that change? Better solution over longer term.

alexander-akait · 2017-06-06T19:32:04Z

@bebraw let's do it

alexander-akait · 2017-06-06T20:25:47Z

/cc @d3viant0ne @bebraw

michael-ciniawsky · 2017-06-06T22:13:07Z

index.js

@@ -9,7 +9,7 @@ var ExtractedModule = require("./ExtractedModule");
 var Chunk = require("webpack/lib/Chunk");
 var OrderUndefinedError = require("./OrderUndefinedError");
 var loaderUtils = require("loader-utils");
-var schemaTester = require('./schema/validator');
+var validateOptions = require('schema-utils');
 var loaderSchema = require('./schema/loader-schema');


The two schemas can be removed, just pass the path/to/schema.json to validateOptions

michael-ciniawsky · 2017-06-06T22:14:42Z

index.js

@@ -122,7 +122,7 @@ function ExtractTextPlugin(options) {
 	if(isString(options)) {
 		options = { filename: options };
 	} else {
-		schemaTester(pluginSchema, options);
+		validateOptions(pluginSchema, options, ' Extract Text Plugin');


./schema/plugin.json && Extract Text Plugin => Extract Text Plugin (no leading space)

Please rename plugin-schema.js => plugin.json

michael-ciniawsky · 2017-06-06T22:16:38Z

index.js

@@ -201,7 +201,7 @@ ExtractTextPlugin.prototype.extract = function(options) {
 	if(Array.isArray(options) || isString(options) || typeof options.options === "object" || typeof options.query === 'object') {
 		options = { loader: options };
 	} else {
-		schemaTester(loaderSchema, options);
+		validateOptions(loaderSchema, options, 'Extract Text Loader');


./schema/loader.json && Extract Text Loader => Extract Text Plugin (Loader)

Please rename loader-schema.js => loader.json ⚠️ JS => JSON

michael-ciniawsky · 2017-06-06T22:18:33Z

test/extract.test.js

@@ -29,7 +29,10 @@ describe("ExtractTextPlugin.extract()", function() {
 					ExtractTextPlugin.extract({style: 'file.css'});
 				},
 				function(err) {
-					return err.message === 'data[\'style\'] should NOT have additional properties';
+					console.log(err.message)


Needed for tests or forgotten to remove ? 😛

@michael-ciniawsky stupid error 😄

alexander-akait · 2017-06-06T23:39:33Z

/cc @michael-ciniawsky

michael-ciniawsky · 2017-06-06T23:42:23Z

index.js

@@ -122,7 +120,7 @@ function ExtractTextPlugin(options) {
 	if(isString(options)) {
 		options = { filename: options };
 	} else {
-		schemaTester(pluginSchema, options);
+		validateOptions('schema/plugin.json', options, 'Extract Text Plugin');


Just to double check => ./ <= schema... ? (validateOptions use require() 'internally')

michael-ciniawsky · 2017-06-06T23:42:44Z

index.js

@@ -201,7 +199,7 @@ ExtractTextPlugin.prototype.extract = function(options) {
 	if(Array.isArray(options) || isString(options) || typeof options.options === "object" || typeof options.query === 'object') {
 		options = { loader: options };
 	} else {
-		schemaTester(loaderSchema, options);
+		validateOptions('schema/loader.json', options, 'Extract Text Plugin (Loader)');


Same as above 😛

alexander-akait · 2017-06-07T11:02:34Z

/cc @michael-ciniawsky done

alexander-akait added pr_action: Review semver: Patch severity: 3 (broken) type: Bug labels Jun 6, 2017

alexander-akait requested review from bebraw, michael-ciniawsky and joshwiens June 6, 2017 19:16

bebraw approved these changes Jun 6, 2017

View reviewed changes

alexander-akait force-pushed the issue-524 branch 2 times, most recently from 0ec10e6 to 0de03b4 Compare June 6, 2017 20:16

alexander-akait closed this Jun 6, 2017

alexander-akait reopened this Jun 6, 2017

michael-ciniawsky changed the title ~~fix: validation schema with latest ajv~~ fix: validation schema with schema-utils Jun 6, 2017

michael-ciniawsky suggested changes Jun 6, 2017

View reviewed changes

alexander-akait force-pushed the issue-524 branch from 0de03b4 to 7ea0b2b Compare June 6, 2017 23:39

michael-ciniawsky reviewed Jun 6, 2017

View reviewed changes

fix: validation schema with latest ajv

541ab86

alexander-akait force-pushed the issue-524 branch from 7ea0b2b to 541ab86 Compare June 7, 2017 11:02

michael-ciniawsky approved these changes Jun 7, 2017

View reviewed changes

michael-ciniawsky merged commit dfeb347 into master Jun 7, 2017

michael-ciniawsky deleted the issue-524 branch June 7, 2017 22:09

michael-ciniawsky changed the title ~~fix: validation schema with schema-utils~~ fix: validation schema (schema-utils) Jun 7, 2017

michael-ciniawsky added this to the 2.1.1 milestone Jun 7, 2017

michael-ciniawsky modified the milestone: 2.1.2 Jun 8, 2017

renovate-tests mentioned this pull request Jul 7, 2017

Update dependency extract-text-webpack-plugin to v2 renovate-tests/discover-package-files#7

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: validation schema (`schema-utils`) #527

fix: validation schema (`schema-utils`) #527

alexander-akait commented Jun 6, 2017 •

edited by michael-ciniawsky

codecov bot commented Jun 6, 2017 •

edited

joshwiens commented Jun 6, 2017

bebraw commented Jun 6, 2017

alexander-akait commented Jun 6, 2017

alexander-akait commented Jun 6, 2017

michael-ciniawsky Jun 6, 2017

michael-ciniawsky Jun 6, 2017 •

edited

michael-ciniawsky Jun 6, 2017 •

edited

michael-ciniawsky Jun 6, 2017 •

edited

alexander-akait Jun 6, 2017

alexander-akait commented Jun 6, 2017

michael-ciniawsky Jun 6, 2017

michael-ciniawsky Jun 6, 2017

alexander-akait commented Jun 7, 2017

fix: validation schema (schema-utils) #527

fix: validation schema (schema-utils) #527

Conversation

alexander-akait commented Jun 6, 2017 • edited by michael-ciniawsky

codecov bot commented Jun 6, 2017 • edited

Codecov Report

joshwiens commented Jun 6, 2017

bebraw commented Jun 6, 2017

alexander-akait commented Jun 6, 2017

alexander-akait commented Jun 6, 2017

michael-ciniawsky Jun 6, 2017

Choose a reason for hiding this comment

michael-ciniawsky Jun 6, 2017 • edited

Choose a reason for hiding this comment

michael-ciniawsky Jun 6, 2017 • edited

Choose a reason for hiding this comment

michael-ciniawsky Jun 6, 2017 • edited

Choose a reason for hiding this comment

alexander-akait Jun 6, 2017

Choose a reason for hiding this comment

alexander-akait commented Jun 6, 2017

michael-ciniawsky Jun 6, 2017

Choose a reason for hiding this comment

michael-ciniawsky Jun 6, 2017

Choose a reason for hiding this comment

alexander-akait commented Jun 7, 2017

fix: validation schema (`schema-utils`) #527

fix: validation schema (`schema-utils`) #527

alexander-akait commented Jun 6, 2017 •

edited by michael-ciniawsky

codecov bot commented Jun 6, 2017 •

edited

michael-ciniawsky Jun 6, 2017 •

edited

michael-ciniawsky Jun 6, 2017 •

edited

michael-ciniawsky Jun 6, 2017 •

edited