html-validate 6.1.5 → 6.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,15 @@
1
1
  # html-validate changelog
2
2
 
3
+ ### [6.1.6](https://gitlab.com/html-validate/html-validate/compare/v6.1.5...v6.1.6) (2022-01-07)
4
+
5
+ ### Bug Fixes
6
+
7
+ - **meta:** disallow unknown element properties ([aca70fc](https://gitlab.com/html-validate/html-validate/commit/aca70fcff5848d91ab4c0c3194bcc44ffc0d2b5d))
8
+
9
+ ### Dependency upgrades
10
+
11
+ - **deps:** drop json-merge-patch dependency ([5306b2d](https://gitlab.com/html-validate/html-validate/commit/5306b2d6314669e353f0500f3a5b6e6f395ca3cf))
12
+
3
13
  ### [6.1.5](https://gitlab.com/html-validate/html-validate/compare/v6.1.4...v6.1.5) (2021-12-28)
4
14
 
5
15
  ### Bug Fixes
@@ -9,7 +9,6 @@ require('kleur');
9
9
  require('@sidvind/better-ajv-errors');
10
10
  require('ajv');
11
11
  require('deepmerge');
12
- require('json-merge-patch');
13
12
  require('path');
14
13
  require('@babel/code-frame');
15
14
  require('@html-validate/stylish');
@@ -1 +1 @@
1
- {"version":3,"file":"browser.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
1
+ {"version":3,"file":"browser.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
package/dist/cjs/cli.js CHANGED
@@ -7,7 +7,6 @@ require('kleur');
7
7
  require('@sidvind/better-ajv-errors');
8
8
  require('ajv');
9
9
  var deepmerge = require('deepmerge');
10
- require('json-merge-patch');
11
10
  var path = require('path');
12
11
  var glob = require('glob');
13
12
  var ignore = require('ignore');
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sources":["../../../src/cli/expand-files.ts","../../../src/cli/formatter.ts","../../../src/cli/is-ignored.ts","../../../src/cli/init.ts","../../../src/cli/cli.ts","../../../src/cli/json.ts"],"sourcesContent":[null,null,null,null,null,null],"names":["fs","path","glob","formatterFactory","legacyRequire","UserError","ignore","deepmerge","prompts","FileSystemConfigLoader","HtmlValidate","readFileSync"],"mappings":"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"}
1
+ {"version":3,"file":"cli.js","sources":["../../../src/cli/expand-files.ts","../../../src/cli/formatter.ts","../../../src/cli/is-ignored.ts","../../../src/cli/init.ts","../../../src/cli/cli.ts","../../../src/cli/json.ts"],"sourcesContent":[null,null,null,null,null,null],"names":["fs","path","glob","formatterFactory","legacyRequire","UserError","ignore","deepmerge","prompts","FileSystemConfigLoader","HtmlValidate","readFileSync"],"mappings":"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"}
package/dist/cjs/core.js CHANGED
@@ -4,7 +4,6 @@ var fs = require('fs');
4
4
  var betterAjvErrors = require('@sidvind/better-ajv-errors');
5
5
  var Ajv = require('ajv');
6
6
  var deepmerge = require('deepmerge');
7
- var jsonMergePatch = require('json-merge-patch');
8
7
  var path = require('path');
9
8
  var semver = require('semver');
10
9
  var kleur = require('kleur');
@@ -17,7 +16,6 @@ var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
17
16
  var betterAjvErrors__default = /*#__PURE__*/_interopDefaultLegacy(betterAjvErrors);
18
17
  var Ajv__default = /*#__PURE__*/_interopDefaultLegacy(Ajv);
19
18
  var deepmerge__default = /*#__PURE__*/_interopDefaultLegacy(deepmerge);
20
- var jsonMergePatch__default = /*#__PURE__*/_interopDefaultLegacy(jsonMergePatch);
21
19
  var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
22
20
  var semver__default = /*#__PURE__*/_interopDefaultLegacy(semver);
23
21
  var kleur__default = /*#__PURE__*/_interopDefaultLegacy(kleur);
@@ -433,6 +431,18 @@ const patternProperties = {
433
431
  title: "Mark element as a submittable form element",
434
432
  type: "boolean"
435
433
  },
434
+ labelable: {
435
+ title: "Mark this element as labelable",
436
+ description: "This element may contain an associated label element.",
437
+ anyOf: [
438
+ {
439
+ type: "boolean"
440
+ },
441
+ {
442
+ $ref: "#/definitions/expression"
443
+ }
444
+ ]
445
+ },
436
446
  deprecatedAttributes: {
437
447
  title: "List of deprecated attributes",
438
448
  type: "array",
@@ -484,7 +494,7 @@ const patternProperties = {
484
494
  ]
485
495
  }
486
496
  },
487
- additionalProperties: true
497
+ additionalProperties: false
488
498
  }
489
499
  };
490
500
  const definitions = {
@@ -879,7 +889,7 @@ class MetaTable {
879
889
  */
880
890
  extendValidationSchema(patch) {
881
891
  if (patch.properties) {
882
- this.schema = jsonMergePatch__default["default"].apply(this.schema, {
892
+ this.schema = deepmerge__default["default"](this.schema, {
883
893
  patternProperties: {
884
894
  "^[^$].*$": {
885
895
  properties: patch.properties,
@@ -888,7 +898,7 @@ class MetaTable {
888
898
  });
889
899
  }
890
900
  if (patch.definitions) {
891
- this.schema = jsonMergePatch__default["default"].apply(this.schema, {
901
+ this.schema = deepmerge__default["default"](this.schema, {
892
902
  definitions: patch.definitions,
893
903
  });
894
904
  }
@@ -2929,7 +2939,7 @@ var TRANSFORMER_API;
2929
2939
  /** @public */
2930
2940
  const name = "html-validate";
2931
2941
  /** @public */
2932
- const version = "6.1.5";
2942
+ const version = "6.1.6";
2933
2943
  /** @public */
2934
2944
  const homepage = "https://html-validate.org";
2935
2945
  /** @public */