Skip to content

Remove vendor folders #21217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jul 28, 2018
Merged

Remove vendor folders #21217

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7e9e3f3
remove files
rdeutz Jul 22, 2018
e27a349
ajust ignores
rdeutz Jul 22, 2018
3f84ec2
build file changes
rdeutz Jul 22, 2018
b8fb764
reset package json file
rdeutz Jul 22, 2018
c4a0376
use the normal package.json
rdeutz Jul 22, 2018
db76d55
use the develop version of the docker image because we need a newer n…
rdeutz Jul 22, 2018
e214f02
symlink no longer needed
rdeutz Jul 22, 2018
403027c
add joomla-javascript-tests to package.json
rdeutz Jul 22, 2018
6b0d441
Merge branch '4.0-dev' into remove_vendor_folders
rdeutz Jul 23, 2018
5a238db
update lock
rdeutz Jul 27, 2018
2d1ef39
update webcomponents package
rdeutz Jul 27, 2018
c6bbd01
run npm as root in container is ok
rdeutz Jul 27, 2018
7d485d1
update postinstall command
rdeutz Jul 27, 2018
bf3cde6
nightly build
rdeutz Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ pipeline:
- export DISPLAY=:0
- Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 &
- sleep 3
- mv -f drone-package.json package.json
Copy link
Contributor

@dgrammatiko dgrammatiko Jul 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still need this json, as the one in the main repo doesn't have the dependencies for the testing. That is why the tests are failing. Karma not found

- fluxbox > /dev/null 2>&1 &
- npm install
- node_modules/karma/bin/karma start node_modules/joomla-javascript-tests/src/karma.conf.js --single-run
Expand Down
182 changes: 11 additions & 171 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@

# Test Related Files #
/phpunit.xml
selenium.log
composer.phar
/test-install


# Vendor directory handeling
/libraries/vendor
!libraries/vendor/.gitkeep

/media/vendor
!media/vendor/.gitkeep

# Stubs file holding mapped classes
/stubs.php
Expand Down Expand Up @@ -75,178 +86,7 @@ Desktop.ini
# Only apply this rule to the main repository's gitignore files
!/.gitignore
!/build/.gitignore
!/tests/unit/suites/libraries/joomla/archive/.gitignore
!/tests/unit/tmp/.gitignore

