Back merge development to v2-dev

eslint.config.base.js

@@ -0,0 +1,15 @@
+import tseslint from 'typescript-eslint';
+
+export const typescriptConfig = tseslint.configs.recommended;
+
+export const baseRules = {
+  eqeqeq: ['error', 'smart'],
+  'id-match': 'error',
+  'no-eval': 'error',
+  'no-var': 'error',
+  '@typescript-eslint/no-unused-vars': ['error', { args: 'none' }],
+  '@typescript-eslint/prefer-namespace-keyword': 'error',
+  semi: 'off',
+  '@typescript-eslint/no-redeclare': 'off',
+  '@typescript-eslint/no-explicit-any': 'off',
+};

packages/contentstack-auth/eslint.config.js

@@ -0,0 +1,17 @@
+import { typescriptConfig, baseRules } from '../../eslint.config.base.js';
+
+export default [
+  ...typescriptConfig,
+  {
+    files: ['src/**/*.ts'],
+    rules: {
+      ...baseRules,
+      '@typescript-eslint/ban-types': 'off',
+      '@typescript-eslint/quotes': 'off',
+      '@typescript-eslint/type-annotation-spacing': 'off',
+    },
+  },
+  {
+    ignores: ['lib/**'],
+  },
+];

packages/contentstack-auth/package.json

@@ -18,7 +18,6 @@
     "@contentstack/cli-command": "~2.0.0-beta.6",
     "@contentstack/cli-utilities": "~2.0.0-beta.7",
     "@oclif/core": "^4.10.5",
