Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: daiscog/ngx-http-request-state
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.0.0
Choose a base ref
...
head repository: daiscog/ngx-http-request-state
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Nov 14, 2022

  1. Node 16, npm audit

    daiscog committed Nov 14, 2022
    Copy the full SHA
    1bc34da View commit details
  2. nx update, pre-migrations

    daiscog committed Nov 14, 2022
    Copy the full SHA
    b751392 View commit details
  3. nx migrations

    daiscog committed Nov 14, 2022
    Copy the full SHA
    262e19e View commit details
  4. Merge pull request #8 from daiscog/feature/npm-audit

    npm audit --fix and nx migrate
    daiscog authored Nov 14, 2022
    Copy the full SHA
    33c3870 View commit details

Commits on Nov 30, 2022

  1. Add Angular 15 support (#9)

    * Pre migration dependency updates
    * Run migrations
    * package.json and readme tweaks for Angular 15 support
    * npm audit fix
    * formatting
    daiscog authored Nov 30, 2022
    Copy the full SHA
    2d396f5 View commit details

Commits on Apr 26, 2023

  1. Introduces a merge function that merges an array of states into a sin…

    …gle new state (#11)
    
    * Added merge function
    
    * Adedd some tests
    
    * Added more tests
    
    * Updated readme
    
    * Update libs/ngx-http-request-state/README.md
    
    Co-authored-by: daiscog <daiscog@users.noreply.github.com>
    
    * npm run format
    
    ---------
    
    Co-authored-by: daiscog <daiscog@users.noreply.github.com>
    PeterSR and daiscog authored Apr 26, 2023
    Copy the full SHA
    999b4cf View commit details
  2. Copy the full SHA
    d4d93fd View commit details
  3. Merge pull request #12 from daiscog/feature/2.2.0-release-prep

    Bump version ready for release
    daiscog authored Apr 26, 2023
    Copy the full SHA
    b3d184c View commit details

Commits on May 30, 2023

  1. Angular 16 support

    nx update
    Change value from being optional to required in LoadedState
    daiscog committed May 30, 2023
    Copy the full SHA
    c8240ee View commit details
  2. Copy the full SHA
    e7b54be View commit details

Commits on Jun 1, 2023

  1. Merge pull request #13 from daiscog/feature/angular-16

    Angular 16 support
    daiscog authored Jun 1, 2023
    Copy the full SHA
    b9dda67 View commit details

Commits on Jun 3, 2023

  1. Copy the full SHA
    a79bfc5 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    aafe241 View commit details

Commits on Jun 10, 2023

  1. README tweaks

    daiscog committed Jun 10, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    130743f View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    cea970d View commit details
  3. Merge pull request #14 from daiscog/multisource-example

    Add example of collecting data from multiple sources into one HttpRequestState stream
    daiscog authored Jun 10, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    05e3ef5 View commit details
  4. Add FUNDING.yml

    daiscog committed Jun 10, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    68a2bf5 View commit details
  5. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    00b42fb View commit details
  6. Copy the full SHA
    c9c94ad View commit details

Commits on Jun 11, 2023

  1. Copy the full SHA
    ffd8fac View commit details

Commits on Dec 13, 2023

  1. Copy the full SHA
    d2e7dc4 View commit details
  2. Fix tests

    daiscog committed Dec 13, 2023
    Copy the full SHA
    3b6e16c View commit details
  3. Update to node 18

    daiscog committed Dec 13, 2023
    Copy the full SHA
    724afb9 View commit details
  4. Fix lockfile

    daiscog committed Dec 13, 2023
    Copy the full SHA
    cfb3c41 View commit details
  5. Copy the full SHA
    1a225e7 View commit details
  6. linting

    daiscog committed Dec 13, 2023
    Copy the full SHA
    dc6750c View commit details
  7. Copy the full SHA
    a2ccbbd View commit details
  8. Copy the full SHA
    a3f17a9 View commit details
  9. Merge pull request #18 from daiscog/angular-17

    Angular 17
    daiscog authored Dec 13, 2023
    Copy the full SHA
    5b60f70 View commit details

Commits on Aug 11, 2024

  1. Migrate to pnpm

    daiscog committed Aug 11, 2024
    Copy the full SHA
    de19c85 View commit details
  2. nx migrate latest

    daiscog committed Aug 11, 2024
    Copy the full SHA
    f3aee62 View commit details
  3. Update workflows for pnpm

    daiscog committed Aug 11, 2024
    Copy the full SHA
    9235316 View commit details
  4. Copy the full SHA
    3bef255 View commit details
  5. Update README

    daiscog committed Aug 11, 2024
    Copy the full SHA
    9b1707b View commit details
  6. Fix broken test

    daiscog committed Aug 11, 2024
    Copy the full SHA
    2322e29 View commit details
  7. Don't use any

    daiscog committed Aug 11, 2024
    Copy the full SHA
    9506eca View commit details
  8. Merge pull request #19 from daiscog/ng-18

    Ng 18
    daiscog authored Aug 11, 2024
    Copy the full SHA
    b5b65f9 View commit details

Commits on Aug 12, 2024

  1. Try to set npm auth config

    daiscog committed Aug 12, 2024
    Copy the full SHA
    1a0aa05 View commit details

Commits on Aug 15, 2024

  1. Added overloads to the loadingState and errorState builder functions …

    …to improve inferred typing when using them with a pre-existing value
    daiscog committed Aug 15, 2024
    Copy the full SHA
    a30b8ea View commit details
  2. Remove redundant eslint-disable comment

    daiscog committed Aug 15, 2024
    Copy the full SHA
    56feea4 View commit details
  3. Merge pull request #20 from daiscog/improve-typing

    Added overloads to the loadingState and errorState builder functions …
    daiscog authored Aug 15, 2024
    Copy the full SHA
    d17b0f6 View commit details

Commits on Sep 29, 2024

  1. Adjust typing for improved type guard ergonomics.

    daiscog committed Sep 29, 2024
    Copy the full SHA
    0b5acf2 View commit details

Commits on Sep 30, 2024

  1. Merge pull request #21 from daiscog/typing-improvements

    Adjust typing for improved type guard ergonomics.
    daiscog authored Sep 30, 2024
    Copy the full SHA
    d892fa1 View commit details

Commits on Nov 28, 2024

  1. nx migrate latest

    daiscog committed Nov 28, 2024
    Copy the full SHA
    28eaec9 View commit details
  2. Add support for Angular 19

    daiscog committed Nov 28, 2024
    Copy the full SHA
    8e83ba2 View commit details
  3. Deprecate providing a mapResponse function to the httpRequestStates o…

    …perator - use rxjs map immediately before this opereator instead
    daiscog committed Nov 28, 2024
    Copy the full SHA
    c2c8e2e View commit details

Commits on Dec 7, 2024

  1. Merge pull request #23 from daiscog/nx-migrate

    Angular 19 + deprecate response mapper
    daiscog authored Dec 7, 2024
    Copy the full SHA
    096193e View commit details

Commits on Dec 8, 2024

  1. nx migrate latest

    daiscog committed Dec 8, 2024
    Copy the full SHA
    a589fa9 View commit details
  2. Merge pull request #24 from daiscog/nx-migrate

    Migrate repo to latest nx & Angular 19
    daiscog authored Dec 8, 2024
    Copy the full SHA
    62b52be View commit details
Showing with 24,520 additions and 21,093 deletions.
  1. +1 −2 .editorconfig
  2. +1 −0 .eslintignore
  3. +18 −5 .eslintrc.json
  4. +1 −0 .github/FUNDING.yml
  5. +19 −8 .github/workflows/npm-publish.yml
  6. +18 −13 .github/workflows/test.yml
  7. +8 −4 .gitignore
  8. +1 −0 .nvmrc
  9. +4 −0 .prettierignore
  10. +2 −2 .vscode/extensions.json
  11. +0 −166 angular.json
  12. +0 −7 apps/examples-e2e/.eslintrc.json
  13. +6 −0 apps/examples-e2e/cypress.config.ts
  14. +0 −12 apps/examples-e2e/cypress.json
  15. +29 −0 apps/examples-e2e/project.json
  16. +13 −0 apps/examples-e2e/src/e2e/app.cy.ts
  17. +4 −0 apps/examples-e2e/src/fixtures/example.json
  18. +0 −7 apps/examples-e2e/src/integration/app.spec.ts
  19. +0 −22 apps/examples-e2e/src/plugins/index.js
  20. +1 −0 apps/examples-e2e/src/support/app.po.ts
  21. +23 −6 apps/examples-e2e/src/support/commands.ts
  22. 0 apps/examples-e2e/src/support/{index.ts → e2e.ts}
  23. +0 −10 apps/examples-e2e/tsconfig.e2e.json
  24. +13 −7 apps/examples-e2e/tsconfig.json
  25. +0 −17 apps/examples/.browserslistrc
  26. +6 −6 apps/examples/.eslintrc.json
  27. +10 −11 apps/examples/jest.config.ts
  28. +84 −0 apps/examples/project.json
  29. +5 −0 apps/examples/src/app/app.component.html
  30. +2 −0 apps/examples/src/app/app.component.ts
  31. +18 −0 apps/examples/src/app/app.config.ts
  32. +0 −36 apps/examples/src/app/app.module.ts
  33. +21 −0 apps/examples/src/app/app.routes.ts
  34. +5 −6 apps/examples/src/app/basic-smart-dumb-example/basic-dumb-alt/basic-dumb-alt.component.html
  35. +10 −3 apps/examples/src/app/basic-smart-dumb-example/basic-dumb-alt/basic-dumb-alt.component.ts
  36. +7 −11 apps/examples/src/app/basic-smart-dumb-example/basic-dumb/basic-dumb.component.html
  37. +9 −2 apps/examples/src/app/basic-smart-dumb-example/basic-dumb/basic-dumb.component.ts
  38. +0 −26 apps/examples/src/app/basic-smart-dumb-example/basic-smart-dumb-example.module.ts
  39. +7 −7 apps/examples/src/app/basic-smart-dumb-example/basic-smart/basic-smart.component.html
  40. +56 −42 apps/examples/src/app/basic-smart-dumb-example/basic-smart/basic-smart.component.spec.ts
  41. +16 −8 apps/examples/src/app/basic-smart-dumb-example/basic-smart/basic-smart.component.ts
  42. +11 −0 apps/examples/src/app/basic-smart-dumb-example/brewery-details/brewery-details.component.html
  43. +13 −0 apps/examples/src/app/basic-smart-dumb-example/brewery-details/brewery-details.component.ts
  44. +3 −0 apps/examples/src/app/basic-smart-dumb-example/index.ts
  45. +20 −0 apps/examples/src/app/basic-smart-dumb-example/model/brewery.ts
  46. +0 −3 apps/examples/src/app/basic-smart-dumb-example/model/random-image.ts
  47. +30 −0 apps/examples/src/app/basic-smart-dumb-example/random-brewery.service.ts
  48. +0 −22 apps/examples/src/app/basic-smart-dumb-example/random-image.service.ts
  49. +3 −0 apps/examples/src/app/infinite-scroll-example/index.ts
  50. +0 −26 apps/examples/src/app/infinite-scroll-example/infinite-scroll-example.module.ts
  51. +9 −14 apps/examples/src/app/infinite-scroll-example/infinite-scroller/book-list/book-list.component.html
  52. +7 −1 apps/examples/src/app/infinite-scroll-example/infinite-scroller/book-list/book-list.component.ts
  53. +10 −13 apps/examples/src/app/infinite-scroll-example/infinite-scroller/book-service/book.service.ts
  54. +3 −4 apps/examples/src/app/infinite-scroll-example/infinite-scroller/infinite-scroller.component.html
  55. +119 −62 apps/examples/src/app/infinite-scroll-example/infinite-scroller/infinite-scroller.component.ts
  56. +4 −4 .../src/app/infinite-scroll-example/infinite-scroller/layout/infinite-scroller-layout.component.html
  57. +16 −5 ...es/src/app/infinite-scroll-example/infinite-scroller/layout/infinite-scroller-layout.component.ts
  58. +8 −9 apps/examples/src/app/infinite-scroll-example/infinite-scroller/model/book.ts
  59. +0 −24 apps/examples/src/app/loading-state-components/error/error.component.spec.ts
  60. +7 −4 apps/examples/src/app/loading-state-components/error/error.component.ts
  61. +2 −0 apps/examples/src/app/loading-state-components/index.ts
  62. +0 −13 apps/examples/src/app/loading-state-components/loading-state.module.ts
  63. +2 −0 apps/examples/src/app/loading-state-components/spinner/spinner.component.ts
  64. +20 −0 apps/examples/src/app/multiple-data-sources/beer-list/beer-list.component.css
  65. +20 −0 apps/examples/src/app/multiple-data-sources/beer-list/beer-list.component.html
  66. +14 −0 apps/examples/src/app/multiple-data-sources/beer-list/beer-list.component.ts
  67. 0 ...keep → examples/src/app/multiple-data-sources/container/multiple-sources-container.component.css}
  68. +4 −0 apps/examples/src/app/multiple-data-sources/container/multiple-sources-container.component.html
  69. +172 −0 apps/examples/src/app/multiple-data-sources/container/multiple-sources-container.component.spec.ts
  70. +51 −0 apps/examples/src/app/multiple-data-sources/container/multiple-sources-container.component.ts
  71. +3 −0 apps/examples/src/app/multiple-data-sources/index.ts
  72. +19 −0 apps/examples/src/app/multiple-data-sources/layout/multiple-sources-layout.component.css
  73. +28 −0 apps/examples/src/app/multiple-data-sources/layout/multiple-sources-layout.component.html
  74. +60 −0 apps/examples/src/app/multiple-data-sources/layout/multiple-sources-layout.component.ts
  75. +10 −0 apps/examples/src/app/multiple-data-sources/model/brews.ts
  76. +4 −0 apps/examples/src/app/multiple-data-sources/model/form.ts
  77. +25 −0 apps/examples/src/app/multiple-data-sources/service/punk-api.service.ts
  78. +0 −3 apps/examples/src/environments/environment.prod.ts
  79. +0 −16 apps/examples/src/environments/environment.ts
  80. +6 −12 apps/examples/src/main.ts
  81. +0 −52 apps/examples/src/polyfills.ts
  82. +7 −13 apps/examples/src/test-setup.ts
  83. +3 −2 apps/examples/tsconfig.app.json
  84. +2 −3 apps/examples/tsconfig.editor.json
  85. +16 −3 apps/examples/tsconfig.json
  86. +7 −1 apps/examples/tsconfig.spec.json
  87. +0 −79 decorate-angular-cli.js
  88. +4 −2 jest.config.ts
  89. +1 −1 jest.preset.js
  90. +23 −6 libs/ngx-http-request-state/.eslintrc.json
  91. +21 −0 libs/ngx-http-request-state/LICENSE
  92. +105 −25 libs/ngx-http-request-state/README.md
  93. +8 −9 libs/ngx-http-request-state/jest.config.ts
  94. +2 −1 libs/ngx-http-request-state/ng-package.json
  95. +7 −4 libs/ngx-http-request-state/package.json
  96. +36 −0 libs/ngx-http-request-state/project.json
  97. +1 −0 libs/ngx-http-request-state/src/index.ts
  98. +1 −1 libs/ngx-http-request-state/src/lib/builders.spec.ts
  99. +38 −17 libs/ngx-http-request-state/src/lib/builders.ts
  100. +65 −0 libs/ngx-http-request-state/src/lib/merge.spec.ts
  101. +60 −0 libs/ngx-http-request-state/src/lib/merge.ts
  102. +39 −27 libs/ngx-http-request-state/src/lib/model.ts
  103. +2 −1 libs/ngx-http-request-state/src/lib/operators.spec.ts
  104. +12 −2 libs/ngx-http-request-state/src/lib/operators.ts
  105. +7 −3 libs/ngx-http-request-state/src/lib/type-guards.spec.ts
  106. +4 −9 libs/ngx-http-request-state/src/lib/type-guards.ts
  107. +7 −13 libs/ngx-http-request-state/src/test-setup.ts
  108. +13 −3 libs/ngx-http-request-state/tsconfig.json
  109. +5 −12 libs/ngx-http-request-state/tsconfig.lib.json
  110. +1 −2 libs/ngx-http-request-state/tsconfig.lib.prod.json
  111. +7 −1 libs/ngx-http-request-state/tsconfig.spec.json
  112. +52 −44 nx.json
  113. +0 −20,007 package-lock.json
  114. +59 −69 package.json
  115. +22,784 −0 pnpm-lock.yaml
  116. 0 tools/generators/.gitkeep
3 changes: 1 addition & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -9,5 +9,4 @@ insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
max_line_length = 120
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
23 changes: 18 additions & 5 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
@@ -23,12 +23,25 @@
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"rules": {}
"extends": ["plugin:@nx/typescript"],
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"extends": ["plugin:@nx/javascript"],
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],
"env": {
"jest": true
},
"rules": {}
}
]
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ko_fi: daicodes
27 changes: 19 additions & 8 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
@@ -11,15 +11,26 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
with:
node-version: 12
registry-url: https://registry.npmjs.org/
- run: npm ci
- run: npm run build
- run: npm run test
- run: npm publish
fetch-depth: 0

