snoopycrimecop
commented
1 year ago Conflicting PR. Removed from build OMERO-plugins-push#1354. See the console output for more details. Possible conflicts:
- PR #108 dependabot[bot] 'Bump loader-utils from 1.1.0 to 1.4.2'
- package-lock.json
- PR #110 dependabot[bot] 'Bump minimatch from 3.0.4 to 3.1.2'
- package-lock.json
- PR #111 dependabot[bot] 'Bump set-value and union-value'
- package-lock.json
- PR #112 dependabot[bot] 'Bump minimist and mkdirp'
- package-lock.json
- PR #113 dependabot[bot] 'Bump glob-parent and watchpack'
- package-lock.json
--conflicts
will-moore
dependabot[bot]
Bumps ssri to 6.0.2 and updates ancestor dependency webpack. These dependencies need to be updated together.
Updates
ssrifrom 5.3.0 to 6.0.2Changelog
Sourced from ssri's changelog.
Commits
b7c8c7cchore(release): 6.0.2b30dfdbfix: backport regex change from 8.0.1a4337cdchore(release): 6.0.1cf86553fix(opts): use figgy-pudding to specify consumed opts97b032ddeps: npm6ify pkglockd1aa2f7chore(release): 6.0.004b3ef7deps: remove safe-bufferd9bf359meta: drop support for node@4b71ef17fix(docs): minor typoMaintainer changes
This version was pushed to npm by nlf, a new releaser for ssri since your current version.
Updates
webpackfrom 4.25.1 to 4.46.0Commits
444e59f4.46.0758bb25Merge pull request #12387 from webpack/bugfix/1238679de1a2enable backward-compatibility for resolve.rootsef75c04Fix filename in azure pipeline7714953add test case03313224.45.0e43bb4bMerge pull request #12372 from webpack/bugfix/split-chunks-min-size-44de8451fix bug where cacheGroup index was inverted3f69f3cfix bug where module size is added multiple times to the split chunk infoc572c15Merge pull request #11831 from Pyrolistical/patch-1Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/ome/omero-parade/network/alerts).