diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e1970a912..f493aa6ac7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v1.35.9 (2022-08-30)
+
+### Bug Fixes
+
+- **cli:** fix source plugin import ([#907](https://github.com/coveo/cli/issues/907)) ([d5b93a3](https://github.com/coveo/cli/commits/d5b93a3ce24910118da9f5d12eaa1e6c77e9d75e))
+
 ## v1.35.8 (2022-08-29)
 
 ### Bug Fixes
diff --git a/package-lock.json b/package-lock.json
index 4d7631e039..a6b0e0e1a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "cli-tools",
-  "version": "1.35.8",
+  "version": "1.35.9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "cli-tools",
-      "version": "1.35.8",
+      "version": "1.35.9",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -879,6 +879,7 @@
       "version": "14.1.3",
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-14.1.3.tgz",
       "integrity": "sha512-V3OJD4cShjLzyJAWQ1ogSW0WhKJwti5zsoT1SQ2RoA5UScBPzZN/F/0n/4IupHeaIC+NfaLX916xKTGWA8G8SQ==",
+      "dev": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -7288,7 +7289,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -7916,7 +7917,7 @@
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
       "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "devOptional": true,
+      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -9647,6 +9648,7 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "optional": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
       }
@@ -12770,6 +12772,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "optional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -13024,7 +13027,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -15955,6 +15958,7 @@
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
       "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "dev": true,
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -20314,9 +20318,7 @@
       "version": "1.19.2",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
       "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
+      "extraneous": true,
       "dependencies": {
         "@types/connect": "*",
         "@types/node": "*"
@@ -20338,9 +20340,7 @@
       "version": "3.4.35",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
       "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
+      "extraneous": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -20369,9 +20369,7 @@
       "version": "4.17.13",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
       "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
+      "extraneous": true,
       "dependencies": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^4.17.18",
@@ -20383,9 +20381,7 @@
       "version": "4.17.28",
       "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz",
       "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
+      "extraneous": true,
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -20490,9 +20486,7 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
       "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+      "extraneous": true
     },
     "node_modules/netlify-cli/node_modules/@types/minimatch": {
       "version": "3.0.5",
@@ -20552,17 +20546,13 @@
       "version": "6.9.7",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
       "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+      "extraneous": true
     },
     "node_modules/netlify-cli/node_modules/@types/range-parser": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+      "extraneous": true
     },
     "node_modules/netlify-cli/node_modules/@types/responselike": {
       "version": "1.0.0",
@@ -20583,9 +20573,7 @@
       "version": "1.13.10",
       "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
       "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
+      "extraneous": true,
       "dependencies": {
         "@types/mime": "^1",
         "@types/node": "*"
@@ -42027,6 +42015,7 @@
       "version": "8.4.16",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
       "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -43311,7 +43300,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -44260,6 +44249,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
       "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -46981,14 +46971,14 @@
     },
     "packages/angular": {
       "name": "@coveo/angular",
-      "version": "1.35.8",
+      "version": "1.35.9",
       "license": "Apache-2.0",
       "dependencies": {
         "@angular-devkit/core": "^14.0.1",
         "@angular-devkit/schematics": "^14.0.1",
         "@angular/cdk": "^14.0.1",
         "@angular/cli": "^14.0.1",
-        "@coveo/search-token-server": "1.35.8",
+        "@coveo/search-token-server": "1.35.9",
         "@schematics/angular": "^14.0.1",
         "jest-config": "^27.4.7",
         "typescript": "^4.3.5"
@@ -47011,7 +47001,7 @@
     },
     "packages/atomic/create-atomic": {
       "name": "@coveo/create-atomic",
-      "version": "1.35.8",
+      "version": "1.35.9",
       "license": "Apache-2.0",
       "dependencies": {
         "@coveord/platform-client": "34.7.0",
@@ -47043,10 +47033,10 @@
     },
     "packages/atomic/template": {
       "name": "@coveo/create-atomic-template",
-      "version": "1.35.8",
+      "version": "1.35.9",
       "dependencies": {
         "@coveo/atomic": "1.86.0",
-        "@coveo/search-token-lambda": "1.35.8",
+        "@coveo/search-token-lambda": "1.35.9",
         "@stencil/core": "2.17.3"
       },
       "devDependencies": {
@@ -47269,78 +47259,6 @@
         "url": "https://opencollective.com/babel"
       }
     },
-    "packages/cli-e2e/node_modules/@coveo/cli": {
-      "version": "1.35.8",
-      "resolved": "https://registry.npmjs.org/@coveo/cli/-/cli-1.35.8.tgz",
-      "integrity": "sha512-B0m/cU3oSWntreUFbHEdJpeujMdyeOMI2xzWqf7g942RD0N13ddnfDA6ygDNBEnSLavGf0763NULEFtHHpojEQ==",
-      "dependencies": {
-        "@amplitude/identify": "^1.9.0",
-        "@amplitude/node": "^1.9.0",
-        "@coveo/cli-commons": "1.35.8",
-        "@coveo/push-api-client": "^2.4.4",
-        "@coveord/platform-client": "34.7.0",
-        "@oclif/core": "1.14.2",
-        "@oclif/plugin-help": "^5",
-        "@oclif/plugin-plugins": "^2.1.0",
-        "@oclif/plugin-update": "^3.0.0",
-        "@oclif/plugin-version": "^1.0.4",
-        "abortcontroller-polyfill": "^1.7.1",
-        "archiver": "^5.3.0",
-        "async-retry": "^1.3.1",
-        "axios": "^0.27.0",
-        "chalk": "4.1.2",
-        "cli-progress": "^3.9.1",
-        "extract-zip": "^2.0.1",
-        "fs-extra": "^10.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "inquirer": "^8.2.0",
-        "isomorphic-fetch": "^3.0.0",
-        "json2csv": "^5.0.6",
-        "jsonschema": "^1.4.0",
-        "node-machine-id": "^1.1.12",
-        "open": "^8.4.0",
-        "semver": "^7.3.4",
-        "tmp": "^0.2.1",
-        "ts-dedent": "^2.1.1",
-        "tslib": "^2"
-      },
-      "bin": {
-        "coveo": "bin/run"
-      },
-      "engines": {
-        "node": ">=14.15.1 <18"
-      },
-      "peerDependencies": {
-        "@angular/cli": "^14.0.1",
-        "@vue/cli": "^4.5.11 || ^5.0.0",
-        "create-react-app": "*"
-      },
-      "peerDependenciesMeta": {
-        "@angular/cli": {
-          "optional": true
-        },
-        "@vue/cli": {
-          "optional": true
-        },
-        "create-react-app": {
-          "optional": true
-        }
-      }
-    },
-    "packages/cli-e2e/node_modules/@coveo/cli/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "packages/cli-e2e/node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -47351,7 +47269,7 @@
     },
     "packages/cli/commons": {
       "name": "@coveo/cli-commons",
-      "version": "1.35.8",
+      "version": "1.35.9",
       "dependencies": {
         "@amplitude/node": "1.10.0",
         "@coveord/platform-client": "34.7.0",
@@ -47365,14 +47283,14 @@
         "ts-dedent": "2.2.0"
       },
       "devDependencies": {
-        "@coveo/cli-commons-dev": "1.35.8",
+        "@coveo/cli-commons-dev": "1.35.9",
         "@types/jest": "27.5.2",
         "typescript": "4.7.4"
       }
     },
     "packages/cli/commons-dev": {
       "name": "@coveo/cli-commons-dev",
-      "version": "1.35.8",
+      "version": "1.35.9",
       "dependencies": {
         "fancy-test": "2.0.0",
         "tslib": "2.4.0"
@@ -47384,13 +47302,13 @@
     },
     "packages/cli/core": {
       "name": "@coveo/cli",
-      "version": "1.35.8",
+      "version": "1.35.9",
       "license": "Apache-2.0",
       "dependencies": {
         "@amplitude/identify": "^1.9.0",
         "@amplitude/node": "^1.9.0",
-        "@coveo/cli-commons": "1.35.8",
-        "@coveo/cli-plugin-source": "1.35.8",
+        "@coveo/cli-commons": "1.35.9",
+        "@coveo/cli-plugin-source": "1.35.9",
         "@coveo/push-api-client": "^2.4.4",
         "@coveord/platform-client": "34.7.0",
         "@oclif/core": "1.14.2",
@@ -47424,11 +47342,11 @@
       "devDependencies": {
         "@amplitude/types": "1.10.0",
         "@babel/core": "7.18.10",
-        "@coveo/angular": "1.35.8",
-        "@coveo/cli-commons-dev": "1.35.8",
-        "@coveo/cra-template": "1.35.8",
-        "@coveo/create-atomic": "1.35.8",
-        "@coveo/vue-cli-plugin-typescript": "1.35.8",
+        "@coveo/angular": "1.35.9",
+        "@coveo/cli-commons-dev": "1.35.9",
+        "@coveo/cra-template": "1.35.9",
+        "@coveo/create-atomic": "1.35.9",
+        "@coveo/vue-cli-plugin-typescript": "1.35.9",
         "@oclif/test": "2.1.1",
         "@types/archiver": "5.3.1",
         "@types/async-retry": "1.4.5",
@@ -47515,10 +47433,10 @@
     },
     "packages/cli/source": {
       "name": "@coveo/cli-plugin-source",
-      "version": "1.35.8",
+      "version": "1.35.9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@coveo/cli-commons": "1.35.8",
+        "@coveo/cli-commons": "1.35.9",
         "@coveo/push-api-client": "2.5.8",
         "@coveord/platform-client": "34.7.0",
         "@oclif/core": "1.14.2",
@@ -47529,7 +47447,7 @@
         "ts-dedent": "2.2.0"
       },
       "devDependencies": {
-        "@coveo/cli-commons-dev": "1.35.8",
+        "@coveo/cli-commons-dev": "1.35.9",
         "@oclif/test": "2.1.1",
         "@types/jest": "27.5.2",
         "@types/node": "16.11.53",
@@ -47549,14 +47467,14 @@
     },
     "packages/cra-template": {
       "name": "@coveo/cra-template",
-      "version": "1.35.8",
+      "version": "1.35.9",
       "license": "Apache-2.0",
       "dependencies": {
         "fs-extra": "10.1.0"
       },
       "devDependencies": {
         "@coveo/headless": "latest",
-        "@coveo/search-token-server": "1.35.8",
+        "@coveo/search-token-server": "1.35.9",
         "@emotion/react": "11.10.0",
         "@emotion/styled": "11.10.0",
         "@mui/material": "5.10.1",
@@ -47744,7 +47662,7 @@
     },
     "packages/search-token-lambda": {
       "name": "@coveo/search-token-lambda",
-      "version": "1.35.8",
+      "version": "1.35.9",
       "license": "Apache-2.0",
       "dependencies": {
         "@coveord/platform-client": "34.7.0",
@@ -47804,7 +47722,7 @@
     },
     "packages/search-token-server": {
       "name": "@coveo/search-token-server",
-      "version": "1.35.8",
+      "version": "1.35.9",
       "license": "Apache-2.0",
       "dependencies": {
         "@coveord/platform-client": "34.7.0",
@@ -47877,11 +47795,11 @@
     },
     "packages/vue-cli-plugin-typescript": {
       "name": "@coveo/vue-cli-plugin-typescript",
-      "version": "1.35.8",
+      "version": "1.35.9",
       "license": "Apache-2.0",
       "devDependencies": {
         "@coveo/headless": "1.100.0",
-        "@coveo/search-token-server": "1.35.8",
+        "@coveo/search-token-server": "1.35.9",
         "buefy": "0.9.21",
         "dotenv": "16.0.1",
         "vue": "2.7.9",
@@ -48568,6 +48486,7 @@
       "version": "14.1.3",
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-14.1.3.tgz",
       "integrity": "sha512-V3OJD4cShjLzyJAWQ1ogSW0WhKJwti5zsoT1SQ2RoA5UScBPzZN/F/0n/4IupHeaIC+NfaLX916xKTGWA8G8SQ==",
+      "dev": true,
       "requires": {
         "tslib": "^2.3.0"
       }
@@ -49931,7 +49850,7 @@
         "@angular/platform-browser": "^14.0.1",
         "@angular/router": "^14.0.1",
         "@coveo/headless": "latest",
-        "@coveo/search-token-server": "1.35.8",
+        "@coveo/search-token-server": "1.35.9",
         "@schematics/angular": "^14.0.1",
         "@types/fs-extra": "9.0.13",
         "@types/jest": "27.5.2",
@@ -49983,14 +49902,14 @@
         "@amplitude/node": "^1.9.0",
         "@amplitude/types": "1.10.0",
         "@babel/core": "7.18.10",
-        "@coveo/angular": "1.35.8",
-        "@coveo/cli-commons": "1.35.8",
-        "@coveo/cli-commons-dev": "1.35.8",
-        "@coveo/cli-plugin-source": "1.35.8",
-        "@coveo/cra-template": "1.35.8",
-        "@coveo/create-atomic": "1.35.8",
+        "@coveo/angular": "1.35.9",
+        "@coveo/cli-commons": "1.35.9",
+        "@coveo/cli-commons-dev": "1.35.9",
+        "@coveo/cli-plugin-source": "1.35.9",
+        "@coveo/cra-template": "1.35.9",
+        "@coveo/create-atomic": "1.35.9",
         "@coveo/push-api-client": "^2.4.4",
-        "@coveo/vue-cli-plugin-typescript": "1.35.8",
+        "@coveo/vue-cli-plugin-typescript": "1.35.9",
         "@coveord/platform-client": "34.7.0",
         "@oclif/core": "1.14.2",
         "@oclif/plugin-help": "^5",
@@ -50079,7 +49998,7 @@
       "version": "file:packages/cli/commons",
       "requires": {
         "@amplitude/node": "1.10.0",
-        "@coveo/cli-commons-dev": "1.35.8",
+        "@coveo/cli-commons-dev": "1.35.9",
         "@coveord/platform-client": "34.7.0",
         "@oclif/core": "1.14.2",
         "@types/jest": "27.5.2",
@@ -50166,52 +50085,6 @@
             "semver": "^6.3.0"
           }
         },
-        "@coveo/cli": {
-          "version": "1.35.8",
-          "resolved": "https://registry.npmjs.org/@coveo/cli/-/cli-1.35.8.tgz",
-          "integrity": "sha512-B0m/cU3oSWntreUFbHEdJpeujMdyeOMI2xzWqf7g942RD0N13ddnfDA6ygDNBEnSLavGf0763NULEFtHHpojEQ==",
-          "requires": {
-            "@amplitude/identify": "^1.9.0",
-            "@amplitude/node": "^1.9.0",
-            "@coveo/cli-commons": "1.35.8",
-            "@coveo/push-api-client": "^2.4.4",
-            "@coveord/platform-client": "34.7.0",
-            "@oclif/core": "1.14.2",
-            "@oclif/plugin-help": "^5",
-            "@oclif/plugin-plugins": "^2.1.0",
-            "@oclif/plugin-update": "^3.0.0",
-            "@oclif/plugin-version": "^1.0.4",
-            "abortcontroller-polyfill": "^1.7.1",
-            "archiver": "^5.3.0",
-            "async-retry": "^1.3.1",
-            "axios": "^0.27.0",
-            "chalk": "4.1.2",
-            "cli-progress": "^3.9.1",
-            "extract-zip": "^2.0.1",
-            "fs-extra": "^10.0.0",
-            "https-proxy-agent": "^5.0.0",
-            "inquirer": "^8.2.0",
-            "isomorphic-fetch": "^3.0.0",
-            "json2csv": "^5.0.6",
-            "jsonschema": "^1.4.0",
-            "node-machine-id": "^1.1.12",
-            "open": "^8.4.0",
-            "semver": "^7.3.4",
-            "tmp": "^0.2.1",
-            "ts-dedent": "^2.1.1",
-            "tslib": "^2"
-          },
-          "dependencies": {
-            "semver": {
-              "version": "7.3.7",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-              "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-              "requires": {
-                "lru-cache": "^6.0.0"
-              }
-            }
-          }
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -50222,8 +50095,8 @@
     "@coveo/cli-plugin-source": {
       "version": "file:packages/cli/source",
       "requires": {
-        "@coveo/cli-commons": "1.35.8",
-        "@coveo/cli-commons-dev": "1.35.8",
+        "@coveo/cli-commons": "1.35.9",
+        "@coveo/cli-commons-dev": "1.35.9",
         "@coveo/push-api-client": "2.5.8",
         "@coveord/platform-client": "34.7.0",
         "@oclif/core": "1.14.2",
@@ -50250,7 +50123,7 @@
       "version": "file:packages/cra-template",
       "requires": {
         "@coveo/headless": "latest",
-        "@coveo/search-token-server": "1.35.8",
+        "@coveo/search-token-server": "1.35.9",
         "@emotion/react": "11.10.0",
         "@emotion/styled": "11.10.0",
         "@mui/material": "5.10.1",
@@ -50401,7 +50274,7 @@
       "version": "file:packages/atomic/template",
       "requires": {
         "@coveo/atomic": "1.86.0",
-        "@coveo/search-token-lambda": "1.35.8",
+        "@coveo/search-token-lambda": "1.35.9",
         "@rollup/plugin-replace": "4.0.0",
         "@stencil/core": "2.17.3",
         "fkill": "8.0.1",
@@ -50655,7 +50528,7 @@
       "version": "file:packages/vue-cli-plugin-typescript",
       "requires": {
         "@coveo/headless": "1.100.0",
-        "@coveo/search-token-server": "1.35.8",
+        "@coveo/search-token-server": "1.35.9",
         "buefy": "0.9.21",
         "dotenv": "16.0.1",
         "vue": "2.7.9",
@@ -51260,8 +51133,7 @@
       "version": "7.1.5",
       "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.5.tgz",
       "integrity": "sha512-HnRXrxgHJYJcT8ZDdDCQIlqk0s0skOKD7eWs9mJgBUu70hyW4iA6Kiv3yspJR474RFH8hysKR65VVSzUSzkuwA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@mui/utils": {
       "version": "5.9.3",
@@ -52367,8 +52239,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
       "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@octokit/plugin-rest-endpoint-methods": {
       "version": "5.16.2",
@@ -52538,8 +52409,7 @@
     "@salesforce-ux/design-system": {
       "version": "2.18.1",
       "resolved": "https://registry.npmjs.org/@salesforce-ux/design-system/-/design-system-2.18.1.tgz",
-      "integrity": "sha512-yrnzHkafWRPDSAwyXrLjehbJIkLNTXJ61sOjorHQiExTopwcY+K6as3aFjHGpKzPS8OPXCzz9pQ8a34urcBmQg==",
-      "requires": {}
+      "integrity": "sha512-yrnzHkafWRPDSAwyXrLjehbJIkLNTXJ61sOjorHQiExTopwcY+K6as3aFjHGpKzPS8OPXCzz9pQ8a34urcBmQg=="
     },
     "@schematics/angular": {
       "version": "14.1.3",
@@ -52609,8 +52479,7 @@
     "@stencil/store": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@stencil/store/-/store-1.5.0.tgz",
-      "integrity": "sha512-fe5fCF6dgVlDM1iLRkkJUyUh0Tfx305asVGgMAJjIs7Q+x/b1pGgTLROm9Ibr53PZuFwr5Kg+4h9p4FLbYqHgA==",
-      "requires": {}
+      "integrity": "sha512-fe5fCF6dgVlDM1iLRkkJUyUh0Tfx305asVGgMAJjIs7Q+x/b1pGgTLROm9Ibr53PZuFwr5Kg+4h9p4FLbYqHgA=="
     },
     "@szmarczak/http-timer": {
       "version": "1.1.2",
@@ -53624,8 +53493,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -54213,7 +54081,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "devOptional": true
+      "dev": true
     },
     "binaryextensions": {
       "version": "4.18.0",
@@ -54685,7 +54553,7 @@
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
       "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -56020,6 +55888,7 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "optional": true,
       "requires": {
         "iconv-lite": "^0.6.2"
       }
@@ -56407,8 +56276,7 @@
       "version": "8.5.0",
       "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
       "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "eslint-import-resolver-node": {
       "version": "0.3.6",
@@ -57819,8 +57687,7 @@
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz",
           "integrity": "sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "eslint-plugin-prettier": {
           "version": "3.4.1",
@@ -58371,6 +58238,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "optional": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       }
@@ -58562,7 +58430,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "binary-extensions": "^2.0.0"
       }
@@ -59268,8 +59136,7 @@
     "jest-pnp-resolver": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "requires": {}
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="
     },
     "jest-regex-util": {
       "version": "27.5.1",
@@ -60813,7 +60680,8 @@
     "nanoid": {
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "dev": true
     },
     "natural-compare": {
       "version": "1.4.0",
@@ -61901,8 +61769,7 @@
               "version": "3.0.0",
               "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz",
               "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==",
-              "dev": true,
-              "requires": {}
+              "dev": true
             },
             "ansi-regex": {
               "version": "6.0.1",
@@ -63584,8 +63451,7 @@
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
           "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "@octokit/plugin-rest-endpoint-methods": {
           "version": "5.13.0",
@@ -63786,9 +63652,7 @@
           "version": "1.19.2",
           "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
           "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-          "dev": true,
-          "optional": true,
-          "peer": true,
+          "extraneous": true,
           "requires": {
             "@types/connect": "*",
             "@types/node": "*"
@@ -63810,9 +63674,7 @@
           "version": "3.4.35",
           "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
           "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-          "dev": true,
-          "optional": true,
-          "peer": true,
+          "extraneous": true,
           "requires": {
             "@types/node": "*"
           }
@@ -63838,12 +63700,9 @@
           }
         },
         "@types/express": {
-          "version": "4.17.13",
-          "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
+          "version": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
           "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
-          "dev": true,
-          "optional": true,
-          "peer": true,
+          "extraneous": true,
           "requires": {
             "@types/body-parser": "*",
             "@types/express-serve-static-core": "^4.17.18",
@@ -63855,9 +63714,7 @@
           "version": "4.17.28",
           "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz",
           "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==",
-          "dev": true,
-          "optional": true,
-          "peer": true,
+          "extraneous": true,
           "requires": {
             "@types/node": "*",
             "@types/qs": "*",
@@ -63962,9 +63819,7 @@
           "version": "1.3.2",
           "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
           "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
-          "dev": true,
-          "optional": true,
-          "peer": true
+          "extraneous": true
         },
         "@types/minimatch": {
           "version": "3.0.5",
@@ -64023,17 +63878,13 @@
           "version": "6.9.7",
           "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
           "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-          "dev": true,
-          "optional": true,
-          "peer": true
+          "extraneous": true
         },
         "@types/range-parser": {
           "version": "1.2.4",
           "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
           "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-          "dev": true,
-          "optional": true,
-          "peer": true
+          "extraneous": true
         },
         "@types/responselike": {
           "version": "1.0.0",
@@ -64054,9 +63905,7 @@
           "version": "1.13.10",
           "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
           "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
-          "dev": true,
-          "optional": true,
-          "peer": true,
+          "extraneous": true,
           "requires": {
             "@types/mime": "^1",
             "@types/node": "*"
@@ -64348,8 +64197,7 @@
           "version": "5.3.2",
           "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
           "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-          "extraneous": true,
-          "requires": {}
+          "extraneous": true
         },
         "acorn-walk": {
           "version": "8.2.0",
@@ -68578,15 +68426,13 @@
           "version": "8.5.0",
           "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
           "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
-          "extraneous": true,
-          "requires": {}
+          "extraneous": true
         },
         "eslint-config-standard": {
           "version": "17.0.0-1",
           "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0-1.tgz",
           "integrity": "sha512-aqRG58dqoBNfOLN+PsitasxmW+W9Os4oQrx081B16T4E4WogsSbpUL6hnKSnyv35sSRYA2XjBtKMOrUboL6jgw==",
-          "extraneous": true,
-          "requires": {}
+          "extraneous": true
         },
         "eslint-formatter-codeframe": {
           "version": "7.32.1",
@@ -68937,8 +68783,7 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.0.0.tgz",
           "integrity": "sha512-7GPezalm5Bfi/E22PnQxDWH2iW9GTvAlUNTztemeHb6c1BniSyoeTrM87JkC0wYdi6aQrZX9p2qEiAno8aTcbw==",
-          "extraneous": true,
-          "requires": {}
+          "extraneous": true
         },
         "eslint-plugin-react": {
           "version": "7.29.4",
@@ -78813,8 +78658,7 @@
           "version": "7.5.9",
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
           "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-          "extraneous": true,
-          "requires": {}
+          "extraneous": true
         },
         "xdg-basedir": {
           "version": "4.0.0",
@@ -80554,6 +80398,7 @@
       "version": "8.4.16",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
       "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
+      "dev": true,
       "requires": {
         "nanoid": "^3.3.4",
         "picocolors": "^1.0.0",
@@ -80851,8 +80696,7 @@
         "ws": {
           "version": "8.5.0",
           "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-          "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-          "requires": {}
+          "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg=="
         }
       }
     },
@@ -81532,7 +81376,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
       }
@@ -81582,8 +81426,7 @@
     "redux-thunk": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
-      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==",
-      "requires": {}
+      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q=="
     },
     "regenerate": {
       "version": "1.4.2",
@@ -82274,7 +82117,8 @@
     "source-map-js": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "dev": true
     },
     "source-map-support": {
       "version": "0.5.21",
@@ -83682,8 +83526,7 @@
       "version": "9.1.2",
       "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz",
       "integrity": "sha512-xYA8MkZynPBGd/w5QFJ2d/NM0z/YeegMqYTphy7NJQXbZcuU6FC6AOdUAcy4SXP+YnkerC6AfH+ldg7PDk9ESQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "vue-router": {
       "version": "3.6.0",
@@ -83945,8 +83788,7 @@
     "ws": {
       "version": "7.5.9",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-      "requires": {}
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="
     },
     "xdg-basedir": {
       "version": "4.0.0",
diff --git a/package.json b/package.json
index 26925a5ac9..9517576a31 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cli-tools",
   "private": true,
-  "version": "1.35.8",
+  "version": "1.35.9",
   "author": "Coveo",
   "bin": {
     "coveo": "./bin/run"
diff --git a/packages/angular/package.json b/packages/angular/package.json
index d30a466d23..44b54e3d3b 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/angular",
-  "version": "1.35.8",
+  "version": "1.35.9",
   "description": "Coveo schematic for angular",
   "scripts": {
     "test": "jest",
@@ -29,7 +29,7 @@
     "@angular-devkit/schematics": "^14.0.1",
     "@angular/cdk": "^14.0.1",
     "@angular/cli": "^14.0.1",
-    "@coveo/search-token-server": "1.35.8",
+    "@coveo/search-token-server": "1.35.9",
     "@schematics/angular": "^14.0.1",
     "jest-config": "^27.4.7",
     "typescript": "^4.3.5"
diff --git a/packages/atomic/create-atomic/package.json b/packages/atomic/create-atomic/package.json
index 61d8120ff2..fe97088047 100644
--- a/packages/atomic/create-atomic/package.json
+++ b/packages/atomic/create-atomic/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@coveo/create-atomic",
   "description": "Coveo Atomic Generator",
-  "version": "1.35.8",
+  "version": "1.35.9",
   "files": [
     "/lib",
     "/template",
diff --git a/packages/atomic/template/package.json b/packages/atomic/template/package.json
index 3a05320388..3a74c1c164 100644
--- a/packages/atomic/template/package.json
+++ b/packages/atomic/template/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@coveo/create-atomic-template",
   "description": "{{titleCase project}} project",
-  "version": "1.35.8",
+  "version": "1.35.9",
   "private": true,
   "scripts": {
     "release:phase2": "node --experimental-specifier-resolution=node ../../../scripts/releaseV2/phase2-bump-all-packages.mjs",
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@coveo/atomic": "1.86.0",
-    "@coveo/search-token-lambda": "1.35.8",
+    "@coveo/search-token-lambda": "1.35.9",
     "@stencil/core": "2.17.3"
   },
   "devDependencies": {
diff --git a/packages/cli/commons-dev/package.json b/packages/cli/commons-dev/package.json
index 4f0dc1cf2b..fc52f06255 100644
--- a/packages/cli/commons-dev/package.json
+++ b/packages/cli/commons-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/cli-commons-dev",
-  "version": "1.35.8",
+  "version": "1.35.9",
   "files": [
     "lib/**",
     ".eslintrc.js",
diff --git a/packages/cli/commons/package.json b/packages/cli/commons/package.json
index 756360d5ff..a5be3872ad 100644
--- a/packages/cli/commons/package.json
+++ b/packages/cli/commons/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@coveo/cli-commons",
-  "version": "1.35.8",
+  "version": "1.35.9",
   "files": [
     "src/**"
   ],
   "devDependencies": {
-    "@coveo/cli-commons-dev": "1.35.8",
+    "@coveo/cli-commons-dev": "1.35.9",
     "@types/jest": "27.5.2",
     "typescript": "4.7.4"
   },
diff --git a/packages/cli/core/CHANGELOG.md b/packages/cli/core/CHANGELOG.md
index d61ad23a29..d418bfb5e7 100644
--- a/packages/cli/core/CHANGELOG.md
+++ b/packages/cli/core/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.35.9 (2022-08-30)
+
+### Bug Fixes
+
+- **cli:** fix source plugin import ([#907](https://github.com/coveo/cli/issues/907)) ([d5b93a3](https://github.com/coveo/cli/commits/d5b93a3ce24910118da9f5d12eaa1e6c77e9d75e))
+
 ## 1.35.8 (2022-08-29)
 
 ### Features
diff --git a/packages/cli/core/README.md b/packages/cli/core/README.md
index 43b686c071..9201984138 100644
--- a/packages/cli/core/README.md
+++ b/packages/cli/core/README.md
@@ -22,7 +22,7 @@ $ npm install -g @coveo/cli
 $ coveo COMMAND
 running command...
 $ coveo (--version)
-@coveo/cli/1.35.8 linux-x64 node-v16.16.0
+@coveo/cli/1.35.9 linux-x64 node-v16.17.0
 $ coveo --help [COMMAND]
 USAGE
   $ coveo COMMAND
@@ -97,7 +97,7 @@ EXAMPLES
   $ coveo auth:login
 ```
 
-_See code: [src/commands/auth/login.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/auth/login.ts)_
+_See code: [src/commands/auth/login.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/auth/login.ts)_
 
 ## `coveo auth:token`
 
@@ -123,7 +123,7 @@ EXAMPLES
   $ coveo auth:token
 ```
 
-_See code: [src/commands/auth/token.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/auth/token.ts)_
+_See code: [src/commands/auth/token.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/auth/token.ts)_
 
 ## `coveo config:get [KEY]`
 
@@ -147,7 +147,7 @@ EXAMPLES
   $ coveo config:get accessToken
 ```
 
-_See code: [src/commands/config/get.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/config/get.ts)_
+_See code: [src/commands/config/get.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/config/get.ts)_
 
 ## `coveo config:set`
 
@@ -165,7 +165,7 @@ DESCRIPTION
   Modify the current configuration.
 ```
 
-_See code: [src/commands/config/set.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/config/set.ts)_
+_See code: [src/commands/config/set.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/config/set.ts)_
 
 ## `coveo help [COMMAND]`
 
@@ -205,7 +205,7 @@ DESCRIPTION
   Create a new test Coveo organization.
 ```
 
-_See code: [src/commands/org/create.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/org/create.ts)_
+_See code: [src/commands/org/create.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/org/create.ts)_
 
 ## `coveo org:list`
 
@@ -231,7 +231,7 @@ DESCRIPTION
   List Coveo organizations.
 ```
 
-_See code: [src/commands/org/list.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/org/list.ts)_
+_See code: [src/commands/org/list.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/org/list.ts)_
 
 ## `coveo org:resources:list`
 
@@ -259,7 +259,7 @@ DESCRIPTION
   List available snapshots from an organization
 ```
 
-_See code: [src/commands/org/resources/list.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/org/resources/list.ts)_
+_See code: [src/commands/org/resources/list.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/org/resources/list.ts)_
 
 ## `coveo org:resources:model:create`
 
@@ -273,7 +273,7 @@ DESCRIPTION
   Create a Snapshot Pull Model
 ```
 
-_See code: [src/commands/org/resources/model/create.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/org/resources/model/create.ts)_
+_See code: [src/commands/org/resources/model/create.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/org/resources/model/create.ts)_
 
 ## `coveo org:resources:monitor SNAPSHOTID`
 
@@ -297,7 +297,7 @@ DESCRIPTION
   Monitor a Snapshot operation
 ```
 
-_See code: [src/commands/org/resources/monitor.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/org/resources/monitor.ts)_
+_See code: [src/commands/org/resources/monitor.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/org/resources/monitor.ts)_
 
 ## `coveo org:resources:preview`
 
@@ -326,7 +326,7 @@ DESCRIPTION
   Preview resource updates
 ```
 
-_See code: [src/commands/org/resources/preview.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/org/resources/preview.ts)_
+_See code: [src/commands/org/resources/preview.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/org/resources/preview.ts)_
 
 ## `coveo org:resources:pull`
 
@@ -364,7 +364,7 @@ DESCRIPTION
   Pull resources from an organization
 ```
 
-_See code: [src/commands/org/resources/pull.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/org/resources/pull.ts)_
+_See code: [src/commands/org/resources/pull.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/org/resources/pull.ts)_
 
 ## `coveo org:resources:push`
 
@@ -390,7 +390,7 @@ DESCRIPTION
   Preview, validate and deploy your changes to the destination org
 ```
 
-_See code: [src/commands/org/resources/push.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/org/resources/push.ts)_
+_See code: [src/commands/org/resources/push.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/org/resources/push.ts)_
 
 ## `coveo org:search:dump`
 
@@ -421,7 +421,7 @@ DESCRIPTION
   `-x` flag.
 ```
 
-_See code: [src/commands/org/search/dump.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/org/search/dump.ts)_
+_See code: [src/commands/org/search/dump.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/org/search/dump.ts)_
 
 ## `coveo plugins`
 
@@ -711,7 +711,7 @@ DESCRIPTION
   Index a JSON document into a Coveo Catalog source. See https://docs.coveo.com/en/2956 for more information.
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/source/src/commands/source/catalog/add.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/source/src/commands/source/catalog/add.ts)_
 
 ## `coveo source:catalog:new NAME`
 
@@ -733,7 +733,7 @@ DESCRIPTION
   Create a new catalog source in a Coveo organization
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/source/src/commands/source/catalog/new.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/source/src/commands/source/catalog/new.ts)_
 
 ## `coveo source:list`
 
@@ -759,7 +759,7 @@ DESCRIPTION
   List all available push sources in your Coveo organization
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/source/src/commands/source/list.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/source/src/commands/source/list.ts)_
 
 ## `coveo source:push:add SOURCEID`
 
@@ -790,7 +790,7 @@ DESCRIPTION
   https://github.com/coveo/cli/wiki/Pushing-JSON-files-with-Coveo-CLI for more information.
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/source/src/commands/source/push/add.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/source/src/commands/source/push/add.ts)_
 
 ## `coveo source:push:delete SOURCEID`
 
@@ -822,7 +822,7 @@ DESCRIPTION
   <https://docs.coveo.com/en/131>
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/source/src/commands/source/push/delete.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/source/src/commands/source/push/delete.ts)_
 
 ## `coveo source:push:list`
 
@@ -848,7 +848,7 @@ DESCRIPTION
   [Deprecated] List all available push sources in your Coveo organization
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/source/src/commands/source/push/list.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/source/src/commands/source/push/list.ts)_
 
 ## `coveo source:push:new NAME`
 
@@ -870,7 +870,7 @@ DESCRIPTION
   Create a new push source in a Coveo organization
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/source/src/commands/source/push/new.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/source/src/commands/source/push/new.ts)_
 
 ## `coveo ui:create:angular NAME`
 
@@ -885,14 +885,14 @@ ARGUMENTS
 
 FLAGS
   -d, --defaults         Whether to automatically select the default value for all prompts that have a default value.
-  -v, --version=<value>  [default: 1.35.8] The version of @coveo/angular to use.
+  -v, --version=<value>  [default: 1.35.9] The version of @coveo/angular to use.
 
 DESCRIPTION
   Create a Coveo Headless-powered search page with the Angular web framework. See <https://docs.coveo.com/headless> and
   <https://angular.io/>.
 ```
 
-_See code: [src/commands/ui/create/angular.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/ui/create/angular.ts)_
+_See code: [src/commands/ui/create/angular.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/ui/create/angular.ts)_
 
 ## `coveo ui:create:atomic NAME`
 
@@ -907,7 +907,7 @@ ARGUMENTS
 
 FLAGS
   -p, --pageId=7944ff4a-9943-4999-a3f6-3e81a7f6fb0a  The hosted search page ID.
-  -v, --version=<value>                              [default: 1.35.8] The version of @coveo/create-atomic to use.
+  -v, --version=<value>                              [default: 1.35.9] The version of @coveo/create-atomic to use.
 
 DESCRIPTION
   Create a Coveo Headless-powered search page with Coveo's own Atomic framework. See <https://docs.coveo.com/atomic> and
@@ -917,7 +917,7 @@ EXAMPLES
   $ coveo ui:create:atomic myapp
 ```
 
-_See code: [src/commands/ui/create/atomic.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/ui/create/atomic.ts)_
+_See code: [src/commands/ui/create/atomic.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/ui/create/atomic.ts)_
 
 ## `coveo ui:create:react NAME`
 
@@ -931,7 +931,7 @@ ARGUMENTS
   NAME  The name of the application to create.
 
 FLAGS
-  -v, --version=<value>  [default: 1.35.8] Version of @coveo/cra-template to use.
+  -v, --version=<value>  [default: 1.35.9] Version of @coveo/cra-template to use.
 
 DESCRIPTION
   Create a Coveo Headless-powered search page with the React web framework. See <https://docs.coveo.com/headless> and
@@ -943,7 +943,7 @@ EXAMPLES
   $ coveo ui:create:react --help
 ```
 
-_See code: [src/commands/ui/create/react.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/ui/create/react.ts)_
+_See code: [src/commands/ui/create/react.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/ui/create/react.ts)_
 
 ## `coveo ui:create:vue NAME`
 
@@ -961,7 +961,7 @@ FLAGS
                          If not specified, the default TypeScript preset is used.
                          For more information about Vue CLI presets, see
                          https://cli.vuejs.org/guide/plugins-and-presets.html#presets.
-  -v, --version=<value>  [default: 1.35.8] The version of @coveo/vue-cli-plugin-typescript to use.
+  -v, --version=<value>  [default: 1.35.9] The version of @coveo/vue-cli-plugin-typescript to use.
 
 DESCRIPTION
   Create a Coveo Headless-powered search page with the Vue.js web framework. See <https://docs.coveo.com/headless> and
@@ -973,7 +973,7 @@ EXAMPLES
   $ coveo ui:create:vue --help
 ```
 
-_See code: [src/commands/ui/create/vue.ts](https://github.com/coveo/cli/blob/v1.35.8/packages/cli/core/src/commands/ui/create/vue.ts)_
+_See code: [src/commands/ui/create/vue.ts](https://github.com/coveo/cli/blob/v1.35.9/packages/cli/core/src/commands/ui/create/vue.ts)_
 
 ## `coveo update [CHANNEL]`
 
diff --git a/packages/cli/core/package.json b/packages/cli/core/package.json
index 391e5a63a1..9e4f09192d 100644
--- a/packages/cli/core/package.json
+++ b/packages/cli/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/cli",
-  "version": "1.35.8",
+  "version": "1.35.9",
   "author": "Coveo",
   "description": "Coveo CLI",
   "engines": {
@@ -9,8 +9,8 @@
   "dependencies": {
     "@amplitude/identify": "^1.9.0",
     "@amplitude/node": "^1.9.0",
-    "@coveo/cli-commons": "1.35.8",
-    "@coveo/cli-plugin-source": "1.35.8",
+    "@coveo/cli-commons": "1.35.9",
+    "@coveo/cli-plugin-source": "1.35.9",
     "@coveo/push-api-client": "^2.4.4",
     "@coveord/platform-client": "34.7.0",
     "@oclif/core": "1.14.2",
@@ -41,11 +41,11 @@
   "devDependencies": {
     "@amplitude/types": "1.10.0",
     "@babel/core": "7.18.10",
-    "@coveo/angular": "1.35.8",
-    "@coveo/cli-commons-dev": "1.35.8",
-    "@coveo/cra-template": "1.35.8",
-    "@coveo/create-atomic": "1.35.8",
-    "@coveo/vue-cli-plugin-typescript": "1.35.8",
+    "@coveo/angular": "1.35.9",
+    "@coveo/cli-commons-dev": "1.35.9",
+    "@coveo/cra-template": "1.35.9",
+    "@coveo/create-atomic": "1.35.9",
+    "@coveo/vue-cli-plugin-typescript": "1.35.9",
     "@oclif/test": "2.1.1",
     "@types/archiver": "5.3.1",
     "@types/async-retry": "1.4.5",
diff --git a/packages/cli/source/CHANGELOG.md b/packages/cli/source/CHANGELOG.md
index 026be58b5f..d856129c08 100644
--- a/packages/cli/source/CHANGELOG.md
+++ b/packages/cli/source/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.35.9 (2022-08-30)
+
+### Bug Fixes
+
+- **cli:** fix source plugin import ([#907](https://github.com/coveo/cli/issues/907)) ([d5b93a3](https://github.com/coveo/cli/commits/d5b93a3ce24910118da9f5d12eaa1e6c77e9d75e))
+
 ## 1.35.8 (2022-08-29)
 
 ### Features
diff --git a/packages/cli/source/package.json b/packages/cli/source/package.json
index 104ffe9913..1525f8ee66 100644
--- a/packages/cli/source/package.json
+++ b/packages/cli/source/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/cli-plugin-source",
-  "version": "1.35.8",
+  "version": "1.35.9",
   "description": "Manage Coveo Sources with the Coveo CLI",
   "author": "Coveo",
   "homepage": "https://github.com/coveo/cli",
@@ -14,7 +14,7 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@coveo/cli-commons": "1.35.8",
+    "@coveo/cli-commons": "1.35.9",
     "@coveo/push-api-client": "2.5.8",
     "@coveord/platform-client": "34.7.0",
     "@oclif/core": "1.14.2",
@@ -25,7 +25,7 @@
     "ts-dedent": "2.2.0"
   },
   "devDependencies": {
-    "@coveo/cli-commons-dev": "1.35.8",
+    "@coveo/cli-commons-dev": "1.35.9",
     "@oclif/test": "2.1.1",
     "@types/jest": "27.5.2",
     "@types/node": "16.11.53",
diff --git a/packages/cra-template/package.json b/packages/cra-template/package.json
index 6c5d259e39..badc3d875a 100644
--- a/packages/cra-template/package.json
+++ b/packages/cra-template/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/cra-template",
-  "version": "1.35.8",
+  "version": "1.35.9",
   "scripts": {
     "lint": "prettier --check . && eslint .",
     "npm:publish:template:local": "npm publish --access public --registry http://verdaccio:4873",
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@coveo/headless": "latest",
-    "@coveo/search-token-server": "1.35.8",
+    "@coveo/search-token-server": "1.35.9",
     "@emotion/react": "11.10.0",
     "@emotion/styled": "11.10.0",
     "@mui/material": "5.10.1",
diff --git a/packages/search-token-lambda/package.json b/packages/search-token-lambda/package.json
index ed8c4c493e..6bb6d1f281 100644
--- a/packages/search-token-lambda/package.json
+++ b/packages/search-token-lambda/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@coveo/search-token-lambda",
   "author": "Coveo",
-  "version": "1.35.8",
+  "version": "1.35.9",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
diff --git a/packages/search-token-server/package.json b/packages/search-token-server/package.json
index 11d760b7db..a5c696293d 100644
--- a/packages/search-token-server/package.json
+++ b/packages/search-token-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/search-token-server",
-  "version": "1.35.8",
+  "version": "1.35.9",
   "main": "server.ts",
   "license": "Apache-2.0",
   "repository": {
diff --git a/packages/vue-cli-plugin-typescript/package.json b/packages/vue-cli-plugin-typescript/package.json
index 0150776eac..a0de8468a8 100644
--- a/packages/vue-cli-plugin-typescript/package.json
+++ b/packages/vue-cli-plugin-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/vue-cli-plugin-typescript",
-  "version": "1.35.8",
+  "version": "1.35.9",
   "description": "Vue-cli 3 plugin for adding Coveo Headless support",
   "main": "index.js",
   "repository": {
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@coveo/headless": "1.100.0",
-    "@coveo/search-token-server": "1.35.8",
+    "@coveo/search-token-server": "1.35.9",
     "buefy": "0.9.21",
     "dotenv": "16.0.1",
     "vue": "2.7.9",