- uses: pnpm/action-setup@v2
with:
version: 9.4.0

- name: Use Node.js 20.x
uses: actions/setup-node@v3
with:
node-version: 20
cache: 'pnpm'

- run: pnpm install --frozen-lockfile
- run: pnpm run build
- run: pnpm run test
- run: |
pnpm config set '//registry.npmjs.org/:_authToken' "${NODE_AUTH_TOKEN}"
pnpm publish --no-git-checks
working-directory: ./dist/libs/ngx-http-request-state
env:
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
31 changes: 18 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -9,19 +9,24 @@ on:
jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
if: ${{ github.base_ref == 'main' }}
- uses: actions/checkout@v4
with:
ref: ${{ github.base_ref }}
- uses: actions/checkout@v2
- name: Use Node.js 12.x
uses: actions/setup-node@v2
fetch-depth: 0

- uses: pnpm/action-setup@v2
with:
node-version: 12.x
- run: npm ci
- run: npm run build
- run: npm run test
- run: npm run format:check
- run: npm run lint
version: 9.4.0

- name: Use Node.js 20.x
uses: actions/setup-node@v3
with:
node-version: 20
cache: 'pnpm'

- run: pnpm install --frozen-lockfile
- uses: nrwl/nx-set-shas@v4
- run: pnpm run build
- run: pnpm run test
- run: pnpm run format:check
- run: pnpm run lint
12 changes: 8 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
dist
tmp
/out-tsc