-    "@oclif/plugin-help": "^6.2.44",
     "otplib": "^12.0.1"
   },
   "overrides": {
@@ -27,20 +26,18 @@
     }
   },
   "devDependencies": {
-    "@fancy-test/nock": "^0.1.1",
-    "@oclif/plugin-help": "^6.2.44",
-    "@oclif/test": "^4.1.18",
+    "@oclif/test": "^4.1.13",
     "@types/chai": "^4.3.20",
-    "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^8.2.3",
     "@types/node": "^14.18.63",
     "@types/sinon": "^21.0.1",
     "chai": "^4.5.0",
-    "dotenv": "^16.6.1",
-    "eslint": "^8.57.1",
+    "dotenv": "^16.4.7",
+    "eslint": "^9.26.0",
     "eslint-config-oclif": "^5.2.2",
     "eslint-config-oclif-typescript": "^3.1.14",
     "mocha": "10.8.2",
+    "nock": "^13.5.6",
     "nyc": "^15.1.0",
     "oclif": "^4.23.0",
     "sinon": "^21.1.2",

packages/contentstack-auth/src/interfaces/index.ts

@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/no-redeclare
 export interface AuthOptions {
   contentstackClient: any;
 }

packages/contentstack-command/eslint.config.js

@@ -0,0 +1,12 @@
+import { typescriptConfig, baseRules } from '../../eslint.config.base.js';
+
+export default [
+  ...typescriptConfig,
+  {
+    files: ['src/**/*.ts'],
+    rules: baseRules,
+  },
+  {
+    ignores: ['lib/**'],
+  },
+];

packages/contentstack-command/package.json

@@ -16,20 +16,18 @@
   "dependencies": {
     "@contentstack/cli-utilities": "~2.0.0-beta.7",
     "contentstack": "^3.27.0",
-    "@oclif/core": "^4.10.5",
-    "@oclif/plugin-help": "^6.2.44"
+    "@oclif/core": "^4.10.5"
   },
   "overrides": {
     "@oclif/core": {
       "picomatch": "^4.0.4"
     }
   },
   "devDependencies": {
-    "@oclif/test": "^4.1.18",
-    "@types/mkdirp": "^1.0.2",
+    "@oclif/test": "^4.1.13",
     "@types/mocha": "^8.2.3",
     "@types/node": "^14.18.63",
-    "eslint": "^8.57.1",
+    "eslint": "^9.26.0",
     "eslint-config-oclif": "^6.0.15",
     "eslint-config-oclif-typescript": "^3.1.14",
     "mocha": "10.8.2",

packages/contentstack-config/eslint.config.js

@@ -0,0 +1,43 @@
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import mochaPlugin from 'eslint-plugin-mocha';
+import { FlatCompat } from '@eslint/eslintrc';
+import { baseRules } from '../../eslint.config.base.js';
+
+const compat = new FlatCompat();
+
+export default [
+  eslint.configs.recommended,
+  ...tseslint.configs.recommended,
+  ...compat.config(mochaPlugin.configs.recommended),
+  {
+    files: ['src/**/*.ts', 'test/**/*.ts'],
+    rules: {
+      ...baseRules,
+      'unicorn/no-abusive-eslint-disable': 'off',
+      '@typescript-eslint/no-use-before-define': 'off',
+      '@typescript-eslint/ban-ts-ignore': 'off',
+      indent: 'off',
+      'object-curly-spacing': 'off',
+      '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
+      'mocha/no-async-describe': 'off',
+      'mocha/no-identical-title': 'off',
+      'mocha/no-mocha-arrows': 'off',
+      'mocha/no-setup-in-describe': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-var-requires': 'off',
+      'prefer-const': 'error',
+      'no-fallthrough': 'error',
+      'no-prototype-builtins': 'off',
+    },
+  },
+  {
+    files: ['*.d.ts'],
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'off',
+    },
+  },
+  {
+    ignores: ['lib/**'],
+  },
+];

packages/contentstack-config/package.json

@@ -17,9 +17,7 @@
     "@contentstack/cli-command": "~2.0.0-beta.6",
     "@contentstack/cli-utilities": "~2.0.0-beta.7",
     "@contentstack/utils": "~1.9.1",
-    "@oclif/core": "^4.10.5",
-    "@oclif/plugin-help": "^6.2.44",
-    "lodash": "^4.18.1"
+    "@oclif/core": "^4.8.3"
   },
   "overrides": {
     "@oclif/core": {
@@ -33,8 +31,8 @@
     "@types/node": "^14.18.63",
     "@types/sinon": "^21.0.1",
     "chai": "^4.5.0",
-    "eslint": "^8.57.1",
-    "eslint-config-oclif": "^6.0.157",
+    "eslint": "^9.26.0",
+    "eslint-config-oclif": "^6.0.62",
     "eslint-config-oclif-typescript": "^3.1.14",
     "mocha": "10.8.2",
     "nyc": "^15.1.0",

packages/contentstack-utilities/eslint.config.js

@@ -0,0 +1,17 @@
+import { typescriptConfig, baseRules } from '../../eslint.config.base.js';
+
+export default [
+  ...typescriptConfig,
+  {
+    files: ['src/**/*.ts'],
+    rules: {
+      ...baseRules,
+      '@typescript-eslint/no-empty-object-type': 'off',
+      '@typescript-eslint/no-this-alias': 'off',
+      '@typescript-eslint/no-unsafe-function-type': 'off',
+    },
+  },
+  {
+    ignores: ['lib/**'],
+  },
+];

packages/contentstack-utilities/package.json

@@ -30,7 +30,7 @@
     "@contentstack/management": "~1.30.1",
     "@contentstack/marketplace-sdk": "^1.5.1",
     "@oclif/core": "^4.10.5",
-    "axios": "^1.15.0",
+    "axios": "^1.15.2",
     "chalk": "^5.6.2",
     "cli-cursor": "^3.1.0",
     "cli-progress": "^3.12.0",
@@ -53,7 +53,8 @@
     "traverse": "^0.6.11",
     "tty-table": "^4.2.3",
     "unique-string": "^2.0.0",
-    "uuid": "^9.0.1",
+    "short-uuid": "^6.0.0",
+    "uuid": "^14.0.0",
     "winston": "^3.19.0",
     "xdg-basedir": "^4.0.0"
   },
@@ -71,8 +72,8 @@
     "@types/sinon": "^21.0.0",
     "@types/traverse": "^0.6.37",
     "chai": "^4.5.0",
-    "eslint": "^8.57.1",
-    "eslint-config-oclif": "^6.0.157",
+    "eslint": "^9.26.0",
+    "eslint-config-oclif": "^6.0.62",
     "eslint-config-oclif-typescript": "^3.1.14",
     "fancy-test": "^2.0.42",
     "mocha": "10.8.2",

packages/contentstack-utilities/src/fs-utility/core.ts

@@ -458,7 +458,6 @@ export async function getFileList(dirName: string, onlyName = true): Promise<str
 
   for (const item of items) {
     if (item.isDirectory()) {
-      /* eslint-disable no-await-in-loop */
       files = [...files, ...(await getFileList(`${dirName}/${item.name}`))];
     } else {
       files.push(onlyName ? item.name : `${dirName}/${item.name}`);