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.

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

Feature/uepr 139 update native branch with newest features #9813

Open
wants to merge 376 commits into
base: native
Choose a base branch
from

Conversation

KManolov3
Copy link
Contributor

@KManolov3 KManolov3 commented Jan 23, 2025

TODO: Make another check that no native-specific functionalities are overwritten by the merge.
TODO2: Move this PR into the scratch-editor repo

Resolves

https://scratchfoundation.atlassian.net/browse/UEPR-139

Proposed Changes

  • Merge changes from newest develop into native branch
  • Stop ignoring /src files, so that scratch-android can checkout gui from git commit and build from source
    • NOTE: This increases project size by ~60MB, and we likely don't want to merge this change into develop. We can remove it entirely if scratch-android starts using gui from npm, instead of building it locally.

Reason for Changes

Update scratch-gui native branch (used by scratch-android) to use newest GUI functionalities

renovate bot and others added 30 commits September 30, 2024 07:21
…vate/eslint-plugin-react-7.x

chore(deps): update dependency eslint-plugin-react to v7.37.0
…vate/lock-file-maintenance

fix(deps): lock file maintenance
## [4.0.33](scratchfoundation/scratch-gui@v4.0.32...v4.0.33) (2024-10-02)

### Bug Fixes

* **deps:** lock file maintenance ([91c6117](scratchfoundation@91c6117))
…vate/eslint-plugin-react-7.x

chore(deps): update dependency eslint-plugin-react to v7.37.1
…vate/lock-file-maintenance

fix(deps): lock file maintenance
## [4.0.34](scratchfoundation/scratch-gui@v4.0.33...v4.0.34) (2024-10-05)

### Bug Fixes

* **deps:** lock file maintenance ([1d097df](scratchfoundation@1d097df))
…vate/babel-monorepo

chore(deps): update babel monorepo to v7.25.7
…vate/eslint-plugin-import-2.x

chore(deps): update dependency eslint-plugin-import to v2.31.0
…vate/lock-file-maintenance

fix(deps): lock file maintenance
## [4.0.35](scratchfoundation/scratch-gui@v4.0.34...v4.0.35) (2024-10-07)

### Bug Fixes

* **deps:** lock file maintenance ([a6fd209](scratchfoundation@a6fd209))
…vate/lock-file-maintenance

fix(deps): lock file maintenance
## [4.0.36](scratchfoundation/scratch-gui@v4.0.35...v4.0.36) (2024-10-09)

### Bug Fixes

* **deps:** lock file maintenance ([c406036](scratchfoundation@c406036))
…t-encoding

ENA-118 Replace text-encoding polyfill with much smaller library, saving 500KB
…vate/lock-file-maintenance

fix(deps): lock file maintenance
## [4.0.37](scratchfoundation/scratch-gui@v4.0.36...v4.0.37) (2024-10-12)

### Bug Fixes

* **deps:** lock file maintenance ([58c1696](scratchfoundation@58c1696))
…vate/babel-monorepo

chore(deps): update babel monorepo to v7.25.8
…vate/lock-file-maintenance

fix(deps): lock file maintenance
renovate bot and others added 28 commits January 3, 2025 07:53
## [5.1.25](scratchfoundation/scratch-gui@v5.1.24...v5.1.25) (2025-01-03)

### Bug Fixes

* **deps:** lock file maintenance ([58f150c](scratchfoundation@58f150c))
…vate/lock-file-maintenance

fix(deps): lock file maintenance
## [5.1.26](scratchfoundation/scratch-gui@v5.1.25...v5.1.26) (2025-01-05)

### Bug Fixes

* **deps:** lock file maintenance ([41be2b8](scratchfoundation@41be2b8))
…vate/lock-file-maintenance

fix(deps): lock file maintenance
## [5.1.27](scratchfoundation/scratch-gui@v5.1.26...v5.1.27) (2025-01-09)

### Bug Fixes

* **deps:** lock file maintenance ([fc16efd](scratchfoundation@fc16efd))
…vate/lock-file-maintenance

fix(deps): lock file maintenance
## [5.1.28](scratchfoundation/scratch-gui@v5.1.27...v5.1.28) (2025-01-11)

### Bug Fixes

* **deps:** lock file maintenance ([fc58754](scratchfoundation@fc58754))
…vate/babel-monorepo

chore(deps): update dependency @babel/eslint-parser to v7.26.5
…vate/lock-file-maintenance

fix(deps): lock file maintenance
## [5.1.29](scratchfoundation/scratch-gui@v5.1.28...v5.1.29) (2025-01-14)

### Bug Fixes

* **deps:** lock file maintenance ([5dcc87c](scratchfoundation@5dcc87c))
…vate/eslint-plugin-react-7.x

chore(deps): update dependency eslint-plugin-react to v7.37.4
…vate/lock-file-maintenance

fix(deps): lock file maintenance
## [5.1.30](scratchfoundation/scratch-gui@v5.1.29...v5.1.30) (2025-01-17)

### Bug Fixes

* **deps:** lock file maintenance ([d36d995](scratchfoundation@d36d995))
…vate/lock-file-maintenance

fix(deps): lock file maintenance
## [5.1.31](scratchfoundation/scratch-gui@v5.1.30...v5.1.31) (2025-01-20)

### Bug Fixes

* **deps:** lock file maintenance ([dfb09b8](scratchfoundation@dfb09b8))
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.

4 participants