From 4fe99dfad5a53329e3dfffd7a4647fe0cc5a4eb9 Mon Sep 17 00:00:00 2001 From: Tom Dale Date: Tue, 4 Dec 2018 11:28:04 -0500 Subject: [PATCH 1/2] Upgrade to Glimmer VM 0.37.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The only API change in this version of the VM relates to TypeScript types for the DOM. Type signatures now use SimpleDOM types throughout, helping ensure code doesn’t inadvertently rely on DOM APIs that are not available in SSR mode. The other change has to do with what happens when an exception is thrown during render. Currently, Glimmer has a limited capacity to recover the state of the VM when errors are thrown from an opcode. A quick-and-dirty fix has been applied to Ember to try to catch and recover from these states, but options are limited until the root issue is addressed in Glimmer VM. This commit changes a previously passing test to be skipped. This is because the old test covered behavior that only worked in some limited scenarios, because it left the DOM in a bad state. This could lead to cases where the same DOM element would be rendered multiple times, or in the wrong location. Glimmer VM 0.37.0 does more rigorous type checking and now fails when a re-render is attempted and the DOM is left in a bad state. After a discussion between myself, @chancancode, @krisselden and @wycats, we felt that it was okay to temporarily mark this test as skipped since the behavior it captures was not working consistently anyway. We plan to address this more robustly in the VM itself, at which time we can re-enable the test, and remove some of the more ad hoc error recovery semantics from Ember itself. --- package.json | 14 +- .../glimmer/lib/component-managers/curly.ts | 2 +- .../glimmer/lib/component-managers/outlet.ts | 4 +- .../-internals/glimmer/lib/component.ts | 2 +- .../-internals/glimmer/lib/environment.ts | 4 +- .../glimmer/lib/modifiers/custom.ts | 8 +- .../-internals/glimmer/lib/setup-registry.ts | 5 +- .../components/error-handling-test.js | 2 +- yarn.lock | 202 +++++++++--------- 9 files changed, 125 insertions(+), 118 deletions(-) diff --git a/package.json b/package.json index 801c4dd8bc4..e0a8cc38b3e 100644 --- a/package.json +++ b/package.json @@ -90,14 +90,14 @@ "@babel/plugin-transform-shorthand-properties": "^7.2.0", "@babel/plugin-transform-spread": "^7.2.0", "@babel/plugin-transform-template-literals": "^7.2.0", - "@glimmer/compiler": "^0.36.4", + "@glimmer/compiler": "^0.37.0", "@glimmer/env": "^0.1.7", - "@glimmer/interfaces": "^0.36.4", - "@glimmer/node": "^0.36.4", - "@glimmer/opcode-compiler": "^0.36.4", - "@glimmer/program": "^0.36.4", - "@glimmer/reference": "^0.36.4", - "@glimmer/runtime": "^0.36.4", + "@glimmer/interfaces": "^0.37.0", + "@glimmer/node": "^0.37.0", + "@glimmer/opcode-compiler": "^0.37.0", + "@glimmer/program": "^0.37.0", + "@glimmer/reference": "^0.37.0", + "@glimmer/runtime": "^0.37.0", "@types/qunit": "^2.5.3", "@types/rsvp": "^4.0.1", "auto-dist-tag": "^1.0.0", diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts index 668f1ebdebe..b092bb0ef14 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts @@ -318,7 +318,7 @@ export default class CurlyComponentManager didCreateElement( { component, classRef, environment }: ComponentStateBucket, - element: HTMLElement, + element: Simple.Element, operations: ElementOperations ): void { setViewElement(component, element); diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts index bd8cf1155eb..d13e7259957 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts @@ -4,7 +4,7 @@ import { OwnedTemplateMeta } from '@ember/-internals/views'; import { _instrumentStart } from '@ember/instrumentation'; import { assign } from '@ember/polyfills'; import { DEBUG } from '@glimmer/env'; -import { ComponentCapabilities, Option, Unique } from '@glimmer/interfaces'; +import { ComponentCapabilities, Option, Simple, Unique } from '@glimmer/interfaces'; import { CONSTANT_TAG, Tag, VersionedPathReference } from '@glimmer/reference'; import { Arguments, @@ -164,7 +164,7 @@ export function createRootOutlet(outletView: OutletView): OutletComponentDefinit didCreateElement( component: OutletInstanceState, - element: Element, + element: Simple.Element, _operations: ElementOperations ): void { // to add GUID id and class diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts index 8202eacaca9..2dc24385b5d 100644 --- a/packages/@ember/-internals/glimmer/lib/component.ts +++ b/packages/@ember/-internals/glimmer/lib/component.ts @@ -655,7 +655,7 @@ const Component = CoreView.extend( */ readDOMAttr(name: string) { // TODO revisit this - let element = getViewElement(this) as HTMLElement; + let element = getViewElement(this); let isSVG = element.namespaceURI === SVG_NAMESPACE; let { type, normalized } = normalizeProperty(element, name); diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts index 1f7b6aba186..fda6bcae98b 100644 --- a/packages/@ember/-internals/glimmer/lib/environment.ts +++ b/packages/@ember/-internals/glimmer/lib/environment.ts @@ -2,7 +2,7 @@ import { OWNER, Owner } from '@ember/-internals/owner'; import { constructStyleDeprecationMessage, lookupComponent } from '@ember/-internals/views'; import { warn } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import { Option } from '@glimmer/interfaces'; +import { Option, Simple } from '@glimmer/interfaces'; import { OpaqueIterable, VersionedReference } from '@glimmer/reference'; import { ElementBuilder, @@ -143,7 +143,7 @@ if (DEBUG) { element, attribute: string, isTrusting: boolean, - namespace: Option + namespace: Option ) { if (attribute === 'style' && !isTrusting) { return new StyleAttributeManager({ element, name: attribute, namespace }); diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts index 2e4fbfbdc91..4ec12f78634 100644 --- a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts +++ b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts @@ -1,5 +1,5 @@ import { Factory } from '@ember/-internals/owner'; -import { Opaque } from '@glimmer/interfaces'; +import { Opaque, Simple } from '@glimmer/interfaces'; import { Tag } from '@glimmer/reference'; import { Arguments, CapturedArguments, ModifierManager } from '@glimmer/runtime'; import { ManagerArgs, valueForCapturedArgs } from '../utils/managers'; @@ -35,7 +35,7 @@ export class CustomModifierDefinition { export class CustomModifierState { constructor( - public element: Element, + public element: Simple.Element, public delegate: ModifierManagerDelegate, public modifier: ModifierInstance, public args: CapturedArguments @@ -51,7 +51,7 @@ export class CustomModifierState { export interface ModifierManagerDelegate { capabilities: Capabilities; createModifier(factory: Opaque, args: ManagerArgs): ModifierInstance; - installModifier(instance: ModifierInstance, element: Element, args: ManagerArgs): void; + installModifier(instance: ModifierInstance, element: Simple.Element, args: ManagerArgs): void; updateModifier(instance: ModifierInstance, args: ManagerArgs): void; destroyModifier(instance: ModifierInstance, args: ManagerArgs): void; } @@ -84,7 +84,7 @@ class CustomModifierManager CustomModifierDefinitionState > { create( - element: Element, + element: Simple.Element, definition: CustomModifierDefinitionState, args: Arguments ) { diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts index 14c9cf86d0b..bb214b3264c 100644 --- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts +++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts @@ -1,6 +1,7 @@ import { hasDOM } from '@ember/-internals/browser-environment'; import { privatize as P, Registry } from '@ember/-internals/container'; import { ENV } from '@ember/-internals/environment'; +import { Simple } from '@glimmer/interfaces'; import Component from './component'; import Checkbox from './components/checkbox'; import LinkToComponent from './components/link-to'; @@ -62,13 +63,13 @@ export function setupApplicationRegistry(registry: Registry) { } registry.register('service:-dom-changes', { - create({ document }: { document: HTMLDocument }) { + create({ document }: { document: Simple.Document }) { return new DOMChanges(document); }, }); registry.register('service:-dom-tree-construction', { - create({ document }: { document: HTMLDocument }) { + create({ document }: { document: Simple.Document }) { let Implementation = hasDOM ? DOMTreeConstruction : NodeDOMTreeConstruction; return new Implementation(document); }, diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js index 86bc5da000b..aa3018bd28e 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js +++ b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js @@ -44,7 +44,7 @@ moduleFor( this.assertText('hello'); } - ['@test it can recover resets the transaction when an error is thrown during rerender']( + ['@skip it can recover resets the transaction when an error is thrown during rerender']( assert ) { let shouldThrow = false; diff --git a/yarn.lock b/yarn.lock index e6750a36dbd..15c33c1bab4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -598,119 +598,125 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" -"@glimmer/compiler@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.36.4.tgz#eee7ef4e49b2e7f8c59be8c0dda70b859333a810" - integrity sha512-3l3cRCucpm/+sO3c4Ulx7kOtrHL/I0KpsnBmbBaHuWpvxrSXWig8iFrYcxxxmzbwAARv2FlZjGn4ZzVK9CTK/w== +"@glimmer/compiler@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.37.0.tgz#861d9c8064b54c24895262e1dd6a805cf24b8175" + integrity sha512-h01QJvqzClYw6Y5+DptqaB74KeBz14fsbNlig2O1sH5B2RKXRXo6T/OFSlFO/BHdzPLIrhyrkNQ/pooy2nTNmQ== dependencies: - "@glimmer/interfaces" "^0.36.4" - "@glimmer/syntax" "^0.36.4" - "@glimmer/util" "^0.36.4" - "@glimmer/wire-format" "^0.36.4" + "@glimmer/interfaces" "^0.37.0" + "@glimmer/syntax" "^0.37.0" + "@glimmer/util" "^0.37.0" + "@glimmer/wire-format" "^0.37.0" -"@glimmer/encoder@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.36.4.tgz#d635c674c28f248fa246ea10cae7a850f7d1528c" - integrity sha512-xGExG3l5WVsASMKNG5Id+lmZ3eFEYYbXlX8bzhg6qgW8KkRJFxG8FRTy5AS4mI83LM8ZZ+LActVCcID49D86/A== +"@glimmer/encoder@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.37.0.tgz#3689bb8dbdbce4ae45783b447d1a7fcc40c067c2" + integrity sha512-NS5UTeBZd0GRQYpUVQ/sSYriHxAPLSb4z1qlRzWQCfJmovtMRRYgcFpyRck/ckmFsXdlfDL+Nu0hJLOcYU+oXQ== "@glimmer/env@^0.1.7": version "0.1.7" resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07" integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc= -"@glimmer/interfaces@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.36.4.tgz#49dc81bd9aaf41905fe8426dc273f25cb339139c" - integrity sha512-WQiZvhYuO1QwpsKZfPyojAOS3TwhO3NoPfdjrRO5CcugSgx44f7BeIhMIQdlsTL1aRYtWA3bMDoIipXh8iiEOw== - dependencies: - "@glimmer/wire-format" "^0.36.4" - -"@glimmer/low-level@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.36.4.tgz#3c09b2f8c81565b78f284b4d0404a41fdfc98997" - integrity sha512-muQOH6k5ApKhYSgiKSTDKBH71xgkG/kBBIXTAYe5a0JQ0S1hxfxYkJrRjGpIuNk3jRq+aczaYLy3MP4aTJJioQ== - -"@glimmer/node@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.36.4.tgz#17f27fa63fbedbcbda0d46186f8318387886398e" - integrity sha512-spcpWUmT516GgZto8WpGrBXbFz0CETmpEFepXiZ2hRaNlwKFyWhOu8hvbx07DxncOMMEk5JXHUAjluVo/Zb6MQ== - dependencies: - "@glimmer/interfaces" "^0.36.4" - "@glimmer/runtime" "^0.36.4" - simple-dom "^0.3.0" - -"@glimmer/opcode-compiler@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.36.4.tgz#b438313734ff2eb4748a3ab15a48a6b7ff56ef28" - integrity sha512-3cHgH2vx78fdahHQtGJ0RllIxtnGORSxEdMwUnOzl4aMd94V6oiIXg2PJJPKtcOfnZ5ufBvtWt/Hv1f9vtRuag== - dependencies: - "@glimmer/encoder" "^0.36.4" - "@glimmer/interfaces" "^0.36.4" - "@glimmer/program" "^0.36.4" - "@glimmer/reference" "^0.36.4" - "@glimmer/util" "^0.36.4" - "@glimmer/vm" "^0.36.4" - "@glimmer/wire-format" "^0.36.4" - -"@glimmer/program@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.36.4.tgz#6c3eb97268400eea4e3940c62cac28435d9c17de" - integrity sha512-nxVb7B1g+9vA3mo5M0RNJxjRNU/2buLHkzfcCwuK2RR5B+xUvlBQVbi/AB8CvNrIAw11X3yv64x6i7/8he3T/w== - dependencies: - "@glimmer/encoder" "^0.36.4" - "@glimmer/interfaces" "^0.36.4" - "@glimmer/util" "^0.36.4" - -"@glimmer/reference@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.36.4.tgz#e8651eb825b26875b52079c42ed0070b1a5f3776" - integrity sha512-W2xjZ+9JI7wKgXQnxBW9Gapx1ZvvCiBK1NFkzUIhn6wQuMhZIbhuRS8Z6t2k69ial58L+XL2U3Yc+zgr77yNHw== - dependencies: - "@glimmer/util" "^0.36.4" - -"@glimmer/runtime@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.36.4.tgz#ae9eeef0b2a5b62b366bc030279b446af7de2090" - integrity sha512-ig3wvGfrZdoRt/x2qSj1MRntJLC0qTU6svg4gy6aom7yUH0xUxEiMUaTzKIiBmDtzj9MYbVIZUO/ZDI6LiUKiA== - dependencies: - "@glimmer/interfaces" "^0.36.4" - "@glimmer/low-level" "^0.36.4" - "@glimmer/program" "^0.36.4" - "@glimmer/reference" "^0.36.4" - "@glimmer/util" "^0.36.4" - "@glimmer/vm" "^0.36.4" - "@glimmer/wire-format" "^0.36.4" - -"@glimmer/syntax@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.36.4.tgz#dfc5d1f0e2bdbc8ff8ec482357311748776aa2ff" - integrity sha512-F/KPqEnpU4IdaYb7vDevyMDTCuKsgqcxhBdFauysUj7ZSwa1BljHxFoUbCsTLVxdpQGU1QTr6NNiD8Ihn4XUjA== - dependencies: - "@glimmer/interfaces" "^0.36.4" - "@glimmer/util" "^0.36.4" +"@glimmer/interfaces@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.37.0.tgz#7e16dc3b44369ea084e13064dd30ec14ed86623f" + integrity sha512-tLvn6O0SqPotkQy/I/PBgnUorho+kim7psitpAZQMljOY8ocSf0+dfIY4GKQsTqefbpHbmdu4dYBhyy09xDJag== + dependencies: + "@glimmer/wire-format" "^0.37.0" + "@simple-dom/interface" "1.4.0" + +"@glimmer/low-level@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.37.0.tgz#ef49a49abb829c5ffcf539c3408cc545df688875" + integrity sha512-OFPE0KVUbSsQhpJpwI2zmG+1+y0NkpSJzn4qQ1kuKzpk50TABeTBo8ycqJFTgYh/cjus/W212G2YgEN/YXZqZw== + +"@glimmer/node@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.37.0.tgz#cbf51153ec3d3e858314b95f249c8c80f458fa23" + integrity sha512-f2F/ttR1J3pkOLBGEuR/I+Z4tNKLuii5983LnUB6UDW0DKbz3DZwkejVcYr6wxhaU5QuD5RWl+AkaREOfZuh7w== + dependencies: + "@glimmer/interfaces" "^0.37.0" + "@glimmer/runtime" "^0.37.0" + +"@glimmer/opcode-compiler@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.37.0.tgz#26b37cc3a569ba88377e373d602f518b65b36cc3" + integrity sha512-a+wMGHXTnzrvapFzyxx7tE73msnnIFCDy7O5vH/gnwNqy8VEGeXperJDpwZxxn0SnSVtwvCPJ+85MXFDmcfrvQ== + dependencies: + "@glimmer/encoder" "^0.37.0" + "@glimmer/interfaces" "^0.37.0" + "@glimmer/program" "^0.37.0" + "@glimmer/reference" "^0.37.0" + "@glimmer/util" "^0.37.0" + "@glimmer/vm" "^0.37.0" + "@glimmer/wire-format" "^0.37.0" + +"@glimmer/program@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.37.0.tgz#25aaa78363216a47074246c4ddea0d6241e3295b" + integrity sha512-wsu9R5+ytndMJg4AXBGm8dJax3q/vk5PkSxl8VHi5jxje4Ja/8AjJl7SpE2nRCfmLpq8rV6vHSmZaKY1tSRANQ== + dependencies: + "@glimmer/encoder" "^0.37.0" + "@glimmer/interfaces" "^0.37.0" + "@glimmer/util" "^0.37.0" + +"@glimmer/reference@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.37.0.tgz#5910810d932a03f5bb62014caa9733cecf0683ed" + integrity sha512-NCYlu9X0ok7pJiGb/Uevv/84xA1Z49PHDUcDrN0X/bDzSI/zoFy//wPevjPO/+ihBtD5Hy9Ve3eC/lfSSWsWVA== + dependencies: + "@glimmer/util" "^0.37.0" + +"@glimmer/runtime@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.37.0.tgz#b1ec8303f6a97141310bb4fe3ecac7396311381a" + integrity sha512-U9FKj4id2HwA1FTVJLFWpCIsICOaIZklwhTHHd7XrtoETdFaesn7/4e3fH/LNx0BrPkXy6dfD/9I7izLFM4ToQ== + dependencies: + "@glimmer/interfaces" "^0.37.0" + "@glimmer/low-level" "^0.37.0" + "@glimmer/program" "^0.37.0" + "@glimmer/reference" "^0.37.0" + "@glimmer/util" "^0.37.0" + "@glimmer/vm" "^0.37.0" + "@glimmer/wire-format" "^0.37.0" + "@simple-dom/interface" "^1.4.0" + +"@glimmer/syntax@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.37.0.tgz#3d91aef9ecad70e70654584f84552c195f3280a6" + integrity sha512-DTWPjTK6f7sXAYIqLjC7lfNpONyY21jmHjhzAbC6nbEfZ3DegmogWDBLCO8dhun1bAF4T2FL7+gLho698UqBiw== + dependencies: + "@glimmer/interfaces" "^0.37.0" + "@glimmer/util" "^0.37.0" handlebars "^4.0.6" simple-html-tokenizer "^0.5.6" -"@glimmer/util@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.36.4.tgz#a79287fe261cc5b198d1c35943dc8aa879b98bc5" - integrity sha512-ng907Cr4i5NsgmP6Im7KzbK5EfP9M21PZoacrhzIhljFW8XptExH0Sekhx8XJkb4SRt+b28cq4X29WM3EFidOQ== +"@glimmer/util@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.37.0.tgz#962937c187b05a8a371d5b064674e74e838411c7" + integrity sha512-gwApoQ4xAAPKUBd9IpKYqW3UojZv45gIH+hxi9G9BbZWQZd1f9qIUHwk6JP+bNQ4zvxv9z4QEL1pOCWLx0TE3w== -"@glimmer/vm@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.36.4.tgz#0ed6cead77b02488a8ad9187d1b64b7cf0c706ce" - integrity sha512-1V7F8ZjScgchScb7Q42VAJLHRM7wZvjqwX7sUEZJWPlZsf5Zu6U88/695U4fPLyiQkYdyBkeIQs+HTklYy7r6g== +"@glimmer/vm@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.37.0.tgz#34268bb46a69e551379ccc554773e80900461c24" + integrity sha512-1H0Vag7kgZKJ6hCFg9Lv5OA0Q5b130atdnbKb79AS0OUpT3G7f64h/eCIlxMxhF+YhRi2nrD5Hb5bVuuD8Pszg== dependencies: - "@glimmer/interfaces" "^0.36.4" - "@glimmer/program" "^0.36.4" - "@glimmer/util" "^0.36.4" + "@glimmer/interfaces" "^0.37.0" + "@glimmer/program" "^0.37.0" + "@glimmer/util" "^0.37.0" -"@glimmer/wire-format@^0.36.4": - version "0.36.4" - resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.36.4.tgz#520918fbd2d4a91953081476ddcc269b0c714795" - integrity sha512-Chwwu77kQios2HWb8vGcuMi35iT3GHfwCyqQZa/BniZyN0MYkg/uT5UMDQwSiW5ZFZxGteHjds50397x/WnG4Q== +"@glimmer/wire-format@^0.37.0": + version "0.37.0" + resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.37.0.tgz#cd26f3d260d92a9e5d2873bd0234b54556ab3e85" + integrity sha512-wMBCo9cosxKzcsHuPlFzd+WHS8AqJoNYYK+LcpgLZRhjXO55oeirEQcwthV1uHdYs0CK7i+HcljuMDdJk2heww== dependencies: - "@glimmer/util" "^0.36.4" + "@glimmer/util" "^0.37.0" + +"@simple-dom/interface@1.4.0", "@simple-dom/interface@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f" + integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA== "@sindresorhus/is@^0.7.0": version "0.7.0" From bb4304fe3244d0746c0b3908dce3ef10d8805c78 Mon Sep 17 00:00:00 2001 From: Tom Dale Date: Mon, 10 Dec 2018 12:48:38 -0500 Subject: [PATCH 2/2] Upgrade simple-dom version --- package.json | 2 +- yarn.lock | 40 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e0a8cc38b3e..6437744b1f8 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "rsvp": "^4.8.4", "semver": "^5.5.0", "serve-static": "^1.13.2", - "simple-dom": "^0.3.0", + "simple-dom": "^1.4.0", "testem": "^2.14.0", "tslint": "^5.9.1", "tslint-config-prettier": "^1.10.0", diff --git a/yarn.lock b/yarn.lock index 15c33c1bab4..adbebb46823 100644 --- a/yarn.lock +++ b/yarn.lock @@ -713,11 +713,37 @@ dependencies: "@glimmer/util" "^0.37.0" +"@simple-dom/document@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@simple-dom/document/-/document-1.4.0.tgz#af60855f957f284d436983798ef1006cca1a1678" + integrity sha512-/RUeVH4kuD3rzo5/91+h4Z1meLSLP66eXqpVAw/4aZmYozkeqUkMprq0znL4psX/adEed5cBgiNJcfMz/eKZLg== + dependencies: + "@simple-dom/interface" "^1.4.0" + "@simple-dom/interface@1.4.0", "@simple-dom/interface@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f" integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA== +"@simple-dom/parser@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@simple-dom/parser/-/parser-1.4.0.tgz#b1fee1a23f48a37d6bdd98f5242db0cab5b67abc" + integrity sha512-TNjDkOehueRIKr1df416qk9ELj+qWuVVJNIT25y1aZg3pQvxv4UPGrgaDFte7dsWBTbF3V8NYPNQ5FDUZQ8Wlg== + dependencies: + "@simple-dom/interface" "^1.4.0" + +"@simple-dom/serializer@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@simple-dom/serializer/-/serializer-1.4.0.tgz#98470f357f418d72b1a1ec78d68191e60aefe215" + integrity sha512-mI1yRahsVs8atXLiQksineDsFEFqeG7RHwnnBTDOK6inbzl4tZQgjR+Z7edjgIJq5j5RhZvwPI6EuCji9B3eQw== + dependencies: + "@simple-dom/interface" "^1.4.0" + +"@simple-dom/void-map@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@simple-dom/void-map/-/void-map-1.4.0.tgz#f15f07568fe1076740407266aa5e6eac249bc78c" + integrity sha512-VDhLEyVCbuhOBBgHol9ShzIv9O8UCzdXeH4FoXu2DOcu/nnvTjLTck+BgXsCLv5ynDiUdoqsREEVFnoyPpFKVw== + "@sindresorhus/is@^0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" @@ -8702,10 +8728,16 @@ silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0: dependencies: debug "^2.2.0" -simple-dom@^0.3.0: - version "0.3.2" - resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-0.3.2.tgz#0663d10f1556f1500551d518f56e3aba0871371d" - integrity sha1-BmPRDxVW8VAFUdUY9W46ughxNx0= +simple-dom@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-1.4.0.tgz#78ad1f41b8b70d16f82b7e0d458441c9262565b7" + integrity sha512-TnBPkmOyjdaOqyBMb4ick+n8c0Xv9Iwg1PykFV7hz9Se3UCiacTbRb+25cPmvozFNJLBUNvUzX/KsPfXF14ivA== + dependencies: + "@simple-dom/document" "^1.4.0" + "@simple-dom/interface" "^1.4.0" + "@simple-dom/parser" "^1.4.0" + "@simple-dom/serializer" "^1.4.0" + "@simple-dom/void-map" "^1.4.0" simple-html-tokenizer@^0.5.6: version "0.5.6"