feat: deploy showcase in github pages

fpaul-1A · Oct 26, 2023 · 178a999 · 178a999
1 parent 3b82e7c
commit 178a999
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 10 deletions.
diff --git a/.github/workflows/deploy-showcase.yml b/.github/workflows/deploy-showcase.yml
@@ -0,0 +1,46 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy static content to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["main"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    env:
+      NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: ./tools/github-actions/setup
+      - name: build
+        run: yarn nx build showcase
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+        with:
+          path: './apps/showcase/dist'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2
diff --git a/apps/showcase/package.json b/apps/showcase/package.json
@@ -35,6 +35,7 @@
     "@angular/router": "~16.2.0",
     "@design-factory/design-factory": "^15.2.2",
     "@formatjs/intl-numberformat": "~8.8.0",
+    "@ng-bootstrap/ng-bootstrap": "^15.1.1",
     "@ngrx/effects": "~16.3.0",
     "@ngrx/entity": "~16.3.0",
     "@ngrx/store": "~16.3.0",
@@ -77,7 +78,6 @@
     "@angular-eslint/template-parser": "~16.2.0",
     "@angular/cli": "~16.2.0",
     "@angular/compiler-cli": "~16.2.0",
-    "@ng-bootstrap/ng-bootstrap": "^15.1.1",
     "@nx/eslint-plugin": "~16.10.0",
     "@o3r/dev-tools": "workspace:^",
     "@o3r/eslint-config-otter": "workspace:^",

diff --git a/apps/showcase/project.json b/apps/showcase/project.json
@@ -32,8 +32,8 @@
       "dependsOn": [
         "extract-translations",
         "extract-components",
-        "compile",
-        "generate-translations"
+        "generate-translations",
+        "compile"
       ]
     },
     "lint": {
@@ -104,7 +104,11 @@
           "namedChunks": true
         }
       },
-      "defaultConfiguration": "production"
+      "defaultConfiguration": "production",
+      "dependsOn": [
+        "^build",
+        "generate-translations"
+      ]
     },
     "serve": {
       "executor": "@o3r/core:multi-watcher",
@@ -215,6 +219,7 @@
       },
       "dependsOn": [
         "i18n",
+        "extract-translations",
         "^build-builders"
       ]
     },
@@ -233,10 +238,7 @@
         "extraFilePatterns": [
           "src/i18n/*.localization.json"
         ]
-      },
-      "dependsOn": [
-        "compile"
-      ]
+      }
     },
     "run": {
       "executor": "@o3r/core:multi-watcher",

diff --git a/packages/@o3r/core/package.json b/packages/@o3r/core/package.json
@@ -146,7 +146,7 @@
     "cpy-cli": "^4.2.0",
     "eslint": "^8.42.0",
     "@nx/eslint-plugin": "~16.10.0",
-    "jsonc-eslint-parser": "~2.3.0",
+    "jsonc-eslint-parser": "~2.4.0",
     "eslint-import-resolver-node": "^0.3.4",
     "eslint-plugin-jest": "~27.4.0",
     "eslint-plugin-jsdoc": "~46.8.0",

diff --git a/packages/@o3r/schematics/schematics/ng-add/index.ts b/packages/@o3r/schematics/schematics/ng-add/index.ts
@@ -3,14 +3,15 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { lastValueFrom } from 'rxjs';
 import type { PackageJson } from 'type-fest';
-import { AddDevInstall } from '@o3r/schematics';
 
 /**
  * Add Otter schematics to an Angular Project
  */
 export function ngAdd(): Rule {
   const schematicsDependencies = ['@angular-devkit/architect', '@angular-devkit/schematics', '@angular-devkit/core', '@schematics/angular', 'globby'];
   return async (tree: Tree, context: SchematicContext): Promise<Rule> => {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    const { AddDevInstall } = await import('@o3r/schematics');
     context.logger.info('Running ng add for schematics');
     const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
     const treePackageJson = tree.readJson('./package.json') as PackageJson;