# dependencies
/node_modules
node_modules

# IDEs and editors
/.idea
@@ -25,7 +25,6 @@
!.vscode/extensions.json

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
@@ -38,3 +37,8 @@ testem.log
# System Files
.DS_Store
Thumbs.db

.angular

.nx/cache
.nx/workspace-data
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -2,3 +2,7 @@

/dist
/coverage
.angular

/.nx/cache
/.nx/workspace-data
4 changes: 2 additions & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"recommendations": [
"angular.ng-template",
"nrwl.angular-console",
"esbenp.prettier-vscode",
"firsttris.vscode-jest-runner"
"firsttris.vscode-jest-runner",
"dbaeumer.vscode-eslint"
]
}
166 changes: 0 additions & 166 deletions angular.json

This file was deleted.

7 changes: 0 additions & 7 deletions apps/examples-e2e/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -5,13 +5,6 @@
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {}
},
{
"files": ["src/plugins/index.js"],
"rules": {
"@typescript-eslint/no-var-requires": "off",
"no-undef": "off"
}
}
]
}
6 changes: 6 additions & 0 deletions apps/examples-e2e/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { defineConfig } from 'cypress';
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';

export default defineConfig({
e2e: nxE2EPreset(__dirname),
});
12 changes: 0 additions & 12 deletions apps/examples-e2e/cypress.json

This file was deleted.

Loading