chore(eslint): merge both configs in one

kuzzleio · fmauNeko · May 7, 2024 · Apr 26, 2024 · Apr 26, 2024 · May 6, 2024
commit 3129fde6f3a2075c81024a89391787b07de8156a
diff --git a/.eslintc-ts.json b/.eslintc-ts.json
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,13 +1,14 @@
 {
-  "plugins": [
-    "kuzzle"
-  ],
-  "extends": [
-    "plugin:kuzzle/default",
-    "plugin:kuzzle/node"
-  ],
+  "plugins": ["kuzzle"],
+  "extends": ["plugin:kuzzle/default", "plugin:kuzzle/node"],
   "rules": {
     "sort-keys": "warn",
     "kuzzle/array-foreach": "warn"
-  }
-}
+  },
+  "overrides": [
+    {
+      "files": ["*.ts"],
+      "extends": ["plugin:kuzzle/typescript"]
+    }
+  ]
+}
diff --git a/package.json b/package.json
@@ -21,9 +21,7 @@
     "test:functional:legacy": "npm run test:functional:legacy:http && npm run test:functional:legacy:websocket && npm run test:functional:legacy:mqtt",
     "test:functional:websocket": "KUZZLE_PROTOCOL=websocket cucumber-js --profile websocket",
     "test:functional": "npm run test:functional:http && npm run test:functional:websocket && npm run test:functional:jest",
-    "test:lint:js": "eslint ./lib ./test ./bin ./features ./plugins/available/functional-test-plugin",
-    "test:lint:ts": "eslint ./lib --ext .ts --config .eslintc-ts.json",
-    "test:lint": "npm run test:lint:js && npm run test:lint:ts",
+    "test:lint": "eslint ./lib ./test ./bin ./features ./plugins/available/functional-test-plugin",
     "test:unit": "DEBUG= npx --node-arg=--trace-warnings mocha --exit",
     "test": "npm run clean && npm run --silent test:lint && npm run build && npm run test:unit:coverage && npm run test:functional"
   },

diff --git a/bin/.upgrades/lib/context.js b/bin/.upgrades/lib/context.js

    if (this.config.configs) {
      this.log.ok("Configuration files loaded:");
      this.config.configs.forEach((f) => this.log.print(`\t- ${f}`));
    }

    this.version = await this.getVersions();
diff --git a/features/fixtures/mappings.js b/features/fixtures/mappings.js
      properties: {
        job: { type: "keyword" },
        name: { type: "keyword" },
        age: { type: "integer" },
        city: { type: "keyword" },
      },
    },
  },
  "mtp-open-data": {
    "green-taxi": {
      properties: {
        job: { type: "keyword" },
        name: { type: "keyword" },
        age: { type: "integer" },
        city: { type: "keyword" },
      },
    },
diff --git a/features/fixtures/permissions.js b/features/fixtures/permissions.js
      credentials: {
        local: {
          username: "test-admin",
          password: "password",
        },
      },
    },
    "default-user": {
      content: {
        profileIds: ["default"],
      },
      credentials: {
        local: {
          username: "default-user",
          password: "password",
        },
      },
    },
diff --git a/features/step_definitions/auth-steps.js b/features/step_definitions/auth-steps.js
  async function (username, password) {
    this.props.result = await this.sdk.auth.login("local", {
      username,
      password,
    });
  },
 );
