Commit 2c6ff6d4 authored by tstruyk's avatar tstruyk
Browse files

Merge branch '8.x-3.x layout and patches commit' into 8.x-3.x-ISTWCMS-3452-Script-Gesso-build

parents ed7115df 0fb6dbec
......@@ -43,9 +43,10 @@
"drupal/ctools": "3.2",
"drupal/devel": "2.1",
"drupal/diff": "1.0-rc2",
"drupal/eck": "1.0-alpha5",
"drupal/eck": "dev-1.0-alpha5-uw_wcms1",
"drupal/entity_browser": "2.2",
"drupal/entity_browser_block": "1.0",
"drupal/entity_browser_block_layout": "dev-8.x-1.x",
"drupal/entity_class_formatter": "1.2",
"drupal/entity_reference_revisions": "1.6",
"drupal/externalauth": "1.2",
......@@ -53,7 +54,7 @@
"drupal/fences": "2.0-alpha2",
"drupal/field_group": "3.0-rc1",
"drupal/field_validation": "1.0-alpha7",
"drupal/file_mdm": "1.1",
"drupal/file_mdm": "2.0-rc1",
"drupal/filefield_sources": "1.0-alpha1",
"drupal/focal_point": "1.2",
"drupal/honeypot": "1.29",
......@@ -61,35 +62,37 @@
"drupal/imageapi_optimize": "2.0-alpha4",
"drupal/imageapi_optimize_binaries": "1.0-alpha1",
"drupal/imageapi_optimize_resmushit": "1.0-beta1",
"drupal/imagemagick": "2.6",
"drupal/imagemagick": "3.0-rc1",
"drupal/imce": "1.7",
"drupal/inline_entity_form": "1.0-rc2",
"drupal/label_help": "dev-8.x-1.x",
"drupal/layout_builder_modal": "1.0-alpha2",
"drupal/layout_builder_restrictions": "2.2",
"drupal/layout_builder_styles": "1.0-beta1",
"drupal/maillog": "dev-8.x-1.x",
"drupal/markup": "1.0-beta1",
"drupal/media_entity_facebook": "2.0-alpha1",
"drupal/media_library_edit": "1.0-alpha1",
"drupal/menu_link_config": "1.0-alpha1",
"drupal/module_filter": "3.1",
"drupal/paragraphs": "1.10",
"drupal/paragraphs": "dev-1.10-uw_wcms1",
"drupal/paragraphs_edit": "2.0-alpha6",
"drupal/pathauto": "1.6-beta1",
"drupal/readmehelp": "1.0-beta4",
"drupal/recaptcha": "2.4",
"drupal/responsive_menu_combined": "dev-8.x-1.x",
"drupal/role_expire": "1.2",
"drupal/samlauth": "3.0-alpha1",
"drupal/samlauth": "dev-3.0-alpha1-uw_wcms3",
"drupal/search_kint": "dev-8.x-1.x",
"drupal/simplify_menu": "2.0",
"drupal/sophron": "1.0-rc1",
"drupal/token": "1.5",
"drupal/twig_field_value": "1.2",
"drupal/twig_tweak": "2.4",
"drupal/twig_vardumper": "1.2",
"drupal/vardumper": "1.4",
"drupal/video_embed_field": "2.2",
"drupal/webform": "5.4",
"drupal/webform": "dev-5.6-uw_wcms2",
"drupal/workbench": "1.1",
"drupal/workbench_access": "1.0-beta2",
"fileeye/mimemap": "^1.1",
......@@ -107,9 +110,18 @@
"symfony/phpunit-bridge": "*",
"symfony/var-dumper": "^4.0",
"wcms/uw_auth_wcms_admins": "dev-8.x-1.x",
"wcms/uw_ct_copy_text": "dev-8.x-1.x",
"wcms/uw_ct_embedded_blockquote": "dev-8.x-1.x",
"wcms/uw_ct_embedded_call_to_action": "dev-8.x-1.x",
"wcms/uw_ct_embedded_expand_collapse": "dev-8.x-1.x",
"wcms/uw_ct_embedded_facebook": "dev-8.x-1.x",
"wcms/uw_ct_embedded_facts_and_figures": "dev-8.x-1.x",
"wcms/uw_ct_site_footer": "dev-8.x-1.x",
"wcms/uw_ct_web_form": "dev-8.x-1.x",
"wcms/uw_ct_web_page": "dev-8.x-1.x",
"wcms/uw_et_core": "dev-8.x-1.x",
"wcms/uw_fdsu_theme_resp": "dev-8.x-1.x-ISTWCMS-3452-Gesso",
"wcms/uw_media": "dev-8.x-1.x",
"wcms/uw_site_dev": "dev-8.x-1.x",
"wcms/uw_sites_all": "dev-8.x-1.x-ISTWCMS-3452-Gesso",
"wikimedia/composer-merge-plugin": "^1.4"
......@@ -132,23 +144,6 @@
"modules/features/{$name}": ["type:wcms-module"],
"modules/contrib/{$name}": ["type:drupal-module"],
"themes/{$name}": ["type:wcms-theme"]
},
"patches": {
"drupal/samlauth": {
"ISTWCMS-2268: Rewrite the samlauth to allow for autoassigning roles": "patches/modules/samlauth/remove_presave_hook-samlauth-2925171-1.patch"
},
"drupal/paragraphs": {
"Integrity constraint violation: 1048 Column 'langcode' cannot be null": "https://www.drupal.org/files/issues/2019-07-10/paragraphs-set_langcode_widgets-2901390-29.patch"
},
"drupal/eck": {
"After 8.7.x core update install profile with ECK config has fatal errors on install": "https://www.drupal.org/files/issues/2019-07-17/%203055007-8-after-8.7-core-update-fatal-errors-on-install-profile-install.patch"
},
"drupal/imagemagick": {
"ImageMagick scale breaks animated gifs":"https://www.drupal.org/files/issues/imagemagick-resize_animated_gifs-1802534-31.patch"
},
"drupal/webform": {
"Allow webform libraries to use our repos": "patches/modules/webform/ISTWCMS-3283-use-wcms-repo.patch"
}
}
}
}
}
......@@ -2,14 +2,14 @@ drupal_core_path=${1:-/var/www/drupal8}
pattern_lab_root_path=${2:-/var/www/html}
drupal_directory=${3:-drupal8}
echo "Rebuilding pattern lab..."
echo "Rebuilding Pattern Lab..."
if [ -d "$pattern_lab_root_path/uw_wcms_pattern_lab" ]; then
echo "Removing old pattern lab ..."
echo "Removing old Pattern Lab ..."
rm -rf "$pattern_lab_root_path/uw_wcms_pattern_lab"
echo "Done."
echo "Done removing old Pattern Lab."
fi
echo "Starting new pattern lab ..."
echo "Starting new Pattern Lab ..."
git clone "https://git.uwaterloo.ca/wcms/uw_wcms_pattern_lab.git" $pattern_lab_root_path/uw_wcms_pattern_lab
cd "$pattern_lab_root_path/uw_wcms_pattern_lab"
......@@ -23,10 +23,10 @@ echo "$drupal_directory" >> "$pattern_lab_root_path/uw_wcms_pattern_lab/uw_wcms_
chmod 775 "$pattern_lab_root_path/uw_wcms_pattern_lab/uw_wcms_pl_variables.sh"
echo "Done."
echo "Done twig functions fix."
yarn install
echo "Done."
echo "Done yarn install."
cd components/js
if [ -f "ready.min.js" ]; then
......@@ -44,12 +44,12 @@ fi
ln -s "$drupal_core_path/core/assets/vendor/domready/ready.min.js"
ln -s "$drupal_core_path/core/misc/drupal.js"
ln -s "$drupal_core_path/core/assets/vendor/jquery/jquery.min.js"
echo "Done."
echo "Done theme install."
echo "Starting watch so distr directory gets created"
cd "$pattern_lab_root_path/uw_wcms_pattern_lab"
gulp clean
gulp compile
gulp build
\ No newline at end of file
gulp build
echo "Done rebuilding Pattern Lab."
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment