Merge branch 'main' into fix/PRO-803-throttle-issue

storyblok · Nov 14, 2024 · bf72e24 · bf72e24
2 parents cb0dd31 + 8bdd0ab
commit bf72e24
Show file tree

Hide file tree

Showing 27 changed files with 3,909 additions and 2,168 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,23 +5,23 @@
 
 version: 2
 updates:
-  - package-ecosystem: "pip"
-    directory: "/"
+  - package-ecosystem: pip
+    directory: /
     schedule:
-      interval: "daily"
+      interval: daily
     # Raise pull requests for version updates
     # to pip against the `develop` branch
-    target-branch: "fix/update-package-json-INT-122"
+    target-branch: fix/update-package-json-INT-122
     # Labels on pull requests for version updates only
     labels:
-      - "pip dependencies"
+      - pip dependencies
 
-  - package-ecosystem: "npm"
-    directory: "/"
+  - package-ecosystem: npm
+    directory: /
     schedule:
-      interval: "weekly"
+      interval: weekly
       # Check for npm updates on Sundays
-      day: "sunday"
+      day: sunday
     # Labels on pull requests for security and version updates
     labels:
-      - "npm dependencies"
+      - npm dependencies
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,23 +6,28 @@ on:
   pull_request:
     branches: [main]
 
+env:
+  PNPM_CACHE_FOLDER: .pnpm-store
+  HUSKY: 0 # Bypass husky commit hook for CI
+
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        node-version: [20]
     environment: test
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-      - name: Use Node.js 18
+      - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: ${{ matrix.node-version }}
           cache: pnpm
       - name: Install dependencies
         run: pnpm install
-      - run: pnpm run lint
-      - run: pnpm run prettier . --check
-
-      - run: pnpm run build
+      - name: Build
+      - run: pnpm build
diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml
@@ -0,0 +1,27 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: pnpm
+      - name: Install dependencies
+        run: pnpm install
+      - name: Validate current commit (last commit) with commitlint
+        if: github.event_name == 'push'
+        run: pnpm commitlint --last --verbose
+      - name: Validate PR commits with commitlint
+        if: github.event_name == 'pull_request'
+        run: pnpm commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} --verbose
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,26 @@
+name: Run linters
+on: [push]
+env:
+  PNPM_CACHE_FOLDER: .pnpm-store
+  HUSKY: 0 # Bypass husky commit hook for CI
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        node-version: [20]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: pnpm
+      - name: Install dependencies
+        run: pnpm install
+      - name: Run Lint
+        run: pnpm run lint
diff --git a/.github/workflows/pkg.pr.new.yml b/.github/workflows/pkg.pr.new.yml
@@ -5,28 +5,26 @@ on:
       - '**'
     tags:
       - '!**'
-
 env:
   PNPM_CACHE_FOLDER: .pnpm-store
   HUSKY: 0 # Bypass husky commit hook for CI
-
 permissions: {}
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number }}
   cancel-in-progress: true
-
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: ${{ matrix.node-version }}
           cache: pnpm
       - name: Install dependencies
         run: pnpm install

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,9 +1,5 @@
 name: Release CI
 
-# env:
-#   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
 on:
   push:
     branches: [main, next, beta]
@@ -29,4 +25,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: npx semantic-release@22.0.12
+        run: npx semantic-release@24.2.0
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,17 +8,20 @@ env:
 jobs:
   test:
     name: Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        node-version: [20]
     environment: test
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-      - name: Use Node.js 18
+      - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: ${{ matrix.node-version }}
           cache: pnpm
       - name: Install dependencies
         run: pnpm install

diff --git a/.husky/commit-msg b/.husky/commit-msg
diff --git a/.npmrc b/.npmrc
@@ -1 +1,3 @@
 registry=https://registry.npmjs.org/
+public-hoist-pattern[]=@commitlint*
+public-hoist-pattern[]=commitlint
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,11 @@
+import { storyblokLintConfig } from '@storyblok/eslint-config';
+
+export default storyblokLintConfig({
+  rules: {
+    // @TODO: remove all of them after fixing and proper testing in v7
+    '@typescript-eslint/no-this-alias': 'off',
+    'ts/no-this-alias': 'off',
+    'no-async-promise-executor': 'off',
+  },
+  ignores: ['**/node_modules/**', 'playground', 'README.md'],
+});
diff --git a/package.json b/package.json
@@ -1,46 +1,54 @@
 {
   "name": "storyblok-js-client",
-  "module": "./dist/index.mjs",
-  "version": "5.0.0",
-  "packageManager": "[email protected]",
+  "version": "6.10.1",
+  "packageManager": "[email protected]",
   "description": "Universal JavaScript SDK for Storyblok's API",
+  "author": "Alexander Feiglstorfer <[email protected]>",
   "license": "MIT",
+  "homepage": "https://github.com/storyblok/storyblok-js-client#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/storyblok/storyblok-js-client.git"
+  },
+  "bugs": {
+    "url": "https://github.com/storyblok/storyblok-js-client/issues"
+  },
   "keywords": [
     "storyblok",
     "javascript",
     "api"
   ],
   "sideEffects": false,
