Skip to content

Commit

Permalink
Remove unmaintained multidep dependency (#423)
Browse files Browse the repository at this point in the history
... in favor of renamed explicit dependencies
  • Loading branch information
Turbo87 authored Feb 11, 2022
1 parent 557930c commit b08179f
Show file tree
Hide file tree
Showing 6 changed files with 98 additions and 51 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ jobs:
- name: install dependencies
run: yarn install

- name: install multidep dependencies
run: yarn multidep multidep.json

- name: node tests
run: yarn test --coverage

Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
/tmp

# dependencies
/multidep_modules
/node_modules
/bower_components

Expand Down
20 changes: 7 additions & 13 deletions hbs-minifier-plugin.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@
/* eslint-env jest */
/* eslint-disable no-inner-declarations */

const multidepRequire = require('multidep')('multidep.json');

const DEFAULT = 'default';
const versions = [DEFAULT];
multidepRequire.forEachVersion('@glimmer/syntax', function(version) {
versions.push(version);
});
const DEP_PREFIX = '@glimmer/syntax';
const DEPS = Object.keys(require('./package.json').devDependencies)
.filter(it => it.startsWith(DEP_PREFIX));

// Remove the unnecessary `loc` properties from the AST snapshots and replace
// the `Object` prefix with the node `type`
Expand All @@ -26,16 +22,14 @@ expect.addSnapshotSerializer({
},
});

