diff --git a/.template-lintrc.js b/.template-lintrc.js new file mode 100644 index 000000000..535d0c12c --- /dev/null +++ b/.template-lintrc.js @@ -0,0 +1,8 @@ +'use strict'; + +module.exports = { + extends: 'recommended', + rules: { + quotes: 'single' + } +}; diff --git a/package.json b/package.json index 763a2ef91..51499ff7b 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ }, "scripts": { "build": "ember build", + "lint:hbs": "ember-template-lint .", "lint:js": "eslint .", "start": "ember serve", "test": "ember try:each", @@ -86,7 +87,7 @@ "broccoli-asset-rev": "^3.0.0", "common-tags": "^1.8.0", "ember-classy-page-object": "^0.5.0", - "ember-cli": "~3.4.0", + "ember-cli": "~3.4.3", "ember-cli-addon-docs-esdoc": "^0.2.1", "ember-cli-addon-docs-yuidoc": "^0.2.1", "ember-cli-dependency-checker": "^3.0.0", @@ -98,15 +99,15 @@ "ember-cli-inject-live-reload": "^1.8.2", "ember-cli-mirage": "^0.4.9", "ember-cli-qunit": "^4.3.2", - "ember-cli-shims": "^1.2.0", "ember-cli-sri": "^2.1.1", + "ember-cli-template-lint": "^1.0.0-beta.2", "ember-cli-uglify": "^2.1.0", "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.0", "ember-load-initializers": "^1.1.0", "ember-maybe-import-regenerator-for-testing": "^1.0.0", "ember-resolver": "^5.0.1", - "ember-source": "~3.4.0", + "ember-source": "~3.4.5", "ember-source-channel-url": "^1.1.0", "ember-test-selectors": "^1.0.0", "ember-try": "^1.0.0", diff --git a/test-apps/new-addon/package.json b/test-apps/new-addon/package.json index dbb989e68..10e8592d1 100644 --- a/test-apps/new-addon/package.json +++ b/test-apps/new-addon/package.json @@ -32,7 +32,6 @@ "ember-cli-htmlbars-inline-precompile": "*", "ember-cli-inject-live-reload": "*", "ember-cli-qunit": "*", - "ember-cli-shims": "*", "ember-cli-sri": "*", "ember-cli-uglify": "*", "ember-disable-prototype-extensions": "*", diff --git a/tests/dummy/app/pods/docs/components/docs-demo/demo3/template.hbs b/tests/dummy/app/pods/docs/components/docs-demo/demo3/template.hbs index c9cea037b..201021f15 100644 --- a/tests/dummy/app/pods/docs/components/docs-demo/demo3/template.hbs +++ b/tests/dummy/app/pods/docs/components/docs-demo/demo3/template.hbs @@ -2,12 +2,16 @@ {{#docs-demo as |demo|}} {{#demo.example name='docs-demo-custom.md'}}
-    # Markdown
-    - Has syntax highlighting, too
+      # Markdown
+      - Has syntax highlighting, too
     
{{/demo.example}} {{demo.snippet 'docs-demo-custom-src.hbs' label='Source'}} - {{demo.snippet 'docs-demo-custom.md' label='My Custom Label' language='markdown'}} + {{demo.snippet + 'docs-demo-custom.md' + label='My Custom Label' + language='markdown' + }} {{/docs-demo}} {{!-- END-SNIPPET --}} diff --git a/tests/dummy/app/pods/docs/components/docs-hero/demo-2/template.hbs b/tests/dummy/app/pods/docs/components/docs-hero/demo-2/template.hbs index 9913909bb..ee54a6731 100644 --- a/tests/dummy/app/pods/docs/components/docs-hero/demo-2/template.hbs +++ b/tests/dummy/app/pods/docs/components/docs-hero/demo-2/template.hbs @@ -3,7 +3,8 @@ {{docs-hero prefix='EmberData' heading='Something' - byline='The best addon ever. Now playing in theaters.'}} + byline='The best addon ever. Now playing in theaters.' + }} {{/demo.example}} {{demo.snippet 'docs-hero-2.hbs'}} diff --git a/tests/dummy/app/pods/docs/components/docs-snippet/demo1/template.hbs b/tests/dummy/app/pods/docs/components/docs-snippet/demo1/template.hbs index 73f745596..672c41442 100644 --- a/tests/dummy/app/pods/docs/components/docs-snippet/demo1/template.hbs +++ b/tests/dummy/app/pods/docs/components/docs-snippet/demo1/template.hbs @@ -1,9 +1,10 @@ -
- {{#docs-snippet name="docs-snippet.hbs"}} +
+ {{#docs-snippet name='docs-snippet.hbs'}}
{{#my-awesome-thing some=true - options=false}} + options=false + }}

Something old, something new

{{/my-awesome-thing}}
diff --git a/tests/dummy/app/pods/docs/components/docs-snippet/demo2/template.hbs b/tests/dummy/app/pods/docs/components/docs-snippet/demo2/template.hbs index 23d83a7a2..2ca9a7454 100644 --- a/tests/dummy/app/pods/docs/components/docs-snippet/demo2/template.hbs +++ b/tests/dummy/app/pods/docs/components/docs-snippet/demo2/template.hbs @@ -1,5 +1,5 @@ -
- {{#docs-snippet name="my-snippet-src.hbs"}} +
+ {{#docs-snippet name='my-snippet-src.hbs'}} // BEGIN-SNIPPET my-snippet.js App = Ember.Application.extend({ modulePrefix: config.modulePrefix, diff --git a/tests/dummy/app/pods/docs/components/docs-snippet/demo3/template.hbs b/tests/dummy/app/pods/docs/components/docs-snippet/demo3/template.hbs index c6c8573ab..37605528c 100644 --- a/tests/dummy/app/pods/docs/components/docs-snippet/demo3/template.hbs +++ b/tests/dummy/app/pods/docs/components/docs-snippet/demo3/template.hbs @@ -1,5 +1,5 @@ -
- {{#docs-snippet name="my-snippet-src2.hbs"}} +
+ {{#docs-snippet name='my-snippet-src2.hbs'}} {{docs-snippet name='my-snippet.js'}} {{/docs-snippet}}
diff --git a/tests/dummy/app/pods/docs/components/docs-snippet/demo4/template.hbs b/tests/dummy/app/pods/docs/components/docs-snippet/demo4/template.hbs index 2477b74a1..caee2c29e 100644 --- a/tests/dummy/app/pods/docs/components/docs-snippet/demo4/template.hbs +++ b/tests/dummy/app/pods/docs/components/docs-snippet/demo4/template.hbs @@ -1,5 +1,8 @@ -
- {{#docs-snippet name="docs-snippet-title-example.js" title="app/components/my-component.js"}} +
+ {{#docs-snippet + name='docs-snippet-title-example.js' + title='app/components/my-component.js' + }} import Component from '@ember/component'; export default Component.extend({ // ... diff --git a/tests/dummy/app/pods/index/template.hbs b/tests/dummy/app/pods/index/template.hbs index d7b1e38f7..a2dbdfef7 100644 --- a/tests/dummy/app/pods/index/template.hbs +++ b/tests/dummy/app/pods/index/template.hbs @@ -4,8 +4,11 @@
{{index/index-content}} -
- {{#link-to 'docs' class='docs-bg-grey-darkest hover:docs-bg-black docs-text-white docs-py-2 docs-px-4 docs-no-underline docs-rounded'}} +
+ {{#link-to + 'docs' + class='docs-bg-grey-darkest hover:docs-bg-black docs-text-white docs-py-2 docs-px-4 docs-no-underline docs-rounded' + }} Read the docs → {{/link-to}}
diff --git a/tests/dummy/app/pods/not-found/template.hbs b/tests/dummy/app/pods/not-found/template.hbs index 3ee9dbcf9..34c5ed3c9 100644 --- a/tests/dummy/app/pods/not-found/template.hbs +++ b/tests/dummy/app/pods/not-found/template.hbs @@ -1,4 +1,4 @@ -
+

Not found

This page doesn't exist. {{#link-to 'index'}}Head home?{{/link-to}}

diff --git a/yarn.lock b/yarn.lock index e31ca1b48..2a1d57674 100644 --- a/yarn.lock +++ b/yarn.lock @@ -670,6 +670,16 @@ ember-cli-babel "^6.12.0" ember-cli-htmlbars-inline-precompile "^1.0.0" +"@glimmer/compiler@^0.36.2": + 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.36.4" + "@glimmer/syntax" "^0.36.4" + "@glimmer/util" "^0.36.4" + "@glimmer/wire-format" "^0.36.4" + "@glimmer/di@^0.2.0": version "0.2.1" resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.1.tgz#5286b6b32040232b751138f6d006130c728d4b3d" @@ -711,6 +721,19 @@ dependencies: "@glimmer/util" "^0.36.4" +"@mrmlnc/readdir-enhanced@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" + integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g== + dependencies: + call-me-maybe "^1.0.1" + glob-to-regexp "^0.3.0" + +"@nodelib/fs.stat@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz#54c5a964462be3d4d78af631363c18d6fa91ac26" + integrity sha512-yprFYuno9FtNsSHVlSWd+nRlmGoAbqbeCwOryP6sC/zoCjhpArcRMYp19EvpSUSizJAlsXEwJv+wcWS9XaXdMw== + "@sindresorhus/is@^0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" @@ -1010,7 +1033,7 @@ arraybuffer.slice@~0.0.7: resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== -arrify@^1.0.0: +arrify@^1.0.0, arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= @@ -2122,6 +2145,24 @@ broccoli-concat@^3.2.2, broccoli-concat@^3.5.1: lodash.uniq "^4.2.0" walk-sync "^0.3.2" +broccoli-concat@^3.7.1: + version "3.7.3" + resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.3.tgz#0dca01311567ffb13180e6b4eb111824628e4885" + integrity sha512-2Ma9h81EJ0PRb9n4sW0i8KZlcnpTQfKxcj87zvi5DFe1fd8CTDEdseHDotK2beuA2l+LbgVPfd8EHaBJKm/Y8g== + dependencies: + broccoli-debug "^0.6.5" + broccoli-kitchen-sink-helpers "^0.3.1" + broccoli-plugin "^1.3.0" + ensure-posix-path "^1.0.2" + fast-sourcemap-concat "^1.4.0" + find-index "^1.1.0" + fs-extra "^4.0.3" + fs-tree-diff "^0.5.7" + lodash.merge "^4.3.1" + lodash.omit "^4.1.0" + lodash.uniq "^4.2.0" + walk-sync "^0.3.2" + broccoli-config-loader@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.1.tgz#d10aaf8ebc0cb45c1da5baa82720e1d88d28c80a" @@ -2151,6 +2192,18 @@ broccoli-debug@^0.6.1, broccoli-debug@^0.6.4: symlink-or-copy "^1.1.8" tree-sync "^1.2.2" +broccoli-debug@^0.6.5: + version "0.6.5" + resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.5.tgz#164a5cdafd8936e525e702bf8f91f39d758e2e78" + integrity sha512-RIVjHvNar9EMCLDW/FggxFRXqpjhncM/3qq87bn/y+/zR9tqEkHvTqbyOc4QnB97NO2m6342w4wGkemkaeOuWg== + dependencies: + broccoli-plugin "^1.2.1" + fs-tree-diff "^0.5.2" + heimdalljs "^0.2.1" + heimdalljs-logger "^0.1.7" + symlink-or-copy "^1.1.8" + tree-sync "^1.2.2" + broccoli-file-creator@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-1.2.0.tgz#27f1b25b1b00e7bb7bf3d5d7abed5f4d5388df4d" @@ -2688,6 +2741,11 @@ calculate-cache-key-for-tree@^1.1.0: dependencies: json-stable-stringify "^1.0.1" +call-me-maybe@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" + integrity sha1-JtII6onje1y95gJQoV8DHBak1ms= + caller-path@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f" @@ -3578,6 +3636,14 @@ diff@^3.5.0: resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== +dir-glob@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034" + integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag== + dependencies: + arrify "^1.0.1" + path-type "^3.0.0" + doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -4062,17 +4128,6 @@ ember-cli-sass@7.1.7: broccoli-sass-source-maps "^2.1.0" ember-cli-version-checker "^2.1.0" -ember-cli-shims@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ember-cli-shims/-/ember-cli-shims-1.2.0.tgz#0f53aff0aab80b5f29da3a9731bac56169dd941f" - integrity sha1-D1Ov8Kq4C18p2jqXMbrFYWndlB8= - dependencies: - broccoli-file-creator "^1.1.1" - broccoli-merge-trees "^2.0.0" - ember-cli-version-checker "^2.0.0" - ember-rfc176-data "^0.3.1" - silent-error "^1.0.1" - ember-cli-sri@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ember-cli-sri/-/ember-cli-sri-2.1.1.tgz#971620934a4b9183cf7923cc03e178b83aa907fd" @@ -4116,6 +4171,23 @@ ember-cli-tailwind@^0.6.2: rollup-plugin-node-resolve "^3.3.0" tailwindcss "^0.6.1" +ember-cli-template-lint@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/ember-cli-template-lint/-/ember-cli-template-lint-1.0.0-beta.2.tgz#0ebd2f8c1f9ca47f9ee3b42755d66262440c14f6" + integrity sha512-i37mJhz+dll7eP/Y3Yh8oLw5aRqfdnIiutqdLsrvTSLb4VphDXbujXCO8XravvZtGeGBVYKXGsjTxobbPXgsgw== + dependencies: + aot-test-generators "^0.1.0" + broccoli-concat "^3.7.1" + broccoli-persistent-filter "^1.4.3" + chalk "^2.4.1" + debug "^3.1.0" + ember-cli-version-checker "^2.1.2" + ember-template-lint "^1.0.0-beta.5" + json-stable-stringify "^1.0.1" + md5-hex "^2.0.0" + strip-ansi "^4.0.0" + walk-sync "^0.3.3" + ember-cli-test-info@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-test-info/-/ember-cli-test-info-1.0.0.tgz#ed4e960f249e97523cf891e4aed2072ce84577b4" @@ -4153,7 +4225,7 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0, ember-cli-ve resolve "^1.3.3" semver "^5.3.0" -ember-cli@~3.4.0: +ember-cli@~3.4.3: version "3.4.3" resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.4.3.tgz#33560c6416612bd8dc56858cffb2c81897ec8822" integrity sha512-PpVpNIWeHFO9nqnqMb5poSZS1b/dFvsAKBUV15wGDnpY50j4LvMAGpbHsijXyWdEb7+CMZDeIMgte4IuJ2tePw== @@ -4540,7 +4612,7 @@ ember-responsive@^3.0.0-beta.1: dependencies: ember-cli-babel "^6.6.0" -ember-rfc176-data@^0.3.1, ember-rfc176-data@^0.3.3, ember-rfc176-data@^0.3.5: +ember-rfc176-data@^0.3.3, ember-rfc176-data@^0.3.5: version "0.3.5" resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.5.tgz#f630e550572c81a5e5c7220f864c0f06eee9e977" integrity sha512-5NfL1iTkIQDYs16/IZ7/jWCEglNsUrigLelBkBMsNcib9T3XzQwmhhVTjoSsk66s57LmWJ1bQu+2c1CAyYCV7A== @@ -4575,10 +4647,10 @@ ember-source-channel-url@^1.0.1, ember-source-channel-url@^1.1.0: dependencies: got "^8.0.1" -ember-source@~3.4.0: - version "3.4.4" - resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.4.4.tgz#b94800f8f0c1cc9baefc27b4fdcd8c65979a9bad" - integrity sha512-nT6BWL8XHP1+Toi2Wtpb7xvzkvvgBFBWotIt40e+P+piXM02QMfGySwO8vK7PR0mO0QkrSNxN8oGDjt0D4agYQ== +ember-source@~3.4.5: + version "3.4.5" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.4.5.tgz#f4a5975affd393c29a69afaa58c2ca9de8bba6c0" + integrity sha512-fm2JyUzIBhYZhMgLerjYMb0sAuv5kTPradWnsdIZbitk+O00ViF7zKb2nTEAb1MtxsUpqRCaxQZsv06LljDvtg== dependencies: broccoli-funnel "^2.0.1" broccoli-merge-trees "^2.0.0" @@ -4613,6 +4685,18 @@ ember-svg-jar@^1.2.2: mkdirp "^0.5.1" path-posix "^1.0.0" +ember-template-lint@^1.0.0-beta.5: + version "1.0.0-beta.5" + resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-1.0.0-beta.5.tgz#b9c3459752b9fb6c93f676f5a99e18372ad60af2" + integrity sha512-dOWEoLXBtX6KzCXEMV++uTFJbkzN/+lLHdRr1MEfe8XiKGYJAm1l9XSZjr3Rp2bvcKlao1YdSCntjudDHHN7Hg== + dependencies: + "@glimmer/compiler" "^0.36.2" + chalk "^2.0.0" + globby "^8.0.1" + minimatch "^3.0.4" + resolve "^1.1.3" + strip-bom "^3.0.0" + ember-test-selectors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-1.0.0.tgz#a2f8cd86f4fb4c320004a2bf0e4c450d41668a21" @@ -5240,6 +5324,18 @@ fast-deep-equal@^1.0.0: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ= +fast-glob@^2.0.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.3.tgz#d09d378e9ef6b0076a0fa1ba7519d9d4d9699c28" + integrity sha512-NiX+JXjnx43RzvVFwRWfPKo4U+1BrK5pJPsHQdKMlLoFHrrGktXglQhHliSihWAq+m1z6fHk3uwGHrtRbS9vLA== + dependencies: + "@mrmlnc/readdir-enhanced" "^2.2.1" + "@nodelib/fs.stat" "^1.0.1" + glob-parent "^3.1.0" + is-glob "^4.0.0" + merge2 "^1.2.1" + micromatch "^3.1.10" + fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" @@ -5787,6 +5883,11 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" +glob-to-regexp@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" + integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= + glob@^5.0.10: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" @@ -5863,6 +5964,19 @@ globby@^6.1.0: pify "^2.0.0" pinkie-promise "^2.0.0" +globby@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50" + integrity sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw== + dependencies: + array-union "^1.0.1" + dir-glob "^2.0.0" + fast-glob "^2.0.2" + glob "^7.1.2" + ignore "^3.3.5" + pify "^3.0.0" + slash "^1.0.0" + globule@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d" @@ -6264,7 +6378,7 @@ ignore-walk@^3.0.1: dependencies: minimatch "^3.0.4" -ignore@^3.3.3: +ignore@^3.3.3, ignore@^3.3.5: version "3.3.10" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug== @@ -7831,6 +7945,11 @@ merge-trees@^2.0.0: fs-updater "^1.0.4" heimdalljs "^0.2.5" +merge2@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34" + integrity sha512-bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg== + merge@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" @@ -8656,6 +8775,13 @@ path-type@^1.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" +path-type@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" + integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== + dependencies: + pify "^3.0.0" + perfectionist@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/perfectionist/-/perfectionist-2.4.0.tgz#c147ad3714e126467f1764129ee72df861d47ea0" @@ -9450,7 +9576,7 @@ resolve@1.5.0: dependencies: path-parse "^1.0.5" -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1: +resolve@^1.1.3, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26" integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==