Update test-app js files to use modern syntax

.eslintrc.js

@@ -1,13 +1,25 @@
+/* eslint-env node */
+
 module.exports = {
  root: true,
+ parser: '@babel/eslint-parser',
  extends: [
  'simplabs',
  'simplabs/plugins/ember',
  'plugin:ember/recommended',
  ],
  parserOptions: {
  ecmaVersion: 2022,
- sourceType: 'module'
+ sourceType: 'module',
+ requireConfigFile: false,
+ babelOptions: {
+ babelrc: false,
+ configFile: false,
+ presets: ["@babel/preset-env"],
+ plugins: [
+ ["@babel/plugin-proposal-decorators", { "legacy": true }],
+ ]
+ },
  },
  rules: {
  'ember/local-modules': 'off',

jsconfig.json

@@ -0,0 +1,8 @@
+{
+ "compilerOptions": {
+ "module": "es6",
+ "target": "es6",
+ "experimentalDecorators": true
+ },
+ "exclude": ["node_modules"]
+}

packages/ember-simple-auth/config/ember-try.js

@@ -24,9 +24,9 @@ module.exports = function() {
  'ember-source': '~3.12.0',
  'ember-inflector': '~3.0.1',
  '@ember/string': '~3.0.1',
- "torii": "^0.10.0",
- "ember-engines": "0.8.21",
- "@ember/legacy-built-in-components": null,
+ 'torii': '^0.10.0',
+ 'ember-engines': '0.8.21',
+ '@ember/legacy-built-in-components': null,
  },
  },
  },
@@ -39,9 +39,9 @@ module.exports = function() {
  'ember-source': '~3.16.0',
  'ember-inflector': '~3.0.1',
  '@ember/string': '~3.0.1',
- "torii": "^0.10.0",
- "ember-engines": "0.8.21",
- "@ember/legacy-built-in-components": null,
+ 'torii': '^0.10.0',
+ 'ember-engines': '0.8.21',
+ '@ember/legacy-built-in-components': null,
  },
  },
  },
@@ -54,9 +54,9 @@ module.exports = function() {
  'ember-source': '~3.20.0',
  'ember-inflector': '~3.0.1',
  '@ember/string': '~3.0.1',
- "torii": "^0.10.0",
- "ember-engines": "0.8.21",
- "@ember/legacy-built-in-components": null,
+ 'torii': '^0.10.0',
+ 'ember-engines': '0.8.21',
+ '@ember/legacy-built-in-components': null,
  },
  },
  },
@@ -67,8 +67,8 @@ module.exports = function() {
  'ember-cli': '~3.28.0',
  'ember-data': '~3.24.0',
  'ember-source': '~3.24.0',
- "ember-engines": "0.8.21",
- "@ember/legacy-built-in-components": null,
+ 'ember-engines': '0.8.21',
+ '@ember/legacy-built-in-components': null,
  },
  },
  },

packages/test-app/.eslintrc.js

@@ -5,4 +5,26 @@ module.exports = {
  extends: [
  '../../.eslintrc.js',
  ],
+ rules: {
+ 'ember/no-get': 'error',
+ 'ember/avoid-leaking-state-in-ember-objects': 'error',
+
+ // Legacy Ember features
+ 'ember/no-actions-hash': 'error',
+ 'ember/no-classic-classes': 'error',
+ 'ember/no-classic-components': 'error',
+ 'ember/no-private-routing-service': 'error',
+ 'ember/require-tagless-components': 'error',
+
+ // TODO: REMOVE
+ 'no-implicit-coercion': 'error',
+ 'no-multi-spaces': 'error',
+ 'no-multi-str': 'error',
+ 'no-trailing-spaces': 'error',
+ 'no-unused-vars': 'error',
+ 'no-var': 'error',
+ 'prefer-template': 'error',
+ 'quotes': 'error',
+ 'semi': 'error'
+ },
 };

packages/test-app/app/adapters/application.js

