Merge pull request #91 from lebesnec/feature/angular18

Feature/angular18
lebesnec · Sep 18, 2024 · aedfbe3 · aedfbe3
2 parents 7c4f42a + f52f7a3
commit aedfbe3
Show file tree

Hide file tree

Showing 21 changed files with 4,694 additions and 4,265 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -18,7 +18,7 @@ jobs:
         uses: JamesIves/github-pages-deploy-action@4.1.4
         with:
           branch: main
-          folder: dist/solar-system
+          folder: dist/solar-system/browser
           repository-name: lebesnec/solar-system-develop
           token: ${{ secrets.SOLAR_SYSTEM_DEVELOP_TOKEN }}
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,5 +18,5 @@ jobs:
         uses: JamesIves/github-pages-deploy-action@4.1.4
         with:
           branch: gh-pages
-          folder: dist/solar-system
+          folder: dist/solar-system/browser
 
diff --git a/angular.json b/angular.json
@@ -11,12 +11,15 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist/solar-system",
+            "outputPath": {
+              "base": "dist/solar-system"
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "src/polyfills.ts"
+            ],
             "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/en.manifest.json",
@@ -25,16 +28,20 @@
               "src/assets"
             ],
             "styles": [
-              "src/custom-theme.scss",
+              "src/m3-theme.scss",
               "src/styles.css"
             ],
             "scripts": [],
-            "vendorChunk": true,
             "extractLicenses": false,
-            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
-            "namedChunks": true
+            "namedChunks": true,
+            "browser": "src/main.ts",
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "."
+              ]
+            }
           },
           "configurations": {
             "production": {
@@ -49,8 +56,6 @@
               "sourceMap": false,
               "namedChunks": false,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",