Merge branch 'develop'

CHANGELOG.MD

@@ -1,5 +1,18 @@
 # Change Log
 
+## v3.31.2 - Dec 14, 2021
+
+* Update version.
+
+## v3.31.1 - Dec 14, 2021
+
+### Fixes
+
+* Starter templates: webpack split chunks.
+* Fixes webpack build of A day in the beach example.
+* Monaco editor loads Phaser built-in type defs. It doesn't require to read the `.d.ts` files from the project.
+* Property section: fixes show three-dots menu and collapsing.
+
 ## v3.31.0 - Nov 29, 2021
 
 ### Added

README.md

@@ -44,9 +44,9 @@ Eventually, we share videos, screenshots, and thoughts about the editor's develo
 
 You can get the binaries in the [website downloads](https://phasereditor2d.com/downloads).
 
-## Play Phaser Editor 2D
+## Quick start
 
-The [Play Phaser Editor 2D](https://play.phasereditor2d.com) is a service hosted in our servers to create Phaser Editor 2D v3 projects online. It is a very nice way to try the editor because it does not requires any download or installation process.
+Check the [starter templates](https://phasereditor2d.com/start).
 
 ### Build and run
 

scripts/get-latest-phaser.sh

@@ -4,6 +4,7 @@ export PHASER=~/Documents/Phaser/phaser
 export PHASER_DIST=$PHASER/dist
 export PHASER_TYPES=$PHASER/types
 export PHASER_PLUGIN=source/editor/plugins/phasereditor2d.phaser
+export CODE_PLUGIN=source/editor/plugins/phasereditor2d.code
 
 # phaser dist
 
@@ -13,20 +14,10 @@ cp $PHASER_DIST/phaser.min.js $PHASER_PLUGIN/scripts/
 
 # phaser types
 
-rm -R $PHASER_PLUGIN/src/phaser/phaser.ts
-rm -R $PHASER_PLUGIN/src/phaser/matter.ts
-
 cp $PHASER_TYPES/phaser.d.ts  $PHASER_PLUGIN/src/phaser/phaser.ts
 cp $PHASER_TYPES/matter.d.ts  $PHASER_PLUGIN/src/phaser/matter.ts
-
-# templates
-
-rm -f source/templates/include/lib/*
-rm -f source/templates/include/types/*
-
-cp $PHASER_DIST/phaser.js source/templates/include/lib/
-cp $PHASER_TYPES/phaser.d.ts  source/templates/include/types/
-cp $PHASER_TYPES/matter.d.ts  source/templates/include/types/
+cp $PHASER_TYPES/phaser.d.ts  $CODE_PLUGIN/data/phaser.d.ts
+cp $PHASER_TYPES/matter.d.ts  $CODE_PLUGIN/data/matter.d.ts
 
 
 

source/editor/plugins/colibri/src/ui/controls/properties/PropertyPage.ts

@@ -47,8 +47,9 @@ namespace colibri.ui.controls.properties {
                 this._menuIcon = new IconControl(ColibriPlugin.getInstance().getIcon(ICON_SMALL_MENU));
                 this._menuIcon.getCanvas().classList.add("IconButton");
                 this._menuIcon.getCanvas().style.visibility = this._section.hasMenu() ? "visible" : "hidden";
-                this._menuIcon.getCanvas().addEventListener("mouseup", e => {
+                this._menuIcon.getCanvas().addEventListener("click", e => {
 
+                    e.stopPropagation();
                     e.stopImmediatePropagation();
 
                     if (this._section.hasMenu()) {

source/editor/plugins/phasereditor2d.code/data/phaser-fixes.d.ts

@@ -0,0 +1 @@
+declare class ActiveXObject { }

source/editor/plugins/phasereditor2d.code/src/ui/PreloadModelsExtension.ts

@@ -2,9 +2,11 @@ namespace phasereditor2d.code.ui {
 
     export class PreloadModelsExtension extends colibri.ui.ide.PreloadProjectResourcesExtension {
 
+        private static PHASER_DEFS = ["data/matter.d.ts", "data/phaser.d.ts", "phaser-fixes.d.ts"];
+
         async computeTotal(): Promise<number> {
 
-            return this.getFiles().length;
+            return this.getFiles().length + PreloadModelsExtension.PHASER_DEFS.length;
         }
 
         private getFiles() {
@@ -35,7 +37,17 @@ namespace phasereditor2d.code.ui {
 
                 monitor.step();
             }
-        }
 
+            // preload phaser defs
+
+            for (const path of PreloadModelsExtension.PHASER_DEFS) {
+
+                const content = await CodePlugin.getInstance().getString(path);
+
+                monaco.editor.createModel(content, "javascript", CodePlugin.fileUri(path));
+
+                monitor.step();
+            }
+        }
     }
 }

source/editor/plugins/phasereditor2d.ide/src/IDEPlugin.ts

@@ -241,7 +241,7 @@ namespace phasereditor2d.ide {
 
     /* program entry point */
 
-    export const VER = "3.31.0";
+    export const VER = "3.31.2";
 
     async function main() {
 

source/editor/plugins/phasereditor2d.phaser/scripts/phaser.js

@@ -80283,7 +80283,7 @@ var CanvasRenderer = new Class({
 
         state.getPixel = getPixel;
 
-        CanvasSnapshot(canvas, state);
+        CanvasSnapshot(this.canvas, state);
 
         state.callback = null;