Merge branch 'master' of github.com:seanmorris/php-wasm

Author: seanmorris

.circleci/config.yml

@@ -69,7 +69,9 @@ jobs:
     parallelism: 1
     machine:
       image: ubuntu-2204:2024.05.1
-    resource_class: medium
+    resource_class: xlarge
+    environment:
+      PS1: ">"
     steps:
       - checkout
       - run: npm install
@@ -84,7 +86,9 @@ jobs:
     parallelism: 1
     machine:
       image: ubuntu-2204:2024.05.1
-    resource_class: medium
+    resource_class: xlarge
+    environment:
+      PS1: ">"
     steps:
       - attach_workspace:
           at: ~/
@@ -99,8 +103,7 @@ jobs:
       - run: sudo apt install -y software-properties-common google-chrome-stable
       - run: cd demo-web; ./switch-packages.sh local; cd ..;
       - run: cp .circleci/.env_8.3-dynamic.ci .env
-      - run: make image
-      - run: make web-mjs worker-cgi-mjs web-dbg-mjs
+      - run: make common-web
       - run: test/browser-test.sh
 
   make-test-8-4-static:

Makefile

@@ -783,7 +783,6 @@ ${PHPIZE}: third_party/php${PHP_VERSION}-src/scripts/phpize-built
 
 third_party/php${PHP_VERSION}-src/scripts/phpize-built: ENVIRONMENT=web
 third_party/php${PHP_VERSION}-src/scripts/phpize-built: ${DEPENDENCIES} | ${ORDER_ONLY}
-	# ${DOCKER_RUN_IN_PHP} emmake make scripts/phpize ${BUILD_FLAGS} PHP_BINARIES=cli WASM_SHARED_LIBS="$(addprefix /src/,${SHARED_LIBS})"
 	${DOCKER_RUN_IN_PHP} emmake make install-build  ${BUILD_FLAGS} PHP_BINARIES=cli WASM_SHARED_LIBS="$(addprefix /src/,${SHARED_LIBS})"
 	${DOCKER_RUN_IN_PHP} chmod +x scripts/phpize
 	${DOCKER_RUN_IN_PHP} touch scripts/phpize-built

demo-node/.gitignore

@@ -1 +1,2 @@
 /node_modules
+/config/.cookies

demo-node/package-lock.json

@@ -2,26 +2,25 @@
   "name": "php-cgi-wasm-node-demo",
   "version": "0.0.0",
   "description": "",
-  "main": "index.js",
   "scripts": {
     "start": "./index.mjs"
   },
   "dependencies": {
-    "php-cgi-wasm": "0.0.9-alpha-27",
-    "php-wasm-dom": "0.0.9-alpha-27",
-    "php-wasm-gd": "0.0.9-alpha-27",
-    "php-wasm-iconv": "0.0.9-alpha-27",
-    "php-wasm-intl": "0.0.9-alpha-27",
-    "php-wasm-libxml": "0.0.9-alpha-27",
-    "php-wasm-libzip": "0.0.9-alpha-27",
-    "php-wasm-mbstring": "0.0.9-alpha-27",
-    "php-wasm-openssl": "0.0.9-alpha-27",
-    "php-wasm-phar": "0.0.9-alpha-27",
-    "php-wasm-simplexml": "0.0.9-alpha-27",
-    "php-wasm-sqlite": "0.0.9-alpha-27",
-    "php-wasm-tidy": "0.0.9-alpha-27",
-    "php-wasm-xml": "0.0.9-alpha-27",
-    "php-wasm-yaml": "0.0.9-alpha-27",
-    "php-wasm-zlib": "0.0.9-alpha-27"
+    "php-cgi-wasm": "../packages/php-cgi-wasm",
+    "php-wasm-dom": "../packages/dom",
+    "php-wasm-gd": "../packages/gd",
+    "php-wasm-iconv": "../packages/iconv",
+    "php-wasm-intl": "../packages/intl",
+    "php-wasm-libxml": "../packages/libxml",
+    "php-wasm-libzip": "../packages/libzip",
+    "php-wasm-mbstring": "../packages/mbstring",
+    "php-wasm-openssl": "../packages/openssl",
+    "php-wasm-phar": "../packages/phar",
+    "php-wasm-simplexml": "../packages/simplexml",
+    "php-wasm-sqlite": "../packages/sqlite",
+    "php-wasm-tidy": "../packages/tidy",
+    "php-wasm-xml": "../packages/xml",
+    "php-wasm-yaml": "../packages/libyaml",
+    "php-wasm-zlib": "../packages/zlib"
   }
 }