Skip to content

Commit

Permalink
fix: wrong paths in exports, update to vite confs (#619)
Browse files Browse the repository at this point in the history
  • Loading branch information
edodusi authored Dec 27, 2024
1 parent 2e5fa31 commit 97818f6
Show file tree
Hide file tree
Showing 8 changed files with 419 additions and 382 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/dependabot-automerge.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
# **** AUTOMERGE ****
# Merge automatically the PR that contain a minor or patch update on the dependency you define in env.DEPENDENCY
# - Inspiration: https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions#enable-auto-merge-on-a-pull-request

name: Dependabot auto-merge
name: Dependabot auto-approve
on: pull_request

permissions:
pull-requests: write
contents: write

jobs:
dependabot:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'storyblok/storyblok-react'
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1.1.1
uses: dependabot/fetch-metadata@v2
with:
github-token: '${{ secrets.GITHUB_TOKEN }}'
- name: Enable auto-merge for Dependabot PRs
if: ${{contains(steps.metadata.outputs.dependency-names, env.DEPENDENCY) && (steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor')}}
run: gh pr merge --auto --merge "$PR_URL"
alert-lookup: true
- uses: actions/checkout@v4
- name: Approve a PR if not already approved
run: |
gh pr checkout "$PR_URL" # sets the upstream metadata for `gh pr status`
if [ "$(gh pr status --json reviewDecision -q .currentBranch.reviewDecision)" != "APPROVED" ];
then gh pr review --approve "$PR_URL"
else echo "PR already approved, skipping additional approvals to minimize emails/notification noise.";
fi
env:
DEPENDENCY: storyblok-js-client
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.DEPENDABOT_TOKEN}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
2 changes: 1 addition & 1 deletion .github/workflows/pkg.pr.new.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ jobs:
run: pnpm install
- name: Build
run: pnpm build
- run: pnpx pkg-pr-new publish --compact --pnpm
- run: pnpx pkg-pr-new publish --pnpm
2 changes: 1 addition & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import { storyblokLintConfig } from '@storyblok/eslint-config';
export default storyblokLintConfig({
vue: true,
}, {
ignores: ['tests/unit/coverage/', 'dist/', 'cypress/', '**/*.d.ts'],
ignores: ['tests/unit/coverage/', 'dist/', 'cypress/', '**/*.d.ts', '**/node_modules/**', 'README.md'],
});
36 changes: 22 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,35 @@
{
"name": "@storyblok/js",
"type": "module",
"version": "0.0.0",
"packageManager": "[email protected]",
"version": "3.2.0",
"private": false,
"packageManager": "[email protected]",
"description": "SDK to integrate Storyblok into your project using JavaScript.",
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/storyblok/storyblok-js"
},
"bugs": {
"url": "https://github.com/storyblok/storyblok-js/issues"
},
"exports": {
".": {
"types": "./dist/types/index.d.ts",
"types": "./dist/index.d.ts",
"import": "./dist/storyblok-js.mjs",
"require": "./dist/storyblok-js.js"
}
},
"main": "./dist/storyblok-js.js",
"module": "./dist/storyblok-js.mjs",
"types": "./dist/types/index.d.ts",
"types": "./dist/index.d.ts",
"files": [
"dist"
],
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"build": "vite build",
"test": "pnpm run test:unit:ci && pnpm run test:e2e",
"test:unit": "vitest",
"test:unit:ci": "vitest run",
"test:unit:ui": "vitest --ui",
Expand All @@ -37,25 +46,24 @@
"storyblok-js-client": "6.10.6"
},
"devDependencies": {
"@commitlint/cli": "^19.6.0",
"@commitlint/cli": "^19.6.1",
"@commitlint/config-conventional": "^19.6.0",
"@storyblok/eslint-config": "^0.3.0",
"@tsconfig/recommended": "^1.0.8",
"@types/node": "^22.10.1",
"cypress": "^13.16.1",
"eslint": "^9.16.0",
"@types/node": "^22.10.2",
"cypress": "^13.17.0",
"eslint": "^9.17.0",
"eslint-plugin-cypress": "^4.1.0",
"isomorphic-fetch": "^3.0.0",
"kolorist": "^1.8.0",
"pathe": "^1.1.2",
"simple-git-hooks": "^2.11.1",
"start-server-and-test": "^2.0.8",
"start-server-and-test": "^2.0.9",
"typescript": "^5.7.2",
"vite": "^6.0.1",
"vite": "^6.0.5",
"vite-plugin-banner": "^0.8.0",
"vite-plugin-dts": "^4.3.0",
"vite-plugin-dts": "^4.4.0",
"vite-plugin-qrcode": "^0.2.3",
"vitest": "^2.1.5"
"vitest": "^2.1.8"
},
"commitlint": {
"extends": [
Expand Down
Loading

0 comments on commit 97818f6

Please sign in to comment.