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

[pull] master from mainmatter:master #110

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
ee843c0
chore(deps): lock file maintenance
renovate[bot] Dec 30, 2024
0db3b4f
feat(test-esa) fix missing test scenarios
Gaurav0 Dec 30, 2024
2579c64
Merge pull request #2905 from Gaurav0/missing_test_scenarios
BobrImperator Dec 30, 2024
44603e9
Merge pull request #2901 from mainmatter/renovate/lock-file-maintenance
BobrImperator Dec 30, 2024
fa131b7
doc: support typescript doc generation
BobrImperator Dec 31, 2024
b71ed86
Merge pull request #2906 from mainmatter/fix-docs-generation
BobrImperator Dec 31, 2024
eaa7a3c
fix pnpm peer dependency warning
Gaurav0 Jan 1, 2025
8f1084e
fix(ember-simple-auth): setting non 'content' fields with #set on Obj…
BobrImperator Jan 2, 2025
3da0137
Merge pull request #2909 from mainmatter/fix-2907-reactivity
BobrImperator Jan 2, 2025
fe934bf
Prepare Release using 'release-plan'
BobrImperator Jan 2, 2025
533e436
Merge pull request #2904 from mainmatter/release-preview
BobrImperator Jan 2, 2025
506bb64
Merge pull request #2908 from Gaurav0/fix_pnpm_peer_warning
BobrImperator Jan 2, 2025
63e7e28
chore(deps): update all non-major dependencies (#2911)
renovate[bot] Jan 6, 2025
d13e70f
chore(deps): update all non-major dependencies to v8.19.0 (#2912)
renovate[bot] Jan 6, 2025
90c0d73
chore(deps): lock file maintenance (#2913)
renovate[bot] Jan 6, 2025
b13be9e
chore(deps): update dependency release-it to v18 (#2914)
renovate[bot] Jan 6, 2025
b9a5d62
chore(deps): lock file maintenance (#2917)
renovate[bot] Jan 13, 2025
c6d97ab
chore(lint): remove .eslintignore files
BobrImperator Jan 13, 2025
ef9a91e
Merge pull request #2920 from mainmatter/eslint-fix
BobrImperator Jan 13, 2025
ab8ff9a
fix(typescript): test-support types path
BobrImperator Jan 13, 2025
0c3380e
chore(deps): update dependency eslint-config-prettier to v10 (#2918)
renovate[bot] Jan 13, 2025
d67087e
Merge pull request #2919 from mainmatter/fix-test-support-types
BobrImperator Jan 13, 2025
a26928f
chore(deps): pin dependency @types/qunit to 2.19.12 (#2921)
renovate[bot] Jan 13, 2025
6ab9ac8
Prepare Release using 'release-plan'
marcoow Jan 13, 2025
f2ca60e
Merge pull request #2910 from mainmatter/release-preview
BobrImperator Jan 13, 2025
c4d5f18
chore(deps): lock file maintenance (#2926)
renovate[bot] Jan 20, 2025
b7d8bb7
chore(deps): update all non-major dependencies (#2925)
renovate[bot] Jan 20, 2025
dc26c65
chore(deps): update all non-major dependencies (#2924)
renovate[bot] Jan 20, 2025
df0ad4a
The authenticate method returns a Promise
andreyfel Jan 20, 2025
8ae3214
Merge pull request #2928 from andreyfel/fix-authenticate-return-type
BobrImperator Jan 20, 2025
c8b83b5
Prepare Release using 'release-plan'
BobrImperator Jan 20, 2025
748e46f
Merge pull request #2927 from mainmatter/release-preview
BobrImperator Jan 20, 2025
65f5ab0
chore(deps): update all non-major dependencies (#2929)
renovate[bot] Jan 27, 2025
d4c7caf
chore(deps): update all non-major dependencies (#2930)
renovate[bot] Jan 27, 2025
b661a1f
chore(deps): update dependency qunit to v2.24.1 (#2931)
renovate[bot] Jan 27, 2025
13572e9
chore(deps): lock file maintenance (#2932)
renovate[bot] Jan 27, 2025
1b3b55c
chore(deps): update pnpm to v10 (#2934)
renovate[bot] Feb 4, 2025
9a61368
chore(deps): update pnpm to v10.2.1 (#2935)
renovate[bot] Feb 7, 2025
371514f
chore(deps): lock file maintenance (#2938)
renovate[bot] Feb 10, 2025
483d478
chore(deps): update all non-major dependencies (#2936)
renovate[bot] Feb 10, 2025
ac47b33
chore(deps): update pnpm to v10.3.0 (#2939)
renovate[bot] Feb 11, 2025
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
5 changes: 0 additions & 5 deletions .eslintignore

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ jobs:
- test:one ember-lts-4.4
- test:one ember-lts-4.8
- test:one ember-lts-4.12
- test:one ember-lts-5.4
- test:one ember-lts-5.8
- test:one ember-lts-5.12
- test:one ember-6.0
- test:one ember-default
- test:one ember-release
Expand Down
12 changes: 6 additions & 6 deletions .release-plan.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"solution": {
"ember-simple-auth": {
"impact": "minor",
"oldVersion": "7.0.0",
"newVersion": "7.1.0",
"impact": "patch",
"oldVersion": "7.1.2",
"newVersion": "7.1.3",
"constraints": [
{
"impact": "minor",
"reason": "Appears in changelog section :rocket: Enhancement"
"impact": "patch",
"reason": "Appears in changelog section :bug: Bug Fix"
}
],
"pkgJSONPath": "./packages/ember-simple-auth/package.json"
}
},
"description": "## Release (2024-12-30)\n\nember-simple-auth 7.1.0 (minor)\n\n#### :rocket: Enhancement\n* `ember-simple-auth`, `test-app`\n * [#2902](https://github.com/mainmatter/ember-simple-auth/pull/2902) feat(ember-simple-auth): add generic type argument to session ([@BobrImperator](https://github.com/BobrImperator))\n\n#### Committers: 1\n- Bartlomiej Dudzik ([@BobrImperator](https://github.com/BobrImperator))\n"
"description": "## Release (2025-01-20)\n\nember-simple-auth 7.1.3 (patch)\n\n#### :bug: Bug Fix\n* `ember-simple-auth`\n * [#2928](https://github.com/mainmatter/ember-simple-auth/pull/2928) The authenticate method returns a Promise ([@andreyfel](https://github.com/andreyfel))\n\n#### Committers: 1\n- Andrey Fel ([@andreyfel](https://github.com/andreyfel))\n"
}
49 changes: 49 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,54 @@
# Changelog

## Release (2025-01-20)

ember-simple-auth 7.1.3 (patch)

#### :bug: Bug Fix
* `ember-simple-auth`
* [#2928](https://github.com/mainmatter/ember-simple-auth/pull/2928) The authenticate method returns a Promise ([@andreyfel](https://github.com/andreyfel))

#### Committers: 1
- Andrey Fel ([@andreyfel](https://github.com/andreyfel))

## Release (2025-01-13)

ember-simple-auth 7.1.2 (patch)

#### :bug: Bug Fix
* `ember-simple-auth`, `test-app`
* [#2919](https://github.com/mainmatter/ember-simple-auth/pull/2919) fix(typescript): test-support types path ([@BobrImperator](https://github.com/BobrImperator))

#### :house: Internal
* `classic-test-app`, `test-app`, `test-esa`
* [#2920](https://github.com/mainmatter/ember-simple-auth/pull/2920) chore(lint): remove .eslintignore files ([@BobrImperator](https://github.com/BobrImperator))
* `ember-simple-auth`
* [#2908](https://github.com/mainmatter/ember-simple-auth/pull/2908) fix pnpm peer dependency warning ([@Gaurav0](https://github.com/Gaurav0))

#### Committers: 2
- Bartlomiej Dudzik ([@BobrImperator](https://github.com/BobrImperator))
- Gaurav Munjal ([@Gaurav0](https://github.com/Gaurav0))

## Release (2025-01-02)

ember-simple-auth 7.1.1 (patch)

#### :bug: Bug Fix
* `ember-simple-auth`, `test-app`
* [#2909](https://github.com/mainmatter/ember-simple-auth/pull/2909) fix(ember-simple-auth): setting non 'content' fields with #set on ObjectProxy is not reactive. ([@BobrImperator](https://github.com/BobrImperator))

#### :memo: Documentation
* `docs`
* [#2906](https://github.com/mainmatter/ember-simple-auth/pull/2906) doc: support typescript doc generation ([@BobrImperator](https://github.com/BobrImperator))

#### :house: Internal
* `test-esa`
* [#2905](https://github.com/mainmatter/ember-simple-auth/pull/2905) feat(test-esa) fix missing test scenarios ([@Gaurav0](https://github.com/Gaurav0))

#### Committers: 2
- Bartlomiej Dudzik ([@BobrImperator](https://github.com/BobrImperator))
- Gaurav Munjal ([@Gaurav0](https://github.com/Gaurav0))

## Release (2024-12-30)

ember-simple-auth 7.1.0 (minor)
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@
},
"devDependencies": {
"@babel/plugin-proposal-decorators": "7.25.9",
"@babel/preset-env": "7.26.0",
"@babel/preset-env": "7.26.8",
"@eslint/eslintrc": "3.2.0",
"@eslint/js": "9.17.0",
"@eslint/js": "9.19.0",
"@mermaid-js/mermaid-cli": "11.4.2",
"@release-it-plugins/lerna-changelog": "7.0.0",
"@typescript-eslint/eslint-plugin": "8.18.2",
"@typescript-eslint/parser": "8.18.2",
"eslint-config-prettier": "9.1.0",
"@typescript-eslint/eslint-plugin": "8.21.0",
"@typescript-eslint/parser": "8.21.0",
"eslint-config-prettier": "10.0.1",
"eslint-config-simplabs": "0.4.0",
"eslint-plugin-ember": "12.3.3",
"eslint-plugin-n": "17.15.1",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-prettier": "5.2.3",
"eslint-plugin-qunit": "8.1.2",
"globals": "15.14.0",
"lerna-changelog": "2.2.0",
"release-it": "17.11.0",
"release-it": "18.1.2",
"release-plan": "0.11.0"
},
"volta": {
"node": "20.10.0",
"pnpm": "9.11.0"
"pnpm": "10.3.0"
},
"packageManager": "pnpm@9.11.0"
"packageManager": "pnpm@10.3.0"
}
24 changes: 0 additions & 24 deletions packages/classic-test-app/.eslintignore

This file was deleted.

8 changes: 4 additions & 4 deletions packages/classic-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-sri": "2.1.1",
"ember-cli-terser": "4.0.2",
"ember-data": "5.3.9",
"ember-data": "5.3.11",
"ember-disable-prototype-extensions": "1.1.3",
"ember-engines": "0.11.0",
"ember-engines-router-service": "0.6.0",
Expand All @@ -49,16 +49,16 @@
"ember-source": "5.12.0",
"ember-source-channel-url": "3.0.0",
"ember-try": "3.0.0",
"eslint": "9.17.0",
"eslint": "9.19.0",
"express": "4.21.2",
"glob": "11.0.0",
"glob": "11.0.1",
"globals": "15.14.0",
"handlebars": "4.7.8",
"loader.js": "4.7.0",
"my-engine": "workspace:./lib/my-engine",
"npm-run-all2": "7.0.2",
"pretender": "3.4.7",
"qunit": "2.23.1",
"qunit": "2.24.1",
"qunit-dom": "2.0.0",
"torii": "1.0.0-beta.2",
"webpack": "5.97.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/jsdoc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"plugins": ["plugins/markdown"],
"plugins": ["plugins/markdown", "better-docs/typescript"],
"recurseDepth": 10,
"source": {
"include": ["../ember-simple-auth/src", "../ember-simple-auth/package.json"],
"exclude": ["../ember-simple-auth/src/test-support"],
"includePattern": ".+\\.js(doc|x)?$",
"includePattern": ".+\\.(js|ts)(doc|x)?$",
"excludePattern": "(^|\\/|\\\\)_"
},
"opts": {
Expand Down
31 changes: 16 additions & 15 deletions packages/ember-simple-auth/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-simple-auth",
"version": "7.1.0",
"version": "7.1.3",
"description": "A lightweight library for implementing authentication/authorization with Ember.js applications.",
"keywords": [
"ember-addon"
Expand Down Expand Up @@ -37,31 +37,32 @@
"silent-error": "^1.0.0"
},
"devDependencies": {
"@babel/core": "7.26.0",
"@babel/core": "7.26.8",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-proposal-decorators": "7.25.9",
"@babel/runtime": "7.26.0",
"@babel/runtime": "7.26.7",
"@embroider/addon-dev": "7.1.1",
"@glint/core": "1.5.0",
"@glint/environment-ember-loose": "1.5.0",
"@glint/environment-ember-template-imports": "1.5.0",
"@glint/core": "1.5.2",
"@glint/environment-ember-loose": "1.5.2",
"@glint/environment-ember-template-imports": "1.5.2",
"@rollup/plugin-babel": "6.0.4",
"@rollup/plugin-node-resolve": "16.0.0",
"@tsconfig/ember": "3.0.8",
"@tsconfig/ember": "3.0.9",
"@types/ember__application": "4.0.11",
"@types/ember__debug": "4.0.8",
"@types/ember__object": "4.0.12",
"@types/ember__routing": "4.0.22",
"@types/ember__service": "4.0.9",
"@typescript-eslint/eslint-plugin": "8.18.2",
"@typescript-eslint/parser": "8.18.2",
"concurrently": "9.1.1",
"ember-template-lint": "6.0.0",
"eslint": "9.17.0",
"@typescript-eslint/eslint-plugin": "8.21.0",
"@typescript-eslint/parser": "8.21.0",
"concurrently": "9.1.2",
"ember-template-lint": "6.1.0",
"eslint": "9.19.0",
"prettier": "3.4.2",
"rollup": "4.29.1",
"rollup": "4.32.0",
"rollup-plugin-copy": "3.5.0",
"typescript": "5.7.2"
"typescript": "5.7.3",
"webpack": "5.97.1"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down Expand Up @@ -105,7 +106,7 @@
},
"./test-support": {
"default": "./dist/test-support/index.js",
"types": "./declarations/test-support/*.d.ts"
"types": "./declarations/test-support/index.d.ts"
},
"./utils/*": {
"default": "./dist/utils/*.js",
Expand Down
16 changes: 5 additions & 11 deletions packages/ember-simple-auth/src/services/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
handleSessionInvalidated,
} from '../-internals/routing';
import type Transition from '@ember/routing/transition';
import { alias } from '@ember/object/computed';
import { alias, readOnly } from '@ember/object/computed';

const SESSION_DATA_KEY_PREFIX = /^data\./;

Expand All @@ -32,7 +32,7 @@ type InternalSessionMock<Data> = {
store: unknown;
attemptedTransition: null;
on: (event: 'authenticationSucceeded' | 'invalidationSucceeded', cb: () => void) => void;
authenticate: (authenticator: string, ...args: any[]) => void;
authenticate: (authenticator: string, ...args: any[]) => Promise<void>;
invalidate: (...args: any[]) => void;
requireAuthentication: (transition: Transition, routeOrCallback: RouteOrCallback) => boolean;
prohibitAuthentication: (routeOrCallback: RouteOrCallback) => boolean;
Expand Down Expand Up @@ -90,9 +90,7 @@ export default class SessionService<Data = DefaultDataShape> extends Service {
@default false
@public
*/
get isAuthenticated() {
return this.session.isAuthenticated;
}
@readOnly('session.isAuthenticated') declare isAuthenticated: boolean;

/**
The current session data as a plain object. The
Expand All @@ -109,9 +107,7 @@ export default class SessionService<Data = DefaultDataShape> extends Service {
@default { authenticated: {} }
@public
*/
get data() {
return this.session.content;
}
@readOnly('session.content') declare data: Data;

/**
The session store.
Expand All @@ -123,9 +119,7 @@ export default class SessionService<Data = DefaultDataShape> extends Service {
@default null
@public
*/
get store() {
return this.session.store;
}
@readOnly('session.store') declare store: unknown;

/**
A previously attempted but intercepted transition (e.g. by the
Expand Down
20 changes: 0 additions & 20 deletions packages/test-app/.eslintignore

This file was deleted.

File renamed without changes.
8 changes: 8 additions & 0 deletions packages/test-app/app/config/environment.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
declare const config: {
apiHost: string;
APP: string;
modulePrefix: string;
podModulePrefix: string;
};

export default config;
1 change: 1 addition & 0 deletions packages/test-app/app/controllers/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { action } from '@ember/object';

export default class ApplicationController extends Controller {
@service router;
@service session;

@action
transitionToLoginRoute() {
Expand Down
7 changes: 6 additions & 1 deletion packages/test-app/app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<MainNavigation @onLogin={{this.transitionToLoginRoute}} />
<div class="container mt-4">
<div class='container mt-4'>
{{outlet}}
</div>

<div data-test-reactivity hidden>
<!-- test SessionService reactivity -->
<span data-is-authenticated={{this.session.isAuthenticated}}> </span>
</div>
Loading