Skip to content
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

Play with satis #1

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Play with satis #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions example-project/.taasrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"endpoint": "http://127.0.0.1:9696",
"version": "1",
"modules": [
"drupal/eu_cookie_compliance"
]
}
4 changes: 2 additions & 2 deletions example-project/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Example project

This is a project example. Instead of the composer related files and everythingh, it just needs the custom code in the
This is a project example. Instead of the composer related files and everything, it just needs the custom code in the
modules folder and the exported config in config folder.

To build the full project use the taas build command. IN this playground project, just call
To build the full project use the taas build command. In this playground project, just call

../taas-cli/taas build

Expand Down
12 changes: 12 additions & 0 deletions taas-base/assets/satis-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "thunder/taas-satis",
"homepage": "http://127.0.0.1:9696",
"output-dir": "build",
"repositories": [
{ "type": "composer", "url": "https://packages.drupal.org/8" },
{ "type": "composer", "url": "https://asset-packagist.org" },
{ "type": "composer", "url": "https://packagist.org" }
],
"require": {
}
}
238 changes: 238 additions & 0 deletions taas-base/satis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,238 @@
{
"name": "thunder/taas-satis",
"homepage": "http://127.0.0.1:9696/1",
"output-dir": "build/1",
"repositories": [
{
"type": "composer",
"url": "https://packages.drupal.org/8"
},
{
"type": "composer",
"url": "https://asset-packagist.org"
},
{
"type": "composer",
"url": "https://packagist.org"
}
],
"require": {
"asm89/stack-cors": "1.3.0",
"caxy/php-htmldiff": "v0.1.14",
"chi-teck/drupal-code-generator": "2.5.3",
"composer/installers": "v1.12.0",
"composer/semver": "3.3.2",
"cweagans/composer-patches": "1.7.2",
"doctrine/annotations": "1.13.2",
"doctrine/lexer": "1.2.3",
"doctrine/reflection": "1.2.2",
"drupal/access_unpublished": "1.4.0",
"drupal/admin_toolbar": "3.1.0",
"drupal/adsense": "1.2.0",
"drupal/autofill": "1.1.0",
"drupal/autosave_form": "1.3.0",
"drupal/better_normalizers": "1.0.0-beta4",
"drupal/blazy": "2.11.0",
"drupal/checklistapi": "2.0.0",
"drupal/config_selector": "2.2.0",
"drupal/config_update": "1.7.0",
"drupal/content_lock": "2.2.0",
"drupal/core": "9.3.13",
"drupal/core-composer-scaffold": "9.3.13",
"drupal/crop": "2.2.0",
"drupal/ctools": "3.7.0",
"drupal/default_content": "2.0.0-alpha1",
"drupal/diff": "1.0.0",
"drupal/dropzonejs": "2.6.0",
"drupal/empty_fields": "1.0.0-beta1",
"drupal/entity_browser": "2.6.0",
"drupal/entity_reference_actions": "1.0.0-beta9",
"drupal/entity_reference_revisions": "1.9.0",
"drupal/eu_cookie_compliance": "1.19.0",
"drupal/facets": "2.0.2",
"drupal/field_group": "3.2.0",
"drupal/focal_point": "1.5.0",
"drupal/google_analytics": "2.5.0",
"drupal/graphql": "4.3.0",
"drupal/inline_entity_form": "1.0.0-rc11",
"drupal/ivw_integration": "2.3.0",
"drupal/length_indicator": "1.2.0",
"drupal/linkit": "6.0.0-beta3",
"drupal/liveblog": "1.3.0-alpha15",
"drupal/media_entity_instagram": "3.0.7",
"drupal/media_entity_pinterest": "2.6.0",
"drupal/media_entity_slideshow": "2.5.0",
"drupal/media_entity_twitter": "2.7.0",
"drupal/media_expire": "2.4.0",
"drupal/metatag": "1.19.0",
"drupal/metatag_async_widget": "1.0.0",
"drupal/paragraphs": "1.14.0",
"drupal/paragraphs_features": "1.16.0",
"drupal/paragraphs_paste": "2.0.0-beta4",
"drupal/password_policy": "3.1.0",
"drupal/pathauto": "1.10.0",
"drupal/redirect": "1.7.0",
"drupal/responsive_preview": "1.1.0",
"drupal/scheduler": "1.4.0",
"drupal/scheduler_content_moderation_integration": "1.3.0",
"drupal/schema_metatag": "2.3.0",
"drupal/search_api": "1.23.0",
"drupal/search_api_mark_outdated": "1.0.0-beta1",
"drupal/select2": "1.13.0",
"drupal/shariff": "1.7.0",
"drupal/simple_gmap": "2.0.0",
"drupal/simple_sitemap": "3.11.0",
"drupal/slick": "2.6.0",
"drupal/thunder_admin": "4.0.2",
"drupal/token": "1.10.0",
"drupal/typed_data": "1.0.0-beta1",
"drupal/update_helper": "3.0.2",
"drupal/views_bulk_edit": "2.6.0",
"drupal/views_bulk_operations": "4.1.2",
"egulias/email-validator": "3.1.2",
"ezyang/htmlpurifier": "v4.14.0",
"guzzlehttp/guzzle": "6.5.5",
"guzzlehttp/promises": "1.5.1",
"guzzlehttp/psr7": "1.8.5",
"j7mbo/twitter-api-php": "1.0.6",
"laminas/laminas-diactoros": "2.10.0",
"laminas/laminas-escaper": "2.10.0",
"laminas/laminas-feed": "2.17.0",
"laminas/laminas-stdlib": "3.7.1",
"masterminds/html5": "2.7.5",
"mkalkbrenner/php-htmldiff-advanced": "0.0.8",
"netcarver/textile": "v3.7.7",
"npm-asset/blazy": "1.8.2",
"npm-asset/dropzone": "5.9.3",
"npm-asset/exif-js": "2.3.0",
"npm-asset/fortawesome--fontawesome-free": "5.15.4",
"npm-asset/select2": "4.0.13",
"npm-asset/shariff": "3.2.1",
"npm-asset/slick-carousel": "1.8.1",
"oomphinc/composer-installers-extender": "2.0.1",
"paragonie/random_compat": "v9.99.100",
"paragonie/sodium_compat": "v1.17.1",
"pear/archive_tar": "1.4.14",
"pear/console_getopt": "v1.4.3",
"pear/pear-core-minimal": "v1.10.11",
"pear/pear_exception": "v1.0.2",
"psr/cache": "3.0.0",
"psr/container": "1.1.2",
"psr/http-factory": "1.0.1",
"psr/http-message": "1.0.1",
"psr/log": "1.1.4",
"pusher/pusher-php-server": "v4.1.5",
"ralouphie/getallheaders": "3.0.3",
"stack/builder": "v1.0.6",
"symfony-cmf/routing": "2.3.4",
"symfony/console": "v4.4.41",
"symfony/debug": "v4.4.41",
"symfony/dependency-injection": "v4.4.41",
"symfony/deprecation-contracts": "v3.0.1",
"symfony/error-handler": "v4.4.41",
"symfony/event-dispatcher": "v4.4.37",
"symfony/event-dispatcher-contracts": "v1.1.12",
"symfony/filesystem": "v4.4.27",
"symfony/http-client-contracts": "v2.5.1",
"symfony/http-foundation": "v4.4.41",
"symfony/http-kernel": "v4.4.41",
"symfony/mime": "v5.4.8",
"symfony/polyfill-ctype": "v1.25.0",
"symfony/polyfill-iconv": "v1.25.0",
"symfony/polyfill-intl-grapheme": "v1.25.0",
"symfony/polyfill-intl-idn": "v1.25.0",
"symfony/polyfill-intl-normalizer": "v1.25.0",
"symfony/polyfill-mbstring": "v1.25.0",
"symfony/polyfill-php72": "v1.25.0",
"symfony/polyfill-php73": "v1.25.0",
"symfony/polyfill-php80": "v1.25.0",
"symfony/process": "v4.4.41",
"symfony/psr-http-message-bridge": "v2.1.2",
"symfony/routing": "v4.4.41",
"symfony/serializer": "v4.4.41",
"symfony/service-contracts": "v2.5.1",
"symfony/string": "v6.0.8",
"symfony/translation": "v4.4.41",
"symfony/translation-contracts": "v2.5.1",
"symfony/validator": "v4.4.41",
"symfony/var-dumper": "v5.4.8",
"symfony/yaml": "v4.4.37",
"thunder/thunder-distribution": "6.3.7",
"twig/twig": "v2.15.0",
"typo3/phar-stream-wrapper": "v3.1.7",
"vlucas/phpdotenv": "v2.6.9",
"webonyx/graphql-php": "v14.11.6",
"behat/mink": "v1.9.0",
"behat/mink-selenium2-driver": "v1.5.0",
"composer/ca-bundle": "1.3.1",
"composer/composer": "2.2.12",
"composer/metadata-minifier": "1.0.0",
"composer/pcre": "1.0.1",
"composer/spdx-licenses": "1.5.6",
"composer/xdebug-handler": "2.0.2",
"consolidation/annotated-command": "4.5.5",
"consolidation/config": "2.1.0",
"consolidation/filter-via-dot-access-data": "2.0.2",
"consolidation/log": "2.1.1",
"consolidation/output-formatters": "4.2.2",
"consolidation/robo": "3.0.10",
"consolidation/self-update": "2.0.5",
"consolidation/site-alias": "3.1.5",
"consolidation/site-process": "4.2.0",
"dflydev/dot-access-data": "v3.0.1",
"doctrine/instantiator": "1.4.0",
"drupal/coder": "8.3.13",
"drupal/core-dev-pinned": "9.3.13",
"drush/drush": "11.0.9",
"easyrdf/easyrdf": "1.1.1",
"enlightn/security-checker": "v1.10.0",
"friends-of-behat/mink-browserkit-driver": "v1.5.0",
"grasmash/expander": "2.0.3",
"instaclick/php-webdriver": "1.4.10",
"justinrainbow/json-schema": "5.2.11",
"league/container": "4.2.0",
"mikey179/vfsstream": "v1.6.10",
"myclabs/deep-copy": "1.10.2",
"nikic/php-parser": "v4.13.2",
"phar-io/manifest": "2.0.3",
"phar-io/version": "3.1.0",
"phpdocumentor/reflection-common": "2.2.0",
"phpdocumentor/reflection-docblock": "5.3.0",
"phpdocumentor/type-resolver": "1.5.1",
"phpspec/prophecy": "1.14.0",
"phpunit/php-code-coverage": "7.0.15",
"phpunit/php-file-iterator": "2.0.4",
"phpunit/php-text-template": "1.2.1",
"phpunit/php-timer": "2.1.3",
"phpunit/php-token-stream": "4.0.4",
"phpunit/phpunit": "8.5.21",
"psy/psysh": "v0.11.4",
"react/promise": "v2.8.0",
"sebastian/code-unit-reverse-lookup": "1.0.2",
"sebastian/comparator": "3.0.3",
"sebastian/diff": "3.0.3",
"sebastian/environment": "4.2.4",
"sebastian/exporter": "3.1.4",
"sebastian/global-state": "3.0.1",
"sebastian/object-enumerator": "3.0.4",
"sebastian/object-reflector": "1.1.2",
"sebastian/recursion-context": "3.0.1",
"sebastian/resource-operations": "2.0.2",
"sebastian/type": "1.1.4",
"sebastian/version": "2.0.1",
"seld/jsonlint": "1.8.3",
"seld/phar-utils": "1.1.2",
"sirbrillig/phpcs-variable-analysis": "v2.11.2",
"squizlabs/php_codesniffer": "3.6.1",
"symfony/browser-kit": "v4.4.27",
"symfony/css-selector": "v4.4.27",
"symfony/dom-crawler": "v4.4.30",
"symfony/finder": "v4.4.30",
"symfony/lock": "v4.4.33",
"symfony/phpunit-bridge": "v5.4.0",
"theseer/tokenizer": "1.2.1",
"webflo/drupal-finder": "1.2.2",
"webmozart/assert": "1.10.0",
"webmozart/path-util": "2.3.0"
}
}
2 changes: 1 addition & 1 deletion taas-base/tools/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ cd assets || exit
composer update
cd ..