@@ -1,26 +1,24 @@
-/* eslint-disable ember/no-mixins */
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import config from '../config/environment';
-import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 
-export default JSONAPIAdapter.extend({
- host: config.apiHost,
- session: service(),
+export default class ApplicationAdapter extends JSONAPIAdapter {
+ host = config.apiHost;
+ @service session;
 
- headers: computed('session.{data.authenticated.access_token,isAuthenticated}', function() {
+ get headers() {
  let headers = {};
- if (this.get('session.isAuthenticated')) {
- headers['Authorization'] = `Bearer ${this.get('session.data.authenticated.access_token')}`;
+ if (this.session.get('isAuthenticated')) {
+ headers['Authorization'] = `Bearer ${this.session.data.authenticated.access_token}`;
  }
 
  return headers;
- }),
+ }
 
  handleResponse(status) {
- if (status === 401 && this.get('session.isAuthenticated')) {
- this.get('session').invalidate();
+ if (status === 401 && this.session.get('isAuthenticated')) {
+ this.session.invalidate();
  }
- return this._super(...arguments);
- },
-});
+ return super.handleResponse(...arguments);
+ }
+}

packages/test-app/app/app.js

@@ -3,12 +3,12 @@ import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-const App = Application.extend({
- modulePrefix: config.modulePrefix,
- podModulePrefix: config.podModulePrefix,
- Resolver,
+class App extends Application {
+ modulePrefix = config.modulePrefix;
+ podModulePrefix = config.podModulePrefix;
+ Resolver = Resolver;
 
- engines: Object.freeze({
+ engines = Object.freeze({
  'my-engine': {
  dependencies: {
  externalRoutes: {
@@ -20,8 +20,8 @@ const App = Application.extend({
  ]
  }
  }
- })
-});
+ });
+}
 
 loadInitializers(App, config.modulePrefix);
 

packages/test-app/app/authenticators/oauth2-implicit-grant.js

@@ -1,3 +1,3 @@
 import OAuth2ImplicitGrant from 'ember-simple-auth/authenticators/oauth2-implicit-grant';
 
-export default OAuth2ImplicitGrant.extend();
+export default class OAuth2ImplicitGrantAuthenticator extends OAuth2ImplicitGrant {}

packages/test-app/app/authenticators/oauth2.js

@@ -1,7 +1,7 @@
 import OAuth2PasswordGrant from 'ember-simple-auth/authenticators/oauth2-password-grant';
 import config from '../config/environment';
 
-export default OAuth2PasswordGrant.extend({
- serverTokenEndpoint: `${config.apiHost}/token`,
- serverTokenRevocationEndpoint: `${config.apiHost}/revoke`
-});
+export default class OAuth2Authenticator extends OAuth2PasswordGrant {
+ serverTokenEndpoint = `${config.apiHost}/token`;
+ serverTokenRevocationEndpoint = `${config.apiHost}/revoke`;
+}

packages/test-app/app/authenticators/torii.js

@@ -1,14 +1,14 @@
 import { inject as service } from '@ember/service';
 import Torii from 'ember-simple-auth/authenticators/torii';
 
-export default Torii.extend({
- torii: service(),
- ajax: service(),
+export default class ToriiAuthenticator extends Torii {
+ @service torii;
+ @service ajax;
 
  authenticate() {
- const ajax = this.get('ajax');
+ const ajax = this.ajax;
 
- return this._super(...arguments).then((data) => {
+ return super.authenticate(...arguments).then((data) => {
  return ajax.request('/token', {
  type: 'POST',
  dataType: 'json',
@@ -21,4 +21,4 @@ export default Torii.extend({
  });
  });
  }
-});
+}

packages/test-app/app/components/login-form.js

@@ -1,52 +1,63 @@
 import { inject as service } from '@ember/service';
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 import config from '../config/environment';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
 
-export default Component.extend({
- session: service('session'),
-
- actions: {
- async authenticateWithOAuth2() {
- try {
- let { identification, password } = this;
- await this.get('session').authenticate('authenticator:oauth2', identification, password);
-
- if (this.rememberMe) {
- this.get('session').set('store.cookieExpirationTime', 60 * 60 * 24 * 14);
- }
- } catch (response) {
- let responseBody = await response.clone().json();
- this.set('errorMessage', responseBody);
+export default class LoginFormComponent extends Component {
+ @service session;
+
+ @tracked errorMessage;
+ @tracked identification;
+ @tracked password;
+ @tracked rememberMe;
+
+ @action
+ async authenticateWithOAuth2() {
+ try {
+ let { identification, password } = this;
+ await this.session.authenticate('authenticator:oauth2', identification, password);
+
+ if (this.rememberMe) {
+ this.session.set('store.cookieExpirationTime', 60 * 60 * 24 * 14);
  }
- },
-
- authenticateWithFacebook() {
- this.get('session').authenticate('authenticator:torii', 'facebook');
- },
-
- authenticateWithGoogleImplicitGrant() {
- let clientId = config.googleClientID;
- let redirectURI = `${window.location.origin}/callback`;
- let responseType = `token`;
- let scope = `email`;
- window.location.replace(`https://accounts.google.com/o/oauth2/v2/auth?`
- + `client_id=${clientId}`
- + `&redirect_uri=${redirectURI}`
- + `&response_type=${responseType}`
- + `&scope=${scope}`
- );
- },
-
- updateIdentification(e) {
- this.set('identification', e.target.value);
- },
-
- updatePassword(e) {
- this.set('password', e.target.value);
- },
-
- updateRememberMe(e) {
- this.set('rememberMe', e.target.checked);
- },
+ } catch (response) {
+ let responseBody = await response.clone().json();
+ this.errorMessage = responseBody;
+ }
+ }
+
+ @action
+ authenticateWithFacebook() {
+ this.session.authenticate('authenticator:torii', 'facebook');
+ }
+
+ @action
+ authenticateWithGoogleImplicitGrant() {
+ let clientId = config.googleClientID;
+ let redirectURI = `${window.location.origin}/callback`;
+ let responseType = `token`;
+ let scope = `email`;
+ window.location.replace(`https://accounts.google.com/o/oauth2/v2/auth?`
+ + `client_id=${clientId}`
+ + `&redirect_uri=${redirectURI}`
+ + `&response_type=${responseType}`
+ + `&scope=${scope}`
+ );
+ }
+
+ @action
+ updateIdentification(e) {
+ this.identification = e.target.value;
+ }
+
+ @action
+ updatePassword(e) {
+ this.password = e.target.value;
+ }
+
+ @action
+ updateRememberMe(e) {
+ this.rememberMe = e.target.checked;
  }
-});
+}

packages/test-app/app/components/main-navigation.js

@@ -1,13 +1,16 @@
 import { inject as service } from '@ember/service';
-import Component from '@ember/component';
+import { action } from '@ember/object';
+import Component from '@glimmer/component';
 
-export default Component.extend({
- session: service('session'),
- sessionAccount: service('session-account'),
+export default class MainNavigationComponent extends Component {
+ @service session;
+ @service sessionAccount;
 
- actions: {
- logout() {
- this.get('session').invalidate();
- }
+ @action
+ logout() {
+ this.session.invalidate();
  }
-});
+
+ @action
+ onLogin() {}
+}

packages/test-app/app/controllers/application.js

@@ -1,9 +1,12 @@
 import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
-export default Controller.extend({
- actions: {
- transitionToLoginRoute() {
- this.transitionToRoute('login');
- }
+export default class ApplicationController extends Controller {
+ @service router;
+
+ @action
+ transitionToLoginRoute() {
+ this.router.transitionTo('login');
  }
-});
+}

packages/test-app/app/controllers/index.js

@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 
-export default Controller.extend({
- session: service()
-});
+export default class ApplicationIndexController extends Controller {
+ @service session;
+}