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

fix: merge changes from open source day #2036

Merged
merged 27 commits into from
Oct 25, 2023
Merged

fix: merge changes from open source day #2036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b049389
fix: #1898 publish types for content-highlight (#1949)
borahm98 Sep 22, 2023
addae02
feat: add publish types for toolbox-search (#1950)
zhangjuliet Sep 22, 2023
f0e8dbf
fix: publish type for field angle (#1956)
sunnydreamer Sep 22, 2023
166ea37
edited package.json and added config options to tsconfig.json (#1953)
juhithaVd Sep 22, 2023
a615010
feat: add publish types for field slider (#1962)
justjess246 Sep 22, 2023
ffa3797
fix: export types for block-dynamic-connection (#1948)
eldu Sep 22, 2023
9c96dbe
fix: Publish types for field-dependent-dropdown (#1961)
bhsingla Sep 22, 2023
3345fa8
fix: Publish types for shadow-block-converter (#1965)
humera811 Sep 22, 2023
8aee09e
fix: Field Colour Plugin types (#1964)
mishra016 Sep 22, 2023
2b60231
Feat: Publish types for block-shareable-procedures (#1952)
Daphne-wu Sep 22, 2023
313035f
feat: updated README for suggested-blocks (#1958)
divziv Sep 22, 2023
cc8b6b1
fix: Advanced playground should use JSON instead of XML on reload (#1…
divyajyotiuk Sep 22, 2023
036f238
feat: Index dropdown field option for toolbox-search (#1971)
sammitako Sep 23, 2023
abc713b
fix: add the type property to the package.json next to the "main" pro…
shivalipatel6 Sep 24, 2023
dfd4966
feat: have field-slider fire intermediate change events (#1954)
joycexfang Sep 25, 2023
4537b8c
fix: #1905 publish types for field-multiline (#1957)
hwanyaur Sep 26, 2023
b76046b
chore: fix ghpage demos (#1974)
alicialics Sep 26, 2023
9dbd268
Fix: Publish types for workspace-search (#1951)
Yalagach Sep 27, 2023
140a24f
fix: Update to use JSON tool definitions (#1968)
karenjohn35 Oct 6, 2023
7050875
fix: progress for Have field-bitmap fire intermediate change events (…
BeksOmega Oct 6, 2023
75739e4
chore: fix using JSON in advanced playground (#1996)
BeksOmega Oct 16, 2023
df4b084
fix: update tsconfigs to publish types accurately
maribethb Oct 20, 2023
f49c3ef
Merge branch 'master' of github.com:google/blockly-samples into osd
maribethb Oct 20, 2023
5a53633
Merge branch 'osd' of github.com:google/blockly-samples into osd
maribethb Oct 20, 2023
b8096f6
Merge branch 'master' of github.com:google/blockly-samples into osd
maribethb Oct 20, 2023
40efc25
fix: use includes rather than excludes
maribethb Oct 24, 2023
33e2c9c
Merge pull request #2026 from maribethb/osd
maribethb Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
491 changes: 357 additions & 134 deletions examples/rtl-demo/index.html
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 21 additions & 1 deletion plugins/block-dynamic-connection/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion plugins/block-dynamic-connection/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"test": "blockly-scripts test"
},
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"unpkg": "./dist/index.js",
"author": "",
"keywords": [
Expand Down Expand Up @@ -43,7 +44,8 @@
"@blockly/dev-tools": "^7.1.0",
"blockly": "^10.2.0",
"chai": "^4.2.0",
"mocha": "^10.2.0"
"mocha": "^10.2.0",
"typescript": "^5.2.2"
},
"peerDependencies": {
"blockly": "^10.2.0"
Expand Down
27 changes: 14 additions & 13 deletions plugins/block-dynamic-connection/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
{
"compilerOptions": {
"baseUrl": "./",
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"module": "ES2015",
"moduleResolution": "node",
"target": "ES2015",
"strict": true,
// Point at the local Blockly. See #1934. Remove if we add hoisting.
"paths": {
"blockly/*": ["node_modules/blockly/*"]
}
"baseUrl": "./",
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"module": "es2015",
"moduleResolution": "bundler",
"target": "es6",
"strict": true,
// Point at the local Blockly. See #1934. Remove if we add hoisting.
"paths": {
"blockly/*": ["node_modules/blockly/*"]
}
},
// NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
// Only src matters for production builds.
"exclude": ["test/**/*"]
"include": ["src"]
}
16 changes: 15 additions & 1 deletion plugins/block-shareable-procedures/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion plugins/block-shareable-procedures/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"test": "blockly-scripts test"
},
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"unpkg": "./dist/index.js",
"author": "Blockly Team",
"keywords": [
Expand Down Expand Up @@ -47,7 +48,8 @@
"chai": "^4.3.7",
"jsdom": "^16.4.0",
"jsdom-global": "^3.0.2",
"sinon": "^15.0.1"
"sinon": "^15.0.1",
"typescript": "^5.2.2"
},
"peerDependencies": {
"blockly": "^10.2.0"
Expand Down
18 changes: 10 additions & 8 deletions plugins/block-shareable-procedures/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{
"compilerOptions": {
"baseUrl": "./",
"outDir": "build",
"target": "es6",
"allowJs": true,
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"lib": ["es6", "dom"],
"moduleResolution": "node",
"module": "es2015",
"moduleResolution": "bundler",
"target": "es6",
"strict": false,
// Point at the local Blockly. See #1934. Remove if we add hoisting.
"paths": {
"blockly/*": ["node_modules/blockly/*"]
}
},
"include": [
"src", "test"
],
// NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
// Only src matters for production builds.
"include": ["src"]
}
22 changes: 21 additions & 1 deletion plugins/content-highlight/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion plugins/content-highlight/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"test": "blockly-scripts test"
},
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"unpkg": "./dist/index.js",
"author": "Blockly Team",
"keywords": [
Expand Down Expand Up @@ -44,7 +45,8 @@
"devDependencies": {
"@blockly/dev-scripts": "^2.0.1",
"@blockly/dev-tools": "^7.1.0",
"blockly": "^10.0.0"
"blockly": "^10.0.0",
"typescript": "^5.2.2"
},
"peerDependencies": {
"blockly": "^10.0.0"
Expand Down
18 changes: 10 additions & 8 deletions plugins/content-highlight/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{
"compilerOptions": {
"baseUrl": "./",
"outDir": "build",
"target": "es6",
"allowJs": true,
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"moduleResolution": "nodenext",
"lib": ["es2021", "dom"],
"module": "es2015",
"moduleResolution": "bundler",
"target": "es6",
"strict": false,
// Point at the local Blockly. See #1934. Remove if we add hoisting.
"paths": {
"blockly/*": ["node_modules/blockly/*"]
}
},
"include": [
"src", "test"
],
// NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
// Only src matters for production builds.
"include": ["src"]
}
17 changes: 10 additions & 7 deletions plugins/dev-create/templates/typescript-block/template/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
{
"compilerOptions": {
"baseUrl": "./",
"outDir": "build",
"target": "es5",
"allowJs": true,
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"lib": ["es6", "dom"],
"module": "es2015",
"moduleResolution": "bundler",
"target": "es6",
"strict": true,
// Point at the local Blockly. See #1934. Remove if we add hoisting.
"paths": {
"blockly/*": ["node_modules/blockly/*"]
}
},
"include": [
"src", "test"
],
// NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
// Only src matters for production builds.
"include": ["src"]
}
17 changes: 10 additions & 7 deletions plugins/dev-create/templates/typescript-field/template/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
{
"compilerOptions": {
"baseUrl": "./",
"outDir": "build",
"target": "es5",
"allowJs": true,
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"lib": ["es6", "dom"],
"module": "es2015",
"moduleResolution": "bundler",
"target": "es6",
"strict": true,
// Point at the local Blockly. See #1934. Remove if we add hoisting.
"paths": {
"blockly/*": ["node_modules/blockly/*"]
}
},
"include": [
"src", "test"
],
// NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
// Only src matters for production builds.
"include": ["src"]
}
17 changes: 10 additions & 7 deletions plugins/dev-create/templates/typescript-plugin/template/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
{
"compilerOptions": {
"baseUrl": "./",
"outDir": "build",
"target": "es5",
"allowJs": true,
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"lib": ["es6", "dom"],
"module": "es2015",
"moduleResolution": "bundler",
"target": "es6",
"strict": true,
// Point at the local Blockly. See #1934. Remove if we add hoisting.
"paths": {
"blockly/*": ["node_modules/blockly/*"]
}
},
"include": [
"src", "test"
],
// NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
// Only src matters for production builds.
"include": ["src"]
}
17 changes: 10 additions & 7 deletions plugins/dev-create/templates/typescript-theme/template/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
{
"compilerOptions": {
"baseUrl": "./",
"outDir": "build",
"target": "es5",
"allowJs": true,
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"lib": ["es6", "dom"],
"module": "es2015",
"moduleResolution": "bundler",
"target": "es6",
"strict": true,
// Point at the local Blockly. See #1934. Remove if we add hoisting.
"paths": {
"blockly/*": ["node_modules/blockly/*"]
}
},
"include": [
"src", "test"
],
// NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
// Only src matters for production builds.
"include": ["src"]
}
Loading