Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Upstream update #5

Merged
merged 476 commits into from
Apr 24, 2024
Merged

Upstream update #5

merged 476 commits into from
Apr 24, 2024

Conversation

eddieferrer
Copy link
Collaborator

@eddieferrer eddieferrer commented Apr 24, 2024 •
edited
Loading

  • Update from upstream
  • Remove dependencies
  • Generate new sprites

Lots of changes from upstream since this was incredibly out of date -- the files I changes/regenerated are these:

  modified:   flags/sprite/1x1/flag-sprite-32.png
    modified:   flags/sprite/1x1/flag-sprite-32_2x.png
    modified:   flags/sprite/4x3/flag-sprite-32.png
    modified:   flags/sprite/4x3/flag-sprite-32_2x.png
    modified:   package-lock.json
    modified:   package.json
    modified:   yarn.lock

seiry and others added 30 commits April 6, 2022 21:12
@seiry
Add main to package.json (lipis#946)
9f05f46 
* add main attr to package.json

* fix the mistype file name
@colinj
Make Unknown flag (xx) as first flag in flag list (lipis#950)
4a48452
@94noni
Upgrade LB flag colors (lipis#939)
defbc14 
* Upgrade LB flag colors

* Update lb.svg

* Update lb.svg
@sebastiankutschbach @lipis
German flag is not rendered correctly on safari (lipis#941)
0ecbb03 
* fixes german flag icon on safari

* Update flags/1x1/de.svg

* Update flags/4x3/de.svg

Co-authored-by: Lipis <lipiridis@gmail.com>
@dependabot
Bump minimist from 1.2.5 to 1.2.6 (lipis#952)
c42a927 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@lipis
build
240fd55
@lipis
6.2.0
c1efa9d
@xavier2k6
CI: Update multiple actions & use nodejs lts version (lipis#955)
80187fb 
* Update `actions/checkout` to `v3`
* Rename `Setup Node.js 14.x` to `Setup Node.js LTS`
* Update `actions/setup-node` to `v3`
* Use `nodejs lts` version -> `lts/*`
@dependabot
Bump async from 2.6.3 to 2.6.4 (lipis#957)
66f9e58 
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](caolan/async@v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Carlgo11
Correct colors and merge paths (lipis#958)
3211f6e
@colinj
Fix AU & HM flags (lipis#949)
49450d4 
* Fix AU & HM flags

- Change to use official AU flag colours (https://www.pmc.gov.au/resource-centre/government/flag-images-and-template-files-download)
- Realign the Southern Cross and Federation stars to match their correct positions on the flag
- Make the stars slightly bigger to be more prominant when used as icons
- HM flag also updated since it is the same flag as the AU flag

* fix: Update AU & HM flag colors
@StarkRobin @lipis
Scss variables (lipis#937)
5557640 
* Variable adjustments

* Update sass/_flag-icons-base.scss

* Update sass/_variables.scss

* Update sass/_flag-icons-base.scss

* Update sass/_flag-icons-base.scss

Co-authored-by: Robin Stark <robin.stark@consid.se>
Co-authored-by: Lipis <lipiridis@gmail.com>
@lipis
6.3.0
01e5137
@lipis
Add CHANGELOG
c1ba155
@lipis
Add CEFTA (lipis#966)
577cf22 
* Add CEFTA

* id

* Change log
@lipis
link
74f3192
@lipis
6.4.0
bbeb483
@lipis
change
7096876
@lipis
6.4.1
01daace
@lipis
Convert text to path (lipis#967)
47732be 
* Convert text to path

* gu

* changelog

* change
@lipis
6.4.2
1f861ac
@lipis
Fix Argentina (lipis#968)
d633e34 
* Fix ag

* change log
@lipis
6.4.3
4055e1a
@RobinvanderVliet
Change colors of flag of AM (lipis#970) (lipis#971)
2839a5e
@RobinvanderVliet
Flag of NU (lipis#621) (lipis#969)
c2c4370
@lipis
Changelog
67d71e9
@lipis
6.4.4
01c6c13
Fix EE flag blue colour (lipis#976)
304c06d 
Fixing the incorrect blue colour HEX in ee.svg to be correct.

Source: https://www.riigiteataja.ee/en/eli/530102013068/consolide#:~:text=annex%201%20estonian%20flag

The blue colour tone is 285 C as specified in the international Pantone matching system

In the colours of the triad:
C 91%	CYAN (blue)
M 43%	MAGENTA (purple)
Y 0%	YELLOW (yellow)
B 0%	BLACK (black)
@dependabot
Bump http-server from 14.1.0 to 14.1.1 (lipis#975)
b5803c6 
Bumps [http-server](https://github.com/http-party/http-server) from 14.1.0 to 14.1.1.
- [Release notes](https://github.com/http-party/http-server/releases)
- [Commits](http-party/http-server@v14.1.0...v14.1.1)

---
updated-dependencies:
- dependency-name: http-server
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@lipis
docs
6493a8f
markvantilburg and others added 18 commits February 1, 2024 15:27
@markvantilburg
Update de.svg (lipis#1209)
1d6788f 
yellow to fc0
@markvantilburg
Update de.svg (lipis#1208)
2aa5032 
fc0 for yellow
@dependabot
Bump prettier from 3.1.1 to 3.2.4 (lipis#1214)
6a8e631 
Bumps [prettier](https://github.com/prettier/prettier) from 3.1.1 to 3.2.4.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.1.1...3.2.4)

---
updated-dependencies:
- dependency-name: prettier
  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>
@xavier2k6
CI: Update multiple actions & make further use of nodejs lts vers…
bcf1c0b 
…ion (lipis#1216)
@dependabot
Bump prettier from 3.2.4 to 3.2.5 (lipis#1219)
c95b262 
Bumps [prettier](https://github.com/prettier/prettier) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.2.4...3.2.5)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump sass from 1.70.0 to 1.71.0 (lipis#1221)
be583cd 
Bumps [sass](https://github.com/sass/dart-sass) from 1.70.0 to 1.71.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.70.0...1.71.0)

---
updated-dependencies:
- dependency-name: sass
  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>
@dependabot
Bump svgo from 3.1.0 to 3.2.0 (lipis#1205)
59db7a2 
Bumps [svgo](https://github.com/svg/svgo) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/svg/svgo/releases)
- [Changelog](https://github.com/svg/svgo/blob/main/CHANGELOG-old.md)
- [Commits](svg/svgo@v3.1.0...v3.2.0)

---
updated-dependencies:
- dependency-name: svgo
  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>
@dependabot
Bump sass from 1.71.0 to 1.71.1 (lipis#1222)
0da24d6 
Bumps [sass](https://github.com/sass/dart-sass) from 1.71.0 to 1.71.1.
- [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.71.0...1.71.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@lipis
Optimize with SVGO 3.2.0 (lipis#1224)
9b5181f 
* Changelog

* Optimize with SVGO 3.2.0

* change log
@lipis
7.2.0
25342e5
@dependabot
Bump sass from 1.71.1 to 1.72.0 (lipis#1227)
5f2eba8 
Bumps [sass](https://github.com/sass/dart-sass) from 1.71.1 to 1.72.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.71.1...1.72.0)

---
updated-dependencies:
- dependency-name: sass
  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>
@dependabot
Bump follow-redirects from 1.15.4 to 1.15.6 (lipis#1228)
ce91162 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@lipis
Fix Belarus Flag (lipis#1230)
7018378 
* Fix Belarus Flag

* cjange
@lipis
7.2.1
05059f9
@dependabot
Bump sass from 1.72.0 to 1.75.0 (lipis#1233)
38dbe5f 
Bumps [sass](https://github.com/sass/dart-sass) from 1.72.0 to 1.75.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.72.0...1.75.0)

---
updated-dependencies:
- dependency-name: sass
  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>
@eddieferrer
Merge remote-tracking branch 'upstream/main' into upstream_update
ff6cec5
@eddieferrer
chore: generated sprites again
375d26c
@eddieferrer
remove workflows
b73ce2c
@mcstover
Copy link
Collaborator

@eddieferrer Were you able to pull this new branch into UI and verify things are looking and working properly there?

emuvente
emuvente approved these changes Apr 24, 2024
View reviewed changes
Copy link
Collaborator

@emuvente emuvente left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work!

mcstover
mcstover approved these changes Apr 24, 2024
View reviewed changes
Copy link
Collaborator

@mcstover mcstover left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So long as this is functioning properly in UI, we should be good to merge.

We'll want to monitor the docker image build and I also wanted to note that this package also shows up in the Auth0 repo package-lock file due to the Ui import there.

@eddieferrer
Copy link
Collaborator Author

Tested and working in UI after I made some modifications to package.json to control which files are exported, and the package name.

Storybook from UI:
Screenshot 2024-04-24 at 2 16 54 PM

@eddieferrer eddieferrer merged commit 741053d into sprite Apr 24, 2024
@eddieferrer eddieferrer deleted the upstream_update branch April 24, 2024 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emuvente emuvente emuvente approved these changes

@mcstover mcstover mcstover approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.