diff --git a/examples/developer-tools/package-lock.json b/examples/developer-tools/package-lock.json index f4f173fadc..95bcd5812a 100644 --- a/examples/developer-tools/package-lock.json +++ b/examples/developer-tools/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "blockly": "^10.1.3" + "blockly": "^10.3.0" }, "devDependencies": { "@webpack-cli/generators": "^3.0.7", @@ -2009,9 +2009,9 @@ } }, "node_modules/blockly": { - "version": "10.1.3", - "resolved": "https://registry.npmjs.org/blockly/-/blockly-10.1.3.tgz", - "integrity": "sha512-3sgeKobXiU8fpj6Kgn7rlVggus+T77bohYhY72sivoL7nzH/6G/NBFC6uuQJUlzCxjsWXDh5QVEN/rfnAaL0mw==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/blockly/-/blockly-10.3.0.tgz", + "integrity": "sha512-+95241EVK5o80F3b/iDP61+LfwKwueqscRyh/JfGKPRA4Tlcg8nngu1DdMhOyVCy8Z58AyXuFJ+96+QlCFx5MQ==", "dependencies": { "jsdom": "22.1.0" } @@ -12222,9 +12222,9 @@ } }, "blockly": { - "version": "10.1.3", - "resolved": "https://registry.npmjs.org/blockly/-/blockly-10.1.3.tgz", - "integrity": "sha512-3sgeKobXiU8fpj6Kgn7rlVggus+T77bohYhY72sivoL7nzH/6G/NBFC6uuQJUlzCxjsWXDh5QVEN/rfnAaL0mw==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/blockly/-/blockly-10.3.0.tgz", + "integrity": "sha512-+95241EVK5o80F3b/iDP61+LfwKwueqscRyh/JfGKPRA4Tlcg8nngu1DdMhOyVCy8Z58AyXuFJ+96+QlCFx5MQ==", "requires": { "jsdom": "22.1.0" } diff --git a/examples/developer-tools/package.json b/examples/developer-tools/package.json index 48028d3fcf..1d94375b61 100644 --- a/examples/developer-tools/package.json +++ b/examples/developer-tools/package.json @@ -5,39 +5,39 @@ "private": true, "main": "index.js", "scripts": { - "start": "webpack serve --open --mode=development", - "build": "webpack --mode=production --node-env=production", - "build:dev": "webpack --mode=development", - "build:prod": "webpack --mode=production --node-env=production", - "watch": "webpack --watch", - "serve": "webpack serve" + "start": "webpack serve --open --mode=development", + "build": "webpack --mode=production --node-env=production", + "build:dev": "webpack --mode=development", + "build:prod": "webpack --mode=production --node-env=production", + "watch": "webpack --watch", + "serve": "webpack serve" }, "repository": { - "type": "git", - "url": "git+https://github.com/google/blockly-samples.git" + "type": "git", + "url": "git+https://github.com/google/blockly-samples.git" }, "keywords": [ - "blockly" + "blockly" ], "author": "Blockly Team", "license": "Apache-2.0", "bugs": { - "url": "https://github.com/google/blockly-samples/issues" + "url": "https://github.com/google/blockly-samples/issues" }, "homepage": "https://github.com/google/blockly-samples#readme", "devDependencies": { - "@webpack-cli/generators": "^3.0.7", - "css-loader": "^6.8.1", - "html-webpack-plugin": "^5.5.3", - "mini-css-extract-plugin": "^2.7.6", - "style-loader": "^3.3.3", - "ts-loader": "^9.4.4", - "typescript": "^5.1.6", - "webpack": "^5.88.2", - "webpack-cli": "^5.1.4", - "webpack-dev-server": "^4.15.1" + "@webpack-cli/generators": "^3.0.7", + "css-loader": "^6.8.1", + "html-webpack-plugin": "^5.5.3", + "mini-css-extract-plugin": "^2.7.6", + "style-loader": "^3.3.3", + "ts-loader": "^9.4.4", + "typescript": "^5.1.6", + "webpack": "^5.88.2", + "webpack-cli": "^5.1.4", + "webpack-dev-server": "^4.15.1" }, "dependencies": { - "blockly": "^10.1.3" + "blockly": "^10.3.0" } - } +} diff --git a/examples/developer-tools/src/index.css b/examples/developer-tools/src/index.css index db3423d426..d74d01bdd9 100644 --- a/examples/developer-tools/src/index.css +++ b/examples/developer-tools/src/index.css @@ -1,55 +1,55 @@ body { - margin: 0; - } - - #blockFactoryContainer { - display: flex; - height: 100vh; - box-sizing: border-box; - } - - #mainWorkspace { - flex-basis: 0; - flex-grow: 1; - flex-shrink: 0; - margin: 8px; - min-width: 500px; - } - - #outputPane { - display: flex; - flex-basis: 0; + margin: 0; +} + +#block-factory-container { + display: flex; + height: 100vh; + box-sizing: border-box; +} + +#main-workspace { + flex-basis: 0; + flex-grow: 1; + flex-shrink: 0; + margin: 8px; + min-width: 500px; +} + +#output-pane { + display: flex; + flex-basis: 0; + flex-direction: column; + flex-grow: 1; + overflow-y: scroll; +} + +#output-pane > * { + flex-basis: 20%; + margin: 8px; + min-height: 100px; +} + +#block-preview { + min-height: 200px; +} + +#block-definition { + overflow: scroll; +} + +@media screen and (max-width: 800px) { + #block-factory-container { flex-direction: column; - flex-grow: 1; overflow-y: scroll; } - - #outputPane > * { - flex-basis: 20%; - margin: 8px; - min-height: 100px; - } - - #preview { - min-height: 200px; - } - - #definition { - overflow: scroll; + + #main-workspace { + flex-grow: 2; + min-height: 400px; } - - @media screen and (max-width: 800px) { - #blockFactoryContainer { - flex-direction: column; - overflow-y: scroll; - } - - #mainWorkspace { - flex-grow: 2; - min-height: 400px; - } - - #outputDiv { - height: fit-content; - } + + #outputDiv { + height: fit-content; } +} diff --git a/examples/developer-tools/src/index.html b/examples/developer-tools/src/index.html index ac852d07ab..b88643f904 100644 --- a/examples/developer-tools/src/index.html +++ b/examples/developer-tools/src/index.html @@ -6,17 +6,17 @@ Blockly Developer Tools -
-
-
-
-
config
-
code headers
- 
+    

