Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/adapters/application.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { service } from '@ember/service';
import JSONAPIAdapter from '@ember-data/adapter/json-api';
import { JSONAPIAdapter } from '@warp-drive/legacy/adapter/json-api';
import { pluralize } from 'ember-inflector';
import { isBlank } from '@ember/utils';
import config from 'ember-api-docs/config/environment';
Expand Down
2 changes: 2 additions & 0 deletions app/app.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import '@warp-drive/ember/install';

import Application from '@ember/application';
import Resolver from 'ember-resolver';
import loadInitializers from 'ember-load-initializers';
Expand Down
4 changes: 2 additions & 2 deletions app/models/class.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Model, { belongsTo, attr } from '@ember-data/model';
import { Model, belongsTo, attr } from '@warp-drive/legacy/model';

export default class Class extends Model {
@attr()
Expand Down Expand Up @@ -43,7 +43,7 @@ export default class Class extends Model {
@belongsTo('class', { async: true, inverse: null })
parentClass;

@belongsTo('project-version', { inverse: 'classes' })
@belongsTo('project-version', { async: false, inverse: null })
projectVersion;

get project() {
Expand Down
4 changes: 2 additions & 2 deletions app/models/module.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { belongsTo, attr } from '@ember-data/model';
import { belongsTo, attr } from '@warp-drive/legacy/model';
import ClassModel from './class';

export default class Module extends ClassModel {
Expand All @@ -23,6 +23,6 @@ export default class Module extends ClassModel {
@attr()
allstaticfunctions;

@belongsTo('project-version', { inverse: 'modules' })
@belongsTo('project-version', { async: false, inverse: null })
projectVersion;
}
4 changes: 2 additions & 2 deletions app/models/namespace.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { belongsTo } from '@ember-data/model';
import { belongsTo } from '@warp-drive/legacy/model';
import ClassModel from './class';

export default class Namespace extends ClassModel {
@belongsTo('project-version', { inverse: 'namespaces' })
@belongsTo('project-version', { async: false, inverse: null })
projectVersion;
}
22 changes: 11 additions & 11 deletions app/models/project-version.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import Model, { attr, hasMany, belongsTo } from '@ember-data/model';
import { Model, attr, hasMany, belongsTo } from '@warp-drive/legacy/model';
import getCompactVersion from '../utils/get-compact-version';

export default class ProjectVersionModel extends Model {
@attr version;
@hasMany('class', { async: true }) classes;
@hasMany('module', { async: true }) modules;
@hasMany('namespace', { async: true }) namespaces;
@hasMany('class', { async: true }) 'public-classes';
@hasMany('class', { async: true }) 'private-classes';
@hasMany('module', { async: true }) 'public-modules';
@hasMany('module', { async: true }) 'private-modules';
@hasMany('namespace', { async: true }) 'public-namespaces';
@hasMany('namespace', { async: true }) 'private-namespaces';
@belongsTo('project') project;
@hasMany('class', { async: true, inverse: null }) classes;
@hasMany('module', { async: true, inverse: null }) modules;
@hasMany('namespace', { async: true, inverse: null }) namespaces;
@hasMany('class', { async: true, inverse: null }) 'public-classes';
@hasMany('class', { async: true, inverse: null }) 'private-classes';
@hasMany('module', { async: true, inverse: null }) 'public-modules';
@hasMany('module', { async: true, inverse: null }) 'private-modules';
@hasMany('namespace', { async: true, inverse: null }) 'public-namespaces';
@hasMany('namespace', { async: true, inverse: null }) 'private-namespaces';
@belongsTo('project', { async: false, inverse: 'projectVersions' }) project;

get compactVersion() {
return getCompactVersion(this.version);
Expand Down
4 changes: 2 additions & 2 deletions app/models/project.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Model, { hasMany, attr } from '@ember-data/model';
import { Model, hasMany, attr } from '@warp-drive/legacy/model';

export default class Project extends Model {
@attr()
Expand All @@ -7,6 +7,6 @@ export default class Project extends Model {
@attr()
githubUrl;

@hasMany('project-version', { async: true })
@hasMany('project-version', { async: true, inverse: 'project' })
projectVersions;
}
2 changes: 1 addition & 1 deletion app/routes/project-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default class ProjectVersionRoute extends Route {
if (!classParams && !moduleParams && !namespaceParams && !functionParams) {
// if there is no class, module, or namespace specified...
let latestVersion = getLastVersion(
model.get('project.content').hasMany('projectVersions').ids(),
model.project.hasMany('projectVersions').ids(),
);
let isLatestVersion =
transitionVersion === latestVersion || transitionVersion === 'release';
Expand Down
2 changes: 1 addition & 1 deletion app/serializers/application.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { service } from '@ember/service';
import JSONAPISerializer from '@ember-data/serializer/json-api';
import { JSONAPISerializer } from '@warp-drive/legacy/serializer/json-api';

export default class Application extends JSONAPISerializer {
@service
Expand Down
15 changes: 15 additions & 0 deletions app/services/store.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { useLegacyStore } from '@warp-drive/legacy';
import { JSONAPICache } from '@warp-drive/json-api';

const Store = useLegacyStore({
linksMode: false,
cache: JSONAPICache,
handlers: [
// -- your handlers here
],
schemas: [
// -- your schemas here
],
});

export default Store;
2 changes: 2 additions & 0 deletions config/fastboot.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ module.exports = function () {
buildSandboxGlobals(defaultGlobals) {
return Object.assign({}, defaultGlobals, {
atob: atob,
setInterval: setInterval,
structuredClone: structuredClone,
AbortController,
fetch: fetch,
ReadableStream:
Expand Down
11 changes: 11 additions & 0 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
const envIsProduction = process.env.EMBER_ENV === 'production';
const premberUrls = require('./prember-urls');
const { setConfig } = require('@warp-drive/core/build-config');

module.exports = function (defaults) {
const app = new EmberApp(defaults, {
Expand Down Expand Up @@ -44,6 +45,16 @@ module.exports = function (defaults) {
},
});

setConfig(app, __dirname, {
// this should be the most recent <major>.<minor> version for
// which all deprecations have been fully resolved
// and should be updated when that changes
compatWith: '4.12',
deprecations: {
// ... list individual deprecations that have been resolved here
},
});

const { Webpack } = require('@embroider/webpack');
const appTree = require('@embroider/compat').compatBuild(app, Webpack, {
staticAddonTrees: true,
Expand Down
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
"@percy/cli": "^1.28.7",
"@percy/ember": "^5.0.0",
"@typescript-eslint/parser": "^8.43.0",
"@warp-drive/core": "^5.8.2",
"@warp-drive/ember": "^5.8.2",
"@warp-drive/json-api": "^5.8.2",
"@warp-drive/legacy": "^5.8.2",
"algoliasearch": "^4.20.0",
"broccoli-asset-rev": "^3.0.0",
"broccoli-funnel": "^2.0.1",
Expand All @@ -71,7 +75,6 @@
"ember-cli-showdown": "^9.0.1",
"ember-cli-terser": "^4.0.2",
"ember-concurrency": "^4.0.6",
"ember-data": "~4.12.8",
"ember-data-fastboot": "https://github.com/kategengler/ember-data-fastboot#v0.0.1",
"ember-decorators": "^6.1.1",
"ember-eslint-parser": "^0.5.11",
Expand All @@ -85,7 +88,7 @@
"ember-resolver": "^13.1.1",
"ember-rfc176-data": "^0.3.17",
"ember-showdown-shiki": "^1.2.1",
"ember-source": "6.7.0",
"ember-source": "~6.7.0",
"ember-styleguide": "^11.3.1",
"ember-svg-jar": "^2.7.1",
"ember-template-imports": "^4.3.0",
Expand Down Expand Up @@ -133,11 +136,6 @@
"pnpm": "10"
},
"packageManager": "pnpm@10.34.1",
"pnpm": {
"overrides": {
"ember-data>ember-inflector": "^6.0.0"
}
},
"cacheDirectories": [
"node_modules"
],
Expand Down
16 changes: 16 additions & 0 deletions patches/ember-data-fastboot@0.1.2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/fastboot/instance-initializers/ember-data-fastboot.js b/fastboot/instance-initializers/ember-data-fastboot.js
index b6db25d90653b5a6b742cb02f2dbba0fd66fefca..9cbafde3d3281f45344b2152dccef4e55ba5984a 100644
--- a/fastboot/instance-initializers/ember-data-fastboot.js
+++ b/fastboot/instance-initializers/ember-data-fastboot.js
@@ -6,9 +6,9 @@ export function initialize(applicationInstance) {

shoebox.put('ember-data-store', {
get records() {
- const modelNames = Object.keys(store._modelFactoryCache);
+ const modelNames = Object.keys(store.cacheKeyManager._cache.resourcesByType);
return modelNames.map(name => {
- return store.peekAll(name).toArray();
+ return store.peekAll(name);
}).reduce((a,b) => a.concat(b), [])
.filter(record => record.get('isLoaded') && !record.get('isNew'))
.map(record => {
Loading
Loading