From 0ee53c71ffadb8a6ddb1febd9f912bc99f5f7a0b Mon Sep 17 00:00:00 2001
From: Yassine Doghri <yassine@doghri.fr>
Date: Tue, 18 Jan 2022 18:51:25 +0000
Subject: [PATCH] fix(bundle): update vite input files path + add `set -e` in
bash scripts to fail if command fails
---
.gitlab-ci.yml | 2 +-
scripts/bundle-prepare.sh | 1 +
scripts/bundle.sh | 1 +
scripts/lint-commit-msg.sh | 1 +
scripts/package.sh | 1 +
vite.config.ts | 18 +++++++++---------
6 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10f35381a8..753e3d626f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,5 +111,5 @@ release:
- js-dependencies
only:
- main
- - alpha
- beta
+ - alpha
diff --git a/scripts/bundle-prepare.sh b/scripts/bundle-prepare.sh
index 883110a868..6bddd17344 100644
--- a/scripts/bundle-prepare.sh
+++ b/scripts/bundle-prepare.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+set -e
# install only production dependencies using the --no-dev option
composer install --no-dev --prefer-dist --no-ansi --no-interaction --no-progress --ignore-platform-reqs
diff --git a/scripts/bundle.sh b/scripts/bundle.sh
index d3e4893f9c..f3bed6d83a 100644
--- a/scripts/bundle.sh
+++ b/scripts/bundle.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+set -e
VERSION=$1
COMPOSER_VERSION=$(echo "$VERSION" | perl -pe 's/(?<=[alpha|beta])\.//g')
diff --git a/scripts/lint-commit-msg.sh b/scripts/lint-commit-msg.sh
index 00fb1e26ae..c48b935b32 100755
--- a/scripts/lint-commit-msg.sh
+++ b/scripts/lint-commit-msg.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+set -e
# see https://github.com/conventional-changelog/commitlint/issues/885
diff --git a/scripts/package.sh b/scripts/package.sh
index adefe625e5..89269fe79c 100644
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+set -e
VERSION=$1
diff --git a/vite.config.ts b/vite.config.ts
index c98eed8eaa..861c45bea1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -13,15 +13,15 @@ export default defineConfig({
sourcemap: true,
rollupOptions: {
input: {
- "podcast.ts": "app/Resources/js/podcast.ts",
- "install.ts": "app/Resources/js/install.ts",
- "app.ts": "app/Resources/js/app.ts",
- "admin.ts": "app/Resources/js/admin.ts",
- "charts.ts": "app/Resources/js/charts.ts",
- "map.ts": "app/Resources/js/map.ts",
- "audio-player.ts": "app/Resources/js/audio-player.ts",
- "embed.ts": "app/Resources/js/embed.ts",
- "styles/index.css": "app/Resources/styles/index.css",
+ "podcast.ts": "js/podcast.ts",
+ "install.ts": "js/install.ts",
+ "app.ts": "js/app.ts",
+ "admin.ts": "js/admin.ts",
+ "charts.ts": "js/charts.ts",
+ "map.ts": "js/map.ts",
+ "audio-player.ts": "js/audio-player.ts",
+ "embed.ts": "js/embed.ts",
+ "styles/index.css": "styles/index.css",
},
},
},
--
GitLab