Skip to content

Commit

Permalink
Merge pull request #17051 from emberjs/update-vm
Browse files Browse the repository at this point in the history 
Update Glimmer VM deps
  • Loading branch information
@chadhietala
chadhietala committed Oct 7, 2018
2 parents 8f81fc9 + 36132d5 commit 7116215
Show file tree
Hide file tree
Showing 4 changed files with 116 additions and 110 deletions.
14 changes: 7 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@
"resolve": "^1.6.0"
},
"devDependencies": {
"@glimmer/compiler": "^0.35.10",
"@glimmer/compiler": "^0.36.4",
"@glimmer/env": "^0.1.7",
"@glimmer/interfaces": "^0.35.10",
"@glimmer/node": "^0.35.10",
"@glimmer/opcode-compiler": "^0.35.10",
"@glimmer/program": "^0.35.10",
"@glimmer/reference": "^0.35.10",
"@glimmer/runtime": "^0.35.10",
"@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",
"@types/qunit": "^2.5.0",
"@types/rsvp": "^4.0.1",
"amd-name-resolver": "^1.2.0",
Expand Down
12 changes: 9 additions & 3 deletions packages/@ember/-internals/glimmer/lib/modifiers/action.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ActionManager, isSimpleClick } from '@ember/-internals/views';
import { assert } from '@ember/debug';
import { flaggedInstrument } from '@ember/instrumentation';
import { join } from '@ember/runloop';
import { Simple } from '@glimmer/interfaces';
import { Opaque, Simple } from '@glimmer/interfaces';
import { RevisionTag, TagWrapper } from '@glimmer/reference';
import {
Arguments,
Expand Down Expand Up @@ -186,8 +186,14 @@ export class ActionState {
}

// implements ModifierManager<Action>
export default class ActionModifierManager implements ModifierManager<ActionState> {
create(element: Simple.Element, args: Arguments, _dynamicScope: DynamicScope, dom: any) {
export default class ActionModifierManager implements ModifierManager<ActionState, Opaque> {
create(
element: Simple.Element,
_state: Opaque,
args: Arguments,
_dynamicScope: DynamicScope,
dom: any
) {
let { named, positional, tag } = args.capture();
let implicitTarget;
let actionName;
Expand Down
6 changes: 3 additions & 3 deletions packages/@ember/-internals/glimmer/lib/resolver.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
RuntimeResolver as IRuntimeResolver,
} from '@glimmer/interfaces';
import { LazyCompiler, Macros, PartialDefinition } from '@glimmer/opcode-compiler';
import { getDynamicVar, Helper, ModifierManager } from '@glimmer/runtime';
import { getDynamicVar, Helper, ModifierDefinition } from '@glimmer/runtime';
import CompileTimeLookup from './compile-time-lookup';
import { CurlyComponentDefinition } from './component-managers/curly';
import { CustomManagerDefinition, ManagerDelegate } from './component-managers/custom';
Expand Down Expand Up @@ -75,7 +75,7 @@ const BUILTINS_HELPERS = {
};

const BUILTIN_MODIFIERS = {
action: new ActionModifierManager(),
action: { manager: new ActionModifierManager(), state: null },
};

export default class RuntimeResolver implements IRuntimeResolver<OwnedTemplateMeta> {
Expand All @@ -91,7 +91,7 @@ export default class RuntimeResolver implements IRuntimeResolver<OwnedTemplateMe
} = BUILTINS_HELPERS;

private builtInModifiers: {
[name: string]: ModifierManager<Opaque>;
[name: string]: ModifierDefinition;
} = BUILTIN_MODIFIERS;

// supports directly imported late bound layouts on component.prototype.layout
Expand Down
194 changes: 97 additions & 97 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,119 +2,119 @@
# yarn lockfile v1


"@glimmer/compiler@^0.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.35.10.tgz#ea830a984ced7fe68dd5e96f21127f76ad22c35c"
integrity sha512-/nwanZgQsXVp0vFSm27CPNuRH6NnSzXU+j8WcKYRx9Dd40Jf8RAmGGgOKkfqGLcDbNVsaxg2zL+WIn9aIU+85Q==
"@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==
dependencies:
"@glimmer/interfaces" "^0.35.10"
"@glimmer/syntax" "^0.35.10"
"@glimmer/util" "^0.35.10"
"@glimmer/wire-format" "^0.35.10"
"@glimmer/interfaces" "^0.36.4"
"@glimmer/syntax" "^0.36.4"
"@glimmer/util" "^0.36.4"
"@glimmer/wire-format" "^0.36.4"

"@glimmer/encoder@^0.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.35.10.tgz#7f8643a1898ee5361dfb5b9878d19d55ec306bc3"
integrity sha512-6NOP7hHIud4vgVqmVYu1qUXbsor5JVCPyoPQ3X9N/0ju/HzdyMgpJertZ3U8ujSZHzn0PhY/4/p7cpj1DvN9Iw==
"@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/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.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.35.10.tgz#1ec18cf7bbcbe42547dd2e131b565a2f71234e3c"
integrity sha512-fegpWTjDd8DAcjvgP4N+5BOnBLpulBvRjUNqvw6raY3OVw5O/Hon+iYqX1bPBbGP16RFj+6BPkc+GnZspQRazQ==
"@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.35.10"
"@glimmer/wire-format" "^0.36.4"

"@glimmer/low-level@^0.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.35.10.tgz#aca245e36b60f0891d1babe53f580986b38b1ec9"
integrity sha512-JrWbmMpC96pHHXK4NLc65IQioyZYh/6H3aMaIBRR97fwqRzPZBJjuZkVTfi+qU924LlPMNGJNYvoJe5OwFhzUA==
"@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.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.35.10.tgz#4aaede71958f23fc944f23043c1ad8b20fcc90a4"
integrity sha512-o5wmLC01A7+P1BiMk3ZpHovnEbDK7gvc0a7sukvK5LWQRHH12RzjAGEh9m6esSXdsOuau/4jHhpUsdW2gQt5OA==
"@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.35.10"
"@glimmer/runtime" "^0.35.10"
"@glimmer/interfaces" "^0.36.4"
"@glimmer/runtime" "^0.36.4"
simple-dom "^0.3.0"

"@glimmer/opcode-compiler@^0.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.35.10.tgz#ac86d7a98af7d64cb362d9bd00200257d65ecc95"
integrity sha512-4bRz+QeMLtNk3V3OoSyYaQiF1y/BAz1J9Md1SSfFVg6gztxKh2mRwM79xicDCZ6Xp/yaHB8I5z9QLxtz56vxXA==
dependencies:
"@glimmer/encoder" "^0.35.10"
"@glimmer/interfaces" "^0.35.10"
"@glimmer/program" "^0.35.10"
"@glimmer/reference" "^0.35.10"
"@glimmer/util" "^0.35.10"
"@glimmer/vm" "^0.35.10"
"@glimmer/wire-format" "^0.35.10"

"@glimmer/program@^0.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.35.10.tgz#2fda7954b0bb4df6e2e0038a36a820bda9f84e1c"
integrity sha512-S2yHKHgqTKN5I6G+F161T39fRSUFf38iIIe1ceTfT1r1aJ5/PZb+p2qPy2RyNWf16D9gz2anmeoax9s7WugwKA==
dependencies:
"@glimmer/encoder" "^0.35.10"
"@glimmer/interfaces" "^0.35.10"
"@glimmer/util" "^0.35.10"

"@glimmer/reference@^0.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.35.10.tgz#663e5f825c9a75b78c40a0d85f93277193bebaec"
integrity sha512-ouZ6AG3tNHdChuFHvin9WExUisnBq/fsdi5enwWecbGjzKRLSg8RRjXWeUKfIuea6RlA72pDDsbmm2tQT5iBUw==
dependencies:
"@glimmer/util" "^0.35.10"

"@glimmer/runtime@^0.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.35.10.tgz#a4085568dcdf65a3029386537d6683788c35f428"
integrity sha512-5DuZsD6SqM0bnl86l3gdUHDlnLTz7enQezwrfBnR5Qz1+jjwgucBWLY6ywLe8+mQDJ5BSfEMXNrQKrhlB67m0g==
dependencies:
"@glimmer/interfaces" "^0.35.10"
"@glimmer/low-level" "^0.35.10"
"@glimmer/program" "^0.35.10"
"@glimmer/reference" "^0.35.10"
"@glimmer/util" "^0.35.10"
"@glimmer/vm" "^0.35.10"
"@glimmer/wire-format" "^0.35.10"

"@glimmer/syntax@^0.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.35.10.tgz#8f50dfd841487c469ad5d94cd01b425a51a9ab32"
integrity sha512-rAm0yC3KOEMNiE5260wjmMGMw/+y4HcyhQE/GgAy/CxnJuWE4fenRczucK1aaEcJyFdwF73bkSn1iF1b8fFiGQ==
dependencies:
"@glimmer/interfaces" "^0.35.10"
"@glimmer/util" "^0.35.10"
"@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"
handlebars "^4.0.6"
simple-html-tokenizer "^0.5.5"
simple-html-tokenizer "^0.5.6"

"@glimmer/util@^0.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.35.10.tgz#2a25fa5c3d2b6114bbb07fd57c6e52abd9d088c3"
integrity sha512-DfO425GLVG9tuEixghIsjYwiJAhtJ0bZVAQYgBvkBk0O1oAaWDJ9eOj5xhuCWiUm8OFulSjqt9kcU0ShxFl4ZQ==
"@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/vm@^0.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.35.10.tgz#169bbceeee9cebb477090ac7b09b2ecee4c894a3"
integrity sha512-YSB70nmUOqn4GsneFhvT82jjxHgjP07QUHmTna/1+lfvUYG1vAKnMzADV7/2/2VrbVkTKSMVpzs20NuNtjj1DA==
"@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==
dependencies:
"@glimmer/interfaces" "^0.35.10"
"@glimmer/program" "^0.35.10"
"@glimmer/util" "^0.35.10"
"@glimmer/interfaces" "^0.36.4"
"@glimmer/program" "^0.36.4"
"@glimmer/util" "^0.36.4"

"@glimmer/wire-format@^0.35.10":
version "0.35.10"
resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.35.10.tgz#8445d51923ccbc6a923d2a911f37c82cc390c2e6"
integrity sha512-HteYOO04QTnjAW7g7RDGDpdVzUTOuF3UUDJLgf6Oi5pYwzSxV3EetErgZfAPjY0L113si3L7eVZmZ62lkfm2vA==
"@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==
dependencies:
"@glimmer/util" "^0.35.10"
"@glimmer/util" "^0.36.4"

"@types/acorn@^4.0.3":
version "4.0.3"
Expand Down Expand Up @@ -7654,10 +7654,10 @@ simple-dom@^0.3.0:
resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-0.3.2.tgz#0663d10f1556f1500551d518f56e3aba0871371d"
integrity sha1-BmPRDxVW8VAFUdUY9W46ughxNx0=

simple-html-tokenizer@^0.5.5:
version "0.5.5"
resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.5.tgz#110e63f2fe095e1f21f2f07e8c259a5ab6d6bebb"
integrity sha1-EQ5j8v4JXh8h8vB+jCWaWrbWvrs=
simple-html-tokenizer@^0.5.6:
version "0.5.6"
resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.6.tgz#e1e442b14f5484bf9a7e2924f78f00855e6b3c14"
integrity sha512-WgtFeFTAzegTCs1/x096l79gscV43LS17fEXBjv1s26oqiu1qmTM0buaqba/HmlxHNfk4yJuKmSJoRDMWuQU6w==

sinon@^1.17.6:
version "1.17.7"
Expand Down

0 comments on commit 7116215

Please sign in to comment.