Merge pull request #923 from ember-learn/mappings-request

mansona · web-flow · commit f50f4feaf8c8 · 2024-07-24T09:53:12.000+01:00
stop requesting mappings over the network and fix shoebox usage
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/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');
 const nodeSass = require('node-sass');
@@ -57,12 +55,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,
@@ -72,5 +64,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
@@ -61,7 +61,6 @@
     "bourbon-neat": "^1.9.1",
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-funnel": "^2.0.1",
-    "broccoli-merge-trees": "^2.0.0",
     "ember-a11y-testing": "^5.2.1",
     "ember-anchor": "^1.0.3",
     "ember-auto-import": "^2.7.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/acceptance/class-test.js b/tests/acceptance/class-test.js
@@ -15,7 +15,7 @@ module('Acceptance | Class', function (hooks) {
 
   test('lists all the methods on the class page', async function (assert) {
     const store = this.owner.lookup('service:store');
-    const container = store.peekRecord('class', 'ember-1.0.0-Container');
+    const container = store.peekRecord('class', 'ember-1.0.0-container');
     assert.equal(
       findAll('.spec-method-list li').length,
       container.get('methods.length')
@@ -32,7 +32,7 @@ module('Acceptance | Class', function (hooks) {
 
   test('lists all the properties on the class page', function (assert) {
     const store = this.owner.lookup('service:store');
-    const container = store.peekRecord('class', 'ember-1.0.0-Container');
+    const container = store.peekRecord('class', 'ember-1.0.0-container');
     assert.equal(
       findAll('.spec-property-list li').length,
       container.get('properties.length')
@@ -41,7 +41,7 @@ module('Acceptance | Class', function (hooks) {
 
   test('lists all the events on the class page', function (assert) {
     const store = this.owner.lookup('service:store');
-    const container = store.peekRecord('class', 'ember-1.0.0-Container');
+    const container = store.peekRecord('class', 'ember-1.0.0-container');
     assert.equal(
       findAll('.spec-event-list li').length,
       container.get('events.length')

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() {`