Skip to content

Commit cc5807e

Browse files
Resolving conflicts in order to merge dev to main (#279)
Co-authored-by: p-buddy <[email protected]>
1 parent b92ac2c commit cc5807e

File tree

344 files changed

+128597
-98355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

344 files changed

+128597
-98355
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Generate Extension Documentation
2+
3+
on: [push]
4+
permissions:
5+
contents: write
6+
pages: write
7+
id-token: write
8+
jobs:
9+
generate:
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
node-version: [16.17.1]
14+
steps:
15+
- uses: actions/checkout@v3
16+
- name: Use Node.js ${{ matrix.node-version }}
17+
uses: actions/setup-node@v3
18+
with:
19+
node-version: ${{ matrix.node-version }}
20+
- name: Initialize
21+
run: npm run init
22+
- name: Generate
23+
run: npm run document:extensions
24+
- name: Commit (without CI)
25+
run: |
26+
git config --local user.email ""
27+
git config --local user.name "GitHub Action"
28+
git add extensions/README.md
29+
git commit -m "[skip ci] re-generate extension documentation"
30+
- name: Push
31+
run: git push

.gitignore

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
.DS_Store
2+
./**/.DS_Store
3+
14
# Logs
25
logs
36
*.log
@@ -6,6 +9,9 @@ yarn-debug.log*
69
yarn-error.log*
710
lerna-debug.log*
811

12+
.DS_Store
13+
**/.DS_Store
14+
915
# Diagnostic reports (https://nodejs.org/api/report.html)
1016
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
1117

@@ -104,7 +110,3 @@ dist
104110
.tern-port
105111

106112
.idea
107-
108-
# Scratch specific
109-
*/package-lock.json
110-
*/package.json

.vscode/extensions.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"recommendations": [
3+
"ms-vscode.vscode-typescript-next",
4+
"svelte.svelte-vscode",
5+
"oderwat.indent-rainbow"
6+
]
7+
}

.vscode/settings.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"svelte.plugin.svelte.compilerWarnings": {
33
"missing-declaration": "ignore"
4-
}
4+
},
5+
"[typescript]": {
6+
"editor.defaultFormatter": "vscode.typescript-language-features"
7+
},
8+
"[javascript]": {
9+
"editor.defaultFormatter": "vscode.typescript-language-features"
10+
},
11+
"[svelte]": {
12+
"editor.defaultFormatter": "svelte.svelte-vscode"
13+
},
14+
"typescript.tsdk": "node_modules/typescript/lib",
515
}

CHANGELOG.md

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
6+
7+
## 2023-03-25 (pending)
8+
9+
### Changed
10+
11+
- Info about an extension (e.g. its `id`, `name`, and `blockIconURI`) are now loaded via an external `.js` file instead of being 'filled in' at bundle-time (which was error prone)
12+
- [Scratch VM Change](#scratch-vm-change): changes are implemented in _bundle-loader.js_ to load this file in and utilize when retrieving an Extension's constructor
13+
14+
## 2023-03-20
15+
16+
### Added
17+
18+
- **_Video mixin:_** Ability for extensions to enable video feed and set transparency
19+
- Available as `"video"` addon
20+
- **_Drawable mixin:_** Ability for extensions to draw arbitrary images onto the stage
21+
- Available as `"drawable`" addon
22+
- **_Add Costumes mixin:_** Ability for extensions to add and set costumes for sprites
23+
- Available as `"addCostumes"` addon
24+
- [Scratch VM Change](#scratch-vm-change): Added `addCostime` function onto `runtime` to allow for utilizing the `loadCostume` function of `scratch-vm/src/import/load-costume.js`
25+
- Block mixins
26+
- **_Toggle video:_** Ability for extensions to include a toggle video block to set the state of the video feed
27+
- Available as `"toggleVideoBlock"` addon
28+
- **_Video transparency:_** Ability for extensions to include a set transparency block to set how see-through the video feed is
29+
- Available as `"setTransparencyBlock"` addon
30+
- **_Legacy Support mixin:_** Legacy support available as a mixin (in addition / instead of as a class decorator)
31+
- Available as "legacySupport"
32+
- Selfie Segmentation extension:
33+
- Guidance on developing on windows
34+
- Vs Code setting to use this project's typescript version instead of Vs Code's
35+
36+
### Fixed
37+
38+
- Limited the potential for endless bundling loops
39+
- Now bundles are only re-generated when a file with a `.ts`, `.svelte`, `.png`, and/or `.svg` extension is changed
40+
- **_NOTE_**: The above 'watched' file extensions can / should grow overtime
41+
- Corrected Extension Probe runtime errors
42+
43+
### Changed
44+
45+
- Extension's `init` function now supports be implemented as `async`
46+
- [Scratch VM Change](#scratch-vm-change): _extension-manager_ now `await`s the `tryInitExtension` function from the _bundle-loader_
47+
- Tests update to support
48+
- The prescribed workflow for legacy support now uses the Legacy Support mixin (instead of the Legacy Extension class decorator)
49+
- Typescript version set to the `latest`
50+
- New way to express dependencies within mixin architecture
51+
52+
# Tags
53+
54+
## Scratch VM Change
55+
56+
As best as possible, we should keep track of when changes are committed that change the `packages/scratch-vm` source and thus cause our repo to diverge (further) from [LLK's scratch-vm](https://github.com/LLK/scratch-vm)
57+
58+
## Scratch GUI Change
59+
60+
As best as possible, we should keep track of when changes are committed that change the `packages/scratch-gui` source and thus cause our repo to diverge (further) from [LLK's scratch-gui](https://github.com/LLK/scratch-gui)
61+
62+
# Template
63+
64+
## YYYY-MM-DD
65+
66+
### Added
67+
68+
### Fixed
69+
70+
### Changed
71+
72+
### Deprecated
73+
74+
### Removed
75+
76+
### Fixed
77+
78+
### Security

0 commit comments

Comments
 (0)