tools/write-composer-file.php
tools/write-satis-file.php
34 changes: 34 additions & 0 deletions taas-base/tools/write-satis-file.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/usr/bin/env php
<?php

writeComposerFile();

function writeComposerFile()
{

$version = 1;

$composerLockFile = json_decode(file_get_contents('assets/composer.lock'), true);
$satisFileTemplate = json_decode(file_get_contents('assets/satis-template.json'), true);
$buildSatisFile = 'satis.json';

foreach ($composerLockFile['packages'] as $package) {
$satisFileTemplate['require'][$package['name']] = $package['version'];
}

foreach ($composerLockFile['packages-dev'] as $package) {
$satisFileTemplate['require'][$package['name']] = $package['version'];
}

$satisFileTemplate['homepage'] .= "/$version";
$satisFileTemplate['output-dir'] .= "/$version";

if (file_exists($buildSatisFile)) {
unlink($buildSatisFile);
}

file_put_contents(
$buildSatisFile,
json_encode($satisFileTemplate, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT).PHP_EOL
);
}
21 changes: 8 additions & 13 deletions taas-build-project/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,16 @@
"email": "[email protected]"
}
],
"repositories": [
{
"type": "path",
"url": "../../taas-base"
},
{
"type": "composer",
"url": "https://packages.drupal.org/8"
},
{
"repositories": {
"taas": {
"type": "composer",
"url": "https://asset-packagist.org"
"url": ""
}
],
},
"require": {
"thunder/taas-base": "dev-main@dev"
"composer/installers": "^1.9",
"drupal/core-composer-scaffold": "^9.3",
"thunder/thunder-distribution": "*"
},
"conflict": {
"drupal/drupal": "*"
Expand Down Expand Up @@ -57,6 +51,7 @@
}
},
"config": {
"secure-http": false,
"sort-packages": true,
"process-timeout": 2000,
"allow-plugins": {
Expand Down
10 changes: 9 additions & 1 deletion taas-cli/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ It restricts the downloaded dependencies by comparing the enabled drupal modules
with the list of optional modules (currently defined in the config/services.yml) and placing all optional modules, that
are not enabled, into the "replace" key of the build composer.json.

## Requirements

### PHIVE

[PHIVE](https://github.com/phar-io/phive) is needed to build the PHAR package.

brew install phive

## Build project

call within your project root:
Expand All @@ -17,7 +25,7 @@ call within your project root:
To locally work on this project run

composer install
phive install
phive install --force-accept-unsigned

to create the phar run

Expand Down
14 changes: 14 additions & 0 deletions taas-cli/packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"packages": {
"thunder/taas-project": {
"dev-master": {
"name": "thunder/taas-project",
"version": "1.0.0",
"dist": {
"url": "../taas-build-project",
"type": "path"
}
}
}
}
}
Loading