Skip to content

Commit

Permalink
Replace forked dependencies with released versions
Browse files Browse the repository at this point in the history
Replaces amd-name-resolver and broccoli-typescript-compiler forked GitHub dependencies with released versions
  • Loading branch information
tomdale committed Oct 17, 2019
1 parent 768817b commit 73b6654
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
10 changes: 2 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@
"yarn:unlink": "node bin/yarn-link-all --unlink",
"link:local": "node bin/yarn-link-local"
},
"resolutions": {
"typescript": "3.5.3",
"amd-name-resolver": "https://github.com/ember-cli/amd-name-resolver.git",
"broccoli-typescript-compiler": "http://github.com/wycats/broccoli-typescript-compiler.git#upgrade-typescript",
"broccoli-typescript-compiler/typescript": "3.5.3"
},
"dependencies": {
"@simple-dom/document": "^1.4.0",
"@simple-dom/interface": "^1.4.0",
Expand All @@ -48,7 +42,7 @@
},
"devDependencies": {
"@types/qunit": "^2.0.31",
"amd-name-resolver": "^1.0.0",
"amd-name-resolver": "^1.3.1",
"auto-dist-tag": "^1.0.0",
"babel-plugin-nukable-import": "^0.4.2",
"babel-plugin-strip-glimmer-utils": "^0.1.1",
Expand All @@ -64,7 +58,7 @@
"broccoli-persistent-filter": "^2.1.1",
"broccoli-rollup": "^2.0.0",
"broccoli-source": "^1.1.0",
"broccoli-typescript-compiler": "http://github.com/wycats/broccoli-typescript-compiler.git#upgrade-typescript",
"broccoli-typescript-compiler": "^4.2.0",
"dag-map": "^2.0.2",
"ember-cli": "~3.6.1",
"ember-cli-release": "^1.0.0-beta.2",
Expand Down
20 changes: 13 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,14 @@ alter@~0.2.0:
dependencies:
stable "~0.1.3"

amd-name-resolver@0.0.4, amd-name-resolver@^1.0.0, amd-name-resolver@^1.2.0, "amd-name-resolver@https://github.com/ember-cli/amd-name-resolver.git":
amd-name-resolver@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.4.tgz#aa19f1b9a0afcef975451b263b7dfb690a9c0ca3"
integrity sha1-qhnxuaCvzvl1RRsmO337aQqcDKM=

amd-name-resolver@^1.0.0, amd-name-resolver@^1.2.0, amd-name-resolver@^1.3.1:
version "1.3.1"
resolved "https://github.com/ember-cli/amd-name-resolver.git#8716595b9b83da9a8fb3fba44ac175bbc0c138c8"
resolved "https://github.com/ember-cli/amd-name-resolver.git#7433667199538b1688ac57394531fe26ab2a84b8"
dependencies:
ensure-posix-path "^1.1.1"
object-hash "^1.3.1"
Expand Down Expand Up @@ -1899,17 +1904,18 @@ broccoli-string-replace@0.1.1:
broccoli-persistent-filter "^1.1.5"
minimatch "^2.0.8"

"broccoli-typescript-compiler@http://github.com/wycats/broccoli-typescript-compiler.git#upgrade-typescript":
version "4.1.0"
resolved "http://github.com/wycats/broccoli-typescript-compiler.git#ab0bd39d3645bdc4fcbe76ab701664de5a868158"
broccoli-typescript-compiler@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/broccoli-typescript-compiler/-/broccoli-typescript-compiler-4.2.0.tgz#b0c75898c75b897f40d3f627d548a64e0bb3d9f2"
integrity sha512-Fk17EapT3Yye5pUNC3lzxq78KdFTWGC7m8Zi8BnIfwD6ZPzVT+uEYMEcYXsfCtMD//jHSIXDQi9YlWZcHVjiDw==
dependencies:
broccoli-funnel "^2.0.1"
broccoli-merge-trees "^3.0.0"
broccoli-plugin "^1.3.0"
fs-tree-diff "^0.5.7"
heimdalljs "0.3.3"
md5-hex "^2.0.0"
typescript "~3.5.1"
typescript "~3.5.3"
walk-sync "^0.3.2"

broccoli-uglify-sourcemap@^1.0.1:
Expand Down Expand Up @@ -9780,7 +9786,7 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

typescript@3.5.3, typescript@~3.5.1:
typescript@~3.5.3:
version "3.5.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
Expand Down

0 comments on commit 73b6654

Please sign in to comment.