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

Update deps #26

Merged
merged 55 commits into from
Sep 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
d63869c
ci: Added release workflows
TriPSs Aug 11, 2022
6dbea6b
chore: Update first batch of deps
TriPSs Aug 11, 2022
03ba1e6
chore: Update second batch of deps
TriPSs Aug 11, 2022
acaff0f
chore: Update third batch of deps + linting rules
TriPSs Aug 11, 2022
4a2ecfb
ci: Use `parallel=1` for version command
TriPSs Aug 11, 2022
2038ee7
refactor: Fix linting
TriPSs Aug 11, 2022
f614f04
fix: Fixed almost all tests
TriPSs Aug 11, 2022
8d62be7
chore: Revert 2 deps
TriPSs Aug 15, 2022
93e7733
test(query-graphql): Fixed tests
TriPSs Aug 16, 2022
a1ea5dc
chore: Updated some deps
TriPSs Aug 16, 2022
a7560ed
docs: Fix typos
GP4cK Aug 25, 2022
a2ae929
docs: Add docker-compose command before e2e tests
GP4cK Aug 25, 2022
ef89e34
chore(deps): Upgrade to typeorm 0.3.7
GP4cK Aug 25, 2022
62d3ed5
chore: Updated some deps
TriPSs Aug 26, 2022
e8af8d7
chore(core): release version 1.0.0-alpha.0
TriPSs Aug 26, 2022
ecb90a0
chore(query-graphql): release version 1.0.0-alpha.0
TriPSs Aug 26, 2022
c6b37e9
chore(query-mongoose): release version 1.0.0-alpha.0
TriPSs Aug 26, 2022
d0d9eff
chore(query-sequelize): release version 1.0.0-alpha.0
TriPSs Aug 26, 2022
b6b35b2
chore(query-typegoose): release version 1.0.0-alpha.0
TriPSs Aug 26, 2022
7a876a9
chore(query-typeorm): release version 1.0.0-alpha.0
TriPSs Aug 26, 2022
c5b153f
chore: Updated some deps + cleanup incorrect changelogs
TriPSs Aug 26, 2022
d20aabb
chore(release): v1.0.0-alpha.0
TriPSs Aug 26, 2022
f877a9c
feat: Updated some deps + cleanup incorrect changelogs
TriPSs Aug 26, 2022
02c08ef
Merge remote-tracking branch 'origin/master' into improvements
TriPSs Aug 26, 2022
1d36ee0
feat: Bump all packages
TriPSs Aug 26, 2022
1bf399d
chore(release): v1.0.0
TriPSs Aug 26, 2022
964dcb7
chore(release): v2.0.0-alpha.0
TriPSs Aug 26, 2022
0a5d5c2
chore: Updated NX
TriPSs Aug 26, 2022
5cc47f6
Merge branch 'improvements' into upgrade-typeorm
TriPSs Aug 26, 2022
771e9b1
chore: Updated run many
TriPSs Aug 26, 2022
ef67a24
Merge pull request #31 from GP4cK/upgrade-typeorm
TriPSs Aug 26, 2022
9e955d3
Merge remote-tracking branch 'origin/improvements' into improvements
TriPSs Aug 26, 2022
de00f77
feat(query-typeorm): Updated Typeorm to `0.3.8`
TriPSs Aug 26, 2022
7f9205d
chore: Remove `releaseAs` in version target
TriPSs Aug 26, 2022
ac7e07d
ci: Updated `releaseAs`
TriPSs Aug 26, 2022
71e8265
test(examples): Updated db-test helpers
TriPSs Aug 26, 2022
52f1921
test(examples): Updated db-test helpers and order of fixtures to delete
TriPSs Aug 26, 2022
54de4e6
chore(release): v2.0.0-alpha.1
TriPSs Aug 28, 2022
0f72a2c
chore: Bump version
TriPSs Aug 28, 2022
1654a53
refactor(query-typeorm): Stop using deprecated TypORM methods
TriPSs Aug 28, 2022
852fb2e
chore: Updated more deps
TriPSs Aug 28, 2022
545074f
fix(query-typeorm): Align fetching of entity metadata with `@nestjs/t…
TriPSs Aug 28, 2022
00f193d
fix: Remove incompatible class-transformer version from peer
Sep 9, 2022
4560ba4
chore: Corrected some `peerDependencies`
TriPSs Sep 9, 2022
eb3f9a9
fix: align @apollo/gateway peer dependencies between @nestjs/graphql …
Sep 10, 2022
8ce958f
remove change from other branch
Sep 10, 2022
1aa2f28
updated ts-morph package to latest supported version
Sep 10, 2022
6376d44
Merge pull request #33 from Goopil/improvements
TriPSs Sep 10, 2022
cc94f47
Merge remote-tracking branch 'origin/improvements' into improvements
TriPSs Sep 10, 2022
b3ba74a
test(core): Re-enabled some tests
TriPSs Sep 10, 2022
bbb3529
Merge pull request #34 from Goopil/conflicting-pear-apollo-gateway
TriPSs Sep 10, 2022
a2b8966
Merge pull request #35 from Goopil/conflicting-peer-ts-morph
TriPSs Sep 10, 2022
1548721
Merge remote-tracking branch 'origin/improvements' into improvements
TriPSs Sep 10, 2022
4a145de
chore: Update yarn.lock
TriPSs Sep 10, 2022
302266e
chore: Remove the alpha preid
TriPSs Sep 10, 2022
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
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions .commitlintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
extends: ['@commitlint/config-conventional'],

rules: {
'subject-case': [1, 'always', 'sentence-case']
}
}
30 changes: 0 additions & 30 deletions .commitlintrc.json

This file was deleted.

96 changes: 82 additions & 14 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"ignorePatterns": [
"**/*"
],
"plugins": [
"@nrwl/nx",
"simple-import-sort"
],
"extends": [
"airbnb-typescript/base",
"eslint:recommended",
Expand All @@ -19,7 +24,12 @@
},
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"files": [
"*.ts",
"*.tsx",
"*.js",
"*.jsx"
],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"error",
Expand All @@ -29,19 +39,33 @@
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
"onlyDependOnLibsWithTags": [
"*"
]
}
]
}
],
"semi": [
"warn",
"never"
]
}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"files": [
"*.ts",
"*.tsx"
],
"extends": [
"plugin:@nrwl/nx/typescript"
],
"rules": {
// airbnb default is 1
"max-classes-per-file": ["error", 5],
"max-classes-per-file": [
"error",
5
],
// never allow default export
"import/prefer-default-export": "off",
// never allow default export
Expand All @@ -53,20 +77,64 @@
// airbnb default this doesn't work when using parameter decorators.
"@typescript-eslint/no-useless-constructor": "off",
// override airbnb to allow class interface merging
"@typescript-eslint/no-redeclare": ["error", {"ignoreDeclarationMerge": true}],
"@typescript-eslint/no-unsafe-assignment": "off"
"@typescript-eslint/no-redeclare": [
"error",
{
"ignoreDeclarationMerge": true
}
],
"@typescript-eslint/no-unsafe-assignment": "off",
"simple-import-sort/imports": [
"warn",
{
"groups": [
// Packages. `react` related packages come first.
[
"^react",
"^@?\\w"
],
// "type" imports.
[
"^.*\\u0000$"
],
// Absolute imports and other imports such as Vue-style `@/foo`.
// Anything not matched in another group.
[
"^"
],
// Relative imports.
// Anything that starts with a dot.
[
"^\\."
]
]
}
],
"simple-import-sort/exports": "warn"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"files": [
"*.js",
"*.jsx"
],
"extends": [
"plugin:@nrwl/nx/javascript"
],
"rules": {}
},
{
"files": ["*.spec.ts", "*/__fixtures__/*.ts"],
"extends": ["plugin:@nrwl/nx/typescript"],
"files": [
"*.spec.ts",
"*/__fixtures__/*.ts"
],
"extends": [
"plugin:@nrwl/nx/typescript"
],
"rules": {
"max-classes-per-file": ["off"],
"max-classes-per-file": [
"off"
],
"@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-unsafe-argument": "off",
"@typescript-eslint/no-unsafe-member-access": "off",
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/release-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Release docs

on:
push:
branches:
- master

permissions:
contents: write

env:
NX_BRANCH: ${{ github.event.number }}
NX_RUN_GROUP: ${{ github.run_id }}

jobs:

setup:
uses: ./.github/workflows/shared.setup-env.yml

docs:
concurrency: ci-${{ github.ref }}
runs-on: ubuntu-latest
needs: setup
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup
uses: ./.github/actions/setup-step
with:
set_shas: false

- name: Build docs
run: npx nx build documentation

- name: Deploy
uses: JamesIves/[email protected]
with:
branch: gh-pages # The branch the action should deploy to.
folder: ./dist/documentation # The folder the action should deploy.
74 changes: 54 additions & 20 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,70 @@ on:
branches:
- master

permissions:
contents: write

env:
NX_BRANCH: ${{ github.event.number }}
NX_RUN_GROUP: ${{ github.run_id }}

jobs:

setup:
uses: ./.github/workflows/shared.setup-env.yml

docs:
concurrency: ci-${{ github.ref }}
prepare-env:
runs-on: ubuntu-latest
needs: setup
outputs:
GITHUB_HEAD_REF: ${{ steps.script.outputs.headRef }}
GITHUB_BASE_REF: ${{ steps.script.outputs.tagHash }}
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup
uses: ./.github/actions/setup-step
- name: Cache node modules
id: cache
uses: actions/cache@v2
with:
set_shas: false
path: |
**/node_modules
key: ${{ env.DEPENDENCIES_CACHE }}-${{ hashFiles('yarn.lock') }}

- name: yarn install
if: steps.cache.outputs.cache-hit != 'true'
run: yarn install

- name: Build docs
run: npx nx build documentation
- name: Set correct env vars
id: script
uses: ./tools/actions/set-master-vars

- name: Deploy
uses: JamesIves/[email protected]
release:
needs: [ prepare-env ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
branch: gh-pages # The branch the action should deploy to.
folder: ./dist/documentation # The folder the action should deploy.
fetch-depth: 0

- name: Cache node modules
uses: actions/cache@v2
with:
path: |
**/node_modules
key: ${{ env.DEPENDENCIES_CACHE }}-${{ hashFiles('yarn.lock') }}

- name: GIT config
run: |
git config user.name "${GITHUB_ACTOR}"
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"

- name: nx workspace:version
run: yarn nx run workspace:version

- name: nx affected:build
run: node ./tools/scripts/run-many.js build origin/${{ needs.prepare-env.outputs.GITHUB_HEAD_REF }} ${{ needs.prepare-env.outputs.GITHUB_BASE_REF }}

- name: nx affected:publish
run: |
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
node ./tools/scripts/run-many.js publish origin/${{ needs.prepare-env.outputs.GITHUB_HEAD_REF }} ${{ needs.prepare-env.outputs.GITHUB_BASE_REF }}
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Push GIT
run: git push --follow-tags origin ${{ needs.prepare-env.outputs.GITHUB_HEAD_REF }}
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ jobs:
git config user.name "${GITHUB_ACTOR}"
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"

- name: nx affected:version
- name: nx workspace:version
if: matrix.target == 'build'
run: node ./tools/scripts/run-many.js version
run: yarn nx run workspace:version

- name: nx affected:${{ matrix.target }}
run: node ./tools/scripts/run-many.js ${{ matrix.target }}
Expand Down
2 changes: 1 addition & 1 deletion .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install commitlint --edit $1
npx --no-install commitlint --edit "$1"
7 changes: 4 additions & 3 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"singleQuote": true,
"printWidth": 130,
"trailingComma": "none"
"singleQuote": true,
"printWidth": 130,
"trailingComma": "none",
"semi": false
}
Loading