diff --git a/features/step_definitions/bulk-steps.js b/features/step_definitions/bulk-steps.js

    const request = {
      controller: "bulk",
      action: "deleteByQuery",
      index: this.props.index,
      collection: this.props.collection,
      refresh: "wait_for",
      body: { query },
    };
	properties: {
	job: { type: "keyword" },
	name: { type: "keyword" },
	age: { type: "integer" },
Check warning on line 10 in features/fixtures/mappings.js GitHub Actions / Lint - Node.js LTS 16 `Expected object keys to be in ascending order. 'age' should be before 'name'` Check warning on line 10 in features/fixtures/mappings.js GitHub Actions / Lint - Node.js LTS 20 `Expected object keys to be in ascending order. 'age' should be before 'name'` Check warning on line 10 in features/fixtures/mappings.js GitHub Actions / Lint - Node.js LTS 18 `Expected object keys to be in ascending order. 'age' should be before 'name'`
	city: { type: "keyword" },
	},
	},
	},
	"mtp-open-data": {
Check warning on line 15 in features/fixtures/mappings.js GitHub Actions / Lint - Node.js LTS 16 `Expected object keys to be in ascending order. 'mtp-open-data' should be before 'nyc-open-data'` Check warning on line 15 in features/fixtures/mappings.js GitHub Actions / Lint - Node.js LTS 20 `Expected object keys to be in ascending order. 'mtp-open-data' should be before 'nyc-open-data'` Check warning on line 15 in features/fixtures/mappings.js GitHub Actions / Lint - Node.js LTS 18 `Expected object keys to be in ascending order. 'mtp-open-data' should be before 'nyc-open-data'`
	"green-taxi": {
	properties: {
	job: { type: "keyword" },
	name: { type: "keyword" },
	age: { type: "integer" },
Check warning on line 20 in features/fixtures/mappings.js GitHub Actions / Lint - Node.js LTS 16 `Expected object keys to be in ascending order. 'age' should be before 'name'` Check warning on line 20 in features/fixtures/mappings.js GitHub Actions / Lint - Node.js LTS 20 `Expected object keys to be in ascending order. 'age' should be before 'name'` Check warning on line 20 in features/fixtures/mappings.js GitHub Actions / Lint - Node.js LTS 18 `Expected object keys to be in ascending order. 'age' should be before 'name'`
	city: { type: "keyword" },
	},
	},
	credentials: {
	local: {
	username: "test-admin",
	password: "password",
Check warning on line 14 in features/fixtures/permissions.js GitHub Actions / Lint - Node.js LTS 16 `Expected object keys to be in ascending order. 'password' should be before 'username'` Check warning on line 14 in features/fixtures/permissions.js GitHub Actions / Lint - Node.js LTS 20 `Expected object keys to be in ascending order. 'password' should be before 'username'` Check warning on line 14 in features/fixtures/permissions.js GitHub Actions / Lint - Node.js LTS 18 `Expected object keys to be in ascending order. 'password' should be before 'username'`
	},
	},
	},
	"default-user": {
Check warning on line 18 in features/fixtures/permissions.js GitHub Actions / Lint - Node.js LTS 16 `Expected object keys to be in ascending order. 'default-user' should be before 'test-admin'` Check warning on line 18 in features/fixtures/permissions.js GitHub Actions / Lint - Node.js LTS 20 `Expected object keys to be in ascending order. 'default-user' should be before 'test-admin'` Check warning on line 18 in features/fixtures/permissions.js GitHub Actions / Lint - Node.js LTS 18 `Expected object keys to be in ascending order. 'default-user' should be before 'test-admin'`
	content: {
	profileIds: ["default"],
	},
	credentials: {
	local: {
	username: "default-user",
	password: "password",
Check warning on line 25 in features/fixtures/permissions.js GitHub Actions / Lint - Node.js LTS 16 `Expected object keys to be in ascending order. 'password' should be before 'username'` Check warning on line 25 in features/fixtures/permissions.js GitHub Actions / Lint - Node.js LTS 20 `Expected object keys to be in ascending order. 'password' should be before 'username'` Check warning on line 25 in features/fixtures/permissions.js GitHub Actions / Lint - Node.js LTS 18 `Expected object keys to be in ascending order. 'password' should be before 'username'`
	},
	},
	},
	async function (username, password) {
	this.props.result = await this.sdk.auth.login("local", {
	username,
	password,
Check warning on line 12 in features/step_definitions/auth-steps.js GitHub Actions / Lint - Node.js LTS 16 `Expected object keys to be in ascending order. 'password' should be before 'username'` Check warning on line 12 in features/step_definitions/auth-steps.js GitHub Actions / Lint - Node.js LTS 20 `Expected object keys to be in ascending order. 'password' should be before 'username'` Check warning on line 12 in features/step_definitions/auth-steps.js GitHub Actions / Lint - Node.js LTS 18 `Expected object keys to be in ascending order. 'password' should be before 'username'`
	});
	},
	);

	const request = {
	controller: "bulk",
	action: "deleteByQuery",
Check warning on line 48 in features/step_definitions/bulk-steps.js GitHub Actions / Lint - Node.js LTS 16 `Expected object keys to be in ascending order. 'action' should be before 'controller'` Check warning on line 48 in features/step_definitions/bulk-steps.js GitHub Actions / Lint - Node.js LTS 20 `Expected object keys to be in ascending order. 'action' should be before 'controller'` Check warning on line 48 in features/step_definitions/bulk-steps.js GitHub Actions / Lint - Node.js LTS 18 `Expected object keys to be in ascending order. 'action' should be before 'controller'`
	index: this.props.index,
	collection: this.props.collection,
Check warning on line 50 in features/step_definitions/bulk-steps.js GitHub Actions / Lint - Node.js LTS 16 `Expected object keys to be in ascending order. 'collection' should be before 'index'` Check warning on line 50 in features/step_definitions/bulk-steps.js GitHub Actions / Lint - Node.js LTS 20 `Expected object keys to be in ascending order. 'collection' should be before 'index'` Check warning on line 50 in features/step_definitions/bulk-steps.js GitHub Actions / Lint - Node.js LTS 18 `Expected object keys to be in ascending order. 'collection' should be before 'index'`
	refresh: "wait_for",
	body: { query },
	};