-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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.
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
[@kbn/ui-framework] move ui-framework to a package #17085
Merged
spalger
merged 4 commits into
elastic:master
from
spalger:upgrade/ui-framework-react-router
Mar 13, 2018
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
e839543
[@kbn/ui-framework] move ui-framework to a package
spalger e664cee
[@kbn/ui-framework] restore doc_site index.html and fix build task names
spalger f17ed36
Merge branch 'master' of github.com:elastic/kibana into upgrade/ui-fr…
spalger b13cbf8
[jest] always ignore modules in target dirs
spalger File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,10 +66,10 @@ | |
"makelogs": "echo 'use `node scripts/makelogs`' && false", | ||
"mocha": "echo 'use `node scripts/mocha`' && false", | ||
"sterilize": "grunt sterilize", | ||
"uiFramework:start": "grunt uiFramework:start", | ||
"uiFramework:build": "grunt uiFramework:build", | ||
"uiFramework:createComponent": "yo ./ui_framework/generator-kui/app/component.js", | ||
"uiFramework:documentComponent": "yo ./ui_framework/generator-kui/app/documentation.js" | ||
"uiFramework:start": "cd packages/kbn-ui-framework && yarn docSiteStart", | ||
"uiFramework:build": "cd packages/kbn-ui-framework && yarn docSiteBuild", | ||
"uiFramework:createComponent": "cd packages/kbn-ui-framework && yarn createComponent", | ||
"uiFramework:documentComponent": "cd packages/kbn-ui-framework && yarn documentComponent" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
|
@@ -84,6 +84,7 @@ | |
"@kbn/datemath": "link:packages/kbn-datemath", | ||
"@kbn/pm": "link:packages/kbn-pm", | ||
"@kbn/test-subj-selector": "link:packages/kbn-test-subj-selector", | ||
"@kbn/ui-framework": "link:packages/kbn-ui-framework", | ||
"JSONStream": "1.1.1", | ||
"accept-language-parser": "1.2.0", | ||
"angular": "1.6.5", | ||
|
@@ -120,11 +121,8 @@ | |
"encode-uri-query": "1.0.0", | ||
"even-better": "7.0.2", | ||
"expiry-js": "0.1.7", | ||
"exports-loader": "0.6.4", | ||
"expose-loader": "0.7.3", | ||
"extract-text-webpack-plugin": "3.0.1", | ||
"file-loader": "1.1.4", | ||
"focus-trap-react": "^3.1.1", | ||
"font-awesome": "4.4.0", | ||
"glob": "5.0.13", | ||
"glob-all": "3.0.1", | ||
|
@@ -135,7 +133,6 @@ | |
"hjson": "3.1.0", | ||
"http-proxy-agent": "1.0.0", | ||
"https-proxy-agent": "2.1.1", | ||
"imports-loader": "0.7.1", | ||
"inert": "4.0.2", | ||
"jade": "1.11.0", | ||
"jade-loader": "0.8.0", | ||
|
@@ -170,17 +167,14 @@ | |
"querystring-browser": "1.0.4", | ||
"raw-loader": "0.5.1", | ||
"react": "^16.2.0", | ||
"react-ace": "^5.9.0", | ||
"react-anything-sortable": "^1.7.3", | ||
"react-color": "^2.13.8", | ||
"react-dom": "^16.2.0", | ||
"react-grid-layout": "^0.16.2", | ||
"react-input-range": "^1.3.0", | ||
"react-markdown": "^3.1.4", | ||
"react-redux": "^5.0.6", | ||
"react-router": "^3.2.0", | ||
"react-router-dom": "4.2.2", | ||
"react-router-redux": "^4.0.8", | ||
"react-select": "^1.2.0", | ||
"react-sizeme": "^2.3.6", | ||
"react-toggle": "4.0.2", | ||
|
@@ -198,7 +192,6 @@ | |
"script-loader": "0.7.2", | ||
"semver": "5.1.0", | ||
"style-loader": "0.19.0", | ||
"tabbable": "1.1.0", | ||
"tar": "2.2.0", | ||
"tinygradient": "0.3.0", | ||
"topojson-client": "3.0.0", | ||
|
@@ -261,9 +254,6 @@ | |
"grunt-run": "0.7.0", | ||
"grunt-simple-mocha": "0.4.0", | ||
"gulp-sourcemaps": "1.7.3", | ||
"highlight.js": "9.0.0", | ||
"html": "1.0.0", | ||
"html-loader": "0.5.1", | ||
"husky": "0.8.1", | ||
"image-diff": "1.6.0", | ||
"istanbul-instrumenter-loader": "3.0.0", | ||
|
@@ -279,7 +269,6 @@ | |
"karma-junit-reporter": "1.2.0", | ||
"karma-mocha": "1.3.0", | ||
"karma-safari-launcher": "1.0.0", | ||
"keymirror": "0.1.1", | ||
"leadfoot": "1.7.1", | ||
"license-checker": "^16.0.0", | ||
"load-grunt-config": "0.19.2", | ||
|
@@ -290,11 +279,9 @@ | |
"murmurhash3js": "3.0.1", | ||
"ncp": "2.0.0", | ||
"nock": "8.0.0", | ||
"node-sass": "4.5.3", | ||
"pixelmatch": "4.0.2", | ||
"prettier": "^1.11.1", | ||
"proxyquire": "1.7.10", | ||
"sass-loader": "6.0.6", | ||
"simple-git": "1.37.0", | ||
"sinon": "1.17.2", | ||
"source-map": "0.5.6", | ||
|
@@ -305,11 +292,8 @@ | |
"tree-kill": "1.1.0", | ||
"ts-jest": "^22.0.4", | ||
"typescript": "^2.7.2", | ||
"webpack-dev-server": "2.9.1", | ||
"xml2js": "0.4.19", | ||
"xmlbuilder": "9.0.4", | ||
"yeoman-generator": "1.1.1", | ||
"yo": "2.0.0" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I ❤️ THIS CLEANUP SO MUCH! |
||
"xmlbuilder": "9.0.4" | ||
}, | ||
"engines": { | ||
"node": "8.9.4", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
...work/doc_site/src/images/elastic-logo.svg → ...work/doc_site/src/images/elastic-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
ui_framework/doc_site/src/main.scss → ...s/kbn-ui-framework/doc_site/src/main.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
@import "../../../node_modules/@elastic/eui/src/global_styling/index"; | ||
@import "~@elastic/eui/src/global_styling/index"; | ||
@import "../../dist/ui_framework.css"; | ||
@import "./components/guide_components"; |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we need this setup for
ui-framework
but not for the rest of Kibana? Maybe it's been discussed somewhere (I've been sick the last week, so my brain is still a bit foggy).Or is it just a "nice addon" to help make it clear?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I only added it to the ui-framework to help me verify that I was pulling in the right dependencies and making the right things dev/normal deps. I think we could absolutely use this in other places, but I don't think it needs to go into this PR.