Skip to content

Commit

Permalink
build: fix import in test-app, update ember-try to v3 to fix a fs-ext…
Browse files Browse the repository at this point in the history
…ra bug, remove no longer applied resolutions
  • Loading branch information
BlueCutOfficial committed Mar 3, 2023
1 parent dfc99fe commit 0c87df5
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 21 deletions.
3 changes: 0 additions & 3 deletions addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@
"prettier": "^2.7.1",
"rollup": "^3.17.3"
},
"resolutions": {
"clean-css": "4.2.1"
},
"engines": {
"node": "14.* || 16.* || >= 18"
},
Expand Down
5 changes: 1 addition & 4 deletions test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"ember-source": "~4.8.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.0.1",
"ember-try": "^2.0.0",
"ember-try": "^3.0.0-beta.1",
"eslint": "^8.16.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.1.0",
Expand All @@ -80,9 +80,6 @@
"qunit-dom": "^2.0.0",
"webpack": "^5.74.0"
},
"resolutions": {
"clean-css": "4.2.1"
},
"engines": {
"node": "14.* || 16.* || >= 18"
},
Expand Down
2 changes: 1 addition & 1 deletion test-app/tests/unit/index-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import slugify, { removeDiacritics } from 'test-app'
import slugify, { removeDiacritics } from 'ember-slugify'
import { module, test } from 'qunit'

module('Unit | Utility | slug', function () {
Expand Down
48 changes: 35 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3098,12 +3098,13 @@ clean-css-promise@^0.1.0:
clean-css "^3.4.5"
pinkie-promise "^2.0.0"

clean-css@4.2.1, clean-css@^3.4.5:
version "4.2.1"
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
clean-css@^3.4.5:
version "3.4.28"
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
integrity sha512-aTWyttSdI2mYi07kWqHi24NUU9YlELFKGOAgFzZjDN1064DMAOy2FBuoyGmkKRlXkbpXd0EVHmiVkbKhKoirTw==
dependencies:
source-map "~0.6.0"
commander "2.8.x"
source-map "0.4.x"

clean-stack@^2.0.0, clean-stack@^2.2.0:
version "2.2.0"
Expand Down Expand Up @@ -3240,6 +3241,13 @@ combined-stream@^1.0.8:
dependencies:
delayed-stream "~1.0.0"

[email protected]:
version "2.8.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
integrity sha512-+pJLBFVk+9ZZdlAOB5WuIElVPPth47hILFkmGym57aq8kwxsowvByvB0DHs1vQAhyMZzdcpTtF0VDKGkSDR4ZQ==
dependencies:
graceful-readlink ">= 1.0.0"

[email protected]:
version "7.2.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
Expand Down Expand Up @@ -4283,18 +4291,18 @@ ember-try-config@^4.0.0:
remote-git-tags "^3.0.0"
semver "^7.3.2"

ember-try@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-2.0.0.tgz#2671c221f5a0335fa2c189d00db7146e2e72a1dd"
integrity sha512-2N7Vic45sbAegA5fhdfDjVbEVS4r+ze+tTQs2/wkY+8fC5yAGHfCM5ocyoTfBN5m7EhznC3AyMsOy4hLPzHFSQ==
ember-try@^3.0.0-beta.1:
version "3.0.0-beta.1"
resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-3.0.0-beta.1.tgz#2809d95ac48f72d989516e20ea589b6ca856ea91"
integrity sha512-L8Nuy1iJZQmaEvxycTXCKe67K85f44DLRvwZL5ow8WtPdaZQuAHs9fJmYEGI1uyymf4MJChu6wwyh3tLSHiCag==
dependencies:
chalk "^4.1.2"
cli-table3 "^0.6.0"
core-object "^3.1.5"
debug "^4.3.2"
ember-try-config "^4.0.0"
execa "^4.1.0"
fs-extra "^9.0.1"
fs-extra "^6.0.1"
resolve "^1.20.0"
rimraf "^3.0.2"
walk-sync "^2.2.0"
Expand Down Expand Up @@ -5292,6 +5300,15 @@ fs-extra@^5.0.0:
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-extra@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
dependencies:
graceful-fs "^4.1.2"
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-extra@^7.0.0, fs-extra@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
Expand All @@ -5310,7 +5327,7 @@ fs-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-extra@^9.0.1, fs-extra@^9.1.0:
fs-extra@^9.1.0:
version "9.1.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
Expand Down Expand Up @@ -5654,6 +5671,11 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0,
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==

"graceful-readlink@>= 1.0.0":
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==

grapheme-splitter@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
Expand Down Expand Up @@ -8916,7 +8938,7 @@ source-map-url@^0.4.0:
resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==

source-map@^0.4.2:
source-map@0.4.x, source-map@^0.4.2:
version "0.4.4"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
integrity sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==
Expand All @@ -8928,7 +8950,7 @@ source-map@^0.5.6:
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==

source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
Expand Down

0 comments on commit 0c87df5

Please sign in to comment.