Update config (#222)

* fix: update config * fix: dockerignore and dockerfile version 1.6 --------- Co-authored-by: Christian Badura <[email protected]>
onecx · Aug 21, 2024 · 1a7e062 · 1a7e062
1 parent 2c005e4
commit 1a7e062
Show file tree

Hide file tree

Showing 10 changed files with 266 additions and 109 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,14 +1,20 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# Copy of .gitignore AND removed "dist" directory
 
 # compiled output
-/tmp
-/out-tsc
+# dist
+tmp
+out-tsc
+reports
 
 # dependencies
-/node_modules
+node_modules
+
+# profiling files
+chrome-profiler-events*.json
+speed-measure-plugin*.json
 
 # IDEs and editors
-/.idea
+.idea
 .project
 .classpath
 .c9/
@@ -22,20 +28,20 @@
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+.history/*
 
 # misc
+.angular
+.eslintcache
+.husky/_
 .sass-cache
 .gitlab*
 .scannerwork
 connect.lock
-reports
 typings
 *.log
-
-# e2e
-/e2e/*.js
-/e2e/*.map
+*.sh
 
 # System Files
 .DS_Store
-Thumbs.db
+Thumbs.db
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -10,8 +10,7 @@
     "helm/**",
     "node_modules/**",
     "src/app/shared/generated/**",
-    "src/app/api/*",
-    "src/app/model/*",
+    "src/assets/api/*",
     "src/**/*.ico",
     "src/**/*.svg"
   ],

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,6 +6,21 @@ updates:
       interval: daily
     labels:
       - dependencies
+    groups:
+      angular:
+        applies-to: version-updates
+        patterns:
+        - "@angular*"
+        update-types:
+        - "minor"
+        - "patch"
+      onecx:
+        applies-to: version-updates
+        patterns:
+        - "@onecx*"
+        update-types:
+        - "minor"
+        - "patch"
   - package-ecosystem: "docker"
     directory: "/"
     schedule:

diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,13 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist
-/tmp
-/out-tsc
-# Only exists if Bazel was run
-/bazel-out
+dist
+tmp
+out-tsc
+reports
 
 # dependencies
-/node_modules
+node_modules
 
 # profiling files
 chrome-profiler-events*.json
@@ -32,13 +31,13 @@ speed-measure-plugin*.json
 .history/*
 
 # misc
-.angular/cache
-.sass-cache
+.angular
 .eslintcache
+.husky/_
+.sass-cache
 .gitlab*
 .scannerwork
 connect.lock
-reports
 typings
 *.log
 *.sh

diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -0,0 +1 @@
+npx --no-install commitlint --edit $1
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/onecx/docker-spa-base:1.5.0
+FROM ghcr.io/onecx/docker-spa-base:1.6.0
 
 # Copy nginx configuration
 COPY nginx/locations.conf $DIR_LOCATION/locations.conf

diff --git a/angular.json b/angular.json
@@ -76,26 +76,26 @@
         "serve": {
           "builder": "ngx-build-plus:dev-server",
           "options": {
-            "browserTarget": "onecx-theme-ui:build",
+            "buildTarget": "onecx-theme-ui:build",
             "port": 4200,
             "publicHost": "http://localhost:4200",
             "extraWebpackConfig": "webpack.config.js",
             "proxyConfig": "proxy.conf.js"
           },
           "configurations": {
             "development": {
-              "browserTarget": "onecx-theme-ui:build:development"
+              "buildTarget": "onecx-theme-ui:build:development"
             },
             "production": {
-              "browserTarget": "onecx-theme-ui:build:production",
+              "buildTarget": "onecx-theme-ui:build:production",
               "extraWebpackConfig": "webpack.prod.config.js"
             }
           }
         },
         "extract-i18n": {
           "builder": "ngx-build-plus:extract-i18n",
           "options": {
-            "browserTarget": "onecx-theme-ui:build",
+            "buildTarget": "onecx-theme-ui:build",
             "extraWebpackConfig": "webpack.config.js"
           }
         },