Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/better-typesc…
Browse files Browse the repository at this point in the history
…ript-support
  • Loading branch information
mbeckem committed Dec 1, 2023
2 parents 8e86e0e + f5c0e31 commit c13ee13
Show file tree
Hide file tree
Showing 152 changed files with 1,798 additions and 2,456 deletions.
6 changes: 6 additions & 0 deletions .changeset/bright-dingos-double.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@open-pioneer/test-utils": patch
"@open-pioneer/runtime": patch
---

Bump @formatjs/intl version
5 changes: 5 additions & 0 deletions .changeset/fast-mails-search.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@open-pioneer/chakra-integration": patch
---

Bump chakra-related dependency versions
5 changes: 5 additions & 0 deletions .changeset/tender-hairs-live.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@open-pioneer/test-utils": patch
---

Bump @testing-library/\* dependencies
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"error",
"line",
[
" SPDX-FileCopyrightText: con terra GmbH and contributors",
" SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)",
" SPDX-License-Identifier: Apache-2.0"
]
],
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/audit-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
jobs:
audit-dependencies:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/test-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ on:
pull_request:
jobs:
test:
# Don't run for pull requests from this repository to avoid duplicate builds (push also triggers build).
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: "Test and Build"
runs-on: ubuntu-latest
timeout-minutes: 15
permissions:
contents: write
steps:
Expand Down Expand Up @@ -47,19 +51,21 @@ jobs:
with:
name: build
path: dist/

retention-days: ${{ github.ref == 'refs/heads/main' && 7 || 1 }}

call_version:
if: github.ref == 'refs/heads/main'
name: "Publish or create version PR"
uses: "./.github/workflows/version.yml"
needs: test
secrets:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

deploy:
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
timeout-minutes: 5
needs: test
if: github.ref == 'refs/heads/main'
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
version:
runs-on: ubuntu-latest
permissions: write-all
timeout-minutes: 15
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .syncpackrc.cjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: con terra GmbH and contributors
// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)
// SPDX-License-Identifier: Apache-2.0

