diff --git a/.gitignore b/.gitignore index a3f816b..7de939a 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ # composer /vendor/ +/cache/ # PhpStorm / IDEA /.idea/ @@ -41,3 +42,6 @@ /node_modules/ /yarn-debug.log /yarn-error.log + +# Project Setup +/install-deploy.php diff --git a/.husky/pre-push b/.husky/pre-push deleted file mode 100755 index a5ebc0b..0000000 --- a/.husky/pre-push +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -DATA=$(cat public/build/environment.json) - -if [ "$DATA" != "{\"environment\": \"prod\"}" ]; then - echo "🚫 You have to compile a production build before pushing to GitHub." && exit 1 -else - echo "✅ Everything is fine, let's push to GitHub." -fi diff --git a/docker-compose.yaml b/docker-compose.yaml index eb80a99..a1f2c3e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -54,7 +54,8 @@ services: - 'pimcore-skeleton-tmp-storage:/tmp:cached' - '.docker/php/php-ini-overrides.ini:/usr/local/etc/php/conf.d/99-overrides.ini' environment: - PHP_IDE_CONFIG: serverName=localhost + COMPOSER_HOME: '/var/www/html' + PHP_IDE_CONFIG: 'serverName=localhost' depends_on: - db - redis diff --git a/package.json b/package.json index a03d3e4..b906d3f 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "icons:custom": "cd node_modules/uikit && yarn && yarn icons --custom ../../assets/custom/icons", "lint": "eslint --ext .js assets/", "phpstan": "php -d memory_limit=4G vendor/bin/phpstan analyse -c phpstan.neon src -l 3", - "prepare": "husky install", "ssh": "php vendor/bin/dep ssh", "watch": "encore dev --watch" }, @@ -32,7 +31,6 @@ "eslint-plugin-import": "^2.0", "eslint-webpack-plugin": "^3.0", "file-loader": "^6.0", - "husky": "^7.0", "postcss": "^8.0", "postcss-loader": "^6.0", "raw-loader": "^4.0", diff --git a/yarn.lock b/yarn.lock index 5f0176e..5acb82a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3243,11 +3243,6 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -husky@^7.0: - version "7.0.4" - resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535" - integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ== - iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"