Merge branch 'trunk' into blueprint-editor

Author: adamziel

.gitignore

@@ -72,3 +72,6 @@ packages/php-wasm/cli/src/ca-bundle.crt
 # Debug artifacts generated by the build with --WITH_DEBUG, --WITH_SOURCEMAPS.
 packages/php-wasm/**/php-src/*
 packages/php-wasm/**/php.wasm.map
+
+# File generated by emscripten 4.0.19 during PHP.wasm compilation since
+default.profraw

package-lock.json

@@ -47,10 +47,14 @@ RUN set -euxo pipefail;\
 #
 # WASM libraries to rebuild live here:
 # https://github.com/WordPress/wordpress-playground/tree/67d916b5eccfe78e26e9c953598cc1a81f316931/packages/php-wasm/compile
+#
+# Version 4.0.19 is required. MAIN_MODULE should not be built as RELOCATABLE.
+# https://github.com/emscripten-core/emscripten/commit/4d16f757adcc801fb3f990ccb6100b747c815650
+#
 RUN ln -s /usr/bin/python3 /usr/bin/python
 RUN git clone https://github.com/emscripten-core/emsdk.git && \
-    ./emsdk/emsdk install 4.0.5 && \
-    /root/emsdk/emsdk activate 4.0.5
+    ./emsdk/emsdk install 4.0.19 && \
+    /root/emsdk/emsdk activate 4.0.19
 
 RUN mkdir -p /root/lib/lib /root/lib/include /root/lib/share /root/lib/bin
 

packages/php-wasm/compile/base-image/Dockerfile

@@ -0,0 +1 @@
+ImageMagick-7/MagickWand

packages/php-wasm/compile/libImageMagick/asyncify/dist/root/lib/include/wand

@@ -1163,10 +1163,10 @@
 /* #undef MODULES_DIRNAME */
 
 /* Magick API method prefix */
-/* #undef NAMESPACE_PREFIX */
+#define MAGICKCORE_NAMESPACE_PREFIX PHPWasm_Magick_
 
 /* Magick API method prefix tag */
-/* #undef NAMESPACE_PREFIX_TAG */
+#define MAGICKCORE_NAMESPACE_PREFIX_TAG "PHPWasm_Magick_"
 
 /* Define to 1 if assertions should be disabled. */
 /* #undef NDEBUG */

packages/php-wasm/compile/libImageMagick/asyncify/dist/root/lib/lib/libMagickCore-7.Q16HDRI.a

@@ -0,0 +1 @@
+ImageMagick-7/MagickWand