diff --git a/.gitignore b/.gitignore index 3cb73f5..16c9e0d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,3 @@ dependency-reduced-pom.xml # Auto-generated files coverage -dist diff --git a/eslint-plugin/.gitignore b/eslint-plugin/.gitignore index 8e47981..481553d 100644 --- a/eslint-plugin/.gitignore +++ b/eslint-plugin/.gitignore @@ -11,3 +11,4 @@ node_modules # Auto-generated files *-report.json .nyc_output +dist/pack diff --git a/eslint-plugin/lib/sonar.js b/eslint-plugin/dist/rules.js similarity index 96% rename from eslint-plugin/lib/sonar.js rename to eslint-plugin/dist/rules.js index 54e6c87..2fcf8d6 100644 --- a/eslint-plugin/lib/sonar.js +++ b/eslint-plugin/dist/rules.js @@ -22,7 +22,7 @@ */ "use strict"; -const rules = require("./rule-list"); +const rules = require("../lib/rule-list"); module.exports = { rules: rules.map((rule) => ({ diff --git a/eslint-plugin/package.json b/eslint-plugin/package.json index bbf39b0..10157d0 100644 --- a/eslint-plugin/package.json +++ b/eslint-plugin/package.json @@ -18,15 +18,16 @@ "author": "Green Code Initiative", "main": "./lib/standalone.js", "files": [ - "lib" + "lib", + "./dist/rules.js" ], "scripts": { - "clean": "rimraf dist", + "clean": "rimraf dist/pack", "lint": "yarn lint:eslint-docs && yarn lint:js", "lint:eslint-docs": "eslint-doc-generator --check", "lint:js": "eslint .", "lint:fix": "eslint . --fix", - "pack:sonar": "npm pkg set main=\"./lib/sonar.js\" && mkdirp dist/pack && yarn pack -o dist/pack/creedengo-eslint-plugin.tgz && npm pkg set main=\"./lib/standalone.js\"", + "pack:sonar": "npm pkg set main=\"./dist/rules.js\" && mkdirp dist/pack && yarn pack -o dist/pack/creedengo-eslint-plugin.tgz && npm pkg set main=\"./lib/standalone.js\"", "test": "mocha tests --recursive", "test:cov": "nyc --reporter=lcov --reporter=text mocha tests --recursive", "update:eslint-docs": "eslint-doc-generator" diff --git a/eslint-plugin/tests/lib/sonar.test.js b/eslint-plugin/tests/dist/rules.test.js similarity index 93% rename from eslint-plugin/tests/lib/sonar.test.js rename to eslint-plugin/tests/dist/rules.test.js index f31b561..56862fc 100644 --- a/eslint-plugin/tests/lib/sonar.test.js +++ b/eslint-plugin/tests/dist/rules.test.js @@ -18,9 +18,9 @@ const assert = require("assert"); -describe("sonar.js", () => { +describe("rules.js", () => { it("should export all rules with a specific rule id pattern", () => { - const { rules } = require("../../lib/sonar"); + const { rules } = require("../../dist/rules"); assert.notEqual(rules.length, 0); assert.match(rules[0].ruleId, /@creedengo\/.*/); assert.equal(rules[0].ruleConfig.length, 0); diff --git a/sonar-project.properties b/sonar-project.properties index 1cc39a7..bcdaded 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,7 +1,7 @@ sonar.organization=green-code-initiative sonar.projectKey=green-code-initiative_ecoCode-linter sonar.projectName=creedengo - JavaScript language -sonar.sources=eslint-plugin/lib/,sonar-plugin/src/main/java/ +sonar.sources=eslint-plugin/lib/,eslint-plugin/dist/rules.js,sonar-plugin/src/main/java/ sonar.tests=eslint-plugin/tests/,sonar-plugin/src/test/java/ sonar.javascript.lcov.reportPaths=eslint-plugin/coverage/lcov.info sonar.java.binaries=sonar-plugin/target/