+      

+      

+        

+        
config

+        
code headers

+        
                     JSON Definition
                     
                 

-        
generator

+        
generator

       

     

   
diff --git a/examples/developer-tools/src/index.ts b/examples/developer-tools/src/index.ts
index 1d0e0268ce..4835d4eaf1 100644
--- a/examples/developer-tools/src/index.ts
+++ b/examples/developer-tools/src/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -16,9 +16,9 @@ import './index.css';
 // if you don't load it specifically, you'll get spurious message warnings.
 Blockly.setLocale(En);
 
-const mainWorkspaceDiv = document.getElementById('mainWorkspace');
-const previewDiv = document.getElementById('preview');
-const definitionDiv = document.getElementById('definition').firstChild;
+const mainWorkspaceDiv = document.getElementById('main-workspace');
+const previewDiv = document.getElementById('block-preview');
+const definitionDiv = document.getElementById('block-definition').firstChild;
 
 const previewWorkspace = Blockly.inject(previewDiv, {});
 const mainWorkspace = Blockly.inject(mainWorkspaceDiv, {});
diff --git a/examples/developer-tools/tsconfig.json b/examples/developer-tools/tsconfig.json
index aa041af5b2..523f5cb212 100644
--- a/examples/developer-tools/tsconfig.json
+++ b/examples/developer-tools/tsconfig.json
@@ -9,4 +9,3 @@
       "moduleResolution": "node"
     },
 }
-  
\ No newline at end of file