From e08a75c0e988eea1d12f6d1b8615ea42c44d5a17 Mon Sep 17 00:00:00 2001 From: Sean Morris <640101+seanmorris@users.noreply.github.com> Date: Thu, 5 Dec 2024 19:15:00 -0500 Subject: [PATCH] Workspaces. --- package-lock.json | 96 ++++++++++++++++++++++++---------------- package.json | 20 +++++++++ packages/phar/static.mak | 3 +- 3 files changed, 79 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfc4b2b9..68e1110c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,38 +1,58 @@ { "name": "php-wasm-builder", - "version": "0.0.9-alpha-18", + "version": "0.0.9-alpha-27", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "php-wasm-builder", - "version": "0.0.9-alpha-18", + "version": "0.0.9-alpha-27", "license": "Apache-2.0", + "workspaces": [ + "packages/dom", + "packages/gd", + "packages/iconv", + "packages/intl", + "packages/libxml", + "packages/libyaml", + "packages/libzip", + "packages/mbstring", + "packages/openssl", + "packages/pdo-pglite", + "packages/pdo-cfd1", + "packages/phar", + "packages/simplexml", + "packages/sqlite", + "packages/tidy", + "packages/vrzno", + "packages/xml", + "packages/zlib" + ], "dependencies": { "@babel/cli": "^7.8.4", "@babel/core": "^7.8.7", "@babel/plugin-proposal-class-properties": "^7.10.4", "@babel/preset-env": "^7.0.0", "cv3-test": "^0.1.6", - "pdo-cfd1": "file:packages/pdo-cfd1", - "pdo-pglite": "file:packages/pdo-pglite", - "php-wasm-dom": "file:packages/dom", - "php-wasm-gd": "file:packages/gd", - "php-wasm-iconv": "file:packages/iconv", - "php-wasm-intl": "file:packages/intl", - "php-wasm-libxml": "file:packages/libxml", - "php-wasm-libzip": "file:packages/libzip", - "php-wasm-mbstring": "file:packages/mbstring", - "php-wasm-openssl": "file:packages/openssl", - "php-wasm-phar": "file:packages/phar", - "php-wasm-simplexml": "file:packages/simplexml", - "php-wasm-sqlite": "file:packages/sqlite", - "php-wasm-tidy": "file:packages/tidy", - "php-wasm-xml": "file:packages/xml", - "php-wasm-yaml": "file:packages/libyaml", - "php-wasm-zlib": "file:packages/zlib", + "pdo-cfd1": "0.0.9-alpha-23", + "pdo-pglite": "0.0.9-alpha-23", + "php-wasm-dom": "0.0.9-alpha-23", + "php-wasm-gd": "0.0.9-alpha-23", + "php-wasm-iconv": "0.0.9-alpha-23", + "php-wasm-intl": "0.0.9-alpha-23", + "php-wasm-libxml": "0.0.9-alpha-23", + "php-wasm-libzip": "0.0.9-alpha-23", + "php-wasm-mbstring": "0.0.9-alpha-23", + "php-wasm-openssl": "0.0.9-alpha-23", + "php-wasm-phar": "0.0.9-alpha-23", + "php-wasm-simplexml": "0.0.9-alpha-23", + "php-wasm-sqlite": "0.0.9-alpha-23", + "php-wasm-tidy": "0.0.9-alpha-23", + "php-wasm-xml": "0.0.9-alpha-23", + "php-wasm-yaml": "0.0.9-alpha-23", + "php-wasm-zlib": "0.0.9-alpha-23", "pobot": "^0.1.5", - "vrzno": "file:packages/vrzno" + "vrzno": "0.0.9-alpha-23" }, "bin": { "php-wasm-builder": "bin/php-wasm-builder.js" @@ -2532,61 +2552,61 @@ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, "packages/dom": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/gd": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/iconv": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/intl": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/libxml": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/libyaml": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/libzip": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/mbstring": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/openssl": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/pdo-cfd1": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/pdo-pglite": { - "version": "0.0.9-alpha-18", + "version": "0.0.9-alpha-27", "optionalDependencies": { "@electric-sql/pglite": "^0.2.7" } }, "packages/phar": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/simplexml": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/sqlite": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/tidy": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/vrzno": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/xml": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" }, "packages/zlib": { - "version": "0.0.9-alpha-18" + "version": "0.0.9-alpha-27" } } } diff --git a/package.json b/package.json index 44b50305..e747da66 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,26 @@ "php-wasm-zlib": "0.0.9-alpha-23", "vrzno": "0.0.9-alpha-23" }, + "workspaces": [ + "packages/dom", + "packages/gd", + "packages/iconv", + "packages/intl", + "packages/libxml", + "packages/libyaml", + "packages/libzip", + "packages/mbstring", + "packages/openssl", + "packages/pdo-pglite", + "packages/pdo-cfd1", + "packages/phar", + "packages/simplexml", + "packages/sqlite", + "packages/tidy", + "packages/vrzno", + "packages/xml", + "packages/zlib" + ], "contributors": [ { "name": "Sean Morris", diff --git a/packages/phar/static.mak b/packages/phar/static.mak index fba3a6ea..a0ac2e02 100644 --- a/packages/phar/static.mak +++ b/packages/phar/static.mak @@ -28,10 +28,9 @@ third_party/php${PHP_VERSION}-phar/config.m4: third_party/php${PHP_VERSION}-src/ packages/phar/php${PHP_VERSION}-phar.so: ${PHPIZE} third_party/php${PHP_VERSION}-phar/config.m4 @ echo -e "\e[33;4mBuilding php-phar\e[0m" ${DOCKER_RUN_IN_EXT_PHAR} chmod +x /src/third_party/php${PHP_VERSION}-src/scripts/phpize; - -@${DOCKER_RUN_IN_EXT_PHAR} /src/third_party/php${PHP_VERSION}-src/scripts/phpize; - ${DOCKER_RUN_IN_EXT_PHAR} sed -i 's#test -f "$$ac_f"#test -f "./$$ac_f"#' configure ${DOCKER_RUN_IN_EXT_PHAR} /src/third_party/php${PHP_VERSION}-src/scripts/phpize; ${DOCKER_RUN_IN_EXT_PHAR} sed -i 's|#define PHAR_MAIN 1|#define PHAR_MAIN 1\n#include "config.h"|g' phar.c; + ${DOCKER_RUN_IN_EXT_PHAR} sed -i 's#test -f "$$ac_f"#test -f "./$$ac_f"#' configure ${DOCKER_RUN_IN_EXT_PHAR} emconfigure ./configure PKG_CONFIG_PATH=${PKG_CONFIG_PATH} --prefix='/src/lib/php${PHP_VERSION}' --with-openssl=/src/lib --with-php-config=/src/lib/php${PHP_VERSION}/bin/php-config --cache-file=/tmp/config-cache; ${DOCKER_RUN_IN_EXT_PHAR} sed -i 's#-shared#-static#g' Makefile; ${DOCKER_RUN_IN_EXT_PHAR} sed -i 's#-export-dynamic##g' Makefile;