From c911bff3c65ce5f485d187eb075ed857ce812c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Tue, 14 Oct 2025 14:56:08 +0200 Subject: [PATCH 1/3] prepare-next --- bin/prepare_next.sh | 69 ++++++++++++++++++ bin/prepare_release.sh | 118 +----------------------------- bin/prepare_release_files.sh | 134 +++++++++++++++++++++++++++++++++++ package.json | 8 +-- 4 files changed, 209 insertions(+), 120 deletions(-) create mode 100755 bin/prepare_next.sh create mode 100755 bin/prepare_release_files.sh diff --git a/bin/prepare_next.sh b/bin/prepare_next.sh new file mode 100755 index 000000000..fa8fa3dd4 --- /dev/null +++ b/bin/prepare_next.sh @@ -0,0 +1,69 @@ +#! /bin/sh +# Script to prepare a admin-ui-assets bundle release as [version]-next branch + +[ ! -f "bin/prepare_release.sh" ] && echo "This script has to be run the root of the bundle" && exit 1 + +print_usage() +{ + echo "Create a new version of admin-ui-assets bundle by creating [version]-next" + echo "This script MUST be run from the bundle root directory. It will create" + echo "a branch but this branch will NOT be pushed" + echo "" + echo "Usage: $1 -v -b " + echo "-v : where version will be used to create next branch" + echo "-b : branch which will be used to create next branch" +} + +VERSION="" +BRANCH="" +while getopts ":h:v:b:" opt ; do + case $opt in + v ) VERSION=$OPTARG ;; + b ) BRANCH=$OPTARG ;; + h ) print_usage "$0" + exit 0 ;; + * ) print_usage "$0" + exit 2 ;; + esac +done + +[ -z "$BRANCH" ] && print_usage "$0" && exit 2 +[ -z "$VERSION" ] && print_usage "$0" && exit 2 + +check_command() +{ + $1 --version 2>&1 > /dev/null + check_process "find '$1' in the PATH, is it installed?" +} + +check_process() +{ + [ $? -ne 0 ] && echo "Fail to $1" && exit 3 +} + +check_command "git" +check_command "yarn" + +CURRENT_BRANCH=`git branch | grep '*' | cut -d ' ' -f 2` +NEXT_BRANCH="$VERSION-next" + +echo "# Switching to $BRANCH and updating" +git checkout -q $BRANCH > /dev/null && git pull > /dev/null +check_process "switch to $BRANCH" + +idsDir=src ./bin/prepare_release_files.sh +check_process "prepare the release files" + +echo "# Creating next branch: $NEXT_BRANCH" +git checkout -q -B "$NEXT_BRANCH" > /dev/null +check_process "create the branch '$NEXT_BRANCH'" + +echo "# Commiting" +git add src/bundle/Resources > /dev/null +git commit -q -m "Version $VERSION" +check_process "commit the assets" + +echo "" +echo "The branch '$NEXT_BRANCH' has been created, please check that everything is correct" +echo "then you can run:" +echo " git push origin $NEXT_BRANCH" \ No newline at end of file diff --git a/bin/prepare_release.sh b/bin/prepare_release.sh index 570bac368..bbf8b8c66 100755 --- a/bin/prepare_release.sh +++ b/bin/prepare_release.sh @@ -44,36 +44,6 @@ check_process() check_command "git" check_command "yarn" -VENDOR_DIR="src/bundle/Resources/public/vendors" -BOOTSTRAP_DIR="$VENDOR_DIR/bootstrap" -BOOTSTRAP_NOTICE="$BOOTSTRAP_DIR/BOOTSTRAP_IN_ADMINUIASSETS.txt" -FLATPICKR_DIR="$VENDOR_DIR/flatpickr" -FLATPICKR_NOTICE="$FLATPICKR_DIR/FLATPICKR_IN_ADMINUIASSETS.txt" -JQUERY_DIR="$VENDOR_DIR/jquery" -JQUERY_NOTICE="$JQUERY_DIR/JQUERY_IN_ADMINUIASSETS.txt" -LEAFLET_DIR="$VENDOR_DIR/leaflet" -LEAFLET_NOTICE="$LEAFLET_DIR/LEAFLET_IN_ADMINUIASSETS.txt" -POPPER_DIR="$VENDOR_DIR/@popperjs" -POPPER_NOTICE="$POPPER_DIR/POPPER_IN_ADMINUIASSETS.txt" -REACT_DIR="$VENDOR_DIR/react" -REACT_NOTICE="$REACT_DIR/REACT_IN_ADMINUIASSETS.txt" -REACT_DOM_DIR="$VENDOR_DIR/react-dom" -REACT_DOM_NOTICE="$REACT_DOM_DIR/REACT_DOM_IN_ADMINUIASSETS.txt" -MOMENT_DIR="$VENDOR_DIR/moment" -MOMENT_NOTICE="$MOMENT_DIR/MOMENT_IN_ADMINUIASSETS.txt" -MOMENT_TIMEZONE_DIR="$VENDOR_DIR/moment-timezone" -MOMENT_TIMEZONE_NOTICE="$MOMENT_TIMEZONE_DIR/MOMENT_TIMEZONE_IN_ADMINUIASSETS.txt" -D3_DIR="$VENDOR_DIR/d3" -D3_NOTICE="$D3_DIR/D3_IN_ADMINUIASSETS.txt" -DAGRE_D3_DIR="$VENDOR_DIR/dagre-d3" -DAGRE_D3_NOTICE="$DAGRE_D3_DIR/DAGRE_D3_IN_ADMINUIASSETS.txt" -JS_MD5_DIR="$VENDOR_DIR/js-md5" -JS_MD5_NOTICE="$JS_MD5_DIR/JS_MD5_IN_ADMINUIASSETS.txt" -CHART_JS_DIR="$VENDOR_DIR/chart-js" -CHART_JS_NOTICE="$CHART_JS_DIR/CHART_JS_IN_ADMINUIASSETS.txt" -CHARTJS_PLUGIN_DATALABELS_DIR="$VENDOR_DIR/chartjs-plugin-datalabels" -CHARTJS_PLUGIN_DATALABELS_NOTICE="$CHARTJS_PLUGIN_DATALABELS_DIR/CHARTJS_PLUGIN_DATALABELS_IN_ADMINUIASSETS.txt" - CURRENT_BRANCH=`git branch | grep '*' | cut -d ' ' -f 2` TMP_BRANCH="version_$VERSION" TAG="v$VERSION" @@ -82,92 +52,8 @@ echo "# Switching to $BRANCH and updating" git checkout -q $BRANCH > /dev/null && git pull > /dev/null check_process "switch to $BRANCH" -echo "# Removing the assets" -[ ! -d "$VENDOR_DIR" ] && mkdir -p $VENDOR_DIR -[ -d "$VENDOR_DIR" ] && rm -rf $VENDOR_DIR/* -check_process "clean the vendor dir $VENDOR_DIR" - -echo "# Removing yarn.lock" -rm "yarn.lock" - -echo "# Installing dependendencies" -yarn install -yarn run prepare-release - -echo "# Removing unused files from Bootstrap" -rm -r "$BOOTSTRAP_DIR/dist/css" "$BOOTSTRAP_DIR/js" $BOOTSTRAP_DIR/dist/js/bootstrap.js $BOOTSTRAP_DIR/dist/js/bootstrap.js.map $BOOTSTRAP_DIR/dist/js/bootstrap.bundle.js $BOOTSTRAP_DIR/dist/js/bootstrap.bundle.js.map $BOOTSTRAP_DIR/dist/js/bootstrap.bundle.min.js $BOOTSTRAP_DIR/dist/js/bootstrap.bundle.min.js.map -check_process "clean bootstrap" -echo "This is a customized Bootstrap version." > $BOOTSTRAP_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $BOOTSTRAP_NOTICE - -echo "# Removing unused files from Flatpickr" -rm -r "$FLATPICKR_DIR/src" $FLATPICKR_DIR/dist/flatpickr.css $FLATPICKR_DIR/dist/flatpickr.js $FLATPICKR_DIR/dist/ie.css $FLATPICKR_DIR/README.md -check_process "clean flatpickr" -echo "This is a customized Flatpickr version." > $FLATPICKR_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $FLATPICKR_NOTICE - -echo "# Removing unused files from jQuery" -rm -r "$JQUERY_DIR/src" $JQUERY_DIR/dist/jquery.js $JQUERY_DIR/dist/jquery.min.map $JQUERY_DIR/dist/jquery.slim.js $JQUERY_DIR/dist/jquery.slim.min.js $JQUERY_DIR/dist/jquery.slim.min.map $JQUERY_DIR/AUTHORS.txt $JQUERY_DIR/bower.json $JQUERY_DIR/README.md -check_process "clean jquery" -echo "This is a customized jQuery version." > $JQUERY_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $JQUERY_NOTICE - -echo "# Removing unused files from Leaflet" -rm -r "$LEAFLET_DIR/src" $LEAFLET_DIR/CHANGELOG.md $LEAFLET_DIR/README.md -check_process "clean Leaflet" -echo "This is a customized Leaflet version." > $LEAFLET_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $LEAFLET_NOTICE - -echo "# Removing unused files from Popper" -rm -r "$POPPER_DIR/core/dist/esm" $POPPER_DIR/core/dist/umd/popper.js $POPPER_DIR/core/dist/umd/popper.js.map -check_process "clean popperjs" -echo "This is a customized Popperjs version." > $POPPER_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $POPPER_NOTICE - -echo "This is a customized React version." > $REACT_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $REACT_NOTICE - -echo "# Removing unused files from react-dom" -rm -r $REACT_DOM_DIR/server.js $REACT_DOM_DIR/test-utils.js -check_process "clean ReactDOM" -echo "This is a customized ReactDOM version." > $REACT_DOM_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $REACT_DOM_NOTICE - -echo "# Removing unused files from moment" -rm -r "$MOMENT_DIR/src" -check_process "clean moment" -echo "This is a customized moment version." > $MOMENT_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $MOMENT_NOTICE - -echo "# Removing unused files from moment-timezone" -rm -r "$MOMENT_TIMEZONE_DIR/data" -check_process "clean moment-timezone" -echo "This is a customized moment version." > $MOMENT_TIMEZONE_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $MOMENT_TIMEZONE_NOTICE - -echo "# Removing unused files from d3" -rm -r "$D3_DIR/node_modules" $D3_DIR/CHANGES.md $D3_DIR/index.js $D3_DIR/dist/d3.node.js $D3_DIR/dist/package.js -check_process "clean d3" -echo "This is a customized d3 version." > $D3_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $D3_NOTICE - -echo "# Removing unused files from dagre-d3" -rm -r "$DAGRE_D3_DIR/lib" "$DAGRE_D3_DIR/dist/demo" $DAGRE_D3_DIR/.jshintrc $DAGRE_D3_DIR/bower.json $DAGRE_D3_DIR/index.js $DAGRE_D3_DIR/karma.conf.js $DAGRE_D3_DIR/karma.core.conf.js $DAGRE_D3_DIR/dist/dagre-d3.core.js $DAGRE_D3_DIR/dist/dagre-d3.core.min.js $DAGRE_D3_DIR/dist/dagre-d3.core.min.js.map -check_process "clean dagre-d3" -echo "This is a customized dagre-d3 version." > $DAGRE_D3_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $DAGRE_D3_NOTICE - -echo "# Removing unused files from js-md5" -rm -r "$JS_MD5_DIR/src" -check_process "clean js-md5" -echo "This is a customized js-md5 version." > $JS_MD5_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $JS_MD5_NOTICE - -echo "This is a customized chart-js version." > $CHART_JS_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $CHART_JS_NOTICE - -echo "This is a customized chartjs-plugin-datalabels version." > $CHARTJS_PLUGIN_DATALABELS_NOTICE -echo "To decrease the size of the bundle, it includes production-only files" >> $CHARTJS_PLUGIN_DATALABELS_NOTICE +./bin/prepare_release_files.sh +check_process "prepare the release files" echo "# Creating the custom branch: $TMP_BRANCH" git checkout -q -b "$TMP_BRANCH" > /dev/null diff --git a/bin/prepare_release_files.sh b/bin/prepare_release_files.sh new file mode 100755 index 000000000..4aed0343a --- /dev/null +++ b/bin/prepare_release_files.sh @@ -0,0 +1,134 @@ +#! /bin/sh +# Script to prepare a admin-ui-assets bundle release files + +check_command() +{ + $1 --version 2>&1 > /dev/null + check_process "find '$1' in the PATH, is it installed?" +} + +check_process() +{ + [ $? -ne 0 ] && echo "Fail to $1" && exit 3 +} + +check_command "yarn" + +VENDOR_DIR="src/bundle/Resources/public/vendors" +BOOTSTRAP_DIR="$VENDOR_DIR/bootstrap" +BOOTSTRAP_NOTICE="$BOOTSTRAP_DIR/BOOTSTRAP_IN_ADMINUIASSETS.txt" +FLATPICKR_DIR="$VENDOR_DIR/flatpickr" +FLATPICKR_NOTICE="$FLATPICKR_DIR/FLATPICKR_IN_ADMINUIASSETS.txt" +JQUERY_DIR="$VENDOR_DIR/jquery" +JQUERY_NOTICE="$JQUERY_DIR/JQUERY_IN_ADMINUIASSETS.txt" +LEAFLET_DIR="$VENDOR_DIR/leaflet" +LEAFLET_NOTICE="$LEAFLET_DIR/LEAFLET_IN_ADMINUIASSETS.txt" +POPPER_DIR="$VENDOR_DIR/@popperjs" +POPPER_NOTICE="$POPPER_DIR/POPPER_IN_ADMINUIASSETS.txt" +REACT_DIR="$VENDOR_DIR/react" +REACT_NOTICE="$REACT_DIR/REACT_IN_ADMINUIASSETS.txt" +REACT_DOM_DIR="$VENDOR_DIR/react-dom" +REACT_DOM_NOTICE="$REACT_DOM_DIR/REACT_DOM_IN_ADMINUIASSETS.txt" +MOMENT_DIR="$VENDOR_DIR/moment" +MOMENT_NOTICE="$MOMENT_DIR/MOMENT_IN_ADMINUIASSETS.txt" +MOMENT_TIMEZONE_DIR="$VENDOR_DIR/moment-timezone" +MOMENT_TIMEZONE_NOTICE="$MOMENT_TIMEZONE_DIR/MOMENT_TIMEZONE_IN_ADMINUIASSETS.txt" +D3_DIR="$VENDOR_DIR/d3" +D3_NOTICE="$D3_DIR/D3_IN_ADMINUIASSETS.txt" +DAGRE_D3_DIR="$VENDOR_DIR/dagre-d3" +DAGRE_D3_NOTICE="$DAGRE_D3_DIR/DAGRE_D3_IN_ADMINUIASSETS.txt" +JS_MD5_DIR="$VENDOR_DIR/js-md5" +JS_MD5_NOTICE="$JS_MD5_DIR/JS_MD5_IN_ADMINUIASSETS.txt" +CHART_JS_DIR="$VENDOR_DIR/chart-js" +CHART_JS_NOTICE="$CHART_JS_DIR/CHART_JS_IN_ADMINUIASSETS.txt" +CHARTJS_PLUGIN_DATALABELS_DIR="$VENDOR_DIR/chartjs-plugin-datalabels" +CHARTJS_PLUGIN_DATALABELS_NOTICE="$CHARTJS_PLUGIN_DATALABELS_DIR/CHARTJS_PLUGIN_DATALABELS_IN_ADMINUIASSETS.txt" + +echo "# Removing the assets" +[ ! -d "$VENDOR_DIR" ] && mkdir -p $VENDOR_DIR +[ -d "$VENDOR_DIR" ] && rm -rf $VENDOR_DIR/* +check_process "clean the vendor dir $VENDOR_DIR" + +echo "# Removing yarn.lock" +rm "yarn.lock" + +echo "# Installing dependendencies" +yarn install +yarn run prepare-release + +echo "# Removing unused files from Bootstrap" +rm -r "$BOOTSTRAP_DIR/dist/css" "$BOOTSTRAP_DIR/js" $BOOTSTRAP_DIR/dist/js/bootstrap.js $BOOTSTRAP_DIR/dist/js/bootstrap.js.map $BOOTSTRAP_DIR/dist/js/bootstrap.bundle.js $BOOTSTRAP_DIR/dist/js/bootstrap.bundle.js.map $BOOTSTRAP_DIR/dist/js/bootstrap.bundle.min.js $BOOTSTRAP_DIR/dist/js/bootstrap.bundle.min.js.map +check_process "clean bootstrap" +echo "This is a customized Bootstrap version." > $BOOTSTRAP_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $BOOTSTRAP_NOTICE + +echo "# Removing unused files from Flatpickr" +rm -r "$FLATPICKR_DIR/src" $FLATPICKR_DIR/dist/flatpickr.css $FLATPICKR_DIR/dist/flatpickr.js $FLATPICKR_DIR/dist/ie.css $FLATPICKR_DIR/README.md +check_process "clean flatpickr" +echo "This is a customized Flatpickr version." > $FLATPICKR_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $FLATPICKR_NOTICE + +echo "# Removing unused files from jQuery" +rm -r "$JQUERY_DIR/src" $JQUERY_DIR/dist/jquery.js $JQUERY_DIR/dist/jquery.min.map $JQUERY_DIR/dist/jquery.slim.js $JQUERY_DIR/dist/jquery.slim.min.js $JQUERY_DIR/dist/jquery.slim.min.map $JQUERY_DIR/AUTHORS.txt $JQUERY_DIR/bower.json $JQUERY_DIR/README.md +check_process "clean jquery" +echo "This is a customized jQuery version." > $JQUERY_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $JQUERY_NOTICE + +echo "# Removing unused files from Leaflet" +rm -r "$LEAFLET_DIR/src" $LEAFLET_DIR/CHANGELOG.md $LEAFLET_DIR/README.md +check_process "clean Leaflet" +echo "This is a customized Leaflet version." > $LEAFLET_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $LEAFLET_NOTICE + +echo "# Removing unused files from Popper" +rm -r "$POPPER_DIR/core/dist/esm" $POPPER_DIR/core/dist/umd/popper.js $POPPER_DIR/core/dist/umd/popper.js.map +check_process "clean popperjs" +echo "This is a customized Popperjs version." > $POPPER_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $POPPER_NOTICE + +echo "This is a customized React version." > $REACT_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $REACT_NOTICE + +echo "# Removing unused files from react-dom" +rm -r $REACT_DOM_DIR/server.js $REACT_DOM_DIR/test-utils.js +check_process "clean ReactDOM" +echo "This is a customized ReactDOM version." > $REACT_DOM_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $REACT_DOM_NOTICE + +echo "# Removing unused files from moment" +rm -r "$MOMENT_DIR/src" +check_process "clean moment" +echo "This is a customized moment version." > $MOMENT_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $MOMENT_NOTICE + +echo "# Removing unused files from moment-timezone" +rm -r "$MOMENT_TIMEZONE_DIR/data" +check_process "clean moment-timezone" +echo "This is a customized moment version." > $MOMENT_TIMEZONE_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $MOMENT_TIMEZONE_NOTICE + +echo "# Removing unused files from d3" +rm -r "$D3_DIR/node_modules" $D3_DIR/CHANGES.md $D3_DIR/index.js $D3_DIR/dist/d3.node.js $D3_DIR/dist/package.js +check_process "clean d3" +echo "This is a customized d3 version." > $D3_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $D3_NOTICE + +echo "# Removing unused files from dagre-d3" +rm -r "$DAGRE_D3_DIR/lib" "$DAGRE_D3_DIR/dist/demo" $DAGRE_D3_DIR/.jshintrc $DAGRE_D3_DIR/bower.json $DAGRE_D3_DIR/index.js $DAGRE_D3_DIR/karma.conf.js $DAGRE_D3_DIR/karma.core.conf.js $DAGRE_D3_DIR/dist/dagre-d3.core.js $DAGRE_D3_DIR/dist/dagre-d3.core.min.js $DAGRE_D3_DIR/dist/dagre-d3.core.min.js.map +check_process "clean dagre-d3" +echo "This is a customized dagre-d3 version." > $DAGRE_D3_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $DAGRE_D3_NOTICE + +echo "# Removing unused files from js-md5" +rm -r "$JS_MD5_DIR/src" +check_process "clean js-md5" +echo "This is a customized js-md5 version." > $JS_MD5_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $JS_MD5_NOTICE + +echo "This is a customized chart-js version." > $CHART_JS_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $CHART_JS_NOTICE + +echo "This is a customized chartjs-plugin-datalabels version." > $CHARTJS_PLUGIN_DATALABELS_NOTICE +echo "To decrease the size of the bundle, it includes production-only files" >> $CHARTJS_PLUGIN_DATALABELS_NOTICE + +exit 0; diff --git a/package.json b/package.json index 030c3d842..f638611b8 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,9 @@ "move-js-md5": "cp -r node_modules/js-md5 src/bundle/Resources/public/vendors/js-md5", "move-ckeditor5": "cp -r node_modules/@ckeditor src/bundle/Resources/public/vendors/@ckeditor", "move-ckeditor5-core": "cp -r node_modules/ckeditor5 src/bundle/Resources/public/vendors/ckeditor5", - "move-ids-assets": "mkdir src/bundle/Resources/public/vendors/ids-assets && cp -r node_modules/@ibexa/design-system/packages/assets/dist src/bundle/Resources/public/vendors/ids-assets/dist", - "move-ids-components": "mkdir src/bundle/Resources/public/vendors/ids-components && cp -r node_modules/@ibexa/design-system/packages/components/dist src/bundle/Resources/public/vendors/ids-components/dist", - "move-ids-core": "mkdir src/bundle/Resources/public/vendors/ids-core && cp -r node_modules/@ibexa/design-system/packages/core/dist src/bundle/Resources/public/vendors/ids-core/dist", + "move-ids-assets": "mkdir src/bundle/Resources/public/vendors/ids-assets && cp -r node_modules/@ibexa/design-system/packages/assets/${idsDir:-dist} src/bundle/Resources/public/vendors/ids-assets/dist", + "move-ids-components": "mkdir src/bundle/Resources/public/vendors/ids-components && cp -r node_modules/@ibexa/design-system/packages/components/${idsDir:-dist} src/bundle/Resources/public/vendors/ids-components/dist", + "move-ids-core": "mkdir src/bundle/Resources/public/vendors/ids-core && cp -r node_modules/@ibexa/design-system/packages/core/${idsDir:-dist} src/bundle/Resources/public/vendors/ids-core/dist", "prepare-release": "yarn run create-folder; yarn run move-bootstrap; yarn run move-jquery; yarn run move-leaflet; yarn run move-react; yarn run move-react-dom; yarn run move-popperjs; yarn run move-flatpickr; yarn run move-create-react-class; yarn run move-prop-types; yarn run move-moment; yarn run move-moment-timezone; yarn run move-d3; yarn run move-dagre-d3; yarn run move-chart-js; yarn run move-js-md5; yarn run move-ckeditor5; yarn run move-ckeditor5-core; yarn run move-chartjs-plugin-datalabels; yarn run move-ids-assets; yarn run move-ids-components; yarn run move-ids-core" }, "repository": { @@ -44,7 +44,7 @@ "d3": "^5.16.0", "dagre-d3": "^0.6.4", "flatpickr": "^4.6.13", - "@ibexa/design-system": "https://github.com/ibexa/design-system#^v1.0.0", + "@ibexa/design-system": "https://github.com/ibexa/design-system#main", "jquery": "^3.7.1", "js-md5": "0.7.3", "leaflet": "^1.9.4", From 22e8e4a7258453689fccefe36b5da9c0fa133613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Wed, 15 Oct 2025 03:09:57 +0200 Subject: [PATCH 2/3] added postinstall --- bin/prepare_next.sh | 6 ++++-- package.json | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/prepare_next.sh b/bin/prepare_next.sh index fa8fa3dd4..e0130966c 100755 --- a/bin/prepare_next.sh +++ b/bin/prepare_next.sh @@ -51,7 +51,9 @@ echo "# Switching to $BRANCH and updating" git checkout -q $BRANCH > /dev/null && git pull > /dev/null check_process "switch to $BRANCH" -idsDir=src ./bin/prepare_release_files.sh +jq --indent 4 '.scripts["postinstall"] = "(cd node_modules/@ibexa/design-system && yarn install &&yarn packages:build)"' package.json > package.json.tmp && mv package.json.tmp package.json +./bin/prepare_release_files.sh +git checkout HEAD -- package.json check_process "prepare the release files" echo "# Creating next branch: $NEXT_BRANCH" @@ -66,4 +68,4 @@ check_process "commit the assets" echo "" echo "The branch '$NEXT_BRANCH' has been created, please check that everything is correct" echo "then you can run:" -echo " git push origin $NEXT_BRANCH" \ No newline at end of file +echo " git push origin $NEXT_BRANCH" diff --git a/package.json b/package.json index f638611b8..5937ce4fd 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,9 @@ "move-js-md5": "cp -r node_modules/js-md5 src/bundle/Resources/public/vendors/js-md5", "move-ckeditor5": "cp -r node_modules/@ckeditor src/bundle/Resources/public/vendors/@ckeditor", "move-ckeditor5-core": "cp -r node_modules/ckeditor5 src/bundle/Resources/public/vendors/ckeditor5", - "move-ids-assets": "mkdir src/bundle/Resources/public/vendors/ids-assets && cp -r node_modules/@ibexa/design-system/packages/assets/${idsDir:-dist} src/bundle/Resources/public/vendors/ids-assets/dist", - "move-ids-components": "mkdir src/bundle/Resources/public/vendors/ids-components && cp -r node_modules/@ibexa/design-system/packages/components/${idsDir:-dist} src/bundle/Resources/public/vendors/ids-components/dist", - "move-ids-core": "mkdir src/bundle/Resources/public/vendors/ids-core && cp -r node_modules/@ibexa/design-system/packages/core/${idsDir:-dist} src/bundle/Resources/public/vendors/ids-core/dist", + "move-ids-assets": "mkdir src/bundle/Resources/public/vendors/ids-assets && cp -r node_modules/@ibexa/design-system/packages/assets/dist src/bundle/Resources/public/vendors/ids-assets/dist", + "move-ids-components": "mkdir src/bundle/Resources/public/vendors/ids-components && cp -r node_modules/@ibexa/design-system/packages/components/dist src/bundle/Resources/public/vendors/ids-components/dist", + "move-ids-core": "mkdir src/bundle/Resources/public/vendors/ids-core && cp -r node_modules/@ibexa/design-system/packages/core/dist src/bundle/Resources/public/vendors/ids-core/dist", "prepare-release": "yarn run create-folder; yarn run move-bootstrap; yarn run move-jquery; yarn run move-leaflet; yarn run move-react; yarn run move-react-dom; yarn run move-popperjs; yarn run move-flatpickr; yarn run move-create-react-class; yarn run move-prop-types; yarn run move-moment; yarn run move-moment-timezone; yarn run move-d3; yarn run move-dagre-d3; yarn run move-chart-js; yarn run move-js-md5; yarn run move-ckeditor5; yarn run move-ckeditor5-core; yarn run move-chartjs-plugin-datalabels; yarn run move-ids-assets; yarn run move-ids-components; yarn run move-ids-core" }, "repository": { @@ -44,7 +44,7 @@ "d3": "^5.16.0", "dagre-d3": "^0.6.4", "flatpickr": "^4.6.13", - "@ibexa/design-system": "https://github.com/ibexa/design-system#main", + "@ibexa/design-system": "https://github.com/ibexa/design-system#fix-build", "jquery": "^3.7.1", "js-md5": "0.7.3", "leaflet": "^1.9.4", From 0998016697a606a4e96d0e605458caa0c9dc6769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Wed, 15 Oct 2025 11:29:20 +0200 Subject: [PATCH 3/3] change to main --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5937ce4fd..124f43517 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "d3": "^5.16.0", "dagre-d3": "^0.6.4", "flatpickr": "^4.6.13", - "@ibexa/design-system": "https://github.com/ibexa/design-system#fix-build", + "@ibexa/design-system": "https://github.com/ibexa/design-system#main", "jquery": "^3.7.1", "js-md5": "0.7.3", "leaflet": "^1.9.4",