Skip to content

Commit

Permalink
Merge branch 'main' of github.com:Lichtblick-Suite/lichtblick into fi…
Browse files Browse the repository at this point in the history
…x/making-metadata-possibly-undefined
  • Loading branch information
ctw-joao-luis committed Oct 18, 2024
2 parents 4641988 + e431262 commit 8ce5df8
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 12 deletions.
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,8 @@
"typescript.preferences.importModuleSpecifier": "non-relative",
"jest.autoRun": { "watch": false, "onSave": "test-file" },
"jest.jestCommandLine": "yarn test",
"eslint.lintTask.enable": true
"eslint.lintTask.enable": true,
"[shellscript]": {
"editor.defaultFormatter": "foxundermoon.shell-format"
}
}
24 changes: 24 additions & 0 deletions ci/clean-build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash

# Clean and build TypeScript packages
tsc --build --clean packages/**/tsconfig.json

# Define the folders to be removed in an array
folders_to_remove=(
".webpack"
"*/.webpack"
"dist"
"storybook-screenshots"
"storybook-static"
"coverage"
"desktop/integration-test/coverage"
"web/integration-test/coverage"
)

# Remove the folders
for folder in "${folders_to_remove[@]}"; do
rimraf "$folder"
done

# Display completion message
echo "Build cleaned and folders removed successfully."
7 changes: 0 additions & 7 deletions jest.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,5 @@
"<rootDir>/desktop/jest.config.json",
"<rootDir>/packages/*/jest.config.json"
],
"collectCoverage": true,
"coverageReporters": [
"text",
"lcov",
"json",
"xml"
],
"coverageDirectory": "coverage"
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lichtblick",
"version": "1.5.8",
"version": "1.5.10",
"license": "MPL-2.0",
"private": true,
"productName": "Lichtblick",
Expand All @@ -20,7 +20,7 @@
"node": ">=16"
},
"scripts": {
"clean": "tsc --build --clean packages/**/tsconfig.json && rimraf .webpack */.webpack dist storybook-screenshots storybook-static coverage",
"clean": "bash ci/clean-build.sh",
"build:packages": "tsc --build --verbose packages/*/tsconfig.json packages/*/src/*/tsconfig.json",
"desktop:build:dev": "webpack --mode development --progress --config desktop/webpack.config.ts",
"desktop:build:prod": "webpack --mode production --progress --config desktop/webpack.config.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/suite/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@lichtblick/suite",
"version": "1.5.8",
"version": "1.5.10",
"license": "MPL-2.0",
"repository": {
"type": "git",
Expand Down
3 changes: 2 additions & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sonar.eslint.reportPaths=eslint-report.json

# Path to sources
sonar.sources=benchmark,ci,desktop,packages,web
sonar.exclusions=**/*.test.ts,**/*.test.tsx
sonar.exclusions=**/*.test.ts,**/*.test.tsx,**/integration-test/**
sonar.inclusions=\
**/*.ts,\
**/*.tsx,\
Expand All @@ -18,6 +18,7 @@ sonar.inclusions=\
# Path to tests
sonar.tests=benchmark,ci,desktop,packages,web
sonar.test.inclusions=**/*.test.ts,**/*.test.tsx
sonar.test.exclusions=**/integration-test/**

# Code coverage
sonar.javascript.lcov.reportPaths=coverage/lcov.info
Expand Down

0 comments on commit 8ce5df8

Please sign in to comment.