Merge branch 'master' into test/verdaccioops

coveo · Mar 19, 2024 · b61316e · b61316e
2 parents 85fe092 + 30dcf59
commit b61316e
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# release-25 (2024-03-18)
+
+### Bug Fixes
+
+- resource type predicate ([#1454](https://github.com/coveo/cli/issues/1454)) ([caef795](https://github.com/coveo/cli/commits/caef795896402696b7eca6295c5cfccd1a504d82)), closes [#1453](https://github.com/coveo/cli/issues/1453)
+
+# release-24 (2024-03-14)
+
+### Bug Fixes
+
+- **snapshot:** define resourceToPreview from resources changed. ([#1453](https://github.com/coveo/cli/issues/1453)) ([c4095f8](https://github.com/coveo/cli/commits/c4095f88c917dc79cf6600c0cd897fb30713c647))
+
 # release-23 (2024-02-21)
 
 # release-22 (2024-02-21)

diff --git a/README.md b/README.md
@@ -74,7 +74,7 @@ $ npm install -g @coveo/cli
 $ coveo COMMAND
 running command...
 $ coveo (--version)
-@coveo/cli/3.2.2 linux-x64 node-v20.9.0
+@coveo/cli/3.2.4 linux-x64 node-v20.9.0
 $ coveo --help [COMMAND]
 USAGE
   $ coveo COMMAND

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cli-tools",
   "private": true,
-  "version": "1.0.0-23",
+  "version": "1.0.0-25",
   "author": "Coveo",
   "bin": {
     "coveo": "./bin/run"

diff --git a/packages/cli-e2e/__tests__/__snapshots__/atomic.specs.ts.snap b/packages/cli-e2e/__tests__/__snapshots__/atomic.specs.ts.snap
@@ -86,11 +86,11 @@ HashedFolder {
         HashedFolder {
           "children": [
             HashedFile {
-              "hash": "61GVF7l8bCVXW00H2rtInTKwoqY=",
+              "hash": "e5DQ3kRU03Vmp2BC+mjlSypQjKE=",
               "name": "index.css",
             },
           ],
-          "hash": "FQZ6fv/Z/8DhwZWuUbrLwgTt6r8=",
+          "hash": "IMDEBLQ/slaFFRst+lJYHMRm07E=",
           "name": "style",
         },
         HashedFolder {
@@ -104,15 +104,15 @@ HashedFolder {
           "name": "utils",
         },
       ],
-      "hash": "pBlrdRw5yuMk/S0mFDAUBGrEvMs=",
+      "hash": "K9gD9O4uCLlQbxYAgmEW6K+5EAw=",
       "name": "src",
     },
     HashedFile {
       "hash": "9nyo2P7hCKS4uXz6KBbyR2tzRtY=",
       "name": "tsconfig.json",
     },
   ],
-  "hash": "MX8XJmhwXYKcItyHsBvb0tWTjlM=",
+  "hash": "TZXkS/G4E85OYZrwyJxf/QI7lJ8=",
   "name": "normalizedDir",
 }
 `;
@@ -329,11 +329,11 @@ HashedFolder {
         HashedFolder {
           "children": [
             HashedFile {
-              "hash": "/limo6D9Trxh05AOjVfMeecwXR8=",
+              "hash": "xbqB+xpmHNlBnQf+PCHR+rT3tfg=",
               "name": "index.css",
             },
           ],
-          "hash": "/ARqEzx1ZY/+YdpH3eOpUbZnjj8=",
+          "hash": "Z+bQXHQFJdpSE56ncUOv3fWRy6w=",
           "name": "style",
         },
         HashedFolder {
@@ -347,15 +347,15 @@ HashedFolder {
           "name": "utils",
         },
       ],
-      "hash": "FJTdsvHKymcS4bWGsVDxdv5+xI0=",
+      "hash": "9IWPASf2gKXfg4rrJ+k4DSwv4c4=",
       "name": "src",
     },
     HashedFile {
       "hash": "9nyo2P7hCKS4uXz6KBbyR2tzRtY=",
       "name": "tsconfig.json",
     },
   ],
-  "hash": "fXSss5dlkGuizSP8OXlIF3OvP2Q=",
+  "hash": "20bLNlmkPR5jmaL2CitCTveWor8=",
   "name": "normalizedDir",
 }
 `;

diff --git a/packages/cli-e2e/__tests__/angular.specs.ts b/packages/cli-e2e/__tests__/angular.specs.ts
@@ -240,7 +240,9 @@ describe('ui:create:angular', () => {
               message.indexOf('Warnings while compiling') === -1 &&
               message.indexOf(
                 'require function is used in a way in which dependencies cannot be statically extracted'
-              ) === -1
+              ) === -1 &&
+              message.indexOf('@reduxjs/toolkit/dist/uncheckedindexed.ts') ===
+                -1
           )
         ).toEqual([]);
       },

diff --git a/packages/cli-e2e/package.json b/packages/cli-e2e/package.json
@@ -61,7 +61,7 @@
     "@babel/core": "7.21.5",
     "@babel/preset-env": "7.21.5",
     "@babel/preset-typescript": "7.21.5",
-    "@coveo/cli": "3.2.2",
+    "@coveo/cli": "3.2.4",
     "@coveo/platform-client": "52.1.0",
     "abortcontroller-polyfill": "1.7.5",
     "async-retry": "1.3.3",

diff --git a/packages/cli/core/CHANGELOG.md b/packages/cli/core/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 3.2.4 (2024-03-18)
+
+### Bug Fixes
+
+- resource type predicate ([#1454](https://github.com/coveo/cli/issues/1454)) ([caef795](https://github.com/coveo/cli/commits/caef795896402696b7eca6295c5cfccd1a504d82)), closes [#1453](https://github.com/coveo/cli/issues/1453)
+
+## 3.2.3 (2024-03-14)
+
+### Bug Fixes
+
+- **snapshot:** define resourceToPreview from resources changed. ([#1453](https://github.com/coveo/cli/issues/1453)) ([c4095f8](https://github.com/coveo/cli/commits/c4095f88c917dc79cf6600c0cd897fb30713c647))
+
 # 3.2.0 (2024-02-20)
 
 ### Bug Fixes

diff --git a/packages/cli/core/README.md b/packages/cli/core/README.md
@@ -23,7 +23,7 @@ $ npm install -g @coveo/cli
 $ coveo COMMAND
 running command...
 $ coveo (--version)
-@coveo/cli/3.2.2 linux-x64 node-v20.9.0
+@coveo/cli/3.2.4 linux-x64 node-v20.9.0
 $ coveo --help [COMMAND]
 USAGE
   $ coveo COMMAND
@@ -155,7 +155,7 @@ EXAMPLES
   $ coveo atomic:component --type=result mySuperResultComponent
 ```
 
-_See code: [src/commands/atomic/component.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/atomic/component.ts)_
+_See code: [src/commands/atomic/component.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/atomic/component.ts)_
 
 ## `coveo atomic:deploy`
 
@@ -252,7 +252,7 @@ EXAMPLES
   $ coveo atomic:init --type=lib myCustomAtomicComponentsLibrary
 ```
 
-_See code: [src/commands/atomic/init.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/atomic/init.ts)_
+_See code: [src/commands/atomic/init.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/atomic/init.ts)_
 
 ## `coveo auth:login`
 
@@ -280,7 +280,7 @@ EXAMPLES
   $ coveo auth:login
 ```
 
-_See code: [src/commands/auth/login.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/auth/login.ts)_
+_See code: [src/commands/auth/login.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/auth/login.ts)_
 
 ## `coveo auth:token`
 
@@ -305,7 +305,7 @@ EXAMPLES
   $ coveo auth:token
 ```
 
-_See code: [src/commands/auth/token.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/auth/token.ts)_
+_See code: [src/commands/auth/token.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/auth/token.ts)_
 
 ## `coveo config:get [KEY]`
 
@@ -335,7 +335,7 @@ EXAMPLES
     $ coveo config:get accessToken
 ```
 
-_See code: [src/commands/config/get.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/config/get.ts)_
+_See code: [src/commands/config/get.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/config/get.ts)_
 
 ## `coveo config:set`
 
@@ -358,7 +358,7 @@ EXAMPLES
     $ coveo config:set --organization myOrgId
 ```
 
-_See code: [src/commands/config/set.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/config/set.ts)_
+_See code: [src/commands/config/set.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/config/set.ts)_
 
 ## `coveo help [COMMAND]`
 
@@ -398,7 +398,7 @@ DESCRIPTION
   Create a new test Coveo organization.
 ```
 
-_See code: [src/commands/org/create.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/org/create.ts)_
+_See code: [src/commands/org/create.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/org/create.ts)_
 
 ## `coveo org:list`
 
@@ -424,7 +424,7 @@ DESCRIPTION
   List Coveo organizations.
 ```
 
-_See code: [src/commands/org/list.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/org/list.ts)_
+_See code: [src/commands/org/list.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/org/list.ts)_
 
 ## `coveo org:resources:list`
 
@@ -455,7 +455,7 @@ EXAMPLES
   $ coveo org:resources:list -o=myOrgId
 ```
 
-_See code: [src/commands/org/resources/list.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/org/resources/list.ts)_
+_See code: [src/commands/org/resources/list.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/org/resources/list.ts)_
 
 ## `coveo org:resources:model:create`
 
@@ -469,7 +469,7 @@ DESCRIPTION
   Create a Snapshot Pull Model
 ```
 
-_See code: [src/commands/org/resources/model/create.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/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/@coveo/[email protected].4/packages/cli/core/src/commands/org/resources/model/create.ts)_
 
 ## `coveo org:resources:monitor SNAPSHOTID`
 
@@ -498,7 +498,7 @@ EXAMPLES
     $ coveo org:resources:monitor --organization myorgid --snapshotId mysnapshotid
 ```
 
-_See code: [src/commands/org/resources/monitor.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/org/resources/monitor.ts)_
+_See code: [src/commands/org/resources/monitor.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/org/resources/monitor.ts)_
 
 ## `coveo org:resources:preview`
 
@@ -534,7 +534,7 @@ EXAMPLES
   $ coveo org:resources:preview -o=myOrgId -d
 ```
 
-_See code: [src/commands/org/resources/preview.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/org/resources/preview.ts)_
+_See code: [src/commands/org/resources/preview.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/org/resources/preview.ts)_
 
 ## `coveo org:resources:pull`
 
@@ -589,7 +589,7 @@ EXAMPLES
     $ coveo org:resources:pull --resourceTypes QUERY_PIPELINE FIELD,
 ```
 
-_See code: [src/commands/org/resources/pull.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/org/resources/pull.ts)_
+_See code: [src/commands/org/resources/pull.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/org/resources/pull.ts)_
 
 ## `coveo org:resources:push`
 
@@ -633,7 +633,7 @@ EXAMPLES
     $ coveo org:resources:push --deleteMissingResources
 ```
 
-_See code: [src/commands/org/resources/push.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/org/resources/push.ts)_
+_See code: [src/commands/org/resources/push.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/org/resources/push.ts)_
 
 ## `coveo org:search:dump`
 
@@ -683,7 +683,7 @@ EXAMPLES
     $ coveo org:search:dump --fieldsToExclude ec_description ec_summary
 ```
 
-_See code: [src/commands/org/search/dump.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/org/search/dump.ts)_
+_See code: [src/commands/org/search/dump.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/org/search/dump.ts)_
 
 ## `coveo plugins`
 
@@ -1128,7 +1128,7 @@ DESCRIPTION
   <https://angular.io/>.
 ```
 
-_See code: [src/commands/ui/create/angular.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/ui/create/angular.ts)_
+_See code: [src/commands/ui/create/angular.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/ui/create/angular.ts)_
 
 ## `coveo ui:create:atomic NAME`
 
@@ -1153,7 +1153,7 @@ EXAMPLES
   $ coveo ui:create:atomic myapp
 ```
 
-_See code: [src/commands/ui/create/atomic.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/ui/create/atomic.ts)_
+_See code: [src/commands/ui/create/atomic.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/ui/create/atomic.ts)_
 
 ## `coveo ui:create:react NAME`
 
@@ -1179,7 +1179,7 @@ EXAMPLES
   $ coveo ui:create:react --help
 ```
 
-_See code: [src/commands/ui/create/react.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/ui/create/react.ts)_
+_See code: [src/commands/ui/create/react.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/ui/create/react.ts)_
 
 ## `coveo ui:create:vue NAME`
 
@@ -1205,7 +1205,7 @@ EXAMPLES
   $ coveo ui:create:vue-v=1.2.3 myVueProject
 ```
 
-_See code: [src/commands/ui/create/vue.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/ui/create/vue.ts)_
+_See code: [src/commands/ui/create/vue.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/ui/create/vue.ts)_
 
 ## `coveo ui:deploy`
 
@@ -1277,7 +1277,7 @@ EXAMPLES
     $ coveo ui:deploy -c ./configs/myconfig.json
 ```
 
-_See code: [src/commands/ui/deploy.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].2/packages/cli/core/src/commands/ui/deploy.ts)_
+_See code: [src/commands/ui/deploy.ts](https://github.com/coveo/cli/blob/@coveo/[email protected].4/packages/cli/core/src/commands/ui/deploy.ts)_
 
 ## `coveo update [CHANNEL]`
 

diff --git a/packages/cli/core/package.json b/packages/cli/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/cli",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "author": "Coveo",
   "description": "Coveo CLI",
   "engines": {

diff --git a/packages/cli/core/src/lib/snapshot/expandedPreviewer/expandedPreviewer.ts b/packages/cli/core/src/lib/snapshot/expandedPreviewer/expandedPreviewer.ts
@@ -15,6 +15,7 @@ import {DotFolder} from '../../project/dotFolder';
 import {cwd} from 'process';
 import {buildResourcesToExport} from '../pullModel/validation/model';
 import {startSpinner, stopSpinner} from '@coveo/cli-commons/utils/ux';
+import {SnapshotReporter} from '../snapshotReporter';
 
 export class ExpandedPreviewer {
   private static readonly previewDirectoryName = 'preview';
@@ -28,9 +29,8 @@ export class ExpandedPreviewer {
     private readonly projectToPreview: Project,
     private readonly shouldDelete: boolean
   ) {
-    this.resourcesToPreview = Object.keys(
-      report.resourceOperationResults
-    ) as ResourceSnapshotType[];
+    const reporter = new SnapshotReporter(report);
+    this.resourcesToPreview = reporter.getAffectedResourceTypes();
   }
 
   private static get previewDirectory() {