for (let version of versions) {
for (let dep of DEPS) {
let moduleName = 'HBS Minifier plugin';
if (version !== DEFAULT) {
moduleName += ` (with @glimmer/syntax v${version})`;
if (dep !== DEP_PREFIX) {
moduleName += ` (with @glimmer/syntax v${dep.slice(DEP_PREFIX.length + 1)})`;
}

describe(moduleName, () => {
const glimmer = version === DEFAULT ?
require('@glimmer/syntax') :
multidepRequire('@glimmer/syntax', version);
const glimmer = require(dep);

it('collapses whitespace into single space character', () => {
assert(`{{foo}} \n\n \n{{bar}}`);
Expand Down
10 changes: 0 additions & 10 deletions multidep.json

This file was deleted.

11 changes: 4 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,15 @@
"test": "jest",
"test:ember": "ember test"
},
"jest": {
"modulePathIgnorePatterns": [
"<rootDir>/multidep_modules"
]
},
"dependencies": {
"hash-obj": "^3.0.0"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@glimmer/syntax": "^0.62.0",
"@glimmer/syntax-0.35.11": "npm:@glimmer/[email protected]",
"@glimmer/syntax-0.37.1": "npm:@glimmer/[email protected]",
"@glimmer/syntax-0.40.1": "npm:@glimmer/[email protected]",
"ember-cli": "~3.26.1",
"ember-cli-babel": "^7.7.3",
"ember-cli-chai": "^0.5.0",
Expand All @@ -55,8 +53,7 @@
"eslint-config-simplabs": "0.4.0",
"jest": "^26.0.1",
"lerna-changelog": "^1.0.0",
"loader.js": "^4.2.3",
"multidep": "github:Turbo87/node-multidep#mkdirp"
"loader.js": "^4.2.3"
},
"engines": {
"node": "10.* || >= 12.*"
Expand Down
104 changes: 87 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1649,6 +1649,56 @@
dependencies:
"@simple-dom/interface" "^1.4.0"

"@glimmer/interfaces@^0.35.11":
version "0.35.11"
resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.35.11.tgz#063a6fd1af1f660604c9f9d3d93fbc1f6509777a"
integrity sha512-0+SiWocsjh6uwEgqsHHcTuvO21/rXfWtS+C+LPqrdELR0miXJHG32PZeknK0S9Hyvn8Y1c6kefRw83vwyV4zFA==
dependencies:
"@glimmer/wire-format" "^0.35.11"

"@glimmer/interfaces@^0.37.1":
version "0.37.1"
resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.37.1.tgz#44328c49d835445fda26efa7c8d5463ee2e626ed"
integrity sha512-ys5I6iEeaPvSPY9dn6uc9NAh9HkL8fnUZjTHJhlKV5nFv5qqXhBK8hFE86fVXqGRtXLHfOa90pg75vLXgw7u/g==
dependencies:
"@glimmer/wire-format" "^0.37.1"
"@simple-dom/interface" "1.4.0"

"@glimmer/interfaces@^0.40.1":
version "0.40.2"
resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.40.2.tgz#2c9959a672282cb7f9e56d1d27cceddf9a90f200"
integrity sha512-KAbNjEyb2UiNqHRil7C4L73UVINdVc72x2XIw+BXLTu3SY2FA85fWEL6CQZWXXaMv6JCjoyqfg4xNPIlBDyMKQ==

"@glimmer/syntax-0.35.11@npm:@glimmer/[email protected]":
version "0.35.11"
resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.35.11.tgz#4080d15f4ba64b5a96069c6dcc9ed7f81c428cd2"
integrity sha512-Hk27mqz14ccyFVtmEO5mfAB+1S8Hi+mzQp5vrTWXPOAV0IIiR0LnThVWzbRvprCP9GAgZbeNxWCuLT8KBoQrfw==
dependencies:
"@glimmer/interfaces" "^0.35.11"
"@glimmer/util" "^0.35.11"
handlebars "^4.0.6"
simple-html-tokenizer "^0.5.5"

"@glimmer/syntax-0.37.1@npm:@glimmer/[email protected]":
version "0.37.1"
resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.37.1.tgz#f3c507122f7c4b859ce712e0c5bbc43608ca12db"
integrity sha512-DtSRWrbZlgAvLOR62slBvMgUmcnYxfq4Jv5uqCqD4/DUrjV2ezmOMhDFW4zxAVz55luqx9/900XHYiUzsicPyA==
dependencies:
"@glimmer/interfaces" "^0.37.1"
"@glimmer/util" "^0.37.1"
handlebars "^4.0.6"
simple-html-tokenizer "^0.5.6"

"@glimmer/syntax-0.40.1@npm:@glimmer/[email protected]":
version "0.40.1"
resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.40.1.tgz#6c387ca8d3080350c039092586adba37ba2bf351"
integrity sha512-lZ0xv9wNBVt1tteWszQy+PZbVi8v1vmlYjCTU9s/q2H1khrnVe6VYvicVapGATqlMQ84reRqJkQKdgfpy+ig6A==
dependencies:
"@glimmer/interfaces" "^0.40.1"
"@glimmer/util" "^0.40.1"
handlebars "^4.0.13"
simple-html-tokenizer "^0.5.7"

"@glimmer/syntax@^0.62.0":
version "0.62.4"
resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.62.4.tgz#9d5ec15584fed85d807762992a1879fe7fe15ae8"
Expand All @@ -1668,13 +1718,42 @@
"@glimmer/interfaces" "0.62.4"
"@simple-dom/interface" "^1.4.0"

"@glimmer/util@^0.35.11":
version "0.35.11"
resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.35.11.tgz#cd805c1c5cbc6e8ffa3d05aed4e9ec8aa2b291d7"
integrity sha512-Jb/QWnHgy9WMLQuh4eOEe9dPEPDCFTaUXqFTi0RA3/gre1XSSsCz7d492MI4trng0hH3mNHmacT9ppkBUjx9MQ==

"@glimmer/util@^0.37.1":
version "0.37.1"
resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.37.1.tgz#b6dafd36134556053121fc8a8ffceb68e490a4b5"
integrity sha512-Of58Of07fsT8JOkok/tXJvewEdI6LzDxdlIIcdhv6iOJgYUsJUQKUYf6XY+5o/rtsrByPQ5da2WwHbLAcpq0aQ==

"@glimmer/util@^0.40.1":
version "0.40.2"
resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.40.2.tgz#b9aa9fdd1f3b56c635001f6b8b963c3dd74228d8"
integrity sha512-RP7GHNTQH9nG4qf9JF68wVIfIEWNLIxnMWUZaN9jgxcUbMz9hPdn5trWCyQxsGNByDu42Dv9QcqiPpeoo729Dw==

"@glimmer/[email protected]":
version "0.78.2"
resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.78.2.tgz#b530a19f54da385c7099a22cf348e9062d186838"
integrity sha512-GSEf16h6OCtKx7PsSvD21cLXZuVc6swW2rSOAvfLeZco1DEWMRgYTwkCkColydKZcQ3gvwbPBeYwTC2K6tlnjg==
dependencies:
babel-plugin-debug-macros "^0.3.4"

"@glimmer/wire-format@^0.35.11":
version "0.35.11"
resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.35.11.tgz#43fc2499cfdca657fc60ee5f7ce02ed3f6e3cb0d"
integrity sha512-Ovwp9MjBRttBkdU2NLYx2swHOS/MVrAG4fpouaInobKI/FFFMSltbm8HcoYD2QOneuWD0fLQdePaxKsoPLTQlQ==
dependencies:
"@glimmer/util" "^0.35.11"

"@glimmer/wire-format@^0.37.1":
version "0.37.1"
resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.37.1.tgz#34906e320d38bc65b1730b5f78890b184211a0d5"
integrity sha512-iDj8D1eCVDmcsNUcz5epdOCN6Gt53W3cMsS2qAkf2H6REiXQ9kG7ySIGIdahNsLT/f21MT+JzqawylZR0hrw0w==
dependencies:
"@glimmer/util" "^0.37.1"

"@handlebars/parser@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf"
Expand Down Expand Up @@ -1901,7 +1980,7 @@
"@nodelib/fs.scandir" "2.1.3"
fastq "^1.6.0"

"@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==
Expand Down Expand Up @@ -6603,7 +6682,7 @@ growly@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"

handlebars@^4.0.4, handlebars@^4.7.3:
handlebars@^4.0.13, handlebars@^4.0.4, handlebars@^4.0.6, handlebars@^4.7.3:
version "4.7.7"
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
Expand Down Expand Up @@ -8965,15 +9044,6 @@ ms@^2.1.1:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==

"multidep@github:Turbo87/node-multidep#mkdirp":
version "2.0.2"
resolved "https://codeload.github.com/Turbo87/node-multidep/tar.gz/566a5f8aa3380cb6e6d2743e3fb83aa5ba6b7de1"
dependencies:
mkdirp "^0.5.1"
rimraf "^2.4.3"
rsvp "^3.1.0"
spawn-cmd "0.0.2"

mustache@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.0.1.tgz#873855f23aa8a95b150fb96d9836edbc5a1d248a"
Expand Down Expand Up @@ -10301,7 +10371,7 @@ rollup@^0.41.4:
dependencies:
source-map-support "^0.4.0"

rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.1.0:
rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21:
version "3.6.2"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"

Expand Down Expand Up @@ -10525,6 +10595,11 @@ simple-html-tokenizer@^0.5.10:
resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.10.tgz#0843e4f00c9677f1c81e3dfeefcee0a4aca8e5d0"
integrity sha512-1DHMUmvUOGuUZ9/+cX/+hOhWhRD5dEw6lodn8WuV+T+cQ31hhBcCu1dcDsNotowi4mMaNhrLyKoS+DtB81HdDA==

simple-html-tokenizer@^0.5.5, simple-html-tokenizer@^0.5.6, simple-html-tokenizer@^0.5.7:
version "0.5.11"
resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz#4c5186083c164ba22a7b477b7687ac056ad6b1d9"
integrity sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og==

sisteransi@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c"
Expand Down Expand Up @@ -10747,11 +10822,6 @@ spawn-args@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb"

[email protected]:
version "0.0.2"
resolved "https://registry.yarnpkg.com/spawn-cmd/-/spawn-cmd-0.0.2.tgz#6d5e251fad0eab00b0f193d245669a7a228ec0de"
integrity sha1-bV4lH60OqwCw8ZPSRWaaeiKOwN4=

spdx-correct@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
Expand Down

0 comments on commit b08179f

Please sign in to comment.