Test ember main + scope bag object cleanup

.ember-cli

@@ -1,15 +1,19 @@
 {
   /**
-    Ember CLI sends analytics information by default. The data is completely
-    anonymous, but there are times when you might want to disable this behavior.
+    Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
+    rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+  */
+  "isTypeScriptProject": false,
 
-    Setting `disableAnalytics` to true will prevent any data from being sent.
+  /**
+    Setting `componentAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
+    or GTS files for the component and the component rendering test. "loose" is the default.
   */
-  "disableAnalytics": false,
+  "componentAuthoringFormat": "loose",
 
   /**
-    Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
-    rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+    Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
+    or GTS templates for routes. "loose" is the default
   */
-  "isTypeScriptProject": false
+  "routeAuthoringFormat": "loose"
 }

.github/workflows/ci.yml

@@ -30,9 +30,9 @@ jobs:
           cache: pnpm
           node-version: ${{ env.NODE_VERSION }}
       - name: Install Dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
       - name: Lint
-        run: pnpm run lint
+        run: pnpm lint
 
   test:
     name: "Test"
@@ -46,7 +46,7 @@ jobs:
         with:
           cache: pnpm
           node-version: ${{ env.NODE_VERSION }}
-      - run: pnpm install
+      - run: pnpm install --frozen-lockfile
       - run: pnpm run clone
       - name: Run Tests
         env:

.gitignore

@@ -1,32 +1,22 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
-/concat-stats-for
-
-# Terraform
-terraform.tfstate
-terraform.tfstate.backup
-.env
-.envrc
-
 # compiled output
 /dist/
-/tmp/
+/declarations/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc
-/.projectile
 /.env*
 /.pnp*
-/.sass-cache
 /.eslintcache
-/connect.lock
 /coverage/
-/libpeerconnection.log
 /npm-debug.log*
 /testem.log
+/yarn-error.log
+
+# broccoli-debug
+/DEBUG/
+
 
 public/json-docs/
 public/rev-index/
@@ -39,14 +29,3 @@ local.log
 # ember-api-docs-data checkout
 /ember-api-docs-data/
 /ember-api-docs-data
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
-
-# broccoli-debug
-/DEBUG/

.prettierignore

@@ -1,29 +1,21 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
+.*/
+/pnpm-lock.yaml
+ember-cli-update.json
+*.html
+
+
 .eslintcache
 .lint-todo/
 
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
-
 # Misc files 
 *.md
 pnpm-lock.yaml

.prettierrc.js

@@ -4,9 +4,10 @@ module.exports = {
   plugins: ['prettier-plugin-ember-template-tag'],
   overrides: [
     {
-      files: '*.{js,ts,gjs,gts}',
+      files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
       options: {
         singleQuote: true,
+        templateSingleQuote: false,
       },
     },
   ],

.stylelintignore

@@ -3,6 +3,3 @@
 
 # compiled output
 /dist/
-
-# addons
-/.node_modules.ember-try/

.watchmanconfig

@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }

app/adapters/application.js

@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import { pluralize } from 'ember-inflector';
 import { isBlank } from '@ember/utils';
@@ -80,9 +80,7 @@ export default class Application extends JSONAPIAdapter {
       throw new Error('Unexpected model lookup');
     }
 
-    const base = this.fastboot.isFastBoot
-      ? config.APP.domain
-      : window.location.origin;
+    const base = window.location.origin;
 
     url = `${base}/${url}.json`;
     try {

app/app.js

@@ -4,6 +4,8 @@ import loadInitializers from 'ember-load-initializers';
 import config from 'ember-api-docs/config/environment';
 import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
 import { setConfig } from 'ember-basic-dropdown/config';
+import setupInspector from '@embroider/legacy-inspector-support/ember-source-4.12';
+
 import 'ember-power-select/styles';
 import './assets/styles.css';
 
@@ -19,6 +21,7 @@ export default class App extends Application {
   modulePrefix = config.modulePrefix;
   podModulePrefix = config.podModulePrefix;
   Resolver = Resolver;
+  inspector = setupInspector(this);
 }
 
 loadInitializers(App, config.modulePrefix);

app/components/api-index-filter.hbs

@@ -1 +1,3 @@
-{{yield this.filteredData}}
+<div class="api-index-filter">
+  {{yield this.filteredData}}
+</div>

app/components/api-index-filter.js

@@ -1,12 +1,6 @@
-/* eslint-disable ember/no-computed-properties-in-native-classes */
-import { classNames } from '@ember-decorators/component';
-import { computed } from '@ember/object';
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 import sortBy from 'lodash.sortby';
 
-const filterDataComputedParams =
-  'filterData.{showInherited,showProtected,showPrivate,showDeprecated}';
-
 /**
  * @typedef Args
  * @property {object} model
@@ -21,44 +15,41 @@ const filterDataComputedParams =
 /**
  * @extends Component<{ Args: Args, Blocks: Blocks }>
  */
-@classNames('api-index-filter')
 export default class ApiIndexFilter extends Component {
-  @computed('model.methods.[]', filterDataComputedParams)
   get filteredMethods() {
     return this.filterItems('methods');
   }
 
-  @computed('model.events.[]', filterDataComputedParams)
   get filteredEvents() {
     return this.filterItems('events');
   }
 
-  @computed('model.properties.[]', filterDataComputedParams)
   get filteredProperties() {
     return this.filterItems('properties');
   }
 
   filterItems(itemType) {
     let items =
-      this.model[itemType] === undefined ? [] : this.model[`${itemType}`];
-    if (!this.filterData.showInherited) {
+      this.args.model[itemType] === undefined
+        ? []
+        : this.args.model[`${itemType}`];
+    if (!this.args.filterData.showInherited) {
       items = items.filter((item) => item.inherited !== true);
     }
-    if (!this.filterData.showProtected) {
+    if (!this.args.filterData.showProtected) {
       items = items.filter((item) => item.access !== 'protected');
     }
-    if (!this.filterData.showPrivate) {
+    if (!this.args.filterData.showPrivate) {
       items = items.filter((item) => item.access !== 'private');
     }
-    if (!this.filterData.showDeprecated) {
+    if (!this.args.filterData.showDeprecated) {
       items = items.filter((item) => item.deprecated !== true);
     }
 
     let sortedItems = sortBy(items, (item) => item.name);
     return this.filterMultipleInheritance(sortedItems);
   }
 
-  @computed('filteredMethods', 'filteredProperties', 'filteredEvents')
   get filteredData() {
     return {
       methods: this.filteredMethods,
@@ -103,8 +94,8 @@ export default class ApiIndexFilter extends Component {
    * @method findMostLocal
    */
   findMostLocal(currentItem, nextItem) {
-    let currentScope = this.model.file;
-    let parentClassScope = this.model.get('parentClass').get('file');
+    let currentScope = this.args.model.file;
+    let parentClassScope = this.args.model.parentClass.get('file');
     if (currentScope === currentItem.file) {
       // if the item belongs to the class, keep it
       return currentItem;