diff --git a/.gitignore b/.gitignore index 4d655ccd..9de9b097 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ tools/ **/.env **/.target package-lock.json +build/ diff --git a/4dev/checking/phpunit.sh b/4dev/checking/phpunit.sh index 556510a0..464210b1 100755 --- a/4dev/checking/phpunit.sh +++ b/4dev/checking/phpunit.sh @@ -49,6 +49,7 @@ php_version=""; no_php_version=0; use_composer=0; opt_generate_coverage=""; +opt_generate_coverage_html=""; while [ -n "${1-}" ]; do case "${1}" in -t | --testdox) @@ -65,6 +66,10 @@ while [ -n "${1-}" ]; do opt_generate_coverage="--coverage-text"; shift ;; + --coverage-report) + opt_generate_coverage_html="--coverage-html build/coverage-report"; + shift + ;; -p | --php) php_version="${2-}"; shift @@ -114,6 +119,7 @@ PHPUNIT_CALL+=( "${opt_testdox}" "${opt_verbose}" "${opt_generate_coverage}" + "${opt_generate_coverage_html}" "-c" "${PHPUNIT_CONFIG}" "${BASE_PATH}4dev/tests/" ); diff --git a/jsconfig.json b/jsconfig.json index 9d08c675..c267a13b 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -1,8 +1,11 @@ // https://www.typescriptlang.org/tsconfig/#compilerOptions { "compilerOptions": { - "module": "ESNext", - "moduleResolution": "Node", + // if "bundler" + // "module": "ESNext", + "module": "NodeNext", + // "bundler" (front), "nodenext" or "node16" + "moduleResolution": "nodenext", "target": "ES2020", "jsx": "react", "checkJs": true, diff --git a/phpunit.xml b/phpunit.xml index 03f9b427..f8d2d723 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -14,6 +14,9 @@ ./www/lib/CoreLibs +