Skip to content

Commit

Permalink
Merge branch 'develop' into KarelJanVanHaute/issue350
Browse files Browse the repository at this point in the history
  • Loading branch information
HannahDeWachter authored Sep 12, 2024
2 parents b723dff + 4b1a961 commit 92be153
Show file tree
Hide file tree
Showing 134 changed files with 4,245 additions and 4,869 deletions.
2 changes: 2 additions & 0 deletions bitbucket-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ pipelines:
script:
# build frontend and run composer
- composer install --verbose --prefer-dist --no-progress --no-interaction --no-dev --optimize-autoloader
- sh ./bitbucket_pipelines_build_frontend.sh
# deploy:
- cp .deploy/ssh/* ~/.ssh/. && chmod 400 ~/.ssh/bitbucket_pipelines*
- dep deploy staging -vv
Expand All @@ -23,6 +24,7 @@ pipelines:
script:
# build frontend and run composer
- composer install --verbose --prefer-dist --no-progress --no-interaction --no-dev --optimize-autoloader
- sh ./bitbucket_pipelines_build_frontend.sh
# deploy:
- cp .deploy/ssh/* ~/.ssh/. && chmod 400 ~/.ssh/bitbucket_pipelines*
- dep deploy production -vv
9 changes: 9 additions & 0 deletions bitbucket_pipelines_build_frontend.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!bin/bash

# curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
nvm install && nvm use
npm install -g yarn
yarn install
yarn prod
23 changes: 11 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,34 @@
"php": ">=8.2",
"ext-json": "*",
"craftcms/ckeditor": "^4.0",
"craftcms/cms": "5.1.7",
"craftcms/cms": "5.3.6",
"craftcms/postmark": "^3.1.0",
"hybridinteractive/craft-position-fieldtype": "^5.0.0",
"hybridinteractive/craft-width-fieldtype": "^5.0.0",
"jaybizzle/crawler-detect": "^1.2",
"mikehaertl/php-shellcommand": "^1.6",
"miranj/craft-obfuscator": "^1.2.0",
"mmikkel/cp-field-inspect": "^2.0.0",
"nystudio107/craft-imageoptimize": "^5.0.0",
"nystudio107/craft-vite": "^5.0.0",
"mmikkel/cp-field-inspect": "2.0.2",
"nystudio107/craft-imageoptimize": "5.0.2",
"nystudio107/craft-vite": "5.0.1",
"percipioglobal/craft-password-policy": "^5.0.0-beta1",
"statikbe/craft-carbon-tracker": "^5.0.0",
"statikbe/craft-carbon-tracker": "5.0.2",
"statikbe/craft-config-values": "^5.0.0",
"statikbe/craft-cookie-banner": "^5.0.0",
"statikbe/craft-sentry": "^5.0.0",
"statikbe/craft-translate": "^5.0.0",
"statikbe/craft-video-parser": "^5.0.0",
"studioespresso/craft-dumper": "5.0.1",
"studioespresso/craft-navigate": "^5.0.0",
"studioespresso/craft-seo-fields": "5.0.0",
"studioespresso/craft-seo-fields": "5.0.2",
"vanderlee/syllable": "^1.7",
"verbb/element-index-defaults": "^4.0.0-beta.1",
"verbb/expanded-singles": "^3.0.0-beta.2",
"verbb/formie": "3.0.0-beta.13",
"verbb/hyper": "2.0.0",
"verbb/image-resizer": "^4.0.0-beta.1",
"verbb/knock-knock": "^3.0.0",
"verbb/super-table": "4.0.0",
"verbb/tablemaker": "^5.0.0",
"verbb/formie": "3.0.5",
"verbb/hyper": "2.0.4",
"verbb/image-resizer": "4.0.1",
"verbb/knock-knock": "3.0.1",
"verbb/tablemaker": "5.0.1",
"vlucas/phpdotenv": "^5.4.1"
},
"autoload": {
Expand Down
Loading

0 comments on commit 92be153

Please sign in to comment.