Merge branch 'main' into feat/add-rating-field

Author: hellofanny

.github/PULL_REQUEST_TEMPLATE.md

@@ -37,7 +37,7 @@
 
 **Dependencies**
 
-- [ ] Committed the `yarn.lock` file when there were changes to the packages
+- [ ] Committed the `pnpm-lock.yaml` file when there were changes to the packages
 
 **Documentation**
 

.github/workflows/ci.yml

@@ -21,26 +21,31 @@ jobs:
         with:
           fetch-depth: 2
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9.15.5
+          cache: 'pnpm'
+
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: 'yarn'
 
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: pnpm i
 
       - name: Build
-        run: yarn build
+        run: pnpm build
 
       - name: Size
-        run: yarn size
+        run: pnpm size
 
       - name: Lint
-        run: yarn lint
+        run: pnpm lint
 
       - name: Test
-        run: yarn test
+        run: pnpm test
 
       - name: Publish to Chromatic
         uses: chromaui/action@latest
@@ -64,6 +69,12 @@ jobs:
       - name: Clone starter
         run: git clone https://github.com/vtex-sites/starter.store.git starter
 
+      - name: Install specific Yarn version
+        run: npm install -g [email protected] # https://github.com/yarnpkg/yarn/issues/9015
+
+      - name: Verify Yarn version
+        run: yarn --version
+
       - name: Install the packages on starter
         run: |
           cd starter
@@ -74,7 +85,7 @@ jobs:
       - name: Install dependencies in starter
         run: |
           cd starter
-          yarn install --frozen-lockfile
+          yarn install
 
       - name: Build starter
         run: |

.github/workflows/release.yml

@@ -23,11 +23,16 @@ jobs:
           token: ${{ secrets.VTEX_GITHUB_BOT_TOKEN }}
           fetch-depth: 2
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9.15.5
+
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: 'yarn'
+          cache: 'pnpm'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Configure CI Git User
@@ -36,22 +41,22 @@ jobs:
           git config user.email [email protected]
 
       - name: Install dependencies
-        run: yarn
+        run: pnpm i
 
       - name: Build
-        run: yarn build
+        run: pnpm build
 
       - name: Size
-        run: yarn size
+        run: pnpm size
 
       - name: Lint
-        run: yarn lint
+        run: pnpm lint
 
       - name: Test
-        run: yarn test
+        run: pnpm test
 
       - name: Publish
-        run: yarn release
+        run: pnpm release
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
 

.husky/pre-commit

@@ -1,2 +1,2 @@
-yarn install
-yarn lint-staged
+pnpm i
+pnpm lint-staged

.npmrc

@@ -0,0 +1 @@
+link-workspace-packages=true

CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.15.2](https://github.com/vtex/faststore/compare/v3.15.1...v3.15.2) (2025-02-05)
+
+### Bug Fixes
+
+- align ts versions ([#2673](https://github.com/vtex/faststore/issues/2673)) ([64035df](https://github.com/vtex/faststore/commit/64035df4d15334fffe66b55d81f475449bc7839e))
+
 ## [3.15.1](https://github.com/vtex/faststore/compare/v3.15.0...v3.15.1) (2025-02-04)
 
 ### Bug Fixes

CONTRIBUTING.MD

@@ -8,9 +8,9 @@ Before you begin, make sure you have the following installed on your local machi
 
 - [Git](https://git-scm.com)
 - [Node.js](https://nodejs.org/en)
-- [Yarn](https://yarnpkg.com/)
+- [Pnpm](https://pnpm.io)
 - [Turbo](https://turbo.build/repo/docs/getting-started/installation#installing-turbo)
-- Your Preferred Code Editor (VSCode, Sublime, etc.)
+- Your Preferred Code Editor (VSCode, Sublime, Zed, etc.)
 
 ## 2. Getting Started
 
@@ -28,17 +28,17 @@ Fork the repository (click the <kbd>Fork</kbd> button at the top right of
 
 ### Setting Up the Environment
 
-1. Run `yarn` at the root of the repository.
+1. Run `pnpm i` at the root of the repository.
 
-2. Run `yarn build` at the root of the repository.
+2. Run `pnpm build` at the root of the repository.
 
-3. Run `yarn turbo run dev --filter={packageName}` to run a package individually.
+3. Run `pnpm turbo run dev --filter={packageName}` to run a package individually.
 
 > For example, if you want to run the `@faststore/core` package, at the root of the repository run:
 >
-> `yarn turbo run dev --filter=@faststore/core`
+> `pnpm turbo run dev --filter=@faststore/core`
 
-**Note**: If you encounter issues during the setup process, please check if your current version of Yarn, Turbo, and Node.js are matching the versions specified in the package.json file.
+**Note**: If you encounter issues during the setup process, please check if your current version of Pnpm, Turbo, and Node.js are matching the versions specified in the package.json file.
 
 ## 3. Working on an Issue
 
@@ -67,7 +67,7 @@ To test your changes in a store, you will need to create a pull request (for mor
 <img width="502" alt="image" src="https://vtexhelp.vtexassets.com/assets/docs/src/fs-package-local-install-cli___692a64eba8c0b3745c468176bfc610fb.png
 "></img>
 
-4. Run `yarn` to install the updates and test your changes in the store.
+4. Run `pnpm` to install the updates and test your changes in the store.
 
 **Note**: This link is intended for testing purposes only. Please avoid using it in your store. Once the published version of your package is available, make sure to update the link accordingly.
 

lerna.json

@@ -1,6 +1,6 @@
 {
-  "version": "3.15.1",
-  "npmClient": "yarn",
+  "version": "3.15.2",
+  "npmClient": "pnpm",
   "command": {
     "publish": {
       "message": "[no ci] Release: %v"

package.json

@@ -5,6 +5,7 @@
   "license": "MIT",
   "private": true,
   "scripts": {
+    "preinstall": "npx only-allow pnpm",
     "build": "turbo run build --log-order=grouped",
     "dev": "turbo run dev --parallel --no-cache",
     "lint": "biome check .",
@@ -17,9 +18,6 @@
     "clean": "turbo run clean && rm -rf node_modules",
     "prepare": "husky"
   },
-  "workspaces": [
-    "packages/*"
-  ],
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
     "husky": "9.1.7",
@@ -33,17 +31,17 @@
     "stylelint-order": "^5.0.0",
     "stylelint-scss": "^4.0.1",
     "turbo": "^2.3.4",
-    "typescript": "^5.3.2"
+    "typescript": "5.3.2"
   },
   "version": "0.0.0",
   "volta": {
     "node": "18.19.0",
-    "yarn": "1.22.22"
+    "pnpm": "9.15.5"
   },
   "dependencies": {},
-  "packageManager": "[email protected]",
+  "packageManager": "[email protected]",
   "lint-staged": {
-    "*.{ts,js,tsx,jsx,json}": "yarn lint:fix",
+    "*.{ts,js,tsx,jsx,json}": "pnpm lint:fix",
     "*.scss": "stylelint --fix"
   }
 }

packages/api/README.md

@@ -23,10 +23,10 @@
 
 ## Installation
 
-From the command line in your project directory, run yarn add `@faststore/api`.
+From the command line in your project directory, run pnpm add `@faststore/api`.
 
 ```cmd
-yarn add @faststore/api
+pnpm add @faststore/api
 ```
 
 ## Usage

packages/api/package.json

@@ -23,10 +23,10 @@
     "node": ">=18"
   },
   "scripts": {
-    "dev": "concurrently \"yarn generate -w\" \"tsc --watch\" \"yarn dev:graphql\"",
+    "dev": "concurrently \"pnpm run generate -w\" \"tsc --watch\" \"pnpm run dev:graphql\"",
     "dev:graphql": "nodemon --watch src --ext graphql --exec \"copyfiles \"src/**/*.graphql\" dist/esm\"",
     "dev:server": "tsx --no-cache ./local/server.ts",
-    "build": "graphql-codegen --config codegen.yml && (yarn build:cjs && yarn build:esm)",
+    "build": "graphql-codegen --config codegen.yml && (pnpm build:cjs && pnpm build:esm)",
     "build:cjs": "tsc --module commonjs --moduleResolution node10 --outDir dist/cjs && copyfiles \"src/**/*.graphql\" dist/cjs",
     "build:esm": "tsc && copyfiles \"src/**/*.graphql\" dist/esm",
     "test": "jest",
@@ -36,10 +36,14 @@
     "@envelop/on-resolve": "^4.1.1",
     "@graphql-tools/load-files": "^7.0.0",
     "@graphql-tools/schema": "^9.0.0",
+    "@graphql-tools/utils": "^10.2.0",
     "@opentelemetry/exporter-logs-otlp-grpc": "^0.39.1",
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.39.1",
     "@opentelemetry/sdk-logs": "^0.39.1",
     "@opentelemetry/sdk-trace-base": "^1.13.0",
+    "@opentelemetry/api-logs": "^0.39.1",
+    "@opentelemetry/api": "^1.4.1",
+    "@opentelemetry/resources": "^1.13.0",
     "@rollup/plugin-graphql": "^1.0.0",
     "cookie": "^0.7.0",
     "dataloader": "^2.1.0",
@@ -56,6 +60,7 @@
     "@types/cookie": "^0.6.0",
     "@types/express": "^4.17.16",
     "@types/sanitize-html": "^2.9.1",
+    "@types/jest": "29.1.0",
     "concurrently": "^6.2.1",
     "copyfiles": "^2.4.1",
     "express": "^4.17.3",

packages/cli/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.15.2](https://github.com/vtex/faststore/compare/v3.15.1...v3.15.2) (2025-02-05)
+
+**Note:** Version bump only for package @faststore/cli
+
 ## [3.15.1](https://github.com/vtex/faststore/compare/v3.15.0...v3.15.1) (2025-02-04)
 
 **Note:** Version bump only for package @faststore/cli

packages/cli/README.md

@@ -30,7 +30,7 @@ $ npm install -g @faststore/cli
 $ faststore COMMAND
 running command...
 $ faststore (--version)
-@faststore/cli/3.15.1 linux-x64 node-v18.20.6
+@faststore/cli/3.15.2 linux-x64 node-v18.20.6
 $ faststore --help [COMMAND]
 USAGE
   $ faststore COMMAND
@@ -61,7 +61,7 @@ ARGUMENTS
   PATH     The path where the FastStore being built is. Defaults to cwd.
 ```
 
-_See code: [dist/commands/build.js](https://github.com/vtex/faststore/blob/v3.15.1/dist/commands/build.js)_
+_See code: [dist/commands/build.js](https://github.com/vtex/faststore/blob/v3.15.2/dist/commands/build.js)_
 
 ## `faststore cms-sync [PATH]`
 
@@ -76,7 +76,7 @@ FLAGS
   -d, --dry-run
 ```
 
-_See code: [dist/commands/cms-sync.js](https://github.com/vtex/faststore/blob/v3.15.1/dist/commands/cms-sync.js)_
+_See code: [dist/commands/cms-sync.js](https://github.com/vtex/faststore/blob/v3.15.2/dist/commands/cms-sync.js)_
 
 ## `faststore create [PATH]`
 
@@ -93,10 +93,10 @@ DESCRIPTION
   Creates a discovery folder based on the starter.store template.
 
 EXAMPLES
-  $ yarn faststore create discovery
+  $ pnpm faststore create discovery
 ```
 
-_See code: [dist/commands/create.js](https://github.com/vtex/faststore/blob/v3.15.1/dist/commands/create.js)_
+_See code: [dist/commands/create.js](https://github.com/vtex/faststore/blob/v3.15.2/dist/commands/create.js)_
 
 ## `faststore dev [ACCOUNT] [PATH] [PORT]`
 
@@ -110,7 +110,7 @@ ARGUMENTS
   PORT     The port where FastStore should run. Defaults to 3000.
 ```
 
-_See code: [dist/commands/dev.js](https://github.com/vtex/faststore/blob/v3.15.1/dist/commands/dev.js)_
+_See code: [dist/commands/dev.js](https://github.com/vtex/faststore/blob/v3.15.2/dist/commands/dev.js)_
 
 ## `faststore generate-graphql [PATH]`
 
@@ -122,7 +122,7 @@ ARGUMENTS
   PATH  The path where the FastStore GraphQL customization is. Defaults to cwd.
 ```
 
-_See code: [dist/commands/generate-graphql.js](https://github.com/vtex/faststore/blob/v3.15.1/dist/commands/generate-graphql.js)_
+_See code: [dist/commands/generate-graphql.js](https://github.com/vtex/faststore/blob/v3.15.2/dist/commands/generate-graphql.js)_
 
 ## `faststore help [COMMAND]`
 
@@ -156,7 +156,7 @@ ARGUMENTS
   PORT     The port where FastStore should run. Defaults to 3000.
 ```
 
-_See code: [dist/commands/start.js](https://github.com/vtex/faststore/blob/v3.15.1/dist/commands/start.js)_
+_See code: [dist/commands/start.js](https://github.com/vtex/faststore/blob/v3.15.2/dist/commands/start.js)_
 
 ## `faststore test [PATH]`
 
@@ -168,5 +168,5 @@ ARGUMENTS
   PATH  The path where the FastStore being tested is. Defaults to cwd.
 ```
 
-_See code: [dist/commands/test.js](https://github.com/vtex/faststore/blob/v3.15.1/dist/commands/test.js)_
+_See code: [dist/commands/test.js](https://github.com/vtex/faststore/blob/v3.15.2/dist/commands/test.js)_
 <!-- commandsstop -->

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/cli",
-  "version": "3.15.1",
+  "version": "3.15.2",
   "description": "FastStore CLI",
   "author": "Emerson Laurentino @emersonlaurentino",
   "bin": {
@@ -18,7 +18,7 @@
   ],
   "dependencies": {
     "@antfu/ni": "^0.21.12",
-    "@faststore/core": "^3.15.1",
+    "@faststore/core": "^3.15.2",
     "@inquirer/prompts": "^5.1.2",
     "@oclif/core": "^1.16.4",
     "@oclif/plugin-help": "^5",
@@ -36,6 +36,7 @@
     "@types/degit": "^2.8.6",
     "@types/fs-extra": "^9.0.13",
     "@types/node": "^16.11.63",
+    "@types/jest": "29.1.0",
     "chai": "^4",
     "jest": "^29.7.0",
     "oclif": "^3",