Skip to content

Commit

Permalink
all the fixes needed to get it running
Browse files Browse the repository at this point in the history
  • Loading branch information
mansona committed Aug 6, 2024
1 parent 78c3d0d commit 16d9e75
Show file tree
Hide file tree
Showing 9 changed files with 1,337 additions and 943 deletions.
1 change: 0 additions & 1 deletion app/adapters/application.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { inject as service } from '@ember/service';
import JSONAPIAdapter from '@ember-data/adapter/json-api';
import fetch from 'fetch';
import { pluralize } from 'ember-inflector';
import { isBlank } from '@ember/utils';

Expand Down
1 change: 1 addition & 0 deletions app/instance-initializers/ember-meta-store.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { isPresent } from '@ember/utils';

export function initialize(appInstance) {
return;
const metaStore = appInstance.lookup('service:meta-store');

Check failure on line 5 in app/instance-initializers/ember-meta-store.js

View workflow job for this annotation

GitHub Actions / Lint files

Unreachable code
const fastBootService = appInstance.lookup('service:fastboot');

Expand Down
4 changes: 4 additions & 0 deletions app/services/fastboot.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import Service from '@ember/service';

export default class FakeFastbootService extends Service {

Check failure on line 3 in app/services/fastboot.js

View workflow job for this annotation

GitHub Actions / Lint files

Delete `⏎`
}
3 changes: 0 additions & 3 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ const { maybeEmbroider } = require('@embroider/test-setup');

module.exports = function (defaults) {
let app = new EmberApp(defaults, {
prember: {
urls: premberUrls(),
},
fingerprint: {
extensions: [
'js',
Expand Down
47 changes: 25 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
},
"scripts": {
"clone": "rm -rf ember-api-docs-data && git clone --depth=1 https://github.com/ember-learn/ember-api-docs-data.git",
"build": "ember build --environment=production",
"build": "vite build",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"start:local": "API_HOST=http://localhost:5050 ember serve",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"start": "vite",
"test:browserstack": "node run-tests.js",
"test:ember": "ember test"
},
Expand All @@ -40,6 +40,7 @@
"@glint/environment-ember-loose": "^0.9.7",
"@percy/cli": "^1.28.7",
"@percy/ember": "^4.2.0",
"@rollup/plugin-babel": "^6.0.4",
"@tsconfig/ember": "^1.0.1",
"@types/ember": "^4.0.2",
"@types/ember-qunit": "^5.0.2",
Expand Down Expand Up @@ -78,10 +79,7 @@
"ember-cli-deploy-build": "^1.1.0",
"ember-cli-deploy-gzip": "^1.0.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",
"@rollup/plugin-babel": "^6.0.4",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-meta-tags": "^7.0.0",
"ember-cli-sass": "^10.0.1",
Expand All @@ -91,12 +89,11 @@
"ember-concurrency": "^2.3.7",
"ember-data": "~3.28.6",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^8.1.1",
"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-page-title": "^8.2.3",
"ember-power-select": "^7.2.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
Expand Down Expand Up @@ -134,45 +131,51 @@
"node-sass": "^9.0.0",
"normalize.css": "^8.0.1",
"npm-run-all": "^4.1.5",
"prember": "^2.1.0",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit-dom": "^1.6.0",
"sanitize-html": "^2.3.2",
"semver": "^7.5.4",
"semver-compare": "^1.0.0",
"showdown": "^2.1.0",
"spawndamnit": "2.0.0",
"testem": "^3.10.0",
"typescript": "^4.9.3",
"webpack": "^5.90.0"
"vite": "^5.3.4",
"webpack": "^5.90.0"
},
"packageManager": "[email protected]",
"engines": {
"node": "16.* || 18.* || 20.*",
"npm": "7 || 8 || >= 9"
},
"pnpm": {
"overrides": {
"ember-get-config": "github:mansona/ember-get-config#config-meta-loader",
"ember-truth-helpers": "^4.0.0",
"node-sass": "^9.0.0"
},
"patchedDependencies": {
"@ember-data/[email protected]": "patches/@[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]"
}
},
"cacheDirectories": [
"node_modules"
],
"ember": {
"edition": "octane"
},
"fastbootDependencies": [
"algoliasearch",
"node-fetch",
"abortcontroller-polyfill",
"abortcontroller-polyfill/dist/cjs-ponyfill"
],
"ember-addon": {
"paths": [
"lib/api-docs-data"
]
},
"pnpm": {
"overrides": {
"node-sass": "^9.0.0",
"ember-truth-helpers": "^4.0.0"
}
},
"packageManager": "[email protected]"
"fastbootDependencies": [
"algoliasearch",
"node-fetch",
"abortcontroller-polyfill",
"abortcontroller-polyfill/dist/cjs-ponyfill"
]
}
52 changes: 52 additions & 0 deletions patches/@[email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
diff --git a/addon/-private/system/backburner.js b/addon/-private/system/backburner.js
index 6aa30ddf1a6c5151f68ec7a1e2b30e34fae64716..28cc2bad6367c2a41a0b589c7e788bf6bcb19ec5 100644
--- a/addon/-private/system/backburner.js
+++ b/addon/-private/system/backburner.js
@@ -2,7 +2,6 @@
@module @ember-data/store
*/

-import { registerWaiter } from '@ember/test';
import { DEBUG } from '@glimmer/env';
import Ember from 'ember';

@@ -17,9 +16,7 @@ import Ember from 'ember';
const backburner = new Ember._Backburner(['coalesce', 'sync', 'notify']);

if (DEBUG) {
- registerWaiter(() => {
- return !backburner.currentInstance && !backburner.hasTimers();
- });
+
}

export default backburner;
diff --git a/addon/-private/system/core-store.ts b/addon/-private/system/core-store.ts
index f7eb8b96bd70abb8b8ebf5beb8a755853e38adc6..319c72e5beb6474a3111b1c5be9b4537797d5b27 100644
--- a/addon/-private/system/core-store.ts
+++ b/addon/-private/system/core-store.ts
@@ -8,7 +8,6 @@ import { computed, defineProperty, get, set } from '@ember/object';
import { assign } from '@ember/polyfills';
import { _backburner as emberBackburner } from '@ember/runloop';
import Service from '@ember/service';
-import { registerWaiter, unregisterWaiter } from '@ember/test';
import { isNone, isPresent, typeOf } from '@ember/utils';
import { DEBUG } from '@glimmer/env';
import Ember from 'ember';
@@ -414,8 +413,6 @@ abstract class CoreStore extends Service {

return shouldTrack !== true || isSettled;
};
-
- registerWaiter(this.__asyncWaiter);
}
}

@@ -3690,7 +3687,6 @@ abstract class CoreStore extends Service {
this.unloadAll();

if (DEBUG) {
- unregisterWaiter(this.__asyncWaiter);
let shouldTrack = this.shouldTrackAsyncRequests;
let tracked = this._trackedAsyncRequests;
let isSettled = tracked.length === 0;
67 changes: 67 additions & 0 deletions patches/[email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 7ab6fbae31241ccf49da5f1dcea7690738e659d9..0000000000000000000000000000000000000000
diff --git a/dist/packages/@ember/-internals/runtime/.gitignore b/dist/packages/@ember/-internals/runtime/.gitignore
deleted file mode 100644
index a1136368651e6eb6d0d93a09c478f4978f4196fa..0000000000000000000000000000000000000000
diff --git a/dist/packages/@ember/debug/index.js b/dist/packages/@ember/debug/index.js
index 6e9b00d5c858be042cd530bcb647fc87d2a00e83..393bdc04dbf1ecc6a091b4696303affa0d94c4a2 100644
--- a/dist/packages/@ember/debug/index.js
+++ b/dist/packages/@ember/debug/index.js
@@ -1,7 +1,7 @@
import { isChrome, isFirefox } from '@ember/-internals/browser-environment';
import EmberError from '@ember/error';
import { DEBUG } from '@glimmer/env';
-import _deprecate from './lib/deprecate';
+import defaultDeprecate from './lib/deprecate';
import { isTesting } from './lib/testing';
import _warn from './lib/warn';
export { inspect } from '@ember/-internals/utils';
@@ -16,7 +16,7 @@ let assert = noop;
let info = noop;
let warn = noop;
let debug = noop;
-let deprecate = noop;
+let currentDeprecate;
let debugSeal = noop;
let debugFreeze = noop;
let runInDebug = noop;
@@ -27,6 +27,14 @@ let deprecateFunc = function () {
return arguments[arguments.length - 1];
};

+export function deprecate() {
+ if (currentDeprecate) {
+ return currentDeprecate(...arguments);
+ }
+
+ return defaultDeprecate(...arguments);
+}
+
if (DEBUG) {
setDebugFunction = function (type, callback) {
switch (type) {
@@ -43,7 +51,7 @@ if (DEBUG) {
return debug = callback;

case 'deprecate':
- return deprecate = callback;
+ return currentDeprecate = callback;

case 'debugSeal':
return debugSeal = callback;
@@ -251,7 +259,6 @@ if (DEBUG) {
Object.freeze(obj);
}
});
- setDebugFunction('deprecate', _deprecate);
setDebugFunction('warn', _warn);
}

@@ -275,4 +282,4 @@ if (DEBUG && !isTesting()) {
}
}

-export { assert, info, warn, debug, deprecate, debugSeal, debugFreeze, runInDebug, deprecateFunc, setDebugFunction, getDebugFunction, _warnIfUsingStrippedFeatureFlags };
\ No newline at end of file
+export { assert, info, warn, debug, debugSeal, debugFreeze, runInDebug, deprecateFunc, setDebugFunction, getDebugFunction, _warnIfUsingStrippedFeatureFlags };
30 changes: 30 additions & 0 deletions patches/[email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
diff --git a/lib/css-syntax-error.js b/lib/css-syntax-error.js
index 169303329e6359e12d59b32cfffc302dd84d2280..74f2908c084ddfdf068993c93ba1cd810b25607b 100644
--- a/lib/css-syntax-error.js
+++ b/lib/css-syntax-error.js
@@ -2,7 +2,7 @@

let pico = require('picocolors')

-let terminalHighlight = require('./terminal-highlight')
+let terminalHighlight = require('./terminal-highlight.js')

class CssSyntaxError extends Error {
constructor(message, line, column, source, file, plugin) {
diff --git a/lib/input.js b/lib/input.js
index 4b5ee5e02f8ecdf880594d191ec1e84b983faeaa..121ae28e6faa06c6c4f773bd015b475e66f4e061 100644
--- a/lib/input.js
+++ b/lib/input.js
@@ -5,9 +5,9 @@ let { fileURLToPath, pathToFileURL } = require('url')
let { isAbsolute, resolve } = require('path')
let { nanoid } = require('nanoid/non-secure')

-let terminalHighlight = require('./terminal-highlight')
-let CssSyntaxError = require('./css-syntax-error')
-let PreviousMap = require('./previous-map')
+let terminalHighlight = require('./terminal-highlight.js')
+let CssSyntaxError = require('./css-syntax-error.js')
+let PreviousMap = require('./previous-map.js')

let fromOffsetCache = Symbol('fromOffsetCache')

Loading

0 comments on commit 16d9e75

Please sign in to comment.