Skip to content

D3 color upstream merge#2053

Open
maxgrossman wants to merge 5360 commits intod3-colorfrom
d3-color-upstream-merge
Open

D3 color upstream merge#2053
maxgrossman wants to merge 5360 commits intod3-colorfrom
d3-color-upstream-merge

Conversation

@maxgrossman
Copy link
Copy Markdown
Contributor

merges iD tag v2.25.1 into the d3-color pr. worked up to point that ui will compile and load. issues still left to resolve

  • work through the sass->css compiling. while the esbuild sass plugin introduced seems to succeed i don't know if the sass is actually being bundled in the iD.css file. maybe there's a separate css file our sass historically was bundled into that i'm not seeing because the merging overwrote the reference in the index.html?
  • to deal with resolving the runtime errors I would see when I first got the app to load in my browser, i commented out a number of svg imports we added in the _icons.scss file. if you uncomment them the esbuild will start to fail so we'll need to work this out
  • smoke test all of our hoot customizations.

tyrasd and others added 30 commits June 24, 2022 11:45
Bumps [d3](https://github.com/d3/d3) from 7.4.5 to 7.6.1.
- [Release notes](https://github.com/d3/d3/releases)
- [Changelog](https://github.com/d3/d3/blob/main/CHANGES.md)
- [Commits](d3/d3@v7.4.5...v7.6.1)

---
updated-dependencies:
- dependency-name: d3
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@mapbox/maki](https://github.com/mapbox/maki) from 7.2.0 to 8.0.0.
- [Release notes](https://github.com/mapbox/maki/releases)
- [Changelog](https://github.com/mapbox/maki/blob/main/CHANGELOG.md)
- [Commits](mapbox/maki@v7.2.0...v8.0.0)

---
updated-dependencies:
- dependency-name: "@mapbox/maki"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
Bumps [@tmcw/togeojson](https://github.com/placemarkio/togeojson) from 4.7.0 to 5.2.1.
- [Release notes](https://github.com/placemarkio/togeojson/releases)
- [Commits](https://github.com/placemarkio/togeojson/commits)

---
updated-dependencies:
- dependency-name: "@tmcw/togeojson"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [mocha](https://github.com/mochajs/mocha) from 9.2.2 to 10.0.0.
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)
- [Commits](mochajs/mocha@v9.2.2...v10.0.0)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Daniele Basso <daniele05.bass@gmail.com>
Co-authored-by: Martin Raifer <martin@raifer.tech>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.