Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
all the fixes needed to get it running
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 { | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| diff --git a/HtmlSanitizer.js b/HtmlSanitizer.js | ||
| index 1dde0ed2effaf438946fd07f550ba502dd0371f4..d40db1d18ee3a5880054afd8611adbbda7488d67 100644 | ||
| --- a/HtmlSanitizer.js | ||
| +++ b/HtmlSanitizer.js | ||
| @@ -110,3 +110,5 @@ const HtmlSanitizer = new (function () { | ||
| this.AllowedCssStyles = _cssWhitelist; | ||
| this.AllowedSchemas = _schemaWhiteList; | ||
| }); | ||
| + | ||
| +module.exports = HtmlSanitizer; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 275a4f64c2f8df215341a74d61e2aa2d05d61f78..6fa64a9ea9119fb194cfe28c9a02748d9d736672 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 685bce74b22af19d28e19aacea26f5f35e37cacc..205653ea088484495ad756ee8cd0a5c5b84d6e17 100644 | ||
| --- a/lib/input.js | ||
| +++ b/lib/input.js | ||
| @@ -5,9 +5,9 @@ let { isAbsolute, resolve } = require('path') | ||
| let { SourceMapConsumer, SourceMapGenerator } = require('source-map-js') | ||
| let { fileURLToPath, pathToFileURL } = require('url') | ||
|
|
||
| -let CssSyntaxError = require('./css-syntax-error') | ||
| -let PreviousMap = require('./previous-map') | ||
| -let terminalHighlight = require('./terminal-highlight') | ||
| +let CssSyntaxError = require('./css-syntax-error.js') | ||
| +let PreviousMap = require('./previous-map.js') | ||
| +let terminalHighlight = require('./terminal-highlight.js') | ||
|
|
||
| let fromOffsetCache = Symbol('fromOffsetCache') | ||
|
|
Oops, something went wrong.