diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fb807f..2b3f477 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,12 +8,12 @@ on: push: branches: - main - - dev + - develop - feature/* pull_request: branches: - main - - dev + - develop # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index dc7dd56..293745d 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,10 +1,10 @@ name: CodeQL on: - push: - branches: [develop,feature/*] - pull_request: - branches: [develop,feature/*] + # push: + # branches: [develop,feature/*] + # pull_request: + # branches: [develop,feature/*] schedule: # ┌───────────── minute (0 - 59) # │ ┌───────────── hour (0 - 23) diff --git a/.gitignore b/.gitignore index 6fe96bc..9e0a324 100644 --- a/.gitignore +++ b/.gitignore @@ -120,4 +120,5 @@ dist .turbo .pnp.cjs -coverage-jest \ No newline at end of file +coverage-jest +**/*.mp4 diff --git a/.husky/pre-commit b/.husky/pre-commit index 0e2fbea..7253392 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -3,4 +3,4 @@ yarn run e2e -# yarn run cy +yarn run cy diff --git a/.vscode/settings.json b/.vscode/settings.json index 53e5656..2fbe163 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,5 +8,17 @@ ], "devskim.ignoreRulesList": [ "DS137138" - ] + ], + "gitlens.autolinks": [ + + { + "prefix": "issue: #", + "url": "https://github.com/devops-example-org/frontend/issues/" + }, + { + "prefix": "pr: #", + "url": "https://github.com/devops-example-org/frontend/pull/" + } + ], + "cmake.configureOnOpen": false } \ No newline at end of file diff --git a/packages/au1-app/index.ejs b/packages/au1-app/index.ejs index 9df296d..0f72389 100644 --- a/packages/au1-app/index.ejs +++ b/packages/au1-app/index.ejs @@ -6,8 +6,6 @@ - - diff --git a/packages/au1-app/package.json b/packages/au1-app/package.json index e2cb1e6..71638c6 100644 --- a/packages/au1-app/package.json +++ b/packages/au1-app/package.json @@ -8,12 +8,12 @@ }, "license": "MIT", "devDependencies": { - "@playwright/test": "^1.31.1", + "@playwright/test": "^1.31.2", "@types/jest": "^29.4.0", - "@types/node": "^18.14.1", + "@types/node": "^18.14.6", "@types/webpack": "^5.28.0", - "@typescript-eslint/eslint-plugin": "^5.53.0", - "@typescript-eslint/parser": "^5.53.0", + "@typescript-eslint/eslint-plugin": "^5.54.1", + "@typescript-eslint/parser": "^5.54.1", "app-settings-loader": "^2.0.8", "aurelia-cli": "^3.0.1", "aurelia-loader-nodejs": "^1.1.0", @@ -26,14 +26,14 @@ "css-loader": "^6.7.3", "cssnano": "^5.1.15", "duplicate-package-checker-webpack-plugin": "^3.0.0", - "eslint": "^8.34.0", + "eslint": "^8.35.0", "expose-loader": "^4.0.0", "gulp": "^4.0.2", "gulp-eslint": "^6.0.0", "html-loader": "^4.2.0", "html-webpack-plugin": "^5.5.0", - "jest": "^29.4.3", - "jest-cli": "^29.4.3", + "jest": "^29.5.0", + "jest-cli": "^29.5.0", "jest-transform-stub": "^2.0.0", "json-loader": "^0.5.7", "mini-css-extract-plugin": "^2.7.2", diff --git a/packages/au1-app/playwright.config.ts b/packages/au1-app/playwright.config.ts index 405d013..ffcf68e 100644 --- a/packages/au1-app/playwright.config.ts +++ b/packages/au1-app/playwright.config.ts @@ -99,8 +99,8 @@ const config: PlaywrightTestConfig = { /* Run your local dev server before starting the tests */ webServer: { - command: 'npm start', - port: 8080, + command: 'webpack serve --port 8081', + port: 8081, }, }; diff --git a/packages/au1-app/src/app.html b/packages/au1-app/src/app.html index e4729a3..e01dee8 100644 --- a/packages/au1-app/src/app.html +++ b/packages/au1-app/src/app.html @@ -1,6 +1,8 @@