Skip to content
Open
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .github/actions/configure-yarn/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# For more information see:
# - https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
# - https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#outputsoutput_id

# The action can be referenced in workflows like:
# ./.github/actions/configure-yarn

name: configure-yarn
description: Configures yarn to use the correct version.

runs:
using: 'composite'
steps:
- name: Configure yarn
shell: bash
run: |
npm i -g [email protected] corepack
corepack enable
corepack prepare [email protected] --activate
yarn --version
yarn config
6 changes: 3 additions & 3 deletions .github/actions/setup-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ runs:
- name: Configure kernel
uses: ./.github/actions/configure-kernel

- name: Use yarn v1 required for integrity check
uses: ./.github/actions/use-yarn-v1
- name: Configure yarn
uses: ./.github/actions/configure-yarn

- name: Workspace cache
id: workspace-cache
Expand All @@ -59,7 +59,7 @@ runs:

- name: Install project dependencies
shell: bash
run: yarn install:ci
run: yarn install --immutable

- name: Install global compodoc
if: inputs.compodoc == 'true'
Expand Down
18 changes: 0 additions & 18 deletions .github/actions/use-yarn-v1/action.yml

This file was deleted.

24 changes: 21 additions & 3 deletions .github/workflows/validate-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ jobs:
sudo apt install shellcheck
npx nx run tools:lint-shell
- name: Analyze circular dependencies
if: fromJSON(needs.checks.outputs.changes).src == 'true'
run: |
sudo npm i -g madge@latest
madge --circular --extensions ts ./apps ./libs ./tools --ts-config ./tsconfig.base.json
- name: Set failure
id: check
if: failure()
Expand Down Expand Up @@ -197,11 +203,15 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment

- name: Compiler check affected
- name: Compiler check
run: npx nx run-many --target tsc-check --projects ${{ matrix.projects }}
env:
NODE_OPTIONS: '--max-old-space-size=4096'

- name: Unit test
run: npx nx run-many --target test --pass-with-no-tests --coverage --projects ${{ matrix.projects }}
run: npx nx run-many --target test --projects ${{ matrix.projects }} --silent --no-file-parallelism --maxWorkers 1 --maxConcurrency 1 --logLevel error
env:
NODE_OPTIONS: '--max-old-space-size=4096'

