Skip to content

Commit

Permalink
Fix build with ui framework (#9471)
Browse files Browse the repository at this point in the history
Backports PR #9463

**Commit 1:**
[uiFramework] include sass deps in production so we can rebuild

* Original sha: aae8eec
* Authored by spalger <[email protected]> on 2016-12-13T19:08:06Z

**Commit 2:**
[build] do not copy the doc_site source into the final build

* Original sha: fccbe49
* Authored by spalger <[email protected]> on 2016-12-13T19:08:31Z

**Commit 3:**
[licenses] allow code that uses the `Unlicense`

* Original sha: 9406b9e
* Authored by spalger <[email protected]> on 2016-12-13T20:46:19Z
  • Loading branch information
elastic-jasper authored and spalger committed Dec 13, 2016
1 parent 67655da commit c0cac00
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
"moment-timezone": "0.5.4",
"no-ui-slider": "1.2.0",
"node-fetch": "1.3.2",
"node-sass": "3.8.0",
"node-uuid": "1.4.7",
"pegjs": "0.9.0",
"querystring-browser": "1.0.4",
Expand All @@ -150,6 +151,7 @@
"rimraf": "2.4.3",
"rison-node": "1.0.0",
"rjs-repack-loader": "1.0.6",
"sass-loader": "4.0.0",
"script-loader": "0.6.1",
"semver": "5.1.0",
"style-loader": "0.12.3",
Expand Down Expand Up @@ -217,7 +219,6 @@
"murmurhash3js": "3.0.1",
"ncp": "2.0.0",
"nock": "8.0.0",
"node-sass": "3.8.0",
"npm": "3.10.8",
"portscanner": "1.0.0",
"proxyquire": "1.7.10",
Expand All @@ -229,7 +230,6 @@
"react-router-redux": "4.0.4",
"redux": "3.0.0",
"redux-thunk": "0.1.0",
"sass-loader": "4.0.0",
"simple-git": "1.37.0",
"sinon": "1.17.2",
"source-map": "0.5.6",
Expand Down
1 change: 1 addition & 0 deletions tasks/config/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ module.exports = function (grunt) {
'!src/core_plugins/tests_bundle/**',
'!src/core_plugins/console/public/tests/**',
'!src/cli/cluster/**',
'!src/ui_framework/doc_site/**',
],
dest: 'build/kibana',
expand: true
Expand Down
1 change: 1 addition & 0 deletions tasks/config/licenses.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ module.exports = function (grunt) {
'MIT/X11',
'OFL-1.1 AND MIT',
'Public domain',
'Unlicense',
'WTFPL',
'new BSD, and MIT'
],
Expand Down

0 comments on commit c0cac00

Please sign in to comment.