Merge pull request #19249 from MauricioFauth/releases-excludes-fixes

MauricioFauth · web-flow · commit c285ae652ae2 · 2024-08-10T19:18:59.000-03:00
Clean up files found by check-release-excludes script
diff --git a/.gitignore b/.gitignore
@@ -61,7 +61,6 @@ cache.properties
 phpstan.neon
 # Infection
 infection.json5
-/public/build/
 /js/
 /setup/
 /themes/
diff --git a/bin/internal/check-release-excludes.sh b/bin/internal/check-release-excludes.sh
@@ -36,7 +36,7 @@ validateExtension() {
     extension="${filename##*.}"
 
     case $pathWithoutFirst in
-        docs/*)
+        public/docs/*)
             if [ "${extension}" != "png" ] && [ "${extension}" != "txt" ] &&
                 [ "${extension}" != "html" ] && [ "${extension}" != "js" ] &&
                 [ "${extension}" != "css" ] && [ "${extension}" != "gif" ]; then
@@ -139,7 +139,8 @@ validateExtension() {
                 [ "${filename}" != "README.md" ] && [ "${filename}" != "BACKERS.md" ] &&
                 [ "${filename}" != "LICENSE.md" ] && [ "${filename}" != "ARCHITECTURE.md" ] &&
                 [ "${filename}" != "LICENSE.txt" ] && [ "${filename}" != "AUTHORS" ] &&
-                [ "${filename}" != "LICENCE.md" ] && [ "${filename}" != "LICENCE" ]; then
+                [ "${filename}" != "LICENCE.md" ] && [ "${filename}" != "LICENCE" ] &&
+                [ "${filename}" != "COPYRIGHT.md" ]; then
                 foundFileExt
             fi
         ;;
diff --git a/bin/internal/create-release.sh b/bin/internal/create-release.sh
@@ -243,7 +243,11 @@ cleanup_composer_vendors() {
         vendor/spomky-labs/cbor-php/infection.json.dist \
         vendor/spomky-labs/cbor-php/phpstan.neon \
         vendor/thecodingmachine/safe/generated/Exceptions/.gitkeep \
-        vendor/thecodingmachine/safe/rector-migrate-0.7.php
+        vendor/thecodingmachine/safe/rector-migrate-0.7.php \
+        vendor/phpmyadmin/motranslator/psalm-baseline.xml \
+        vendor/phpmyadmin/motranslator/psalm.xml \
+        vendor/slim/psr7/phpunit.xml.dist \
+        vendor/slim/psr7/tests/
     find vendor/tecnickcom/tcpdf/fonts/ -maxdepth 1 -type f \
         -not -name 'dejavusans.*' \
         -not -name 'dejavusansb.*' \
@@ -525,7 +529,7 @@ echo "* Installing composer packages '$PACKAGES_VERSIONS'"
 
 # Allows word splitting
 # shellcheck disable=SC2086
-composer require --no-interaction $PACKAGES_VERSIONS
+composer require --no-interaction --update-no-dev $PACKAGES_VERSIONS
 
 echo "* Running a security checkup"
 security_checkup
diff --git a/webpack.config.cjs b/webpack.config.cjs
@@ -186,15 +186,15 @@ module.exports = [
         mode: 'none',
         devtool: 'source-map',
         entry: {
-            'themes/bootstrap/css/theme': publicPath + '/themes/bootstrap/scss/theme.scss',
-            'themes/metro/css/theme': publicPath + '/themes/metro/scss/theme.scss',
-            'themes/original/css/theme': publicPath + '/themes/original/scss/theme.scss',
-            'themes/pmahomme/css/theme': publicPath + '/themes/pmahomme/scss/theme.scss',
-            'setup/styles': publicPath + '/setup/scss/styles.scss',
+            'public/themes/bootstrap/css/theme': publicPath + '/themes/bootstrap/scss/theme.scss',
+            'public/themes/metro/css/theme': publicPath + '/themes/metro/scss/theme.scss',
+            'public/themes/original/css/theme': publicPath + '/themes/original/scss/theme.scss',
+            'public/themes/pmahomme/css/theme': publicPath + '/themes/pmahomme/scss/theme.scss',
+            'public/setup/styles': publicPath + '/setup/scss/styles.scss',
         },
         output: {
             filename: 'build/css/[name].js',
-            path: publicPath,
+            path: rootPath,
         },
         module: {
             rules: [
