From 2f2bddcb61dbb5329ff8041a43fd0cb820ccc408 Mon Sep 17 00:00:00 2001 From: Trevor Smith Date: Tue, 8 Aug 2017 12:22:01 -0600 Subject: [PATCH 1/4] Fix the ajv-keywords "keyword select requires $data option" warning. --- src/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 5a50c76..92a749d 100644 --- a/src/index.js +++ b/src/index.js @@ -14,7 +14,9 @@ import requireCssModule from './requireCssModule'; import resolveStringLiteral from './resolveStringLiteral'; import replaceJsxExpressionContainer from './replaceJsxExpressionContainer'; -const ajv = new Ajv(); +const ajv = new Ajv({ + $data: true +}); ajvKeywords(ajv); From 2a61c25441a024ac15858b6ff8d270c6d61fd28b Mon Sep 17 00:00:00 2001 From: Trevor Smith Date: Tue, 15 Aug 2017 11:18:28 -0600 Subject: [PATCH 2/4] Disable the id-match eslint rule when configuring the ajv $data property. --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 92a749d..b7c6606 100644 --- a/src/index.js +++ b/src/index.js @@ -15,7 +15,7 @@ import resolveStringLiteral from './resolveStringLiteral'; import replaceJsxExpressionContainer from './replaceJsxExpressionContainer'; const ajv = new Ajv({ - $data: true + $data: true // eslint-disable-line id-match }); ajvKeywords(ajv); From 76442dca276b09c5440b041fad6a276c1d574916 Mon Sep 17 00:00:00 2001 From: Trevor Smith Date: Tue, 15 Aug 2017 11:18:49 -0600 Subject: [PATCH 3/4] Upgrade ajv to ^5.0.0. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bed9f57..3f6ad14 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "url": "http://gajus.com" }, "dependencies": { - "ajv": "^4.11.4", + "ajv": "^5.0.0", "ajv-keywords": "^2.1.0", "babel-plugin-syntax-jsx": "^6.18.0", "babel-types": "^6.19.0", From 6aeceb2d4ed29356b4e132591c1ef2a19d9bfb79 Mon Sep 17 00:00:00 2001 From: Gajus Kuizinas Date: Tue, 15 Aug 2017 18:36:43 +0100 Subject: [PATCH 4/4] style: --- src/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index b7c6606..c1d3e3d 100644 --- a/src/index.js +++ b/src/index.js @@ -15,7 +15,8 @@ import resolveStringLiteral from './resolveStringLiteral'; import replaceJsxExpressionContainer from './replaceJsxExpressionContainer'; const ajv = new Ajv({ - $data: true // eslint-disable-line id-match + // eslint-disable-next-line id-match + $data: true }); ajvKeywords(ajv);