From f1161332a1a1d07ae6e86b007638c5b9523998df Mon Sep 17 00:00:00 2001 From: Alexander Schedrov Date: Fri, 28 Apr 2017 13:49:23 -0400 Subject: [PATCH 01/15] Add development version on OpenY. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4a16828..c18f327 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "project", "license": "GPL-2.0+", "require": { - "ymcatwincities/openy": "8.*.*", + "ymcatwincities/openy": "dev-8.x-1.x", "composer/installers": "^1.2", "drupal-composer/drupal-scaffold": "^2.2", "cweagans/composer-patches": "~1.0" From 7532b5f8dafedabea39695b39b1e67310b44b416 Mon Sep 17 00:00:00 2001 From: Alexander Schedrov Date: Thu, 30 Nov 2017 18:10:30 +0200 Subject: [PATCH 02/15] Update composer.json --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7c1cd15..b6a5850 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,8 @@ "behat/mink": "~1.7", "behat/mink-goutte-driver": "~1.2", "emuse/behat-html-formatter": "^0.1.0", - "drupal/tqextension": "dev-drupal-8" + "drupal/tqextension": "dev-drupal-8", + "integratedexperts/behat-screenshot": "^0.6.2" }, "minimum-stability": "dev", "prefer-stable": true, From 750ea5b24a9681c62611d357a98c29719ec86df8 Mon Sep 17 00:00:00 2001 From: Alexander Schedrov Date: Fri, 1 Dec 2017 11:28:31 +0200 Subject: [PATCH 03/15] Update composer.json --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b6a5850..d4fc5d3 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,8 @@ "behat/mink-goutte-driver": "~1.2", "emuse/behat-html-formatter": "^0.1.0", "drupal/tqextension": "dev-drupal-8", - "integratedexperts/behat-screenshot": "^0.6.2" + "integratedexperts/behat-screenshot": "^0.6.2", + "consolidation/robo": "^1.1.5" }, "minimum-stability": "dev", "prefer-stable": true, From 55b92c71f6d6d473987a820aca83c082f143b162 Mon Sep 17 00:00:00 2001 From: Alexander Schedrov Date: Mon, 11 Dec 2017 16:31:23 +0200 Subject: [PATCH 04/15] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d4fc5d3..e69dec3 100644 --- a/composer.json +++ b/composer.json @@ -146,19 +146,19 @@ ], "scripts": { "post-install-cmd": [ - "@composer drupal-scaffold", + "DrupalComposer\\DrupalScaffold\\Plugin::scaffold", "@cibox-build", "@cibox-vm", "@docksal", "bash scripts/remove_vendor_git_folders.sh || :" ], "post-update-cmd": [ + "DrupalComposer\\DrupalScaffold\\Plugin::scaffold", "@cibox-build", "@cibox-vm", "@docksal", "bash scripts/remove_vendor_git_folders.sh || :" ], - "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold", "cibox-build": "[ -d ./vendor/ymcatwincities/openy-cibox-build ] && (rsync -r --exclude=composer.json --exclude=.gitignore --exclude=.git ./vendor/ymcatwincities/openy-cibox-build/ ./docroot) || (rm -rf ./docroot/devops ./docroot/*.sh ./docroot/*.yml ./docroot/*.md ./docroot/ansible.cfg)", "cibox-vm": "[ -d ./vendor/ymcatwincities/openy-cibox-vm ] && (rsync -r --exclude=composer.json --exclude=README.md --exclude=.gitignore --exclude=.git --exclude=LICENSE ./vendor/ymcatwincities/openy-cibox-vm/ ./) || (rm -rf cibox provisioning Vagrantfile .vagrant backup cache)", "docksal": "[ -d ./vendor/ymcatwincities/openy-docksal ] && (rsync -r --exclude=composer.json --exclude=.git --exclude=README.md ./vendor/ymcatwincities/openy-docksal/ ./) || (rm -rf .docksal build.sh)" From 3d59d9bf24004b618624c2a80b4e02875097c416 Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Thu, 24 May 2018 16:53:00 +0300 Subject: [PATCH 05/15] Update composer.json --- composer.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/composer.json b/composer.json index dda7ae0..239d293 100644 --- a/composer.json +++ b/composer.json @@ -155,6 +155,19 @@ "reference": "1620254d294a209bdf18cc0bc7b131d2ffaa10db" } } + }, + { + "type": "package", + "package": { + "name": "grt-youtube-popup", + "version": "1.0.0", + "type": "drupal-library", + "source": { + "url": "https://github.com/grt107/grt-youtube-popup", + "type": "git", + "reference": "d5cb51ae5dbe526dba7d82c646ec0f46791fa7a0" + } + } } ], "scripts": { From 1a97f2c12f19c76665ee4b92524929742fdc74e2 Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 19 Nov 2018 16:22:28 +0300 Subject: [PATCH 06/15] Support 2.0 development --- README.md | 28 +++++++++++++++++++++++++++- composer.json | 2 +- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5acb9e9..5bf0305 100644 --- a/README.md +++ b/README.md @@ -35,22 +35,48 @@ If you do not have [Composer](http://getcomposer.org/), you may install it by fo #### Latest STABLE version ``` composer create-project ymcatwincities/openy-project MY_PROJECT --no-interaction --no-dev +cd MY_PROJECT && composer update ``` This command will build project based on [**latest stable**](https://github.com/ymcatwincities/openy/releases) release. -#### Latest DEVELOPMENT version +#### Latest 2.0 BETA version +``` +composer create-project ymcatwincities/openy-project:8.2.x-dev MY_PROJECT --no-interaction --no-dev +cd MY_PROJECT && composer update +``` + +This command will build project based on [**latest 8.2 beta**](https://github.com/ymcatwincities/openy/releases) release. + +#### Latest DEVELOPMENT version (1.x) ``` composer create-project ymcatwincities/openy-project:8.1.x-development-dev MY_PROJECT --no-interaction --no-dev +cd MY_PROJECT && composer update ``` This command will build project based on [**latest development**](https://github.com/ymcatwincities/openy/commits/8.x-1.x) release. +#### Latest DEVELOPMENT version (2.x) +``` +composer create-project ymcatwincities/openy-project:8.2.x-development-dev MY_PROJECT --no-interaction --no-dev +cd MY_PROJECT && composer update +``` + +This command will build project based on the [**development branch**](https://github.com/ymcatwincities/openy/commits/8.x-2.x) release. + ## Development environment You should use composer command without `--no-dev` if you would like to get environment that was configured especially for OpenY. So it should look like this: ``` composer create-project ymcatwincities/openy-project:8.1.x-development-dev MY_PROJECT --no-interaction +cd MY_PROJECT && composer update +``` + +or (for Open Y 2.0) + +``` +composer create-project ymcatwincities/openy-project:8.2.x-development-dev MY_PROJECT --no-interaction +cd MY_PROJECT && composer update ``` ### CIBox VM diff --git a/composer.json b/composer.json index a8a8cff..59d48f6 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "project", "license": "GPL-2.0+", "require": { - "ymcatwincities/openy": "dev-8.x-1.x", + "ymcatwincities/openy": "dev-8.x-2.x", "composer/installers": "^1.2", "drupal-composer/drupal-scaffold": "^2.2", "cweagans/composer-patches": "~1.0" From 7fe78530d21c7639d6973e41b9579f4cc85e0e94 Mon Sep 17 00:00:00 2001 From: Dmitry Drozdik Date: Tue, 15 Jan 2019 22:38:00 +0300 Subject: [PATCH 07/15] Add drupal library for the PEF: class name filter. --- composer.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 59d48f6..2437892 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "project", "license": "GPL-2.0+", "require": { - "ymcatwincities/openy": "dev-8.x-2.x", + "ymcatwincities/openy": "8.*.*", "composer/installers": "^1.2", "drupal-composer/drupal-scaffold": "^2.2", "cweagans/composer-patches": "~1.0" @@ -172,6 +172,18 @@ "reference": "d5cb51ae5dbe526dba7d82c646ec0f46791fa7a0" } } + }, + { + "type": "package", + "package": { + "name": "library-davekoelle/alphanum", + "version": "1.0.0", + "type": "drupal-library", + "dist": { + "url": "https://github.com/AndreyMaximov/alphanum/archive/1.0.0.zip", + "type": "zip" + } + } } ], "scripts": { From 45a1aed99e8663e8f50501de5a807ce1413339ab Mon Sep 17 00:00:00 2001 From: Dmitry Chubar Date: Fri, 18 Jan 2019 13:29:59 +0300 Subject: [PATCH 08/15] Updated composer.json file to include new version of dropzone and slick libraries --- composer.json | 60 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 2437892..a582df6 100644 --- a/composer.json +++ b/composer.json @@ -36,16 +36,28 @@ }, { "type": "package", - "package": { - "name": "library-kenwheeler/slick", - "version": "1.6.0", - "type": "drupal-library", - "source": { - "url": "https://github.com/kenwheeler/slick", - "type": "git", - "reference": "1.6.0" + "package": [ + { + "name": "library-kenwheeler/slick", + "version": "1.8.0", + "type": "drupal-library", + "source": { + "url": "https://github.com/kenwheeler/slick", + "type": "git", + "reference": "1.8.0" + } + }, + { + "name": "library-kenwheeler/slick", + "version": "1.6.0", + "type": "drupal-library", + "source": { + "url": "https://github.com/kenwheeler/slick", + "type": "git", + "reference": "1.6.0" + } } - } + ] }, { "type": "package", @@ -75,16 +87,28 @@ }, { "type": "package", - "package": { - "name": "library-enyo/dropzone", - "version": "4.3.0", - "type": "drupal-library", - "source": { - "url": "https://github.com/enyo/dropzone", - "type": "git", - "reference": "v4.3.0" + "package": [ + { + "name": "library-enyo/dropzone", + "version": "5.5.0", + "type": "drupal-library", + "source": { + "url": "https://github.com/enyo/dropzone", + "type": "git", + "reference": "v5.5.0" + } + }, + { + "name": "library-enyo/dropzone", + "version": "4.3.0", + "type": "drupal-library", + "source": { + "url": "https://github.com/enyo/dropzone", + "type": "git", + "reference": "v4.3.0" + } } - } + ] }, { "type": "package", From ee75013e2ee56ad43a69ad8cdc60361ee5f6d19f Mon Sep 17 00:00:00 2001 From: Dmitry Drozdik Date: Fri, 18 Jan 2019 14:19:37 +0300 Subject: [PATCH 09/15] Revert "Updated composer.json file to include new version of dropzone and slick libraries" --- composer.json | 60 ++++++++++++++++----------------------------------- 1 file changed, 18 insertions(+), 42 deletions(-) diff --git a/composer.json b/composer.json index a582df6..2437892 100644 --- a/composer.json +++ b/composer.json @@ -36,28 +36,16 @@ }, { "type": "package", - "package": [ - { - "name": "library-kenwheeler/slick", - "version": "1.8.0", - "type": "drupal-library", - "source": { - "url": "https://github.com/kenwheeler/slick", - "type": "git", - "reference": "1.8.0" - } - }, - { - "name": "library-kenwheeler/slick", - "version": "1.6.0", - "type": "drupal-library", - "source": { - "url": "https://github.com/kenwheeler/slick", - "type": "git", - "reference": "1.6.0" - } + "package": { + "name": "library-kenwheeler/slick", + "version": "1.6.0", + "type": "drupal-library", + "source": { + "url": "https://github.com/kenwheeler/slick", + "type": "git", + "reference": "1.6.0" } - ] + } }, { "type": "package", @@ -87,28 +75,16 @@ }, { "type": "package", - "package": [ - { - "name": "library-enyo/dropzone", - "version": "5.5.0", - "type": "drupal-library", - "source": { - "url": "https://github.com/enyo/dropzone", - "type": "git", - "reference": "v5.5.0" - } - }, - { - "name": "library-enyo/dropzone", - "version": "4.3.0", - "type": "drupal-library", - "source": { - "url": "https://github.com/enyo/dropzone", - "type": "git", - "reference": "v4.3.0" - } + "package": { + "name": "library-enyo/dropzone", + "version": "4.3.0", + "type": "drupal-library", + "source": { + "url": "https://github.com/enyo/dropzone", + "type": "git", + "reference": "v4.3.0" } - ] + } }, { "type": "package", From 31afaf4b18973b1cd123d8be922fcb2c92fd9f13 Mon Sep 17 00:00:00 2001 From: Dmitry Chubar Date: Fri, 18 Jan 2019 14:44:01 +0300 Subject: [PATCH 10/15] Slick 1.8.0 and Dropzone 5.5.0 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 2437892..c6e0e82 100644 --- a/composer.json +++ b/composer.json @@ -38,12 +38,12 @@ "type": "package", "package": { "name": "library-kenwheeler/slick", - "version": "1.6.0", + "version": "1.8.0", "type": "drupal-library", "source": { "url": "https://github.com/kenwheeler/slick", "type": "git", - "reference": "1.6.0" + "reference": "1.8.0" } } }, @@ -77,12 +77,12 @@ "type": "package", "package": { "name": "library-enyo/dropzone", - "version": "4.3.0", + "version": "5.5.0", "type": "drupal-library", "source": { "url": "https://github.com/enyo/dropzone", "type": "git", - "reference": "v4.3.0" + "reference": "v5.5.0" } } }, From e4cead8536729a75306931a50bf68450a41853b8 Mon Sep 17 00:00:00 2001 From: Andriy Prokopenko Date: Fri, 25 Jan 2019 15:06:26 +0200 Subject: [PATCH 11/15] Update ckeditor libs --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 2437892..7145ef0 100644 --- a/composer.json +++ b/composer.json @@ -103,10 +103,10 @@ "type": "package", "package": { "name": "library-ckeditor/panelbutton", - "version": "4.7.0", + "version": "4.10.1", "type": "drupal-library", "dist": { - "url": "http://download.ckeditor.com/panelbutton/releases/panelbutton_4.7.0.zip", + "url": "http://download.ckeditor.com/panelbutton/releases/panelbutton_4.10.1.zip", "type": "zip" } } @@ -115,10 +115,10 @@ "type": "package", "package": { "name": "library-ckeditor/colorbutton", - "version": "4.7.0", + "version": "4.10.1", "type": "drupal-library", "dist": { - "url": "http://download.ckeditor.com/colorbutton/releases/colorbutton_4.7.0.zip", + "url": "http://download.ckeditor.com/colorbutton/releases/colorbutton_4.10.1.zip", "type": "zip" } } @@ -127,10 +127,10 @@ "type": "package", "package": { "name": "library-ckeditor/colordialog", - "version": "4.7.0", + "version": "4.10.1", "type": "drupal-library", "dist": { - "url": "http://download.ckeditor.com/colordialog/releases/colordialog_4.7.0.zip", + "url": "http://download.ckeditor.com/colordialog/releases/colordialog_4.10.1.zip", "type": "zip" } } From 046c871461049a994e7440405b22cbc6901b6761 Mon Sep 17 00:00:00 2001 From: Dmitry Chubar Date: Thu, 31 Jan 2019 19:45:18 +0300 Subject: [PATCH 12/15] drupal-scaffold upgraded to 2.5.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 09f5c95..ba86a3c 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "require": { "ymcatwincities/openy": "8.*.*", "composer/installers": "^1.2", - "drupal-composer/drupal-scaffold": "^2.2", + "drupal-composer/drupal-scaffold": "^2.5.0", "cweagans/composer-patches": "~1.0" }, "require-dev": { From bf4fedda77b2d60939f4943541f26f1993cbcfbb Mon Sep 17 00:00:00 2001 From: Dmitry Drozdik Date: Tue, 5 Feb 2019 12:43:47 +0300 Subject: [PATCH 13/15] Specify correct Open Y version for the development needs --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ba86a3c..c675ec6 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "project", "license": "GPL-2.0+", "require": { - "ymcatwincities/openy": "8.*.*", + "ymcatwincities/openy": "dev-8.x-2.x", "composer/installers": "^1.2", "drupal-composer/drupal-scaffold": "^2.5.0", "cweagans/composer-patches": "~1.0" From eaa199447218fd42befd55c426c253f766de951b Mon Sep 17 00:00:00 2001 From: Dmitry Chubar Date: Sun, 10 Feb 2019 21:44:44 +0300 Subject: [PATCH 14/15] [OPENY-277]: Added https://asset-packagist.org/ repo --- composer.json | 58 +++++++-------------------------------------------- 1 file changed, 7 insertions(+), 51 deletions(-) diff --git a/composer.json b/composer.json index c675ec6..027fa4b 100644 --- a/composer.json +++ b/composer.json @@ -35,56 +35,8 @@ "url": "https://packages.drupal.org/8" }, { - "type": "package", - "package": { - "name": "library-kenwheeler/slick", - "version": "1.8.0", - "type": "drupal-library", - "source": { - "url": "https://github.com/kenwheeler/slick", - "type": "git", - "reference": "1.8.0" - } - } - }, - { - "type": "package", - "package": { - "name": "library-dinbror/blazy", - "version": "1.8.2", - "type": "drupal-library", - "source": { - "url": "https://github.com/dinbror/blazy", - "type": "git", - "reference": "1.8.2" - } - } - }, - { - "type": "package", - "package": { - "name": "library-gdsmith/jquery.easing", - "version": "1.4.1", - "type": "drupal-library", - "source": { - "url": "https://github.com/gdsmith/jquery.easing", - "type": "git", - "reference": "1.4.1" - } - } - }, - { - "type": "package", - "package": { - "name": "library-enyo/dropzone", - "version": "5.5.0", - "type": "drupal-library", - "source": { - "url": "https://github.com/enyo/dropzone", - "type": "git", - "reference": "v5.5.0" - } - } + "type": "composer", + "url": "https://asset-packagist.org" }, { "type": "package", @@ -208,7 +160,11 @@ "extra": { "installer-paths": { "docroot/core": ["type:drupal-core"], - "docroot/libraries/{$name}": ["type:drupal-library"], + "docroot/libraries/{$name}": [ + "type:drupal-library", + "type:bower-asset", + "type:npm-asset" + ], "docroot/modules/contrib/{$name}": ["type:drupal-module"], "docroot/profiles/contrib/{$name}": ["type:drupal-profile"], "docroot/themes/contrib/{$name}": ["type:drupal-theme"], From e3872b33a63d68097fb69cf89f777b89a399dcf5 Mon Sep 17 00:00:00 2001 From: Dmitry Chubar Date: Mon, 11 Feb 2019 22:53:35 +0300 Subject: [PATCH 15/15] [OPENY-277]: Added npm and bower installer-types. --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index 027fa4b..8c71c38 100644 --- a/composer.json +++ b/composer.json @@ -158,6 +158,10 @@ "docksal": "[ -d ./vendor/ymcatwincities/openy-docksal ] && (rsync -r --exclude=composer.json --exclude=.git --exclude=README.md ./vendor/ymcatwincities/openy-docksal/ ./) || (rm -rf .docksal build.sh)" }, "extra": { + "installer-types": [ + "bower-asset", + "npm-asset" + ], "installer-paths": { "docroot/core": ["type:drupal-core"], "docroot/libraries/{$name}": [