Merge pull request #784 from contentstack/fix/merge-main-to-staging

Fix/merge main to staging

Author: abhinav-from-contentstack

.github/config/release.json

@@ -16,6 +16,7 @@
         "bulk-publish": false,
         "dev-dependencies": false,
         "launch": false,
+        "branches": false,
         "core": false
     }
 }

.github/workflows/release.yml

@@ -220,6 +220,22 @@ jobs:
           token: ${{ secrets.NPM_TOKEN }}
           package: ./packages/contentstack-launch/package.json
           access: public
+      - name: Installing dependencies of branches
+        id: branches-installation
+        if: ${{env.release_releaseAll == 'true' || env.release_plugins_branches == 'true'}}
+        working-directory: ./packages/contentstack-branches
+        run: npm install
+      - name: Compiling branches
+        if: ${{ steps.branches-installation.conclusion == 'success'  }}
+        working-directory: ./packages/contentstack-branches
+        run: npm run prepack
+      - name: Publishing branches
+        uses: JS-DevTools/npm-publish@v1
+        if: ${{ steps.branches-installation.conclusion == 'success'  }}
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          package: ./packages/contentstack-branches/package.json
+          access: public
       - name: Installing dependencies of core
         id: core-installation
         if: ${{env.release_releaseAll == 'true' || env.release_plugins_core == 'true'}}

package-lock.json

@@ -10,8 +10,8 @@
   "private": true,
   "scripts": {
     "cache:clear": "pnpm store prune",
-    "bootstrap": "pnpm install --no-frozen-lockfile",
     "clean": "pnpm --filter './packages/*' -w clean",
+    "bootstrap": "pnpm install --no-frozen-lockfile",
     "prepack": "pnpm --filter \"./packages/*\" -w prepack",
     "package-lock-only": "npm i --package-lock-only --workspaces",
     "setup-repo": "npm i && pnpm package-lock-only && pnpm clean && pnpm install --no-frozen-lockfile && pnpm prepack"
@@ -20,4 +20,4 @@
   "workspaces": [
     "packages/*"
   ]
-}
+}

package.json

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-auth/1.3.2 darwin-arm64 node-v18.14.2
+@contentstack/cli-auth/1.3.2 darwin-arm64 node-v18.15.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-auth/README.md

@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@contentstack/cli-command": "^1.2.3",
-    "@contentstack/cli-utilities": "^1.3.3",
+    "@contentstack/cli-utilities": "^1.4.0",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",
@@ -85,4 +85,4 @@
     }
   },
   "repository": "contentstack/cli"
-}
+}

packages/contentstack-auth/package.json

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bootstrap/1.4.2 darwin-arm64 node-v18.14.2
+@contentstack/cli-cm-bootstrap/1.4.2 darwin-arm64 node-v18.15.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-bootstrap/README.md

@@ -19,7 +19,7 @@
   "dependencies": {
     "@contentstack/cli-cm-seed": "^1.4.2",
     "@contentstack/cli-command": "^1.2.3",
-    "@contentstack/cli-utilities": "^1.3.3",
+    "@contentstack/cli-utilities": "^1.4.0",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",
     "tar": "^6.1.13"

packages/contentstack-bootstrap/package.json

@@ -0,0 +1,4 @@
+# Build files
+/lib
+/test
+/types

packages/contentstack-branches/.eslintignore

@@ -0,0 +1,55 @@
+{
+    "env": {
+        "node": true
+    },
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "project": "tsconfig.json",
+        "sourceType": "module"
+    },
+    "extends": [
+        // "oclif",
+        "oclif-typescript",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    "rules": {
+        "@typescript-eslint/no-unused-vars": [
+            "error",
+            {
+                "args": "none"
+            }
+        ],
+        "@typescript-eslint/prefer-namespace-keyword": "error",
+        "@typescript-eslint/quotes": [
+            "error",
+            "single",
+            {
+                "avoidEscape": true,
+                "allowTemplateLiterals": true
+            }
+        ],
+        "semi": "off",
+        "@typescript-eslint/type-annotation-spacing": "error",
+        "@typescript-eslint/no-redeclare": "off",
+        "eqeqeq": [
+            "error",
+            "smart"
+        ],
+        "id-match": "error",
+        "no-eval": "error",
+        "no-var": "error",
+        "quotes": "off",
+        "indent": "off",
+        "camelcase": "off",
+        "comma-dangle": "off",
+        "arrow-parens": "off",
+        "operator-linebreak": "off",
+        "object-curly-spacing": "off",
+        "node/no-missing-import": "off",
+        "padding-line-between-statements": "off",
+        "@typescript-eslint/ban-ts-ignore": "off",
+        "unicorn/no-abusive-eslint-disable": "off",
+        "unicorn/consistent-function-scoping": "off",
+        "@typescript-eslint/no-use-before-define": "off"
+    }
+}