forked from nextcloud-libraries/nextcloud-vue
-
Notifications
You must be signed in to change notification settings - Fork 0
Fix merge of upstream by merging again and replaying npm customizations (fix ci build in server project) #9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
thlehmann-ionos
wants to merge
49
commits into
ionos-dev
Choose a base branch
from
fix-root-ci-build-1350
base: ionos-dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: GitHub <[email protected]>
Bumps [linkify-string](https://github.com/nfrasser/linkifyjs/tree/HEAD/packages/linkify-string) from 4.2.0 to 4.3.1. - [Release notes](https://github.com/nfrasser/linkifyjs/releases) - [Changelog](https://github.com/nfrasser/linkifyjs/blob/main/CHANGELOG.md) - [Commits](https://github.com/nfrasser/linkifyjs/commits/v4.3.1/packages/linkify-string) --- updated-dependencies: - dependency-name: linkify-string dependency-version: 4.3.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [webpack](https://github.com/webpack/webpack) from 5.99.7 to 5.99.8. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.99.7...v5.99.8) --- updated-dependencies: - dependency-name: webpack dependency-version: 5.99.8 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.3.4 to 6.3.5. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v6.3.5/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 6.3.5 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [@nextcloud/vite-config](https://github.com/nextcloud/nextcloud-vite-config) from 1.5.4 to 1.5.6. - [Release notes](https://github.com/nextcloud/nextcloud-vite-config/releases) - [Changelog](https://github.com/nextcloud-libraries/nextcloud-vite-config/blob/v1.5.6/CHANGELOG.md) - [Commits](nextcloud-libraries/nextcloud-vite-config@v1.5.4...v1.5.6) --- updated-dependencies: - dependency-name: "@nextcloud/vite-config" dependency-version: 1.5.6 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [sass](https://github.com/sass/dart-sass) from 1.87.0 to 1.88.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](sass/dart-sass@1.87.0...1.88.0) --- updated-dependencies: - dependency-name: sass dependency-version: 1.88.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…dependabot/npm_and_yarn/stable8/linkify-string-4.3.1
…dependabot/npm_and_yarn/stable8/webpack-5.99.8
…dependabot/npm_and_yarn/stable8/vite-6.3.5
…dependabot/npm_and_yarn/stable8/sass-1.88.0
…dependabot/npm_and_yarn/stable8/nextcloud/vite-config-1.5.6
…automated/noid/stable8-fix-npm-audit [stable8] Fix npm audit
Signed-off-by: Ferdinand Thiessen <[email protected]>
Signed-off-by: Ferdinand Thiessen <[email protected]> Co-authored-by: Grigorii K. Shartsev <[email protected]>
…backport/6659/stable8 [stable8] refactor(useIsFullscreen): migrate to Typescript
…backport/6430/stable8 [stable8] refactor(useHotKey): migrate code to Typescript
Signed-off-by: Ferdinand Thiessen <[email protected]>
…backport/6786/stable8 [stable8] refactor(Focus): migrate directive to Typescript
Bumps [sass](https://github.com/sass/dart-sass) from 1.88.0 to 1.89.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](sass/dart-sass@1.88.0...1.89.0) --- updated-dependencies: - dependency-name: sass dependency-version: 1.89.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [@nextcloud/auth](https://github.com/nextcloud/nextcloud-auth) from 2.4.0 to 2.5.1. - [Release notes](https://github.com/nextcloud/nextcloud-auth/releases) - [Changelog](https://github.com/nextcloud-libraries/nextcloud-auth/blob/main/CHANGELOG.md) - [Commits](nextcloud-libraries/nextcloud-auth@v2.4.0...v2.5.1) --- updated-dependencies: - dependency-name: "@nextcloud/auth" dependency-version: 2.5.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…dependabot/npm_and_yarn/stable8/sass-1.89.0
…dependabot/npm_and_yarn/stable8/nextcloud/auth-2.5.1
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5.4.2 to 5.4.3. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@ad3126e...18283e0) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-version: 5.4.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…dependabot/github_actions/stable8/codecov/codecov-action-5.4.3
Signed-off-by: Radek Pleskac <[email protected]>
Signed-off-by: Radek Pleskac <[email protected]>
Signed-off-by: Maksim Sukharev <[email protected]>
…backport/6936/stable8 [stable8] fix(NcEmptyContent): description styling for mobile
Signed-off-by: Maksim Sukharev <[email protected]>
Signed-off-by: Maksim Sukharev <[email protected]>
…backport/6944/stable8 [stable8] style(NcAppSidebar): remove custom styles from close button
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.2.5 to 3.2.6. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](cure53/DOMPurify@3.2.5...3.2.6) --- updated-dependencies: - dependency-name: dompurify dependency-version: 3.2.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [webpack](https://github.com/webpack/webpack) from 5.99.8 to 5.99.9. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.99.8...v5.99.9) --- updated-dependencies: - dependency-name: webpack dependency-version: 5.99.9 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…dependabot/npm_and_yarn/stable8/webpack-5.99.9
Signed-off-by: Ferdinand Thiessen <[email protected]>
…dependabot/npm_and_yarn/stable8/dompurify-3.2.6 chore(deps): Bump dompurify from 3.2.5 to 3.2.6
If the component is used within a container this allow to also limit the actions popover to that container. Signed-off-by: Ferdinand Thiessen <[email protected]>
…backport/6813/stable8 [stable8] feat(NcChip): allow to define the actions container
Signed-off-by: Maksim Sukharev <[email protected]>
Signed-off-by: Maksim Sukharev <[email protected]>
Signed-off-by: Max <[email protected]>
…backport/6932/stable8
…eded Signed-off-by: Ferdinand Thiessen <[email protected]>
Signed-off-by: Ferdinand Thiessen <[email protected]>
…backport/6767/stable8 [stable8] refactor: use `NcIconSvgWrapper` with `directional` property where needed
…backport/6966/stable8 [stable8] feat(NcRichText): filter links based on protocol
Signed-off-by: Maksim Sukharev <[email protected]>
…chore/release/stable8 chore: prepare v8.27.0 release
Upstream branch v8.27.0 merged into our most recent fork main-branch with package-lock.json conflicts solved manually. == Determining the source version https://github.com/nextcloud/server/blob/v31.0.7/package.json#L64 Showed version v8.27.0, so we'll use that tag. == Merge Merge by: git merge v8.27.0 This went without conflicts, the all files were auto-merged. Inspecting the merge git diff v8.27.0..HEAD -- package.json This showed that @mdi/js, @mdi/svg and vue-material-design-icons had conflicts _auto-merged_ to our versions with the file: paths. The auto-merge of package-lock.json is wrong, though as Git can not reliably merge this file, we have to discard it and resolve it manually. == Updating the package-lock.json We will pick their package-lock.json, but keep our customized package.json: git checkout v8.27.0 -- package-lock.json Re-install: rm -rf node_modules/ npm install npm install finished without errors, but showed warning of conflicting peer dependencies, that it could resolve. The same warnings are logged when running npm install for the v8.27.0 tag on the upstream repo checkout. == Replaying our dependency-overrides: We then install our customized packages again to have npn update package-lock: npm install file:../nc-vue-material-design-icons/dist npm install file:../nc-mdi-js npm install file:../nc-mdi-svg/dist Which updated the package-lock with our override-packages accordingly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge tag 'v8.27.0' into fix-root-ci-build-1350
Upstream branch v8.27.0 merged into our most recent fork main-branch
with package-lock.json conflicts solved manually.
Determining the source version
https://github.com/nextcloud/server/blob/v31.0.7/package.json#L64
Showed version v8.27.0, so we'll use that tag.
Merge
Merge by:
This went without conflicts, the all files were auto-merged.
Inspecting the merge
This showed that @mdi/js, @mdi/svg and vue-material-design-icons had conflicts auto-merged
to our versions with the file: paths.
The auto-merge of package-lock.json is wrong, though as Git can not reliably merge this file,
we have to discard it and resolve it manually.
Updating the package-lock.json
We will pick their package-lock.json, but keep our customized package.json:
Re-install:
npm install finished without errors, but showed warning of conflicting
peer dependencies, that it could resolve.
The same warnings are logged when running npm install for the v8.27.0
tag on the upstream repo checkout.
Replaying our dependency-overrides:
We then install our customized packages again to have npn update package-lock:
Which updated the package-lock with our override-packages accordingly.