Merge branch 'refs/heads/master' into development

# Conflicts: # package.json # pnpm-lock.yaml
js-smart · May 8, 2024 · 90dbcea · 90dbcea
2 parents 3f5313d + 38cc933
commit 90dbcea
Show file tree

Hide file tree

Showing 8 changed files with 20,770 additions and 13,277 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,15 +6,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v4
         with:
-          version: latest
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
+          node-version: 20
       - name: Install Dependencies
-        run: pnpm install --frozen-lockfile
+        run: npm i
       - name: Run Tests
-        run: pnpm test react-cookie-service
+        run: npm run test react-cookie-service
       - name: Build project
-        run: pnpm run build react-cookie-service
+        run: npm run build react-cookie-service
diff --git a/.github/workflows/npm_publish.yml b/.github/workflows/npm_publish.yml
@@ -9,18 +9,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v4
         with:
-          version: latest
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
+          node-version: 20
       - name: Install Dependencies
-        run: pnpm install --frozen-lockfile
+        run: npm i
       - name: Build project
-        run: pnpm build react-cookie-service
+        run: npm run build react-cookie-service
       - name: Run Tests
-        run: pnpm test react-cookie-service
+        run: npm run test react-cookie-service
       - name: Publish to NPM
         uses: JS-DevTools/npm-publish@v3
         with:

diff --git a/.github/workflows/npm_publish_js_cookie_service.yml b/.github/workflows/npm_publish_js_cookie_service.yml
@@ -9,18 +9,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v4
         with:
-          version: latest
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
+          node-version: 20
       - name: Install Dependencies
-        run: pnpm install --frozen-lockfile
+        run: npm i
       - name: Build project
-        run: pnpm build js-cookie-service
+        run: npm run build js-cookie-service
       - name: Run Tests
-        run: pnpm test js-cookie-service
+        run: npm run test js-cookie-service
       - name: Publish to NPM
         uses: JS-DevTools/npm-publish@v3
         with:

diff --git a/libs/js-cookie-service/package.json b/libs/js-cookie-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@js-smart/js-cookie-service",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "private": false,
   "repository": {
     "type": "git",

diff --git a/libs/react-cookie-service/package.json b/libs/react-cookie-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@js-smart/react-cookie-service",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "private": false,
   "repository": {
     "type": "git",