-  "types": "./dist/types/entry.esm.d.ts",
-  "main": "./dist/index.umd.js",
-  "unpkg": "./dist/index.umd.js",
-  "jsdelivr": "./dist/index.umd.js",
-  "source": "src/index.ts",
   "exports": {
     ".": {
+      "types": "./dist/types/entry.esm.d.ts",
       "import": "./dist/index.mjs",
-      "require": "./dist/index.umd.js",
-      "types": "./dist/types/entry.esm.d.ts"
+      "require": "./dist/index.umd.js"
     },
     "./richTextResolver": {
+      "types": "./dist/types/richTextResolver.d.ts",
       "import": "./dist/richTextResolver.mjs",
-      "require": "./dist/richTextResolver.umd.js",
-      "types": "./dist/types/richTextResolver.d.ts"
+      "require": "./dist/richTextResolver.umd.js"
     },
     "./schema": {
+      "types": "./dist/types/schema.d.ts",
       "import": "./dist/schema.mjs",
-      "require": "./dist/schema.umd.js",
-      "types": "./dist/types/schema.d.ts"
+      "require": "./dist/schema.umd.js"
     }
   },
+  "main": "./dist/index.umd.js",
+  "module": "./dist/index.mjs",
+  "unpkg": "./dist/index.umd.js",
+  "jsdelivr": "./dist/index.umd.js",
+  "types": "./dist/types/entry.esm.d.ts",
+  "source": "src/index.ts",
   "files": [
     "dist",
     "src",
     "tests"
   ],
   "scripts": {
     "lint": "eslint --max-warnings=0 './src/**/*.{ts,js}'",
-    "prettier": "prettier . --write",
     "build": "node vite.build.mjs && tsc",
     "demo": "vite serve playground",
     "dev:umd": "npx serve ./",
@@ -50,34 +58,25 @@
     "coverage": "vitest run --coverage",
     "prepare": "npm run build"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/storyblok/storyblok-js-client.git"
-  },
-  "author": "Alexander Feiglstorfer <[email protected]>",
-  "bugs": {
-    "url": "https://github.com/storyblok/storyblok-js-client/issues"
-  },
-  "homepage": "https://github.com/storyblok/storyblok-js-client#readme",
   "devDependencies": {
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
-    "@tsconfig/recommended": "^1.0.7",
-    "@typescript-eslint/eslint-plugin": "^6.12.0",
-    "@typescript-eslint/parser": "^6.12.0",
-    "@vitest/coverage-v8": "^2.0.5",
-    "@vitest/ui": "^2.0.5",
-    "eslint": "^8.54.0",
-    "eslint-config-prettier": "^9.0.0",
-    "husky": "^9.1.5",
+    "@commitlint/cli": "^19.5.0",
+    "@commitlint/config-conventional": "^19.5.0",
+    "@storyblok/eslint-config": "^0.3.0",
+    "@tsconfig/recommended": "^1.0.8",
+    "@typescript-eslint/eslint-plugin": "^8.14.0",
+    "@typescript-eslint/parser": "^8.14.0",
+    "@vitest/coverage-v8": "^2.1.4",
+    "@vitest/ui": "^2.1.4",
+    "eslint": "^9.14.0",
+    "eslint-config-prettier": "^9.1.0",
     "isomorphic-fetch": "^3.0.0",
     "kolorist": "^1.8.0",
     "prettier": "^3.3.3",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.2",
-    "vite-plugin-banner": "^0.7.1",
-    "vite-plugin-dts": "^4.0.3",
-    "vitest": "^2.0.5"
+    "typescript": "^5.6.3",
+    "vite": "^5.4.11",
+    "vite-plugin-banner": "^0.8.0",
+    "vite-plugin-dts": "^4.3.0",
+    "vitest": "^2.1.4"
   },
   "release": {
     "branches": [
@@ -95,50 +94,9 @@
   "publishConfig": {
     "access": "public"
   },
-  "lint-staged": {
-    "*.{js,jsx,css,ts,tsx}": [
-      "prettier --write",
-      "eslint"
-    ],
-    "*.md": [
-      "prettier --write"
-    ]
-  },
   "commitlint": {
     "extends": [
       "@commitlint/config-conventional"
     ]
-  },
-  "eslintConfig": {
-    "env": {
-      "browser": true,
-      "es2021": true,
-      "node": true
-    },
-    "extends": [
-      "eslint:recommended",
-      "plugin:@typescript-eslint/recommended",
-      "prettier"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-      "ecmaVersion": "latest",
-      "sourceType": "module"
-    },
-    "plugins": [
-      "@typescript-eslint"
-    ],
-    "rules": {
-      "@typescript-eslint/no-explicit-any": "off",
-      "@typescript-eslint/no-var-requires": 1,
-      "no-async-promise-executor": 0,
-      "no-undef": 0
-    }
-  },
-  "prettier": {
-    "semi": false,
-    "singleQuote": true,
-    "tabWidth": 2,
-    "trailingComma": "es5"
   }
 }