From 04c28f24ae5c221442da09eba7c4b729e688c371 Mon Sep 17 00:00:00 2001 From: Cyrille David Date: Mon, 4 Nov 2019 11:30:32 +0100 Subject: [PATCH 1/5] Cleanup travis config * reorder items * activate --frozen-lockfile yarn option --- .travis.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 03d2a33..e1945f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,18 +3,22 @@ language: node_js node_js: - "8" -sudo: false -dist: trusty - -cache: - yarn: true - branches: only: - master # npm version tags - /^v\d+\.\d+\.\d+/ +cache: + yarn: true + +before_install: + - curl -o- -L https://yarnpkg.com/install.sh | bash + - export PATH=$HOME/.yarn/bin:$PATH + +install: + - yarn install --frozen-lockfile --non-interactive + env: global: # See https://git.io/vdao3 for details. @@ -27,14 +31,8 @@ jobs: # runs linting and tests with current locked deps - stage: "Tests" - name: "Tests" - install: - - yarn install --non-interactive + name: "ember-template-lint 1.6.1" script: - yarn lint:js - yarn lint:md - yarn test - -before_install: - - curl -o- -L https://yarnpkg.com/install.sh | bash - - export PATH=$HOME/.yarn/bin:$PATH From 00228b0db658d630e12c22b74f0958bcecce61e1 Mon Sep 17 00:00:00 2001 From: Cyrille David Date: Mon, 4 Nov 2019 11:39:27 +0100 Subject: [PATCH 2/5] peerDependency: Bump ember-template-lint to ^1.6.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2ada55..93d5d96 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "license": "Apache-2.0", "private": false, "peerDependencies": { - "ember-template-lint": "^1.3.0", + "ember-template-lint": "^1.6.1", "prettier": "^1.18.2" }, "devDependencies": { From f761263410df5588f721a706f8bac74418c2bb02 Mon Sep 17 00:00:00 2001 From: Cyrille David Date: Mon, 4 Nov 2019 11:41:05 +0100 Subject: [PATCH 3/5] Use peerDependencies min versions as devDependencies --- yarn.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/yarn.lock b/yarn.lock index 982c6a1..9157ef5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18,25 +18,25 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@glimmer/interfaces@^0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.43.0.tgz#a7a38c2476f87d68d6dc894840df17bc8b92de33" - integrity sha512-rWu6WHVo6tuFFOKOSJWAWsFfXZgkdnKDnvhl3tAb20njW/0uBZ2nx7GZ3lImvBeG0HoxyzYA7pD299ps03TemA== - -"@glimmer/syntax@^0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.43.0.tgz#d6e30c857c575eeac25b3f7ffab2cfee43685726" - integrity sha512-qJqzcbF9lgdLE5A1rCwTs0CLnblNK95Y6MMLNsvJEJA7j1Gx50ySoUZ5HTk86Z5auhDgvInhuufyGtdojSIMSg== - dependencies: - "@glimmer/interfaces" "^0.43.0" - "@glimmer/util" "^0.43.0" +"@glimmer/interfaces@^0.42.2": + version "0.42.2" + resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.42.2.tgz#9cf8d6f8f5eee6bfcfa36919ca68ae716e1f78db" + integrity sha512-7LOuQd02cxxNNHChzdHMAU8/qOeQvTro141CU5tXITP7z6aOv2D2gkFdau97lLQiVxezGrh8J7h8GCuF7TEqtg== + +"@glimmer/syntax@^0.42.2": + version "0.42.2" + resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.42.2.tgz#89bb3cb787285b84665dc0d8907d94b008e5be9a" + integrity sha512-SR26SmF/Mb5o2cc4eLHpOyoX5kwwXP4KRhq4fbWfrvan74xVWA38PLspPCzwGhyVH/JsE7tUEPMjSo2DcJge/Q== + dependencies: + "@glimmer/interfaces" "^0.42.2" + "@glimmer/util" "^0.42.2" handlebars "^4.0.13" simple-html-tokenizer "^0.5.8" -"@glimmer/util@^0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.43.0.tgz#dd28cd1a233c25427032437b9050c6fa6d098e2c" - integrity sha512-RtjHU8/rhysOugu+Q0j6dQ3G67J4h45tQgKPEwVPxu8P+hqijqnz/lBLxTdVg/1zKmlqUkyngTr8H4Jpg2yF/g== +"@glimmer/util@^0.42.2": + version "0.42.2" + resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.42.2.tgz#9ca1631e42766ea6059f4b49d0bdfb6095aad2c4" + integrity sha512-Heck0baFSaWDanCYtmOcLeaz7v+rSqI8ovS7twrp2/FWEteb3Ze5sWQ2BEuSAG23L/k/lzVwYM/MY7ZugxBpaA== "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" @@ -625,11 +625,11 @@ duplexify@^3.4.2, duplexify@^3.6.0: stream-shift "^1.0.0" ember-template-lint@^1.6.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-1.7.0.tgz#aa08dd9cb5b687209bfa27b4fe8605545c1184f5" - integrity sha512-BXXofuXOATt6Tz3wfsQK1iw3DLKgDTgeNOJeP6jH+Jxqpz7c84BLgISeLDdDsBfYumUeUQORDrmwI9Ia69iOGw== + version "1.6.1" + resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-1.6.1.tgz#9530f702996691d479570be71cab396d42b07234" + integrity sha512-vETWXQtQzv+hZc0/vOrox0+6G+5Sr0qPEOnaTy0ZkwcRv9TJyflru7IXm3V1vEtKCljR7pHzRQ4/IsSEWSDLVw== dependencies: - "@glimmer/syntax" "^0.43.0" + "@glimmer/syntax" "^0.42.2" chalk "^2.0.0" globby "^9.0.0" minimatch "^3.0.4" From b9ebcfca73ddd320767e894c3e039de5af7b1e88 Mon Sep 17 00:00:00 2001 From: Cyrille David Date: Mon, 4 Nov 2019 11:45:32 +0100 Subject: [PATCH 4/5] dependabot: Do not upgrade peerDependencies --- .dependabot/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.dependabot/config.yml b/.dependabot/config.yml index 3176b08..a58c20c 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -9,3 +9,8 @@ update_configs: - match: update_type: "in_range" version_requirement_updates: "auto" + ignored_updates: + - match: + dependency_name: "prettier" + - match: + dependency_name: "ember-template-lint" From 7048f07296864193cc847243a7e254cdcbc8970b Mon Sep 17 00:00:00 2001 From: Cyrille David Date: Mon, 4 Nov 2019 11:34:02 +0100 Subject: [PATCH 5/5] CI: Add a job against latest peerDependencies --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index e1945f5..1e79d6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,3 +36,9 @@ jobs: - yarn lint:js - yarn lint:md - yarn test + - name: "ember-template-lint latest" + install: yarn install --no-lockfile + script: + - yarn lint:js + - yarn lint:md + - yarn test