From 4b2ac1038102bdae3a485aa6017e000a00a161e5 Mon Sep 17 00:00:00 2001 From: Spencer Date: Tue, 13 Dec 2016 14:41:57 -0700 Subject: [PATCH] Fix build with ui framework (#9463) * [uiFramework] include sass deps in production so we can rebuild * [build] do not copy the doc_site source into the final build * [licenses] allow code that uses the `Unlicense` --- package.json | 4 ++-- tasks/config/copy.js | 1 + tasks/config/licenses.js | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 44c95cdaf4b21..d4e0d209b3b20 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/tasks/config/copy.js b/tasks/config/copy.js index f087966510f27..8ec6916190dec 100644 --- a/tasks/config/copy.js +++ b/tasks/config/copy.js @@ -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 diff --git a/tasks/config/licenses.js b/tasks/config/licenses.js index 97731e063da1d..c43499364018f 100644 --- a/tasks/config/licenses.js +++ b/tasks/config/licenses.js @@ -29,6 +29,7 @@ module.exports = function (grunt) { 'MIT/X11', 'OFL-1.1 AND MIT', 'Public domain', + 'Unlicense', 'WTFPL', 'new BSD, and MIT' ],