# Extra files installed by Composer not needed in the CMS environment
# This should only ignore files like unit testing or READMEs, production
# code must remain to ensure all libraries properly function
/libraries/vendor/fig/link-util/test
/libraries/vendor/fig/link-util/composer.json
/libraries/vendor/fig/link-util/phpcs.xml
/libraries/vendor/fig/link-util/README.md
/libraries/vendor/ircmaxell/password-compat/test
/libraries/vendor/ircmaxell/password-compat/.travis.yml
/libraries/vendor/ircmaxell/password-compat/composer.json
/libraries/vendor/ircmaxell/password-compat/phpunit.xml.dist
/libraries/vendor/ircmaxell/password-compat/README.md
/libraries/vendor/ircmaxell/password-compat/version-test.php
/libraries/vendor/composer/ca-bundle/composer.json
/libraries/vendor/composer/ca-bundle/README.md
/libraries/vendor/defuse/php-encryption/dist
/libraries/vendor/defuse/php-encryption/docs
/libraries/vendor/defuse/php-encryption/test
/libraries/vendor/defuse/php-encryption/.gitignore
/libraries/vendor/defuse/php-encryption/.php_cs
/libraries/vendor/defuse/php-encryption/composer.json
/libraries/vendor/defuse/php-encryption/README.md
/libraries/vendor/defuse/php-encryption/psalm.xml
/libraries/vendor/defuse/php-encryption/test.sh
/libraries/vendor/doctrine/inflector/composer.json
/libraries/vendor/doctrine/inflector/README.md
/libraries/vendor/google/recaptcha/examples
/libraries/vendor/google/recaptcha/tests
/libraries/vendor/google/recaptcha/.gitignore
/libraries/vendor/google/recaptcha/.travis.yml
/libraries/vendor/google/recaptcha/composer.json
/libraries/vendor/google/recaptcha/CONTRIBUTING.md
/libraries/vendor/google/recaptcha/phpunit.xml.dist
/libraries/vendor/google/recaptcha/README.md
/libraries/vendor/joomla/*/.appveyor.yml
/libraries/vendor/joomla/*/.gitattributes
/libraries/vendor/joomla/*/.github
/libraries/vendor/joomla/*/.gitignore
/libraries/vendor/joomla/*/.gitmodules
/libraries/vendor/joomla/*/.travis/
/libraries/vendor/joomla/*/docs
/libraries/vendor/joomla/*/Tests
/libraries/vendor/joomla/*/tests
/libraries/vendor/joomla/*/vendor
/libraries/vendor/joomla/*/.scrutinizer.yml
/libraries/vendor/joomla/*/.travis.yml
/libraries/vendor/joomla/*/CONTRIBUTING.md
/libraries/vendor/joomla/*/composer.json
/libraries/vendor/joomla/*/phpunit.xml.dist
/libraries/vendor/joomla/*/phpunit.travis.xml
/libraries/vendor/joomla/*/phpunit.appveyor.xml
/libraries/vendor/joomla/*/README.md
/libraries/vendor/joomla/*/ruleset.xml
/libraries/vendor/leafo/lessphp/docs
/libraries/vendor/leafo/lessphp/tests
/libraries/vendor/leafo/lessphp/.gitignore
/libraries/vendor/leafo/lessphp/.travis.yml
/libraries/vendor/leafo/lessphp/composer.json
/libraries/vendor/leafo/lessphp/Makefile
/libraries/vendor/leafo/lessphp/package.sh
/libraries/vendor/leafo/lessphp/README.md
/libraries/vendor/mso/idna-convert/.gitattributes
/libraries/vendor/mso/idna-convert/.gitignore
/libraries/vendor/mso/idna-convert/composer.json
/libraries/vendor/mso/idna-convert/README.md
/libraries/vendor/paragonie/random_compat/.gitignore
/libraries/vendor/paragonie/random_compat/.scrutinizer.yml
/libraries/vendor/paragonie/random_compat/.travis.yml
/libraries/vendor/paragonie/random_compat/dist
/libraries/vendor/paragonie/random_compat/other
/libraries/vendor/paragonie/random_compat/CHANGELOG.md
/libraries/vendor/paragonie/random_compat/ERRATA.md
/libraries/vendor/paragonie/random_compat/RATIONALE.md
/libraries/vendor/paragonie/random_compat/README.md
/libraries/vendor/paragonie/random_compat/SECURITY.md
/libraries/vendor/paragonie/random_compat/build-phar.sh
/libraries/vendor/paragonie/random_compat/composer.json
/libraries/vendor/paragonie/random_compat/psalm-autoload.php
/libraries/vendor/paragonie/random_compat/psalm.xml
/libraries/vendor/paragonie/random_compat/tests
/libraries/vendor/paragonie/sodium_compat/dist
/libraries/vendor/paragonie/sodium_compat/.gitignore
/libraries/vendor/paragonie/sodium_compat/appveyor.yml
/libraries/vendor/paragonie/sodium_compat/build-phar.sh
/libraries/vendor/paragonie/sodium_compat/composer.json
/libraries/vendor/paragonie/sodium_compat/composer.lock
/libraries/vendor/paragonie/sodium_compat/phpunit.xml.dist
/libraries/vendor/paragonie/sodium_compat/README.md
/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/README.md
/libraries/vendor/phpmailer/phpmailer/docs
/libraries/vendor/phpmailer/phpmailer/examples
/libraries/vendor/phpmailer/phpmailer/language
/libraries/vendor/phpmailer/phpmailer/test
/libraries/vendor/phpmailer/phpmailer/.github
/libraries/vendor/phpmailer/phpmailer/.gitignore
/libraries/vendor/phpmailer/phpmailer/.phan
/libraries/vendor/phpmailer/phpmailer/.php_cs
/libraries/vendor/phpmailer/phpmailer/.scrutinizer.yml
/libraries/vendor/phpmailer/phpmailer/.travis.yml
/libraries/vendor/phpmailer/phpmailer/changelog.md
/libraries/vendor/phpmailer/phpmailer/composer.json
/libraries/vendor/phpmailer/phpmailer/composer.lock
/libraries/vendor/phpmailer/phpmailer/get_oauth_token.php
/libraries/vendor/phpmailer/phpmailer/ISSUE_TEMPLATE.md
/libraries/vendor/phpmailer/phpmailer/phpdoc.dist.xml
/libraries/vendor/phpmailer/phpmailer/README.md
/libraries/vendor/phpmailer/phpmailer/SECURITY.md
/libraries/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist
/libraries/vendor/phpmailer/phpmailer/UPGRADING.md
/libraries/vendor/psr/container/.gitignore
/libraries/vendor/psr/container/composer.json
/libraries/vendor/psr/container/README.md
/libraries/vendor/psr/http-message/CHANGELOG.md
/libraries/vendor/psr/http-message/composer.json
/libraries/vendor/psr/http-message/README.md
/libraries/vendor/psr/link/composer.json
/libraries/vendor/psr/link/README.md
/libraries/vendor/psr/log/Psr/Log/Test
/libraries/vendor/psr/log/.gitignore
/libraries/vendor/psr/log/composer.json
/libraries/vendor/psr/log/README.md
/libraries/vendor/symfony/*/Tests
/libraries/vendor/symfony/*/.gitignore
/libraries/vendor/symfony/*/CHANGELOG.md
/libraries/vendor/symfony/*/composer.json
/libraries/vendor/symfony/*/phpunit.xml.dist
/libraries/vendor/symfony/*/README.md
/libraries/vendor/symfony/console/Resources/bin/hiddeninput.exe
/libraries/vendor/symfony/debug/Resources/ext
/libraries/vendor/symfony/polyfill-util/TestListener.php
/libraries/vendor/simplepie/simplepie/demo
/libraries/vendor/simplepie/simplepie/tests
/libraries/vendor/simplepie/simplepie/README.markdown
/libraries/vendor/simplepie/simplepie/phpunit.xml.dist
/libraries/vendor/simplepie/simplepie/.gitignore
/libraries/vendor/simplepie/simplepie/.travis.yml
/libraries/vendor/simplepie/simplepie/compatibility_test
/libraries/vendor/simplepie/simplepie/build
/libraries/vendor/simplepie/simplepie/idn/ReadMe.txt
/libraries/vendor/simplepie/simplepie/composer.json
/libraries/vendor/wamania/php-stemmer/.gitignore
/libraries/vendor/wamania/php-stemmer/README.md
/libraries/vendor/wamania/php-stemmer/composer.json
/libraries/vendor/wamania/php-stemmer/phpunit.xml.dist
/libraries/vendor/wamania/php-stemmer/test
/libraries/vendor/zendframework/zend-diactoros/.coveralls.yml
/libraries/vendor/zendframework/zend-diactoros/CHANGELOG.md
/libraries/vendor/zendframework/zend-diactoros/composer.json
/libraries/vendor/zendframework/zend-diactoros/composer.lock
/libraries/vendor/zendframework/zend-diactoros/CONDUCT.md
/libraries/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
/libraries/vendor/zendframework/zend-diactoros/mkdocs.yml
/libraries/vendor/zendframework/zend-diactoros/README.md

# System Test related files
/libraries/vendor/codeception
/libraries/vendor/behat
/libraries/vendor/consolidation
/libraries/vendor/joomla/test-system
/libraries/vendor/league/
/libraries/vendor/phpdocumentor/
/libraries/vendor/phpspec/
/libraries/vendor/phpunit/
/libraries/vendor/sebastian/
/libraries/vendor/squizlabs/

selenium.log
composer.phar
/test-install

# Build related
RoboFile.ini
Expand Down
7 changes: 7 additions & 0 deletions build/build.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ function usage($command)
$repo = dirname(__DIR__);
$here = __DIR__;

system('cd ' . $repo);
// run composer install and npm install
system('composer install');
Copy link
Contributor

@mbabker mbabker Jul 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has to be done after the git archive command is run (line 97 pre-diff). That command is what creates the temporary space in build/tmp/<timestamp> based on a clean git clone from whatever remote is given, so doing the composer install in the repo root before extracting the git archive is going to be pointless.

We should also do composer install --no-dev --optimize-autoloader so we don't get dev dependencies in build packages.

We might also want to strip the extra files as a post install action (maybe make a Composer plugin for this?) that are in our .gitignore to keep us from shipping things like testing framework files, code examples (which has already bitten us in the past with the IDNA_Convert library), and other non-production assets.

Copy link
Member

@HLeithner HLeithner Jul 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would add --ignore-platform-reqs too, so it doesn't require php ldap extension on the building host for example.

Copy link
Contributor

@dgrammatiko dgrammatiko Jul 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 for the clean up action

system('npm install');

system('cd ' . $here);

// Set paths for the build packages
$tmp = $here . '/tmp';
$fullpath = $tmp . '/' . $time;
Expand Down
7 changes: 0 additions & 7 deletions libraries/vendor/autoload.php
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion libraries/vendor/bin/generate-defuse-key
View file
Open in desktop

This file was deleted.

Loading