Skip to content

Commit

Permalink
Revert "[@kbn/ui-framework] move ui-framework to a package (#17085)"
Browse files Browse the repository at this point in the history
This reverts commit ef3339b.
  • Loading branch information
chrisronline committed Mar 13, 2018
1 parent 15c245c commit ce9ce14
Show file tree
Hide file tree
Showing 767 changed files with 1,832 additions and 8,099 deletions.
4 changes: 1 addition & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/src/core_plugins/console/public/tests/webpackShims
/src/ui/public/utils/decode_geo_hash.js
/src/core_plugins/timelion/public/webpackShims/jquery.flot.*
/ui_framework/doc_site/build
/tasks/vendor
/packages/*/node_modules
/packages/*/target
Expand All @@ -17,7 +18,4 @@
/packages/kbn-pm/dist
/packages/kbn-pm/vendor
/packages/kbn-plugin-generator/sao_template/template
/packages/kbn-ui-framework/dist
/packages/kbn-ui-framework/doc_site/build
/packages/kbn-ui-framework/generator-kui/*/templates/
!/.eslintrc.js
39 changes: 0 additions & 39 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,44 +41,5 @@ module.exports = {
'prefer-object-spread/prefer-object-spread': 'off',
},
},

// files that are not allowed to use devDepenedncies
{
files: ['packages/kbn-ui-framework/**/*'],
excludedFiles: [
'packages/kbn-ui-framework/**/*.test.js',
'packages/kbn-ui-framework/doc_site/**/*',
'packages/kbn-ui-framework/generator-kui/**/*',
'packages/kbn-ui-framework/Gruntfile.js',
],
rules: {
'import/no-extraneous-dependencies': [
'error',
{
devDependencies: false,
peerDependencies: true,
},
],
},
},

// files that are allowed to use devDepenedncies
{
files: [
'packages/kbn-ui-framework/**/*.test.js',
'packages/kbn-ui-framework/doc_site/**/*',
'packages/kbn-ui-framework/generator-kui/**/*',
'packages/kbn-ui-framework/Gruntfile.js',
],
rules: {
'import/no-extraneous-dependencies': [
'error',
{
devDependencies: true,
peerDependencies: true,
},
],
},
},
],
};
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ selenium
*.swp
*.swo
*.out
/packages/kbn-ui-framework/doc_site/build/*
!/packages/kbn-ui-framework/doc_site/build/index.html
ui_framework/doc_site/build
!ui_framework/doc_site/build/index.html
package-lock.json
.yo-rc.json
/.vscode
Expand Down
28 changes: 22 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
"makelogs": "echo 'use `node scripts/makelogs`' && false",
"mocha": "echo 'use `node scripts/mocha`' && false",
"sterilize": "grunt sterilize",
"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"
"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"
},
"repository": {
"type": "git",
Expand All @@ -84,7 +84,6 @@
"@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",
Expand Down Expand Up @@ -121,8 +120,11 @@
"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",
Expand All @@ -133,6 +135,7 @@
"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",
Expand Down Expand Up @@ -167,14 +170,17 @@
"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",
Expand All @@ -192,6 +198,7 @@
"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",
Expand Down Expand Up @@ -254,6 +261,9 @@
"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",
Expand All @@ -269,6 +279,7 @@
"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",
Expand All @@ -279,9 +290,11 @@
"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",
Expand All @@ -292,8 +305,11 @@
"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"
"xmlbuilder": "9.0.4",
"yeoman-generator": "1.1.1",
"yo": "2.0.0"
},
"engines": {
"node": "8.9.4",
Expand Down
75 changes: 0 additions & 75 deletions packages/kbn-ui-framework/package.json

This file was deleted.

Loading

0 comments on commit ce9ce14

Please sign in to comment.