diff --git a/composer.json b/composer.json index fb0d2dcd1..dd761a99d 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,10 @@ "license": "AGPL-3.0-only", "type": "library", "description": "Most used bundles for chill-project", - "keywords": ["chill", "social worker"], + "keywords": [ + "chill", + "social worker" + ], "autoload": { "psr-4": { "Chill\\ActivityBundle\\": "src/Bundle/ChillActivityBundle", @@ -16,12 +19,13 @@ "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle", "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle", "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle", - "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle" + "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle", + "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src" } }, "autoload-dev": { "psr-4": { - "App\\": "tests/app/src/" + "App\\": "tests/app/src/" } }, "require": { @@ -84,7 +88,6 @@ } }, "config": { - "vendor-dir": "tests/app/vendor", - "bin-dir": "bin" + "bin-dir": "bin" } -} +} \ No newline at end of file diff --git a/src/Bundle/ChillAsideActivityBundle/chill.webpack.config.js b/src/Bundle/ChillAsideActivityBundle/chill.webpack.config.js deleted file mode 100644 index 98569ccae..000000000 --- a/src/Bundle/ChillAsideActivityBundle/chill.webpack.config.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = function(encore, entries) { - entries.push(__dirname + '/Resources/public/index.js'); -}; diff --git a/src/Bundle/ChillAsideActivityBundle/composer.json b/src/Bundle/ChillAsideActivityBundle/composer.json deleted file mode 100644 index 8d4b22fd6..000000000 --- a/src/Bundle/ChillAsideActivityBundle/composer.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "name": "chill-project/chill-bundles", - "license": "AGPL-3.0-only", - "type": "library", - "description": "Most used bundles for chill-project", - "keywords": [ - "chill", - "social worker" - ], - "autoload": { - "psr-4": { - "Chill\\ActivityBundle\\": "src/Bundle/ChillActivityBundle", - "Chill\\BudgetBundle\\": "src/Bundle/ChillBudgetBundle", - "Chill\\CustomFieldsBundle\\": "src/Bundle/ChillCustomFieldsBundle", - "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle", - "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle", - "Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle", - "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle", - "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle", - "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle", - "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle", - "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle", - "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle" - } - }, - "autoload-dev": { - "psr-4": { - "App\\": "tests/app/src/" - } - }, - "require": { - "champs-libres/async-uploader-bundle": "dev-sf4", - "graylog2/gelf-php": "^1.5", - "symfony/form": "4.*", - "symfony/twig-bundle": "^4.4", - "twig/extra-bundle": "^2.12|^3.0", - "twig/twig": "^2.12|^3.0", - "composer/package-versions-deprecated": "^1.10", - "doctrine/doctrine-bundle": "^2.1", - "doctrine/doctrine-migrations-bundle": "^3.0", - "doctrine/orm": "^2.7", - "symfony/asset": "4.*", - "symfony/monolog-bundle": "^3.5", - "symfony/security-bundle": "4.*", - "symfony/translation": "4.*", - "symfony/validator": "4.*", - "sensio/framework-extra-bundle": "^5.5", - "symfony/yaml": "4.*", - "symfony/webpack-encore-bundle": "^1.11", - "knplabs/knp-menu": "^3.1", - "knplabs/knp-menu-bundle": "^3.0", - "symfony/templating": "4.*", - "twig/intl-extra": "^3.0", - "symfony/workflow": "4.*", - "symfony/expression-language": "4.*", - "knplabs/knp-time-bundle": "^1.12", - "symfony/intl": "4.*", - "symfony/swiftmailer-bundle": "^3.5", - "league/csv": "^9.6", - "phpoffice/phpspreadsheet": "^1.16", - "symfony/browser-kit": "^5.2", - "symfony/css-selector": "^5.2", - "twig/markdown-extra": "^3.3", - "erusev/parsedown": "^1.7", - "symfony/serializer": "^5.2", - "symfony/webpack-encore-bundle": "^1.11" - }, - "conflict": { - "symfony/symfony": "*" - }, - "require-dev": { - "fakerphp/faker": "^1.13", - "phpunit/phpunit": "^7.0", - "symfony/dotenv": "^5.1", - "symfony/maker-bundle": "^1.20", - "doctrine/doctrine-fixtures-bundle": "^3.3", - "symfony/stopwatch": "^5.1", - "symfony/web-profiler-bundle": "^5.0", - "symfony/var-dumper": "4.*", - "symfony/debug-bundle": "^5.1", - "symfony/phpunit-bridge": "^5.2", - "nelmio/alice": "^3.8" - }, - "scripts": { - "auto-scripts": { - "cache:clear": "symfony-cmd", - "assets:install %PUBLIC_DIR%": "symfony-cmd" - } - }, - "config": { - "vendor-dir": "tests/app/vendor", - "bin-dir": "bin" - } -} \ No newline at end of file