fix: resolved conflicts

Author: Vikram Kalta

CODEOWNERS

@@ -1 +1 @@
-* @contentstack/security-admin @contentstack/cli-admin
+* @contentstack/security-admin

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Contentstack
+Copyright (c) 2023 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

bin/run

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
 
-require('@oclif/command').run()
-.catch(require('@oclif/errors/handle'))
+(async () => {
+    const oclif = require('@contentstack/cli-utilities/node_modules/@oclif/core')
+    await oclif.execute({ type: 'cjs', dir: __dirname })
+})()

package-lock.json

@@ -1,11 +1,10 @@
 {
   "name": "@contentstack/cli-cm-regex-validate",
   "description": "Validate Fields with Regex Property of Content Type and Global Field in a Stack",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli-cm-regex-validate/issues",
   "devDependencies": {
-    "@oclif/dev-cli": "^1.26.0",
     "@oclif/plugin-help": "^3.2.3",
     "@oclif/test": "^1.2.8",
     "@types/chai": "^4.2.21",
@@ -23,6 +22,7 @@
     "globby": "^10.0.2",
     "mocha": "^10.0.0",
     "nyc": "^15.1.0",
+    "oclif": "^3.7.0",
     "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
@@ -57,16 +57,14 @@
     "mocha": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
     "postpack": "rm -f oclif.manifest.json",
     "posttest": "eslint . --ext .ts --config .eslintrc",
-    "prepack": "rm -rf lib && tsc -b && oclif-dev manifest && oclif-dev readme",
+    "prepack": "rm -rf lib && tsc -b && oclif manifest && oclif readme",
     "test": "jest --detectOpenHandles --silent",
     "version": "oclif-dev readme && git add README.md"
   },
   "dependencies": {
-    "@contentstack/cli-command": "^1.0.0",
-    "@contentstack/cli-utilities": "^1.0.0",
+    "@contentstack/cli-command": "^1.2.0",
+    "@contentstack/cli-utilities": "^1.2.0",
     "@contentstack/management": "^1.2.4",
-    "@oclif/command": "^1.8.16",
-    "@oclif/config": "^1.17.0",
     "cli-table3": "^0.6.0",
     "cli-ux": "^6.0.9",
     "inquirer": "^8.2.4",
@@ -76,4 +74,4 @@
     "tslib": "^1.14.1",
     "uuid": "^8.3.2"
   }
-}
+}

package.json

@@ -1,12 +1,13 @@
-import { Command, flags } from "@contentstack/cli-command";
+import { Command } from "@contentstack/cli-command";
+import { flags } from '@contentstack/cli-utilities';
 import { inquireAlias, inquireModule } from "../../../utils/interactive";
 import connectStack from "../../../utils/connect-stack";
 const regexMessages = require("../../../../messages/index.json").validateRegex;
 
 export default class ValidateRegex extends Command {
   static description = regexMessages.command.description;
 
-  static flags = {
+  static flags: any = {
     help: flags.help({ char: "h", description: regexMessages.command.help }),
     alias: flags.string({
       char: "a",
@@ -37,7 +38,7 @@ export default class ValidateRegex extends Command {
   ];
 
   async run() {
-    const commandObject = this.parse(ValidateRegex);
+    const commandObject = await this.parse(ValidateRegex);
 
     await inquireAlias(commandObject.flags);