yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-11-01 19:25:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolves conflict between monorepo package dependencies

Browse Source
This commit is contained in:
Seyi Adebajo 2020-01-29 23:22:03 -08:00
parent 67548c1409
commit 25ea4df19d
10 changed files with 1028 additions and 780 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
datahub-web/@datahub/datasets-core/package.json
View File

@ -27,22 +27,22 @@
"@fortawesome/ember-fontawesome": "^0.1.13",
"@fortawesome/free-regular-svg-icons": "^5.7.2",
"@fortawesome/free-solid-svg-icons": "^5.7.2",
"@nacho-ui/animations": "^0.0.21",
"@nacho-ui/core": "^0.0.21",
"@nacho-ui/pill": "^0.0.21",
"@nacho-ui/table": "^0.0.21",
"@nacho-ui/animations": "^0.0.37",
"@nacho-ui/core": "0.0.34",
"@nacho-ui/pill": "^0.0.37",
"@nacho-ui/table": "^0.0.37",
"ember-ace": "^2.0.1",
"ember-basic-dropdown": "^1.1.3",
"ember-cli-babel": "^7.8.0",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-typescript": "^2.0.2",
"ember-composable-helpers": "^2.1.0",
"ember-concurrency": "^1.0.0"
"ember-concurrency": "^1.1.5"
},
"devDependencies": {
"@babel/core": "^7.4.0",
"@ember/optional-features": "^0.7.0",
"@nacho-ui/dropdown": "^0.0.21",
"@nacho-ui/dropdown": "^0.0.37",
"broccoli-asset-rev": "^3.0.0",
"ember-ace": "^2.0.1",
"ember-ajax": "^4.0.2",

4
datahub-web/@datahub/entity-deprecation/package.json
View File

@ -20,7 +20,7 @@
"postpublish": "ember ts:clean"
},
"dependencies": {
"@nacho-ui/core": "^0.0.21",
"@nacho-ui/core": "0.0.34",
"ember-basic-dropdown": "^1.1.3",
"ember-cli-babel": "^7.8.0",
"ember-cli-htmlbars": "^2.0.1",
@ -28,7 +28,7 @@
"ember-cli-string-helpers": "^2.0.0",
"ember-cli-typescript": "^2.0.2",
"ember-medium-editor-fix": "^0.0.3",
"ember-moment": "^7.8.1",
"ember-moment": "^8.0.0",
"ember-power-calendar": "^0.14.0",
"ember-power-calendar-moment": "^0.1.7",
"ember-truth-helpers": "^2.1.0",

2
datahub-web/@datahub/entity-header/package.json
View File

@ -24,7 +24,7 @@
"postpublish": "ember ts:clean"
},
"dependencies": {
"@nacho-ui/core": "^0.0.21",
"@nacho-ui/core": "0.0.34",
"ember-cli-babel": "^7.8.0",
"ember-cli-htmlbars": "^3.0.1",
"ember-cli-string-helpers": "^2.0.0",

10
datahub-web/@datahub/institutional-memory/package.json
View File

@ -24,17 +24,17 @@
"@datahub/data-models": "0.0.0",
"@datahub/utils": "0.0.0",
"@fortawesome/ember-fontawesome": "^0.1.13",
"@nacho-ui/animations": "^0.0.21",
"@nacho-ui/core": "^0.0.21",
"@nacho-ui/table": "^0.0.21",
"@nacho-ui/animations": "^0.0.37",
"@nacho-ui/core": "0.0.34",
"@nacho-ui/table": "^0.0.37",
"ember-cli-babel": "^7.8.0",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-sass": "^10.0.0",
"ember-cli-typescript": "^2.0.2",
"ember-concurrency": "^1.0.0",
"ember-concurrency": "^1.1.5",
"ember-inflector": "^3.0.0",
"ember-modal-dialog": "^3.0.0-beta.0",
"ember-moment": "^7.8.1"
"ember-moment": "^8.0.0"
},
"devDependencies": {
"@babel/core": "^7.4.0",

6
datahub-web/@datahub/lists/package.json
View File

@ -29,8 +29,8 @@
"@fortawesome/ember-fontawesome": "^0.1.13",
"@fortawesome/free-regular-svg-icons": "^5.7.2",
"@fortawesome/free-solid-svg-icons": "^5.7.2",
"@nacho-ui/animations": "^0.0.21",
"@nacho-ui/core": "^0.0.21",
"@nacho-ui/animations": "^0.0.37",
"@nacho-ui/core": "0.0.34",
"ember-cli-babel": "^7.8.0",
"ember-cli-htmlbars": "^3.0.1",
"ember-cli-typescript": "^2.0.2",
@ -59,7 +59,7 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-typescript-blueprints": "^2.0.0",
"ember-cli-uglify": "^2.1.0",
"ember-concurrency": "^1.0.0",
"ember-concurrency": "^1.1.5",
"ember-decorators": "^6.0.0",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",

8
datahub-web/@datahub/shared/package.json
View File

@ -24,10 +24,10 @@
"@datahub/utils": "0.0.0",
"ember-cli-babel": "^7.8.0",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-string-helpers": "^2.0.0",
"ember-cli-typescript": "^2.0.2",
"ember-moment": "^7.8.1",
"ember-simple-auth": "^1.8.2",
"ember-cli-string-helpers": "^2.0.0"
"ember-moment": "^8.0.0",
"ember-simple-auth": "^1.8.2"
},
"devDependencies": {
"@babel/core": "^7.4.0",
@ -47,7 +47,7 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-typescript-blueprints": "^2.0.0",
"ember-cli-uglify": "^2.1.0",
"ember-concurrency": "^1.0.0",
"ember-concurrency": "^1.1.5",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-maybe-import-regenerator": "^0.1.6",

12
datahub-web/@datahub/user/package.json
View File

@ -29,10 +29,10 @@
"@fortawesome/free-brands-svg-icons": "^5.7.2",
"@fortawesome/free-regular-svg-icons": "^5.7.2",
"@fortawesome/free-solid-svg-icons": "^5.7.2",
"@nacho-ui/avatars": "^0.0.34",
"@nacho-ui/core": "^0.0.34",
"@nacho-ui/dropdown": "^0.0.34",
"@nacho-ui/pill": "^0.0.34",
"@nacho-ui/avatars": "^0.0.37",
"@nacho-ui/core": "0.0.34",
"@nacho-ui/dropdown": "^0.0.37",
"@nacho-ui/pill": "^0.0.37",
"@nacho-ui/table": "^0.0.37",
"ember-cli-babel": "^7.8.0",
"ember-cli-htmlbars": "^3.0.0",
@ -40,7 +40,7 @@
"ember-cli-sass": "^10.0.0",
"ember-cli-typescript": "^2.0.2",
"ember-composable-helpers": "^2.1.0",
"ember-concurrency": "^1.1.2",
"ember-concurrency": "^1.1.5",
"ember-modal-dialog": "^3.0.0-beta.0",
"ember-moment": "^8.0.0",
"ember-simple-auth": "^1.9.2",
@ -50,7 +50,7 @@
"devDependencies": {
"@babel/core": "^7.4.0",
"@ember/optional-features": "^0.7.0",
"@nacho-ui/animations": "^0.0.34",
"@nacho-ui/animations": "^0.0.37",
"@types/ember": "^3.1.0",
"@types/ember-qunit": "^3.4.6",
"@types/ember-test-helpers": "^1.0.5",

6
datahub-web/@datahub/utils/package.json
View File

@ -21,7 +21,7 @@
"postpublish": "ember ts:clean"
},
"dependencies": {
"@nacho-ui/core": "^0.0.21",
"@nacho-ui/core": "0.0.34",
"ember-cli-babel": "^7.8.0",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-moment-shim": "^3.7.1",
@ -29,7 +29,7 @@
"ember-fetch": "^6.4.0",
"ember-lodash": "^4.18.0",
"ember-modal-dialog": "^3.0.0-beta.0",
"ember-moment": "^7.8.1",
"ember-moment": "^8.0.0",
"ember-radio-button": "^2.0.0",
"ember-tooltips": "^2.10.0",
"ember-truth-helpers": "^2.0.0"
@ -58,7 +58,7 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-typescript-blueprints": "^2.0.0",
"ember-cli-uglify": "^2.1.0",
"ember-concurrency": "^1.0.0",
"ember-concurrency": "^1.1.5",
"ember-decorators": "^6.0.0",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",

14
datahub-web/packages/data-portal/package.json
View File

@ -60,7 +60,7 @@
"ember-cli-typescript-blueprints": "^2.0.0",
"ember-cli-uglify": "^2.1.0",
"ember-composable-helpers": "^2.1.0",
"ember-concurrency": "^1.0.0",
"ember-concurrency": "^1.1.5",
"ember-decorators": "^6.0.0",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",
@ -88,14 +88,14 @@
"@datahub/lists": "0.0.0",
"@datahub/metadata-types": "0.0.0",
"@datahub/shared": "0.0.0",
"@datahub/user": "0.0.0",
"@datahub/tracking": "0.0.0",
"@datahub/user": "0.0.0",
"@datahub/utils": "0.0.0",
"@fortawesome/ember-fontawesome": "^0.1.13",
"@nacho-ui/avatars": "^0.0.21",
"@nacho-ui/core": "^0.0.21",
"@nacho-ui/table": "^0.0.21",
"@nacho-ui/dropdown": "^0.0.21",
"@nacho-ui/avatars": "^0.0.37",
"@nacho-ui/core": "0.0.34",
"@nacho-ui/dropdown": "^0.0.37",
"@nacho-ui/table": "^0.0.37",
"@types/vis": "^4.21.11",
"bootstrap": "3.3.7",
"bootstrap-sass": "^3.3.7",
@ -111,7 +111,7 @@
"ember-medium-editor-fix": "^0.0.3",
"ember-metrics": "^0.13.0",
"ember-modal-dialog": "^3.0.0-beta.0",
"ember-moment": "^7.8.1",
"ember-moment": "^8.0.0",
"ember-power-calendar": "^0.14.0",
"ember-power-select": "^2.0.9",
"ember-power-select-typeahead": "^0.7.2",

1734
datahub-web/yarn.lock
View File

File diff suppressed because it is too large Load Diff