/**
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Core packages of the open pioneer client framework.

## Getting started

Requirements: Node >= 16, pnpm >= 8.
Requirements: Node >= 18, pnpm >= 8.

To start the development server, run:

Expand All @@ -33,4 +33,4 @@ For more details, consult the starter project's [Repository Guide](https://githu

## License

[Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0)
Apache-2.0 (see `LICENSE` file)
82 changes: 41 additions & 41 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,67 +51,67 @@
]
},
"patchedDependencies": {
"@changesets/assemble-release-plan@5.2.4": "patches/@changesets__assemble-release-plan@5.2.4.patch"
"@changesets/assemble-release-plan@6.0.0": "patches/@changesets__assemble-release-plan@6.0.0.patch"
}
},
"dependencies": {
"@chakra-ui/icons": "^2.0.19",
"@chakra-ui/react": "^2.6.1",
"@chakra-ui/system": "^2.5.7",
"@chakra-ui/icons": "^2.1.1",
"@chakra-ui/react": "^2.8.2",
"@chakra-ui/system": "^2.6.2",
"@emotion/cache": "^11.11.0",
"@emotion/react": "^11.11.0",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@formatjs/intl": "^2.7.2",
"framer-motion": "^10.12.16",
"@formatjs/intl": "^2.9.9",
"framer-motion": "^10.16.9",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-use": "^17.4.0"
"react-use": "^17.4.1"
},
"devDependencies": {
"@changesets/cli": "^2.26.1",
"@open-pioneer/build-package-cli": "^1.0.1",
"@changesets/cli": "^2.27.1",
"@open-pioneer/build-package-cli": "^1.0.4",
"@open-pioneer/build-support": "^1.0.0",
"@open-pioneer/runtime": "workspace:^",
"@open-pioneer/tag-current-versions": "^1.0.0",
"@open-pioneer/vite-plugin-pioneer": "^1.0.2",
"@testing-library/dom": "^9.3.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"@types/js-yaml": "^4.0.5",
"@types/node": "^16.18.34",
"@types/react": "^18.2.7",
"@types/react-dom": "^18.2.4",
"@typescript-eslint/eslint-plugin": "^5.59.9",
"@typescript-eslint/parser": "^5.59.9",
"@vitejs/plugin-react-swc": "^3.3.2",
"eslint": "^8.42.0",
"eslint-config-prettier": "^8.8.0",
"eslint-import-resolver-typescript": "^3.5.5",
"@open-pioneer/tag-current-versions": "^1.0.1",
"@open-pioneer/vite-plugin-pioneer": "^1.1.2",
"@testing-library/dom": "^9.3.3",
"@testing-library/jest-dom": "^6.1.5",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.1",
"@types/js-yaml": "^4.0.9",
"@types/node": "^18.19.0",
"@types/react": "^18.2.39",
"@types/react-dom": "^18.2.17",
"@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.13.1",
"@vitejs/plugin-react-swc": "^3.5.0",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-unused-imports": "^2.0.0",
"fast-glob": "^3.2.12",
"handlebars": "^4.7.7",
"eslint-plugin-unused-imports": "^3.0.0",
"fast-glob": "^3.3.2",
"handlebars": "^4.7.8",
"happy-dom": "^12.10.3",
"husky": "^8.0.3",
"js-yaml": "^4.1.0",
"jsdom": "^22.1.0",
"prettier": "^2.8.8",
"rimraf": "^5.0.1",
"rollup-plugin-visualizer": "^5.9.0",
"sass": "^1.62.1",
"prettier": "^3.1.0",
"rimraf": "^5.0.5",
"rollup-plugin-visualizer": "^5.9.3",
"sass": "^1.69.5",
"syncpack": "^10.5.1",
"ts-node": "^10.9.1",
"typedoc": "^0.24.8",
"typescript": "~5.1.3",
"vite": "^4.3.9",
"typedoc": "^0.25.4",
"typescript": "~5.3.2",
"vite": "^4.5.0",
"vite-plugin-eslint": "^1.8.1",
"vitest": "^0.31.4"
"vitest": "^0.34.6"
},
"engines": {
"node": ">= 16",
"node": ">= 18",
"pnpm": ">= 8"
}
}
39 changes: 0 additions & 39 deletions patches/@[email protected]

This file was deleted.

26 changes: 26 additions & 0 deletions patches/@[email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/dist/changesets-assemble-release-plan.cjs.js b/dist/changesets-assemble-release-plan.cjs.js
index ee5c0f67fabadeb112e9f238d8b144a4d125830f..04e62e3fb543b4f992df606fb0733969d3c451fa 100644
--- a/dist/changesets-assemble-release-plan.cjs.js
+++ b/dist/changesets-assemble-release-plan.cjs.js
@@ -209,7 +209,7 @@ function shouldBumpMajor({
// we check if it is a peerDependency because if it is, our dependent bump type might need to be major.
return depType === "peerDependencies" && nextRelease.type !== "none" && nextRelease.type !== "patch" && ( // 1. If onlyUpdatePeerDependentsWhenOutOfRange set to true, bump major if the version is leaving the range.
// 2. If onlyUpdatePeerDependentsWhenOutOfRange set to false, bump major regardless whether or not the version is leaving the range.
- !onlyUpdatePeerDependentsWhenOutOfRange || !semverSatisfies__default["default"](incrementVersion(nextRelease, preInfo), versionRange)) && ( // bump major only if the dependent doesn't already has a major release.
+ !onlyUpdatePeerDependentsWhenOutOfRange) && ( // bump major only if the dependent doesn't already has a major release.
!releases.has(dependent) || releases.has(dependent) && releases.get(dependent).type !== "major");
}

diff --git a/dist/changesets-assemble-release-plan.esm.js b/dist/changesets-assemble-release-plan.esm.js
index bf5202626a164a7780650d333983c3479b078689..529601b6da9cbd05bc1be0fa5d39a10efd4a67cc 100644
--- a/dist/changesets-assemble-release-plan.esm.js
+++ b/dist/changesets-assemble-release-plan.esm.js
@@ -198,7 +198,7 @@ function shouldBumpMajor({
// we check if it is a peerDependency because if it is, our dependent bump type might need to be major.
return depType === "peerDependencies" && nextRelease.type !== "none" && nextRelease.type !== "patch" && ( // 1. If onlyUpdatePeerDependentsWhenOutOfRange set to true, bump major if the version is leaving the range.
// 2. If onlyUpdatePeerDependentsWhenOutOfRange set to false, bump major regardless whether or not the version is leaving the range.
- !onlyUpdatePeerDependentsWhenOutOfRange || !semverSatisfies(incrementVersion(nextRelease, preInfo), versionRange)) && ( // bump major only if the dependent doesn't already has a major release.
+ !onlyUpdatePeerDependentsWhenOutOfRange) && ( // bump major only if the dependent doesn't already has a major release.
!releases.has(dependent) || releases.has(dependent) && releases.get(dependent).type !== "major");
}

Loading

0 comments on commit c13ee13

Please sign in to comment.