Skip to content

Commit 16d9e75

Browse files
committed
all the fixes needed to get it running
1 parent 78c3d0d commit 16d9e75

File tree

9 files changed

+1337
-943
lines changed

9 files changed

+1337
-943
lines changed

app/adapters/application.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { inject as service } from '@ember/service';
22
import JSONAPIAdapter from '@ember-data/adapter/json-api';
3-
import fetch from 'fetch';
43
import { pluralize } from 'ember-inflector';
54
import { isBlank } from '@ember/utils';
65

app/instance-initializers/ember-meta-store.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { isPresent } from '@ember/utils';
22

33
export function initialize(appInstance) {
4+
return;
45
const metaStore = appInstance.lookup('service:meta-store');
56
const fastBootService = appInstance.lookup('service:fastboot');
67

app/services/fastboot.js

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import Service from '@ember/service';
2+
3+
export default class FakeFastbootService extends Service {
4+
}

ember-cli-build.js

-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ const { maybeEmbroider } = require('@embroider/test-setup');
77

88
module.exports = function (defaults) {
99
let app = new EmberApp(defaults, {
10-
prember: {
11-
urls: premberUrls(),
12-
},
1310
fingerprint: {
1411
extensions: [
1512
'js',

package.json

+25-22
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
},
1515
"scripts": {
1616
"clone": "rm -rf ember-api-docs-data && git clone --depth=1 https://github.com/ember-learn/ember-api-docs-data.git",
17-
"build": "ember build --environment=production",
17+
"build": "vite build",
1818
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
1919
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
2020
"lint:hbs": "ember-template-lint .",
2121
"lint:hbs:fix": "ember-template-lint . --fix",
2222
"lint:js": "eslint . --cache",
2323
"start:local": "API_HOST=http://localhost:5050 ember serve",
2424
"lint:js:fix": "eslint . --fix",
25-
"start": "ember serve",
25+
"start": "vite",
2626
"test:browserstack": "node run-tests.js",
2727
"test:ember": "ember test"
2828
},
@@ -40,6 +40,7 @@
4040
"@glint/environment-ember-loose": "^0.9.7",
4141
"@percy/cli": "^1.28.7",
4242
"@percy/ember": "^4.2.0",
43+
"@rollup/plugin-babel": "^6.0.4",
4344
"@tsconfig/ember": "^1.0.1",
4445
"@types/ember": "^4.0.2",
4546
"@types/ember-qunit": "^5.0.2",
@@ -78,10 +79,7 @@
7879
"ember-cli-deploy-build": "^1.1.0",
7980
"ember-cli-deploy-gzip": "^1.0.0",
8081
"ember-cli-deprecation-workflow": "^3.0.1",
81-
"ember-cli-document-title-northm": "^1.0.3",
82-
"ember-cli-fastboot": "^4.1.5",
8382
"ember-cli-htmlbars": "^6.1.1",
84-
"@rollup/plugin-babel": "^6.0.4",
8583
"ember-cli-inject-live-reload": "^2.1.0",
8684
"ember-cli-meta-tags": "^7.0.0",
8785
"ember-cli-sass": "^10.0.1",
@@ -91,12 +89,11 @@
9189
"ember-concurrency": "^2.3.7",
9290
"ember-data": "~3.28.6",
9391
"ember-export-application-global": "^2.0.1",
94-
"ember-fetch": "^8.1.1",
9592
"ember-inflector": "^4.0.3",
9693
"ember-load-initializers": "^2.1.2",
9794
"ember-maybe-import-regenerator": "^0.1.6",
9895
"ember-metrics": "^1.5.2",
99-
"ember-page-title": "^6.2.2",
96+
"ember-page-title": "^8.2.3",
10097
"ember-power-select": "^7.2.0",
10198
"ember-qunit": "^5.1.5",
10299
"ember-resolver": "^8.0.3",
@@ -134,45 +131,51 @@
134131
"node-sass": "^9.0.0",
135132
"normalize.css": "^8.0.1",
136133
"npm-run-all": "^4.1.5",
137-
"prember": "^2.1.0",
138134
"prettier": "^2.5.1",
139135
"qunit": "^2.17.2",
140136
"qunit-dom": "^1.6.0",
141137
"sanitize-html": "^2.3.2",
142138
"semver": "^7.5.4",
143139
"semver-compare": "^1.0.0",
140+
"showdown": "^2.1.0",
144141
"spawndamnit": "2.0.0",
145142
"testem": "^3.10.0",
146143
"typescript": "^4.9.3",
147-
"webpack": "^5.90.0"
148144
"vite": "^5.3.4",
145+
"webpack": "^5.90.0"
149146
},
147+
"packageManager": "[email protected]",
150148
"engines": {
151149
"node": "16.* || 18.* || 20.*",
152150
"npm": "7 || 8 || >= 9"
153151
},
152+
"pnpm": {
153+
"overrides": {
154+
"ember-get-config": "github:mansona/ember-get-config#config-meta-loader",
155+
"ember-truth-helpers": "^4.0.0",
156+
"node-sass": "^9.0.0"
157+
},
158+
"patchedDependencies": {
159+
"@ember-data/[email protected]": "patches/@[email protected]",
160+
161+
162+
}
163+
},
154164
"cacheDirectories": [
155165
"node_modules"
156166
],
157167
"ember": {
158168
"edition": "octane"
159169
},
160-
"fastbootDependencies": [
161-
"algoliasearch",
162-
"node-fetch",
163-
"abortcontroller-polyfill",
164-
"abortcontroller-polyfill/dist/cjs-ponyfill"
165-
],
166170
"ember-addon": {
167171
"paths": [
168172
"lib/api-docs-data"
169173
]
170174
},
171-
"pnpm": {
172-
"overrides": {
173-
"node-sass": "^9.0.0",
174-
"ember-truth-helpers": "^4.0.0"
175-
}
176-
},
177-
"packageManager": "[email protected]"
175+
"fastbootDependencies": [
176+
"algoliasearch",
177+
"node-fetch",
178+
"abortcontroller-polyfill",
179+
"abortcontroller-polyfill/dist/cjs-ponyfill"
180+
]
178181
}

patches/@[email protected]

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
diff --git a/addon/-private/system/backburner.js b/addon/-private/system/backburner.js
2+
index 6aa30ddf1a6c5151f68ec7a1e2b30e34fae64716..28cc2bad6367c2a41a0b589c7e788bf6bcb19ec5 100644
3+
--- a/addon/-private/system/backburner.js
4+
+++ b/addon/-private/system/backburner.js
5+
@@ -2,7 +2,6 @@
6+
@module @ember-data/store
7+
*/
8+
9+
-import { registerWaiter } from '@ember/test';
10+
import { DEBUG } from '@glimmer/env';
11+
import Ember from 'ember';
12+
13+
@@ -17,9 +16,7 @@ import Ember from 'ember';
14+
const backburner = new Ember._Backburner(['coalesce', 'sync', 'notify']);
15+
16+
if (DEBUG) {
17+
- registerWaiter(() => {
18+
- return !backburner.currentInstance && !backburner.hasTimers();
19+
- });
20+
+
21+
}
22+
23+
export default backburner;
24+
diff --git a/addon/-private/system/core-store.ts b/addon/-private/system/core-store.ts
25+
index f7eb8b96bd70abb8b8ebf5beb8a755853e38adc6..319c72e5beb6474a3111b1c5be9b4537797d5b27 100644
26+
--- a/addon/-private/system/core-store.ts
27+
+++ b/addon/-private/system/core-store.ts
28+
@@ -8,7 +8,6 @@ import { computed, defineProperty, get, set } from '@ember/object';
29+
import { assign } from '@ember/polyfills';
30+
import { _backburner as emberBackburner } from '@ember/runloop';
31+
import Service from '@ember/service';
32+
-import { registerWaiter, unregisterWaiter } from '@ember/test';
33+
import { isNone, isPresent, typeOf } from '@ember/utils';
34+
import { DEBUG } from '@glimmer/env';
35+
import Ember from 'ember';
36+
@@ -414,8 +413,6 @@ abstract class CoreStore extends Service {
37+
38+
return shouldTrack !== true || isSettled;
39+
};
40+
-
41+
- registerWaiter(this.__asyncWaiter);
42+
}
43+
}
44+
45+
@@ -3690,7 +3687,6 @@ abstract class CoreStore extends Service {
46+
this.unloadAll();
47+
48+
if (DEBUG) {
49+
- unregisterWaiter(this.__asyncWaiter);
50+
let shouldTrack = this.shouldTrackAsyncRequests;
51+
let tracked = this._trackedAsyncRequests;
52+
let isSettled = tracked.length === 0;

patches/[email protected]

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
diff --git a/CHANGELOG.md b/CHANGELOG.md
2+
deleted file mode 100644
3+
index 7ab6fbae31241ccf49da5f1dcea7690738e659d9..0000000000000000000000000000000000000000
4+
diff --git a/dist/packages/@ember/-internals/runtime/.gitignore b/dist/packages/@ember/-internals/runtime/.gitignore
5+
deleted file mode 100644
6+
index a1136368651e6eb6d0d93a09c478f4978f4196fa..0000000000000000000000000000000000000000
7+
diff --git a/dist/packages/@ember/debug/index.js b/dist/packages/@ember/debug/index.js
8+
index 6e9b00d5c858be042cd530bcb647fc87d2a00e83..393bdc04dbf1ecc6a091b4696303affa0d94c4a2 100644
9+
--- a/dist/packages/@ember/debug/index.js
10+
+++ b/dist/packages/@ember/debug/index.js
11+
@@ -1,7 +1,7 @@
12+
import { isChrome, isFirefox } from '@ember/-internals/browser-environment';
13+
import EmberError from '@ember/error';
14+
import { DEBUG } from '@glimmer/env';
15+
-import _deprecate from './lib/deprecate';
16+
+import defaultDeprecate from './lib/deprecate';
17+
import { isTesting } from './lib/testing';
18+
import _warn from './lib/warn';
19+
export { inspect } from '@ember/-internals/utils';
20+
@@ -16,7 +16,7 @@ let assert = noop;
21+
let info = noop;
22+
let warn = noop;
23+
let debug = noop;
24+
-let deprecate = noop;
25+
+let currentDeprecate;
26+
let debugSeal = noop;
27+
let debugFreeze = noop;
28+
let runInDebug = noop;
29+
@@ -27,6 +27,14 @@ let deprecateFunc = function () {
30+
return arguments[arguments.length - 1];
31+
};
32+
33+
+export function deprecate() {
34+
+ if (currentDeprecate) {
35+
+ return currentDeprecate(...arguments);
36+
+ }
37+
+
38+
+ return defaultDeprecate(...arguments);
39+
+}
40+
+
41+
if (DEBUG) {
42+
setDebugFunction = function (type, callback) {
43+
switch (type) {
44+
@@ -43,7 +51,7 @@ if (DEBUG) {
45+
return debug = callback;
46+
47+
case 'deprecate':
48+
- return deprecate = callback;
49+
+ return currentDeprecate = callback;
50+
51+
case 'debugSeal':
52+
return debugSeal = callback;
53+
@@ -251,7 +259,6 @@ if (DEBUG) {
54+
Object.freeze(obj);
55+
}
56+
});
57+
- setDebugFunction('deprecate', _deprecate);
58+
setDebugFunction('warn', _warn);
59+
}
60+
61+
@@ -275,4 +282,4 @@ if (DEBUG && !isTesting()) {
62+
}
63+
}
64+
65+
-export { assert, info, warn, debug, deprecate, debugSeal, debugFreeze, runInDebug, deprecateFunc, setDebugFunction, getDebugFunction, _warnIfUsingStrippedFeatureFlags };
66+
\ No newline at end of file
67+
+export { assert, info, warn, debug, debugSeal, debugFreeze, runInDebug, deprecateFunc, setDebugFunction, getDebugFunction, _warnIfUsingStrippedFeatureFlags };

patches/[email protected]

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --git a/lib/css-syntax-error.js b/lib/css-syntax-error.js
2+
index 169303329e6359e12d59b32cfffc302dd84d2280..74f2908c084ddfdf068993c93ba1cd810b25607b 100644
3+
--- a/lib/css-syntax-error.js
4+
+++ b/lib/css-syntax-error.js
5+
@@ -2,7 +2,7 @@
6+
7+
let pico = require('picocolors')
8+
9+
-let terminalHighlight = require('./terminal-highlight')
10+
+let terminalHighlight = require('./terminal-highlight.js')
11+
12+
class CssSyntaxError extends Error {
13+
constructor(message, line, column, source, file, plugin) {
14+
diff --git a/lib/input.js b/lib/input.js
15+
index 4b5ee5e02f8ecdf880594d191ec1e84b983faeaa..121ae28e6faa06c6c4f773bd015b475e66f4e061 100644
16+
--- a/lib/input.js
17+
+++ b/lib/input.js
18+
@@ -5,9 +5,9 @@ let { fileURLToPath, pathToFileURL } = require('url')
19+
let { isAbsolute, resolve } = require('path')
20+
let { nanoid } = require('nanoid/non-secure')
21+
22+
-let terminalHighlight = require('./terminal-highlight')
23+
-let CssSyntaxError = require('./css-syntax-error')
24+
-let PreviousMap = require('./previous-map')
25+
+let terminalHighlight = require('./terminal-highlight.js')
26+
+let CssSyntaxError = require('./css-syntax-error.js')
27+
+let PreviousMap = require('./previous-map.js')
28+
29+
let fromOffsetCache = Symbol('fromOffsetCache')
30+

0 commit comments

Comments
 (0)