Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated sync from source branch v93 #211

Merged
merged 10 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e4d4f7c0648e4c8f5418f2bdfa18b3e0f138b4d6
98 changes: 12 additions & 86 deletions .github/workflows/npm-build.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
name: Build Angular applications
name: Build Angular workspace

on:
push:
branches: [ master ]
pull_request:
branches: [ master, v82, v90, v92, v93 ]
branches: [ master, v93 ]

jobs:
build:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [windows-latest, ubuntu-latest]
node-version: [18.x]
# Currently only can run ubuntu on github agents, windows isn't correctly installing packages
os: [ubuntu-latest, windows-latest]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
Expand All @@ -25,89 +26,14 @@ jobs:

- name: Install packages
working-directory: ./imxweb
run: npm install
run: npm install --skip-dialog

- name: Build qbm
- name: Build All
working-directory: ./imxweb
run: npm run build qbm

- name: Build qer
working-directory: ./imxweb
run: npm run build qer

- name: Build tsb
working-directory: ./imxweb
run: npm run build tsb

- name: Build att
working-directory: ./imxweb
run: npm run build att

- name: Build rms
working-directory: ./imxweb
run: npm run build rms

- name: Build aad
working-directory: ./imxweb
run: npm run build aad

- name: Build aob
working-directory: ./imxweb
run: npm run build aob

- name: Build uci
working-directory: ./imxweb
run: npm run build uci

- name: Build cpl
working-directory: ./imxweb
run: npm run build cpl

- name: Build dpr
working-directory: ./imxweb
run: npm run build dpr

- name: Build rmb
working-directory: ./imxweb
run: npm run build rmb
run: npm run nx:build-all
timeout-minutes: 25

- name: Build rps
- name: Test All
working-directory: ./imxweb
run: npm run build rps

- name: Build o3t
working-directory: ./imxweb
run: npm run build o3t

- name: Build olg
working-directory: ./imxweb
run: npm run build olg

- name: Build hds
working-directory: ./imxweb
run: npm run build hds

- name: Build pol
working-directory: ./imxweb
run: npm run build pol

- name: Build qer-app-portal
working-directory: ./imxweb
run: npm run build qer-app-portal

- name: Build qbm-app-landingpage
working-directory: ./imxweb
run: npm run build qbm-app-landingpage

- name: Build qer-app-operationssupport
working-directory: ./imxweb
run: npm run build qer-app-operationssupport

- name: Build qer-app-pwdportal
working-directory: ./imxweb
run: npm run build qer-app-pwdportal

- name: Build custom-app
working-directory: ./imxweb
run: npm run build custom-app

run: npm run nx:test-ci
timeout-minutes: 25
1 change: 1 addition & 0 deletions imxweb/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
64 changes: 64 additions & 0 deletions imxweb/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"root": true,
"ignorePatterns": ["projects/**/*"],
"overrides": [
{
"files": ["*.ts"],
"parserOptions": {
"project": ["tsconfig.json"],
"createDefaultProgram": true
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@angular-eslint/recommended",
"plugin:prettier/recommended"
],
"rules": {
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"prefix": "imx",
"style": "camelCase"
}
],
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"prefix": "imx",
"style": "kebab-case"
}
],
"max-classes-per-file": ["error", { "ignoreExpressions": true, "max": 1 }],
"no-bitwise": ["error"],
"prettier/prettier": [
"error",
{
"endOfLine": "auto"
}
]
}
},
{
"files": ["*.html"],
"extends": ["plugin:@angular-eslint/template/recommended", "plugin:prettier/recommended"],
"rules": {
"@angular-eslint/template/accessibility-valid-aria": ["error"]
}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
},
{
"files": ["*.spec.ts"],
"env": {
"jest": true
},
"rules": {}
}
]
}
4 changes: 3 additions & 1 deletion imxweb/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ speed-measure-plugin.json

# IDE - VSCode
.vscode/*
!.vscode/settings.json
.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
Expand All @@ -54,3 +54,5 @@ documentation
!.gitkeep
debug.log
.angular
.nx
*.env
4 changes: 3 additions & 1 deletion imxweb/.npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
package-lock=true
@imx-modules:registry=https://pkgs.dev.azure.com/1id/_packaging/OneIdentity/npm/registry/
@elemental-ui:registry=https://pkgs.dev.azure.com/1id/_packaging/OneIdentity/npm/registry/
# always-auth=true
5 changes: 5 additions & 0 deletions imxweb/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Add files here to ignore them from prettier formatting
/dist
/coverage
/.nx/cache
.angular
7 changes: 7 additions & 0 deletions imxweb/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"printWidth": 140,
"singleQuote": true
}
9 changes: 4 additions & 5 deletions imxweb/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@
"request": "launch",
"type": "pwa-chrome",
"url": "http://localhost:4200/",
"webRoot": "${workspaceFolder}",
"webRoot": "${workspaceFolder}"
},
{
"name": "QER App Portal (Chrome)",
"request": "launch",
"type": "pwa-chrome",
"url": "http://localhost:4200/",
"webRoot": "${workspaceFolder}",
"webRoot": "${workspaceFolder}"
},
{
"name": "QER App Portal (Chrome - SSL)",
"request": "launch",
"type": "pwa-chrome",
"url": "https://localhost:4200/",
"webRoot": "${workspaceFolder}",
"webRoot": "${workspaceFolder}"
},
{
"name": "QER App Portal (Chrome, API Server)",
Expand Down Expand Up @@ -91,7 +91,6 @@
"webpack:///ng://qbm/lib/*": "${workspaceFolder}/projects/qbm/src/lib/*",
"webpack:///ng://qer/lib/*": "${workspaceFolder}/projects/qer/src/lib/*"
}
},

}
]
}
30 changes: 23 additions & 7 deletions imxweb/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
{
"explorer.compactFolders": false,
"editor.tabSize": 2,
"git.ignoreLimitWarning": true,
"cSpell.words": [
"requestable"
]
}
"explorer.compactFolders": false,
"editor.tabSize": 2,
"git.ignoreLimitWarning": true,
"editor.wordWrapColumn": 140,
"editor.wordWrap": "wordWrapColumn",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
},
"typescript.updateImportsOnFileMove.enabled": "always",
"eslint.options": {
"extensions": [".ts", ".html"]
},
"eslint.validate": ["javascript", "typescript", "html"],
"eslint.format.enable": true,
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
Loading
Loading