Merge pull request #926 from ember-learn/merge-main

mansona · web-flow · commit 4ae19a8aafd8 · 2024-07-25T16:35:20.000+01:00
Merge main into website redesign
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,9 +21,6 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v4
-        name: Install pnpm
-        with:
-          version: 8
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
@@ -47,9 +44,6 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v4
-        name: Install pnpm
-        with:
-          version: 8
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
diff --git a/README.md b/README.md
@@ -46,10 +46,11 @@ locally yourself.
 ```
 git clone https://github.com/ember-learn/ember-api-docs.git
 cd ember-api-docs
-npm install
-npm run clone
-npm run start
+pnpm install
+pnpm run clone
+pnpm run start
 ```
+
 View at http://localhost:4200
 
 ### Run locally with a sym-link
@@ -64,8 +65,8 @@ git clone https://github.com/ember-learn/ember-api-docs-data
 git clone https://github.com/ember-learn/ember-api-docs
 cd ember-api-docs
 ln -s ../ember-api-docs-data
-npm install
-npm start
+pnpm install
+pnpm start
 ```
 
 Visit the app in your browser at [http://localhost:4200](http://localhost:4200)
@@ -76,9 +77,9 @@ To run a11y tests, run `test_a11y=yes ember serve`
 
 ## Linting
 
-* `npm run lint:hbs`
-* `npm run lint:js`
-* `npm run lint:js -- --fix`
+* `pnpm run lint:hbs`
+* `pnpm run lint:js`
+* `pnpm run lint:js -- --fix`
 
 ## Staging and Deployment
 
diff --git a/app/adapters/application.js b/app/adapters/application.js
@@ -29,13 +29,8 @@ export default class Application extends JSONAPIAdapter {
     return false;
   }
 
-  shouldBackgroundReloadRecord(store, { modelName, id }) {
-    let key = `${modelName}-${id}`;
-    let hasId = this.ids[key];
-    if (!hasId) {
-      this.ids[key] = true;
-    }
-    return !hasId;
+  shouldBackgroundReloadRecord() {
+    return false;
   }
 
   constructor() {
diff --git a/app/app.js b/app/app.js
@@ -3,6 +3,8 @@ import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'ember-api-docs/config/environment';
 
+import './deprecation-workflow';
+
 export default class App extends Application {
   modulePrefix = config.modulePrefix;
   podModulePrefix = config.podModulePrefix;
diff --git a/app/deprecation-workflow.js b/app/deprecation-workflow.js
@@ -1,15 +1,14 @@
-self.deprecationWorkflow = self.deprecationWorkflow || {};
-self.deprecationWorkflow.config = {
+import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow';
+
+setupDeprecationWorkflow({
   workflow: [
-    { handler: 'silence', matchId: 'ember-global' },
     { handler: 'silence', matchId: 'ember.component.reopen' },
     { handler: 'silence', matchId: 'implicit-injections' },
-    { handler: 'silence', matchId: 'manager-capabilities.modifiers-3-13' },
     { handler: 'silence', matchId: 'this-property-fallback' },
     { handler: 'silence', matchId: 'ember-component.is-visible' },
     {
       handler: 'silence',
       matchId: 'deprecated-run-loop-and-computed-dot-access',
     },
   ],
-};
+});
diff --git a/app/routes/class.js b/app/routes/class.js
@@ -10,19 +10,13 @@ export default class ClassRoute extends Route {
   legacyModuleMappings;
 
   model(params) {
-    return this.legacyModuleMappings
-      .fetch()
-      .then((response) => response.json())
-      .then((mappings) => {
-        let ret = {
-          mappings: this.legacyModuleMappings.buildMappings(mappings),
-          className: params['class'].substr(
-            0,
-            params['class'].lastIndexOf('.')
-          ),
-        };
-        return ret;
-      });
+    let ret = {
+      mappings: this.legacyModuleMappings.buildMappings(
+        this.legacyModuleMappings.legacyMappings
+      ),
+      className: params['class'].substr(0, params['class'].lastIndexOf('.')),
+    };
+    return ret;
   }
 
   redirect(model) {
diff --git a/app/routes/data-class.js b/app/routes/data-class.js
@@ -10,18 +10,12 @@ export default class DataClassRoute extends Route {
   legacyModuleMappings;
 
   model(params) {
-    return this.legacyModuleMappings
-      .fetch()
-      .then((response) => response.json())
-      .then((mappings) => {
-        return {
-          mappings: this.legacyModuleMappings.buildMappings(mappings),
-          className: params['class'].substr(
-            0,
-            params['class'].lastIndexOf('.')
-          ),
-        };
-      });
+    return {
+      mappings: this.legacyModuleMappings.buildMappings(
+        this.legacyModuleMappings.legacyMappings
+      ),
+      className: params['class'].substr(0, params['class'].lastIndexOf('.')),
+    };
   }
 
   redirect(model) {
diff --git a/app/routes/data-module.js b/app/routes/data-module.js
@@ -10,15 +10,12 @@ export default class DataModuleRoute extends Route {
   legacyModuleMappings;
 
   model(params) {
-    return this.legacyModuleMappings
-      .fetch()
-      .then((response) => response.json())
-      .then((mappings) => {
-        return {
-          moduleName: params.module.substr(0, params.module.lastIndexOf('.')),
-          mappings: this.legacyModuleMappings.buildMappings(mappings),
-        };
-      });
+    return {
+      moduleName: params.module.substr(0, params.module.lastIndexOf('.')),
+      mappings: this.legacyModuleMappings.buildMappings(
+        this.legacyModuleMappings.legacyMappings
+      ),
+    };
   }
 
   redirect(model) {
diff --git a/app/routes/module.js b/app/routes/module.js
@@ -10,15 +10,12 @@ export default class ModuleRoute extends Route {
   legacyModuleMappings;
 
   model(params) {
-    return this.legacyModuleMappings
-      .fetch()
-      .then((response) => response.json())
-      .then((mappings) => {
-        return {
-          moduleName: params.module.substr(0, params.module.lastIndexOf('.')),
-          mappings: this.legacyModuleMappings.buildMappings(mappings),
-        };
-      });
+    return {
+      moduleName: params.module.substr(0, params.module.lastIndexOf('.')),
+      mappings: this.legacyModuleMappings.buildMappings(
+        this.legacyModuleMappings.legacyMappings
+      ),
+    };
   }
 
   redirect(model) {
diff --git a/app/routes/project-version/classes/class.js b/app/routes/project-version/classes/class.js
@@ -33,7 +33,10 @@ export default class ClassRoute extends Route.extend(ScrollTracker) {
       this.metaStore
     );
     const klass = params['class'];
-    return this.find('class', `${project}-${projectVersion}-${klass}`);
+    return this.find(
+      'class',
+      `${project}-${projectVersion}-${klass}`.toLowerCase()
+    );
   }
 
   find(typeName, param) {
diff --git a/app/services/legacy-module-mappings.js b/app/services/legacy-module-mappings.js
@@ -1,7 +1,8 @@
-import fetch from 'fetch';
 import Service from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
+import legacyMappings from 'ember-rfc176-data/mappings.json';
+
 const LOCALNAME_CONVERSIONS = {
   Object: 'EmberObject',
   Array: 'EmberArray',
@@ -10,12 +11,11 @@ const LOCALNAME_CONVERSIONS = {
 
 export default class LegacyModuleMappingsService extends Service {
   @tracked mappings;
+  legacyMappings = legacyMappings;
 
   async initMappings() {
     try {
-      let response = await this.fetch();
-      let mappings = await response.json();
-      let newMappings = this.buildMappings(mappings);
+      let newMappings = this.buildMappings(legacyMappings);
       this.mappings = newMappings;
     } catch (e) {
       this.mappings = [];
@@ -32,10 +32,6 @@ export default class LegacyModuleMappingsService extends Service {
     });
   }
 
-  fetch() {
-    return fetch('/assets/mappings.json');
-  }
-
   getModule(name, documentedModule) {
     if (!this.mappings) {
       return '';
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -1,8 +1,6 @@
 'use strict';
 
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');
-const Funnel = require('broccoli-funnel');
-const mergeTrees = require('broccoli-merge-trees');
 const envIsProduction = process.env.EMBER_ENV === 'production';
 const premberUrls = require('./prember-urls');
 
@@ -38,12 +36,6 @@ module.exports = function (defaults) {
     },
   });
 
-  let mappingsTree = new Funnel('node_modules/ember-rfc176-data/', {
-    srcDir: '/',
-    include: ['mappings.json'],
-    destDir: '/assets/',
-  });
-
   const { Webpack } = require('@embroider/webpack');
   const appTree = require('@embroider/compat').compatBuild(app, Webpack, {
     staticAddonTrees: true,
@@ -53,5 +45,5 @@ module.exports = function (defaults) {
     staticComponents: true,
   });
 
-  return mergeTrees([require('prember').prerender(app, appTree), mappingsTree]);
+  return require('prember').prerender(app, appTree);
 };
diff --git a/package.json b/package.json
@@ -58,21 +58,20 @@
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-funnel": "^2.0.1",
-    "broccoli-merge-trees": "^2.0.0",
-    "ember-a11y-testing": "^0.5.4",
+    "ember-a11y-testing": "^5.2.1",
     "ember-anchor": "^1.0.3",
     "ember-auto-import": "^2.7.2",
     "ember-cli": "~3.28.6",
     "ember-cli-app-version": "^5.0.0",
     "ember-cli-autoprefixer": "^1.0.0",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-browserstack": "^1.0.1",
-    "ember-cli-clipboard": "^0.8.1",
+    "ember-cli-clipboard": "^1.1.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-deploy": "^1.0.1",
     "ember-cli-deploy-build": "^1.1.0",
     "ember-cli-deploy-gzip": "^1.0.0",
-    "ember-cli-deprecation-workflow": "^2.1.0",
+    "ember-cli-deprecation-workflow": "^3.0.1",
     "ember-cli-document-title-northm": "^1.0.3",
     "ember-cli-fastboot": "^4.1.5",
     "ember-cli-htmlbars": "^6.1.1",
@@ -87,16 +86,16 @@
     "ember-decorators": "^6.1.1",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.1.1",
-    "ember-inflector": "^3.0.0",
+    "ember-inflector": "^4.0.3",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-metrics": "^1.5.2",
     "ember-page-title": "^6.2.2",
-    "ember-power-select": "^6.0.1",
+    "ember-power-select": "^7.2.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
     "ember-rfc176-data": "^0.3.17",
-    "ember-route-action-helper": "^2.0.5",
+    "ember-route-action-helper": "^2.0.8",
     "ember-showdown-shiki": "^1.2.1",
     "ember-sinon": "^4.1.1",
     "ember-source": "~3.28.8",
@@ -161,5 +160,11 @@
     "paths": [
       "lib/api-docs-data"
     ]
-  }
+  },
+  "pnpm": {
+    "overrides": {
+      "node-sass": "^9.0.0"
+    }
+  },
+  "packageManager": "pnpm@9.5.0"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/acceptance/class-test.js b/tests/acceptance/class-test.js

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,8 @@ export default class Application extends JSONAPIAdapter {`
`29`	`29`	`return false;`
`30`	`30`	`}`
`31`	`31`
`32`		`- shouldBackgroundReloadRecord(store, { modelName, id }) {`
`33`		- let key = `${modelName}-${id}`;
`34`		`- let hasId = this.ids[key];`
`35`		`- if (!hasId) {`
`36`		`- this.ids[key] = true;`
`37`		`- }`
`38`		`- return !hasId;`
	`32`	`+ shouldBackgroundReloadRecord() {`
	`33`	`+ return false;`
`39`	`34`	`}`
`40`	`35`
`41`	`36`	`constructor() {`