Merge branch 'main' into BC-7995-node-22

hpi-schul-cloud · Nov 19, 2024 · cd32611 · cd32611
2 parents 47bccd4 + 45f68c7
commit cd32611
Show file tree

Hide file tree

Showing 66 changed files with 1,689 additions and 933 deletions.
diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -214,12 +214,18 @@ module.exports = {
 					},
 				],
 			},
-			// I18n - TS
+			// I18n - TS, JSON
 			{
-				test: /\.ts$/,
+				test: /\.(ts|mjs)$/,
 				type: "javascript/auto",
 				loader: path.resolve(__dirname, "vue-i18n-loader.js"),
-				include: [path.resolve(__src, "locales")],
+				include: [
+					path.resolve(__src, "locales"),
+					path.resolve(__base, "node_modules/vuetify/lib/locale"),
+				],
+				exclude: [
+					path.resolve(__base, "node_modules/vuetify/lib/locale/adapters"),
+				],
 			},
 			// Vue
 			{

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -2,6 +2,6 @@ sonar.organization=schulcloud-verbund
 sonar.projectKey=hpi-schul-cloud_nuxt-client
 sonar.sources=.
 sonar.exclusions=src/serverApi/**/*.*,src/fileStorageApi/**/*.*,src/h5pEditorApi/**/*.*,**/themes/**.ts
-sonar.coverage.exclusions=tests/**/*.*,**/*.unit.ts,**/*.unit.js,**/themes/**.ts,eslint.config.js
+sonar.coverage.exclusions=tests/**/*.*,**/*.unit.ts,**/*.unit.js,**/themes/**.ts,eslint.config.js,src/main.ts,src/plugins/vuetify.ts
 sonar.cpd.exclusions=**/locales/**.ts,tests/**/*.*,**/*.unit.ts,**/*.unit.js,**/themes/**.ts
 sonar.javascript.lcov.reportPaths=./coverage/lcov.info