Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switching to using a fork #23422

Merged
merged 6 commits into from
Oct 15, 2018
Merged

Switching to using a fork #23422

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b3bf0f0
Switching to using a fork
kobelb Sep 21, 2018
ad62a0d
Updating package.jsons to use @elastic/lodash
kobelb Sep 24, 2018
c3a6602
Changing import/require to @elastic/lodash
kobelb Sep 24, 2018
652c8af
Revert "Changing import/require to @elastic/lodash"
kobelb Sep 24, 2018
de6ef60
Switching lodash to an alias so the import/requires are transparent
kobelb Sep 24, 2018
8fe04ef
Merge remote-tracking branch 'upstream/master' into lodash-fork
kobelb Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
"leaflet.heat": "0.2.0",
"less": "2.7.1",
"less-loader": "4.0.5",
"lodash": "3.10.1",
"lodash": "git://github.com/kobelb/lodash.git#3.10.2-npm",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might just be testing this for now, but ultimately we'll need to publish this to the elastic org on npm and use that. With URL references, yarn has to pull down the remote package every time you bootstrap in order to resolve the packages, whereas with npm repo packages it will determine whether it needs to pull based on the file system first.

Take a page from the hapi upgrade where the forked versioned it based on the scheme <original version>-kibana1 https://github.com/elastic/kibana/pull/21707/files#diff-b9cfc7f2cdf78a7f4b91a753d10865a2R64

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using the hard-coded git link was just for testing, I'll be pushing to a package before we actually switch to this.

"lru-cache": "4.1.1",
"markdown-it": "^8.4.1",
"minimatch": "^3.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-ui-framework/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dependencies": {
"classnames": "2.2.5",
"focus-trap-react": "^3.1.1",
"lodash": "3.10.1",
"lodash": "git://github.com/kobelb/lodash.git#3.10.2-npm",
"prop-types": "15.5.8",
"react": "^16.2.0",
"react-ace": "^5.9.0",
Expand Down
12 changes: 8 additions & 4 deletions packages/kbn-ui-framework/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4195,18 +4195,22 @@ lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"

lodash@3.10.1, lodash@^3.10.1, lodash@^3.3.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"

lodash@4.17.4:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

lodash@^3.10.1, lodash@^3.3.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"

lodash@^4.0.0, lodash@^4.0.1, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.4, lodash@~4.17.5:
version "4.17.5"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"

"lodash@git://github.com/kobelb/lodash.git#3.10.2-npm":
version "3.10.2"
resolved "git://github.com/kobelb/lodash.git#f3969c402203ec22bd6b1dae3841c73df134e7db"

lodash@~4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.3.0.tgz#efd9c4a6ec53f3b05412429915c3e4824e4d25a4"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"joi": "6.10.1",
"jquery": "^3.3.1",
"jstimezonedetect": "1.0.5",
"lodash": "3.10.1",
"lodash": "git://github.com/kobelb/lodash.git#3.10.2-npm",
"lodash.clone": "^4.5.0",
"lodash.keyby": "^4.6.0",
"lodash.lowercase": "^4.3.0",
Expand Down
6 changes: 5 additions & 1 deletion x-pack/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5342,7 +5342,7 @@ lodash@2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"

lodash@3.10.1, lodash@^3.10.1:
lodash@^3.10.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"

Expand All @@ -5362,6 +5362,10 @@ lodash@^4.3.0:
version "4.17.5"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"

"lodash@git://github.com/kobelb/lodash.git#3.10.2-npm":
version "3.10.2"
resolved "git://github.com/kobelb/lodash.git#f3969c402203ec22bd6b1dae3841c73df134e7db"

lodash@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
Expand Down
12 changes: 8 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8708,14 +8708,14 @@ lodash@2.4.2, lodash@~2.4.1:
version "2.4.2"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"

lodash@3.10.1, lodash@^3.10.0, lodash@^3.10.1, lodash@^3.3.1, lodash@^3.8.0, lodash@~3.10.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"

lodash@4.17.4:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

lodash@^3.10.0, lodash@^3.10.1, lodash@^3.3.1, lodash@^3.8.0, lodash@~3.10.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"

lodash@^4.0.0, lodash@^4.17.10:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
Expand All @@ -8724,6 +8724,10 @@ lodash@^4.0.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, l
version "4.17.5"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"

"lodash@git://github.com/kobelb/lodash.git#3.10.2-npm":
version "3.10.2"
resolved "git://github.com/kobelb/lodash.git#f3969c402203ec22bd6b1dae3841c73df134e7db"

lodash@~4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.3.0.tgz#efd9c4a6ec53f3b05412429915c3e4824e4d25a4"
Expand Down