diff --git a/broccoli/packages.js b/broccoli/packages.js index 543de0ecd77..e8d97866e0a 100644 --- a/broccoli/packages.js +++ b/broccoli/packages.js @@ -1,6 +1,6 @@ 'use strict'; -const { readFileSync, existsSync } = require('fs'); +const { existsSync } = require('fs'); const path = require('path'); const Rollup = require('broccoli-rollup'); const Funnel = require('broccoli-funnel'); @@ -118,38 +118,19 @@ module.exports.getPackagesES = function getPackagesES() { }; module.exports.handlebarsES = function _handlebars() { - return new Rollup(findLib('handlebars', 'lib'), { - annotation: 'handlebars', + return new Rollup(findLib('@handlebars/parser', 'dist/esm'), { + annotation: '@handlebars/parser', rollup: { - input: 'handlebars/compiler/base.js', + input: 'index.js', output: { - file: 'handlebars.js', + file: '@handlebars/parser/index.js', format: 'es', exports: 'named', }, - plugins: [handlebarsFix()], }, }); }; -function handlebarsFix() { - let HANDLEBARS_PARSER = /[/\\]parser.js$/; - return { - load: function(id) { - if (HANDLEBARS_PARSER.test(id)) { - let code = readFileSync(id, 'utf8'); - return { - code: code - .replace('exports.__esModule = true;', '') - .replace("exports['default'] = handlebars;", 'export default handlebars;'), - - map: { mappings: null }, - }; - } - }, - }; -} - module.exports.rsvpES = function _rsvpES() { let lib = path.resolve(path.dirname(require.resolve('rsvp')), '../lib'); return new Rollup(lib, { diff --git a/package.json b/package.json index a7f431bbac5..98859dae332 100644 --- a/package.json +++ b/package.json @@ -74,16 +74,16 @@ }, "devDependencies": { "@babel/preset-env": "^7.9.5", - "@glimmer/compiler": "^0.61.2", + "@glimmer/compiler": "0.62.1", "@glimmer/env": "^0.1.7", - "@glimmer/global-context": "^0.61.2", - "@glimmer/interfaces": "^0.61.2", - "@glimmer/node": "^0.61.2", - "@glimmer/opcode-compiler": "^0.61.2", - "@glimmer/program": "^0.61.2", - "@glimmer/reference": "^0.61.2", - "@glimmer/runtime": "^0.61.2", - "@glimmer/validator": "^0.61.2", + "@glimmer/global-context": "0.62.1", + "@glimmer/interfaces": "0.62.1", + "@glimmer/node": "0.62.1", + "@glimmer/opcode-compiler": "0.62.1", + "@glimmer/program": "0.62.1", + "@glimmer/reference": "0.62.1", + "@glimmer/runtime": "0.62.1", + "@glimmer/validator": "0.62.1", "@simple-dom/document": "^1.4.0", "@types/qunit": "^2.9.1", "@types/rsvp": "^4.0.3", diff --git a/yarn.lock b/yarn.lock index 271a04e105a..665459bac2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -913,152 +913,157 @@ resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6" integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog== -"@glimmer/compiler@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.61.2.tgz#76c1334d318955ae16ca61c3110ae4e0e9fd0935" - integrity sha512-+WrDbTKeOFsoxn1wLHmDt22IAEr7u/dqfc2V9kTH8CzB+f7HHtO++jmctoxD+arHx/lTJtZHITXFZNFqLmU6hw== - dependencies: - "@glimmer/interfaces" "^0.61.2" - "@glimmer/syntax" "^0.61.2" - "@glimmer/util" "^0.61.2" - "@glimmer/wire-format" "^0.61.2" +"@glimmer/compiler@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.62.1.tgz#4b80f1cd55d39858e602080de03db6febf5b9303" + integrity sha512-s709URSvV3IzSmyyKd1t2twlxcjM7OZgh+pmehwjEEVXSm6nDrAtJcBw8OBPw0AL6TnArf5xHTHtH4EJJ8fyAg== + dependencies: + "@glimmer/interfaces" "0.62.1" + "@glimmer/syntax" "0.62.1" + "@glimmer/util" "0.62.1" + "@glimmer/wire-format" "0.62.1" "@simple-dom/interface" "^1.4.0" -"@glimmer/encoder@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.61.2.tgz#d160d867dc44c808740d0ff119f5070fb3694094" - integrity sha512-AbxpNdfkPbPvQGNTwuYqrnZvBHEYx/ruBnUC04rMG7Z2GDrPgNyToEtuhRPcRoRBOuOsU7tAjG+U7Xz/f89BZw== +"@glimmer/encoder@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.62.1.tgz#75baeef7b923515ccfee778d99b1c61a5541050a" + integrity sha512-zlGhEYhWP+DSHumbJqckgUhFzhScze6D5ys69A3iJrmiDOYSs2uaRvonAKl7aQS4FGoUhelWfQT0xvWxD/u5OQ== dependencies: - "@glimmer/interfaces" "^0.61.2" - "@glimmer/vm" "^0.61.2" + "@glimmer/interfaces" "0.62.1" + "@glimmer/vm" "0.62.1" "@glimmer/env@0.1.7", "@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/global-context@0.61.2", "@glimmer/global-context@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.61.2.tgz#d455827850c5b1f3eacae150defbfeea9f2f9342" - integrity sha512-rqNb2JAkDtakYI5y5wOEYmQym67woIA7KYbifB9/mL9N1xZXvc87XK/lO60+7U8IdX/guevnkw0N+Fkjkr+UOQ== +"@glimmer/global-context@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.62.1.tgz#41f6a130a235361cdb853ba6da276d4b84fd0fee" + integrity sha512-ZqLPa6KZitYbvlQCE9oyy6h7MTEwV0MqPgtrlb2nAKDZ8lZ90pzVvVNEmXpr6lkajEggISCt3GDsl8W/2IiBeQ== dependencies: "@glimmer/env" "^0.1.7" -"@glimmer/interfaces@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.61.2.tgz#c8760d9aab6469d4a3bde923f129fb86a3b70262" - integrity sha512-i4qTGFKXWD1Bjr3V6HVxTRWj8DzAhXQ0W0pvsymDRY/r386crH11sTclp8ZFyEiybA8JBlsUvadX8lUD7Oc0TA== +"@glimmer/interfaces@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.62.1.tgz#42e4021569a00ca60d469ef06cc0c719883d109e" + integrity sha512-Ui4u/0G0zOYeDuz497DQ/isOgd43r6zNO0JdsDeVw1D/tYQQHR1Xk/1YRKC9jK2n5oicMYKVyEeT62Ec2rL/Jg== dependencies: "@simple-dom/interface" "^1.4.0" -"@glimmer/low-level@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.61.2.tgz#1d03de3341d73648abaf56a55f9a11c1bf8d6649" - integrity sha512-XYIOUgWqCSld43xzZgy4Mi2XN1r6xrL14VFbH4Eh3LwuT0avMqB6lJCeT3Xt4ROO1lDmVAuJIL4/eniBcErc0g== +"@glimmer/low-level@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.62.1.tgz#0fd0870d1ec97d6a81e29ac66ed69e2e17f3094a" + integrity sha512-sMNcGWdfgthq0DWHqawMJXoXuhtlA0dY3Y63HyMe5aB94JXw/0SujKdysjG5ImqgRxADcPj39EjS9aJO5AfW2A== -"@glimmer/node@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.61.2.tgz#82f3f550b0dbb3a8628db3acffa6349a9a12aa6e" - integrity sha512-mkwfHjDcRzyQhyngqx8fVCT1VpPPWamnKEiDtnWLS/Ay9Or5ApK+cflmvWUaoIBrpLxhGoxBGI0j8lSECQDy/w== +"@glimmer/node@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.62.1.tgz#48ecee29f596f833d7dc50a27abb83db8a31a711" + integrity sha512-gUaQJ950x3BSMKR/PPRD7P+dycqdrYd1gWBTvXDNuAHantH6lLofkGEJmeeDHq+nw8B/CXkD9uqn7H94jiOttg== dependencies: - "@glimmer/interfaces" "^0.61.2" - "@glimmer/runtime" "^0.61.2" - "@glimmer/util" "^0.61.2" + "@glimmer/interfaces" "0.62.1" + "@glimmer/runtime" "0.62.1" + "@glimmer/util" "0.62.1" "@simple-dom/document" "^1.4.0" "@simple-dom/interface" "^1.4.0" -"@glimmer/opcode-compiler@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.61.2.tgz#424d01f99c7863bece55061abce7f297589fb175" - integrity sha512-XUALj/8PqEbStGSoYZ9jfli1BPKO55nUdPo5jpMEPPmRb/Ai6PZi2Q8Ih3RBOYQAIGOnlfLa4R8jUB+oz2lh2Q== - dependencies: - "@glimmer/encoder" "^0.61.2" - "@glimmer/interfaces" "^0.61.2" - "@glimmer/program" "^0.61.2" - "@glimmer/reference" "^0.61.2" - "@glimmer/util" "^0.61.2" - "@glimmer/vm" "^0.61.2" - "@glimmer/wire-format" "^0.61.2" - -"@glimmer/program@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.61.2.tgz#0e23fd9483117b1dccb594944c4c65744b5e82b6" - integrity sha512-nxVhZudrJBtBETCSG7DLy41daO3b2pckQ/jNcYzX8jrqe3hgr1eFo+xEr6s9jiceakDY51DXDtAmXwJbo04ZAg== - dependencies: - "@glimmer/encoder" "^0.61.2" - "@glimmer/interfaces" "^0.61.2" - "@glimmer/util" "^0.61.2" - -"@glimmer/reference@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.61.2.tgz#991f1f19bedf474af55ed42faebd526542a8d941" - integrity sha512-e1SZpao8ht2OYaWr1Q2vcNMqO6/g4usZmj3SzUCgHbXeB/u+VCPiHEl9S3WZXwQwMWTGzxphkB2Q1MaUagR1Cg== +"@glimmer/opcode-compiler@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.62.1.tgz#86596ed10df791887de1f9d43d1e5bcead5878ec" + integrity sha512-OJ9kyBwFiPyxu8hNaHHadNlG7ujEu9SLwSJD+5p3lYO3aIbCr0XkQaPmYSgsXiTxtWU9lDLuUVowirHMk/0ZfQ== + dependencies: + "@glimmer/encoder" "0.62.1" + "@glimmer/interfaces" "0.62.1" + "@glimmer/program" "0.62.1" + "@glimmer/reference" "0.62.1" + "@glimmer/util" "0.62.1" + "@glimmer/vm" "0.62.1" + "@glimmer/wire-format" "0.62.1" + +"@glimmer/program@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.62.1.tgz#8ad8ccdf0ae68b74c349314734b6fb127730da5e" + integrity sha512-0gGN2hJWMFFby6PKsCvVA+Yp2fjqR1sjATR3dgZfi8VVxF+VQbMVVLA52o3xuyNzSsVL6GahX6t+RwksR9TXKQ== + dependencies: + "@glimmer/encoder" "0.62.1" + "@glimmer/interfaces" "0.62.1" + "@glimmer/util" "0.62.1" + +"@glimmer/reference@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.62.1.tgz#b4f2263634459673d3c839da04d47202deffb189" + integrity sha512-/bud6PB6yw89m9Vyg2CGwk5cwjYjRoA0ZJG3k5WDpLXXF/sHrMxdJFVtVcnmonKRuPzpduypvWzBDAxVdq7w0A== dependencies: "@glimmer/env" "^0.1.7" - "@glimmer/global-context" "^0.61.2" - "@glimmer/interfaces" "^0.61.2" - "@glimmer/util" "^0.61.2" - "@glimmer/validator" "^0.61.2" + "@glimmer/global-context" "0.62.1" + "@glimmer/interfaces" "0.62.1" + "@glimmer/util" "0.62.1" + "@glimmer/validator" "0.62.1" -"@glimmer/runtime@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.61.2.tgz#a7d525cde6a16ee0821f8e77c123a056d9f53cd1" - integrity sha512-1C/tODub6Hy/oAj7bU+RoOaLzJJkMkYQUc1KPOCGxb49kRe/RgN2mAPuM4BvZI00JReD/NXXBRAXVA0R/dUsXg== +"@glimmer/runtime@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.62.1.tgz#b172f4315cfec831b380f7814c73021d78789501" + integrity sha512-yrpK1Hvj1GdiVHNyVcN12c/WMqxercdYMMn2ZEiaX9Oc+OcY7ojUK2gkOEoqPx905T8+q27yIc8Xs+89jKAVeg== dependencies: "@glimmer/env" "0.1.7" - "@glimmer/global-context" "0.61.2" - "@glimmer/interfaces" "^0.61.2" - "@glimmer/low-level" "^0.61.2" - "@glimmer/program" "^0.61.2" - "@glimmer/reference" "^0.61.2" - "@glimmer/util" "^0.61.2" - "@glimmer/validator" "^0.61.2" - "@glimmer/vm" "^0.61.2" - "@glimmer/wire-format" "^0.61.2" + "@glimmer/global-context" "0.62.1" + "@glimmer/interfaces" "0.62.1" + "@glimmer/low-level" "0.62.1" + "@glimmer/program" "0.62.1" + "@glimmer/reference" "0.62.1" + "@glimmer/util" "0.62.1" + "@glimmer/validator" "0.62.1" + "@glimmer/vm" "0.62.1" + "@glimmer/wire-format" "0.62.1" "@simple-dom/interface" "^1.4.0" -"@glimmer/syntax@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.61.2.tgz#a8c381872354ebf441e23cfd6fd27caacdb5356b" - integrity sha512-YiXP/saSy/JWVf6AiSWWZemCnYn6z9b4mAifqdba2D/3wrH5TScEiS01mDLlGi2HNhCXffcWf9aOAkEUbnOtFw== +"@glimmer/syntax@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.62.1.tgz#60f0b14c8503f059b9b73065a2d86f9ca6c6e3f3" + integrity sha512-pjnPouu3tVJ5sDcpYCv9hyodJW6T07LvOjsGQ+QT5TdMqN4hoc4iK3dkdrRh+dkNcUsBxFQhxOtAbwOVSgtVtg== dependencies: - "@glimmer/interfaces" "^0.61.2" - "@glimmer/util" "^0.61.2" - handlebars "^4.7.4" + "@glimmer/interfaces" "0.62.1" + "@glimmer/util" "0.62.1" + "@handlebars/parser" "^1.1.0" simple-html-tokenizer "^0.5.9" -"@glimmer/util@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.61.2.tgz#c1d7ccfdd38f97c828e218c6d8e237c0c96ff724" - integrity sha512-xel7wbNldpHzDOmC4GJ1je4UnSmehy5MGzPp/rEON9OcSggCrl2v8cEP413TMfyRGDQJ5Houkr0R4zpvs8aqOg== +"@glimmer/util@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.62.1.tgz#44221aca6a8bb06791b0057db9b1d72330c08094" + integrity sha512-e6YTDAgEh8fqarhyN+0ncXOixLn5Wt12/IWdwKmtGIhdALOc/lWbJfrxlmKD+kkFTTjUVJUKm1Y6pxUyXOo4Ww== dependencies: "@glimmer/env" "0.1.7" - "@glimmer/interfaces" "^0.61.2" + "@glimmer/interfaces" "0.62.1" "@simple-dom/interface" "^1.4.0" -"@glimmer/validator@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.61.2.tgz#deeb324a767c776b55d5b2ba14700b881a16dd7e" - integrity sha512-gNZ+XFeP8fFAyqRr3kHXdRVaGTpfCTUfDOeo6mgsQXgoJl7wGV2pjMZVh9fImozUKCLzjLNd9Xtu11hcmwSHNg== +"@glimmer/validator@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.62.1.tgz#30240a5d7bb574b833fdb39e90202dbbdde9886c" + integrity sha512-pewpCA8oh4ONnflgHDhuMYkS4D0sdkxrc9iNwf+LMweGGSszAa34hoiC4noLKdYPGx+oRwi/JXwUPf93cvj2+g== dependencies: "@glimmer/env" "^0.1.7" - "@glimmer/global-context" "0.61.2" + "@glimmer/global-context" "0.62.1" -"@glimmer/vm@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.61.2.tgz#d9ddc7d8c4a7801e4d90a445eb7d7d6577676cc8" - integrity sha512-sak45jpV5hNRGSAq1dmvXfyAjF6MTMtrd8rD8UE7CCfSnnIXn2nUwbqkimHoxi9HvbdPzy1fK5pecpJYiG4htA== +"@glimmer/vm@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.62.1.tgz#418242bfcac4570872543a2a5c5c7fcdab33a690" + integrity sha512-W1bYb47jHmJYQIlvEtnrAUWZjbhH+CL83jiIoWBELhOAbiHUUdcmtjZlO3sweCHDsLz+9FQlTWOJuBoOCMRdZg== dependencies: - "@glimmer/interfaces" "^0.61.2" - "@glimmer/util" "^0.61.2" + "@glimmer/interfaces" "0.62.1" + "@glimmer/util" "0.62.1" -"@glimmer/wire-format@^0.61.2": - version "0.61.2" - resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.61.2.tgz#2c8a09d75ee77a7923e4c09222f1004a3c2d4ef8" - integrity sha512-HDy/3Vm1Lu2KQLMsKri6v0xSIxetqrGs+DK+XhECRaZicW2Y6LZE1+mDiTly9axO38jMHsNlnLtAryiQB3aM4Q== +"@glimmer/wire-format@0.62.1": + version "0.62.1" + resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.62.1.tgz#4b210a6746dd2430e891e4ce4e2c9a743d703bd7" + integrity sha512-oLmIosr7RNk6BrZvOKj/NhkZ4/rWqYiQ/nGqzZzwvLY7HZlWmzDcpVsOJtIGOKFO33zHgkEBRtfXDo1+CmmSWQ== dependencies: - "@glimmer/interfaces" "^0.61.2" - "@glimmer/util" "^0.61.2" + "@glimmer/interfaces" "0.62.1" + "@glimmer/util" "0.62.1" + +"@handlebars/parser@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf" + integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A== "@nodelib/fs.scandir@2.1.3": version "2.1.3" @@ -4990,7 +4995,7 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= -handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.7.4: +handlebars@^4.0.11, handlebars@^4.0.4: version "4.7.6" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e" integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==