- name: Set failure
id: check
Expand Down Expand Up @@ -306,7 +316,15 @@ jobs:
steps:
- name: Check result
run: |
if [[ "$CHECKS_RESULT" != "true" || "$LINT_RESULT" != "true" || "$LINT_AFFECTED_RESULT" != "true" || "$TEST_RESULT" != "true" || "$TEST_AFFECTED_RESULT" != "true" || "$BUILD_RESULT" != "true" || "$BUILD_AFFECTED_RESULT" != "true" || "$BUILD_AFFECTED_STORYBOOK_RESULT" != "true" ]]; then exit 1; fi
if [[ "$CHECKS_RESULT" != "true" || \
"$LINT_RESULT" != "true" || \
"$LINT_AFFECTED_RESULT" != "true" || \
"$TEST_RESULT" != "true" || \
"$TEST_AFFECTED_RESULT" != "true" || \
"$BUILD_RESULT" != "true" || \
"$BUILD_AFFECTED_RESULT" != "true" || \
"$BUILD_AFFECTED_STORYBOOK_RESULT" != "true" \
]]; then exit 1; fi
echo "### :rocket: Premerge checks succeeded" >> $GITHUB_STEP_SUMMARY
env:
CHECKS_RESULT: ${{ needs.checks.outputs.success }}
Expand Down
2 changes: 1 addition & 1 deletion .ncurc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"reject": ["typescript", "firebase", "firebase-admin", "@apollo/*", "apollo-upload-client"],
"reject": ["typescript", "firebase", "firebase-admin", "@apollo/*", "apollo-upload-client", "@storybook/angular", "storybook", "marked", "@types/marked"],
"timeout": 120000
}
9 changes: 7 additions & 2 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ module.exports = {
const tsPaths = new TsconfigPathsPlugin({
configFile: './tsconfig.base.json',
});
config.resolve.plugins ? config.resolve.plugins.push(tsPaths) : (config.resolve.plugins = [tsPaths]);

if (config.resolve.plugins) {
config.resolve.plugins.push(tsPaths);
} else {
config.resolve.plugins = [tsPaths];
}

// add your own webpack tweaks below if needed

Expand All @@ -54,5 +59,5 @@ module.exports = {
// add your own webpack tweaks above if needed

return config;
}
},
};
10 changes: 5 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"eslint.validate": ["json"],
"eslint.validate": ["json", "javascript", "typescript"],
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
Expand All @@ -19,10 +19,10 @@
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "always",
"source.fixAll.stylelint": "always",
"source.fixAll.tslint": "always",
"source.organizeImports": "always"
"source.organizeImports": "never",
"source.fixAll.eslint": "explicit",
"source.fixAll.tslint": "never",
"source.fixAll.stylelint": "explicit"
},
"editor.formatOnPaste": true,
"editor.formatOnSave": true,
Expand Down
Binary file added .yarn/install-state.gz
Binary file not shown.
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
36 changes: 18 additions & 18 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,38 @@
"description": "Dependencies for docker containers running api application. Do not install dependencies in this directory. This file is only for containers.",
"dependencies": {
"@apollo/server": "5.0.0",
"@grpc/grpc-js": "1.14.0",
"@grpc/grpc-js": "1.14.1",
"@grpc/proto-loader": "0.8.0",
"@nestjs/apollo": "13.1.0",
"@nestjs/apollo": "13.2.1",
"@nestjs/axios": "4.0.1",
"@nestjs/cache-manager": "3.0.1",
"@nestjs/common": "11.1.6",
"@nestjs/common": "11.1.9",
"@nestjs/config": "4.0.2",
"@nestjs/core": "11.1.6",
"@nestjs/graphql": "13.1.0",
"@nestjs/jwt": "11.0.0",
"@nestjs/microservices": "11.1.6",
"@nestjs/core": "11.1.9",
"@nestjs/graphql": "13.2.0",
"@nestjs/jwt": "11.0.1",
"@nestjs/microservices": "11.1.9",
"@nestjs/passport": "11.0.5",
"@nestjs/platform-express": "11.1.6",
"@nestjs/platform-ws": "11.1.6",
"@nestjs/serve-static": "5.0.3",
"@nestjs/swagger": "11.2.0",
"@nestjs/platform-express": "11.1.9",
"@nestjs/platform-ws": "11.1.9",
"@nestjs/serve-static": "5.0.4",
"@nestjs/swagger": "11.2.2",
"@nestjs/throttler": "6.4.0",
"@nestjs/websockets": "11.1.6",
"axios": "1.12.2",
"cache-manager": "7.2.2",
"@nestjs/websockets": "11.1.9",
"axios": "1.13.2",
"cache-manager": "7.2.5",
"class-transformer": "0.5.1",
"class-validator": "0.14.2",
"compression": "1.8.1",
"dotenv": "17.2.2",
"dotenv": "17.2.3",
"express": "5.1.0",
"firebase-admin": "12.5.0",
"firebase-functions": "6.4.0",
"firebase-functions": "7.0.0",
"google-protobuf": "4.0.0",
"graphql": "16.11.0",
"graphql": "16.12.0",
"graphql-subscriptions": "3.0.0",
"graphql-tag": "2.12.6",
"graphql-tools": "9.0.20",
"graphql-tools": "9.0.24",
"graphql-upload": "17.0.0",
"grpc-web": "2.0.2",
"protobufjs": "7.5.4",
Expand Down
20 changes: 20 additions & 0 deletions apps/client/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,26 @@
"tsConfig": "apps/client/tsconfig.app.json"
}
},
"build-with-hooks": {
"executor": "nx:run-commands",
"options": {
"commands": [
{
"command": "npx nx run client:configure-env",
"forwardAllArgs": false
},
{
"command": "npx nx build client",
"forwardAllArgs": true
},
{
"command": "npx nx run client:configure-env --reset",
"forwardAllArgs": false
}
],
"parallel": false
}
},
"configure-env": {
"executor": "./tools/executors/client-env:configure",
"options": {
Expand Down
20 changes: 20 additions & 0 deletions apps/elements/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,26 @@
"tsConfig": "apps/elements/tsconfig.app.json"
}
},
"build-with-hooks": {
"executor": "nx:run-commands",
"options": {
"commands": [
{
"command": "npx nx run elements:configure-env",
"forwardAllArgs": false
},
{
"command": "npx nx build elements",
"forwardAllArgs": true
},
{
"command": "npx nx run elements:configure-env --reset",
"forwardAllArgs": false
}
],
"parallel": false
}
},
"configure-env": {
"executor": "./tools/executors/client-env:configure",
"options": {
Expand Down
10 changes: 5 additions & 5 deletions apps/server-prod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"description": "Dependencies for docker containers running server-prod application. Do not install dependencies in this directory. This file is only for containers.",
"dependencies": {
"@nestjs/axios": "4.0.1",
"@nestjs/common": "11.1.6",
"@nestjs/core": "11.1.6",
"@nestjs/platform-express": "11.1.6",
"@nestjs/serve-static": "5.0.3",
"axios": "1.12.2",
"@nestjs/common": "11.1.9",
"@nestjs/core": "11.1.9",
"@nestjs/platform-express": "11.1.9",
"@nestjs/serve-static": "5.0.4",
"axios": "1.13.2",
"compression": "1.8.1",
"express": "5.1.0",
"reflect-metadata": "0.2.2",
Expand Down
68 changes: 0 additions & 68 deletions decorate-angular-cli.js

This file was deleted.

Loading
Loading