From 59132d8537be1e98fd0bc0e8aec89c217acba305 Mon Sep 17 00:00:00 2001 From: d064310 Date: Thu, 14 Nov 2024 11:44:52 +0100 Subject: [PATCH 1/4] chore(ci): do not check markdowns in ci --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index e8bc5c6ed..9d5934167 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "generate:app": "turbo gen workspace --type app --copy @cloudoperators/juno-app-template --name", "format": "prettier --log-level warn --write \"**/*.{js,jsx,ts,tsx,md}\"", "check-format": "prettier --config ./.prettierrc --check \"**/*.{js,jsx,ts,tsx,md}\" ", + "check-format-no-md": "prettier --config ./.prettierrc --check \"**/*.{js,jsx,ts,tsx}\" ", "changeset": "changeset", "version-packages": "changeset version", "release": "npm run build && changeset publish", From 17670e0f2183bb577bb30ccbb4317d533143a5b2 Mon Sep 17 00:00:00 2001 From: d064310 Date: Thu, 14 Nov 2024 11:54:19 +0100 Subject: [PATCH 2/4] chore(ci): do not check markdown in ci --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 9d5934167..e8bc5c6ed 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "generate:app": "turbo gen workspace --type app --copy @cloudoperators/juno-app-template --name", "format": "prettier --log-level warn --write \"**/*.{js,jsx,ts,tsx,md}\"", "check-format": "prettier --config ./.prettierrc --check \"**/*.{js,jsx,ts,tsx,md}\" ", - "check-format-no-md": "prettier --config ./.prettierrc --check \"**/*.{js,jsx,ts,tsx}\" ", "changeset": "changeset", "version-packages": "changeset version", "release": "npm run build && changeset publish", From 16cb600470c8863fa80f6bef20505246291c7d65 Mon Sep 17 00:00:00 2001 From: d064310 Date: Thu, 14 Nov 2024 14:37:12 +0100 Subject: [PATCH 3/4] chore(ci): do not use relative paths in apps --- .github/scripts/build-vite-app.sh | 4 ++-- apps/carbon/vite.config.ts | 1 - package-lock.json | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/scripts/build-vite-app.sh b/.github/scripts/build-vite-app.sh index 4814e5ce5..07e595339 100755 --- a/.github/scripts/build-vite-app.sh +++ b/.github/scripts/build-vite-app.sh @@ -7,7 +7,7 @@ build_folder=$(dirname $entry_file) package_name=$(jq -r '.name' $PACKAGE_PATH/package.json) # Run build using turbo -npx turbo run build:static --filter $package_name +npx turbo run build:static --filter $package_name -- --base ./ # Copy build folder to deploy path mkdir -p "$DEPLOY_PATH/$TARGET_FOLDER" @@ -15,5 +15,5 @@ cp -r "$PACKAGE_PATH/$build_folder/." "$DEPLOY_PATH/$TARGET_FOLDER" # Generate appProps.json if APP_PROPS_BASE64 is non-empty if [ -n "$APP_PROPS_BASE64" ]; then - echo "$APP_PROPS_BASE64" | base64 -d > "$DEPLOY_PATH/$TARGET_FOLDER/appProps.json" + echo "$APP_PROPS_BASE64" | base64 -d >"$DEPLOY_PATH/$TARGET_FOLDER/appProps.json" fi diff --git a/apps/carbon/vite.config.ts b/apps/carbon/vite.config.ts index f06c3e8ae..6a82fa6c8 100644 --- a/apps/carbon/vite.config.ts +++ b/apps/carbon/vite.config.ts @@ -37,7 +37,6 @@ export default defineConfig(({ mode }) => { if (mode === "static") { return { ...sharedConfig, - base: "./", // Relative Path in Generated index.html build: { outDir: "build", }, diff --git a/package-lock.json b/package-lock.json index b5855438c..b31548066 100644 --- a/package-lock.json +++ b/package-lock.json @@ -681,7 +681,7 @@ }, "apps/greenhouse": { "name": "@cloudoperators/juno-app-greenhouse", - "version": "0.3.3", + "version": "0.3.4", "license": "Apache-2.0", "dependencies": { "@cloudoperators/juno-app-doop": "*", @@ -826,7 +826,7 @@ }, "apps/heureka": { "name": "@cloudoperators/juno-app-heureka", - "version": "2.9.2", + "version": "2.10.0", "license": "Apache-2.0", "dependencies": { "@cloudoperators/juno-communicator": "*", @@ -29600,7 +29600,7 @@ }, "packages/ui-components": { "name": "@cloudoperators/juno-ui-components", - "version": "2.28.0", + "version": "2.29.0", "license": "Apache-2.0", "devDependencies": { "@babel/plugin-transform-parameters": "^7.22.15", @@ -29811,7 +29811,7 @@ }, "packages/url-state-provider": { "name": "@cloudoperators/juno-url-state-provider", - "version": "2.0.7", + "version": "2.1.0", "license": "Apache-2.0", "dependencies": { "juri": "^1.0.3" From a26a8b98a38859f113175e0c17dc49a77e131d9e Mon Sep 17 00:00:00 2001 From: d064310 Date: Thu, 14 Nov 2024 14:44:07 +0100 Subject: [PATCH 4/4] chore(ci): do not use relative paths in apps --- apps/doop/vite.config.ts | 1 - apps/example/vite.config.ts | 1 - apps/greenhouse/vite.config.ts | 1 - apps/heureka/vite.config.ts | 1 - apps/supernova/vite.config.ts | 1 - 5 files changed, 5 deletions(-) diff --git a/apps/doop/vite.config.ts b/apps/doop/vite.config.ts index 74360cbf0..5e81710aa 100644 --- a/apps/doop/vite.config.ts +++ b/apps/doop/vite.config.ts @@ -30,7 +30,6 @@ export default defineConfig(({ mode }) => { if (mode === "static") { return { ...sharedConfig, - base: "./", // Relative Path in Generated index.html build: { outDir: "build", }, diff --git a/apps/example/vite.config.ts b/apps/example/vite.config.ts index 17ed2806c..58d36be4b 100644 --- a/apps/example/vite.config.ts +++ b/apps/example/vite.config.ts @@ -30,7 +30,6 @@ export default defineConfig(({ mode }) => { if (mode === "static") { return { ...sharedConfig, - base: "./", // Relative Path in Generated index.html build: { outDir: "build", }, diff --git a/apps/greenhouse/vite.config.ts b/apps/greenhouse/vite.config.ts index 10c83784a..1e3b5b539 100644 --- a/apps/greenhouse/vite.config.ts +++ b/apps/greenhouse/vite.config.ts @@ -31,7 +31,6 @@ export default defineConfig(({ mode }) => { if (mode === "static") { return { ...sharedConfig, - base: "./", // Relative Path in Generated index.html build: { outDir: "build", }, diff --git a/apps/heureka/vite.config.ts b/apps/heureka/vite.config.ts index 74360cbf0..5e81710aa 100644 --- a/apps/heureka/vite.config.ts +++ b/apps/heureka/vite.config.ts @@ -30,7 +30,6 @@ export default defineConfig(({ mode }) => { if (mode === "static") { return { ...sharedConfig, - base: "./", // Relative Path in Generated index.html build: { outDir: "build", }, diff --git a/apps/supernova/vite.config.ts b/apps/supernova/vite.config.ts index 74360cbf0..5e81710aa 100644 --- a/apps/supernova/vite.config.ts +++ b/apps/supernova/vite.config.ts @@ -30,7 +30,6 @@ export default defineConfig(({ mode }) => { if (mode === "static") { return { ...sharedConfig, - base: "./", // Relative Path in Generated index.html build: { outDir: "build", },