Merge pull request #25 from Contentstack-Solutions/Feat/CS-35664

Oclif core v2 migration changes

Author: abhinav-from-contentstack

.github/workflows/node.js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [16.x]
 
     steps:
     - uses: actions/checkout@v2

.talismanrc

@@ -1,4 +1,6 @@
 fileignoreconfig:
 - filename: lib/commands/tsgen.js
   checksum: 02bab20fef5508565dbf38b5c12192c48ec27249b89d48c70303abaae17984ce
+- filename: package-lock.json
+  checksum: f69fb633369ac69c08b707b17c96fffb89198944fae8d6f6bcf590bda960f26a
 version: "1.0"

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,19 +1,17 @@
 {
   "name": "contentstack-cli-tsgen",
   "description": "Generate TypeScript typings from a Stack.",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "author": "Michael Davis",
   "bugs": "https://github.com/Contentstack-Solutions/contentstack-cli-tsgen/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.0.3",
-    "@oclif/command": "^1.8.0",
-    "@oclif/config": "^1.17.0",
+    "@contentstack/cli-command": "^1.2.0",
+    "@contentstack/cli-utilities": "^1.2.0",
     "lodash": "^4.17.20",
     "prettier": "^2.0.5",
     "tslib": "^1.13.0"
   },
   "devDependencies": {
-    "@oclif/dev-cli": "^1.22.2",
     "@oclif/plugin-help": "^3.2.0",
     "@types/jest": "^26.0.14",
     "@types/lodash": "^4.14.162",
@@ -23,9 +21,10 @@
     "eslint-config-oclif-typescript": "^0.1.0",
     "globby": "^10.0.2",
     "jest": "^26.5.3",
+    "oclif": "^3.7.0",
     "ts-jest": "^26.4.1",
-    "ts-node": "^8.10.2",
-    "typescript": "^3.9.7"
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.4"
   },
   "engines": {
     "node": ">=8.0.0"
@@ -54,8 +53,8 @@
   "scripts": {
     "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",
-    "version": "oclif-dev readme && git add README.md"
+    "version": "oclif readme && git add README.md"
   }
-}
+}

package.json

@@ -1,4 +1,5 @@
-import {Command, flags} from '@contentstack/cli-command'
+import {Command} from '@contentstack/cli-command'
+import {flags} from '@contentstack/cli-utilities'
 import {getGlobalFields, stackConnect, StackConnectionConfig} from '../lib/stack/client'
 import {ContentType} from '../lib/stack/schema'
 import tsgenRunner from '../lib/tsgen/runner'
@@ -12,7 +13,7 @@ export default class TypeScriptCodeGeneratorCommand extends Command {
     '$ csdx tsgen -a "delivery token alias" -o "contentstack/generated.d.ts" --no-doc',
   ];
 
-  static flags = {
+  static flags: any = {
     'token-alias': flags.string({
       char: 'a',
       description: 'delivery token alias',
@@ -88,7 +89,7 @@ export default class TypeScriptCodeGeneratorCommand extends Command {
         this.log('No Content Types exist in the Stack.')
       }
     } catch (error) {
-      this.error(error, {exit: 1})
+      this.error(error as any, {exit: 1})
     }
   }
 }

src/commands/tsgen.ts

@@ -7,9 +7,9 @@
     "rootDir": "src",
     "strict": true,
     "target": "es2017",
-    "allowJs": true
+    "skipLibCheck": true
   },
   "include": [
-    "src/**/*", "src/typings/@contentstack/cli-command.ts"
+    "src/**/*"
   ]
 }