Skip to content
This repository was archived by the owner on Mar 31, 2024. It is now read-only.

Commit

Permalink
building is mostly stable, less is improving, initial cached building…
Browse files Browse the repository at this point in the history
… added
  • Loading branch information
Spencer Alger committed Jul 7, 2015
1 parent 935bb5e commit 522a00e
Show file tree
Hide file tree
Showing 235 changed files with 1,848 additions and 1,440 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
.node_binaries
node_modules
bower_components
**/*.css
trash
build
bundles
target
.jruby
.idea
Expand Down
1 change: 1 addition & 0 deletions .jscsrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"esprima": "./node_modules/babel-jscs",
"maximumLineLength": {
"value": 140,
"allowComments": true
Expand Down
1 change: 1 addition & 0 deletions .jshintrc.node
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"extends": "./.jshintrc",
"node": true,
"esnext": true,

"globals": {
"Promise": true,
Expand Down
11 changes: 1 addition & 10 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,21 @@
"angular-route": "1.2.28",
"angular-ui-ace": "0.2.3",
"bluebird": "~2.9.27",
"bootstrap": "3.3.4",
"d3": "3.5.5",
"elasticsearch": "~5.0.0",
"Faker": "1.1.0",
"FileSaver": "babc6d9d8f",
"font-awesome": "4.3.0",
"gridster": "0.5.6",
"jquery": "2.1.4",
"leaflet": "0.7.3",
"Leaflet.heat": "Leaflet/Leaflet.heat#627ede7c11bbe43",
"lesshat": "3.0.2",
"lodash": "3.9.3",
"moment": "2.10.3",
"moment-timezone": "0.4.0",
"ng-clip": "0.2.6",
"require-css": "0.1.8",
"requirejs": "2.1.18",
"requirejs-text": "2.0.14",
"marked": "0.3.3",
"numeral": "1.5.3",
"leaflet-draw": "0.2.4"
},
"devDependencies": {},
"resolutions": {
"angular": "1.2.28"
}
"devDependencies": {}
}
Empty file removed entries/sense.js
Empty file.
25 changes: 18 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,52 @@
},
"dependencies": {
"ansicolors": "^0.3.2",
"autoprefixer-loader": "^2.0.0",
"babel-jscs": "^1.0.3",
"bluebird": "^2.9.27",
"body-parser": "^1.10.1",
"boom": "^2.8.0",
"bootstrap": "^3.3.5",
"bunyan": "^1.2.3",
"commander": "^2.6.0",
"compression": "^1.3.0",
"cookie-parser": "^1.3.3",
"css-loader": "^0.15.1",
"debug": "^2.1.1",
"elasticsearch": "^5.0.0",
"exports-loader": "^0.6.2",
"express": "^4.10.6",
"file-loader": "^0.8.4",
"font-awesome": "^4.3.0",
"glob": "^4.3.2",
"good": "^5.1.2",
"good-console": "^4.1.0",
"good-file": "^4.0.2",
"good-reporter": "^3.1.0",
"hapi": "^8.6.1",
"http-auth": "^2.2.5",
"imports-loader": "^0.6.4",
"joi": "^6.4.3",
"js-yaml": "^3.2.5",
"json-stringify-safe": "^5.0.1",
"lodash": "^3.9.3",
"less": "^2.5.1",
"less-loader": "^2.2.0",
"loader-utils": "^0.2.10",
"lodash": "^3.10.0",
"minimatch": "^2.0.8",
"mkdirp": "^0.5.1",
"moment": "^2.10.3",
"node-libs-browser": "spalger/node-libs-browser",
"numeral": "^1.5.3",
"raw-loader": "^0.5.1",
"request": "^2.40.0",
"requirefrom": "^0.2.0",
"rimraf": "^2.4.1",
"semver": "^4.3.6",
"serve-favicon": "^2.2.0",
"style-loader": "^0.12.3",
"through": "^2.3.6",
"url-loader": "^0.5.6",
"webpack": "^1.10.0"
},
"devDependencies": {
Expand All @@ -84,8 +100,6 @@
"grunt-contrib-copy": "^0.8.0",
"grunt-contrib-jade": "^0.14.0",
"grunt-contrib-jshint": "^0.11",
"grunt-contrib-less": "^1.0.1",
"grunt-contrib-requirejs": "^0.4.4",
"grunt-contrib-watch": "^0.6.1",
"grunt-esvm": "^1.0.1",
"grunt-jscs": "^1.8.0",
Expand All @@ -112,14 +126,11 @@
"path-browserify": "0.0.0",
"portscanner": "^1.0.0",
"progress": "^1.1.8",
"requirejs": "^2.1.14",
"rjs-build-analysis": "0.0.3",
"simple-git": "^1.3.0",
"sinon": "^1.12.2",
"tar": "^2.1.1"
},
"engines": {
"node": "~0.10 || ~0.12",
"iojs": ">=1.5"
"node": ">=2"
}
}
1 change: 0 additions & 1 deletion src/bin/kibana.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ for %%I in ("%SCRIPT_DIR%..") do set DIR=%%~dpfI

set NODE=%DIR%\node\node.exe
set SERVER=%DIR%\src\server\cli
set NODE_ENV="production"
set CONFIG_PATH=%DIR%\config\kibana.yml

TITLE Kibana Server @@version
Expand Down
2 changes: 1 addition & 1 deletion src/bin/kibana.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ DIR=$(dirname "${SCRIPT}")/..
NODE=${DIR}/node/bin/node
SERVER=${DIR}/src/server/cli

CONFIG_PATH="${DIR}/config/kibana.yml" NODE_ENV="production" exec "${NODE}" ${SERVER} ${@}
CONFIG_PATH="${DIR}/config/kibana.yml" exec "${NODE}" ${SERVER} ${@}

79 changes: 0 additions & 79 deletions src/dev_server/dev_statics_plugin/index.js

This file was deleted.

97 changes: 87 additions & 10 deletions src/dev_server/index.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,101 @@
var _ = require('lodash');
var join = require('path').join;

var resolve = require('path').resolve.bind(null, __dirname, '..', '..');
var KbnServer = require('../server/KbnServer');

function kibanaPlugin(kibana) {
var path = require('path');
var glob = require('glob');
var join = path.join;
var rel = join.bind(null, __dirname);

var ROOT = rel('../../../');
var SRC = join(ROOT, 'src');
var NODE_MODULES = join(ROOT, 'node_modules');
var APP = join(SRC, 'kibana');
var TEST = join(ROOT, 'test');
var istanbul = require('./lib/istanbul');
var amdWrapper = require('./lib/amd_wrapper');
var kibanaSrcFilter = require('./lib/kibana_src_filter');

return new kibana.Plugin({
init: function (server, options) {
server.ext('onPreHandler', istanbul({ root: SRC, displayRoot: SRC, filter: kibanaSrcFilter }));
server.ext('onPreHandler', istanbul({ root: APP, displayRoot: SRC, filter: kibanaSrcFilter }));

server.route({
path: '/test/{paths*}',
method: 'GET',
handler: {
directory: {
path: TEST
}
}
});

server.route({
path: '/amd-wrap/{paths*}',
method: 'GET',
handler: amdWrapper({ root: ROOT })
});

server.route({
path: '/src/{paths*}',
method: 'GET',
handler: {
directory: {
path: SRC
}
}
});

server.route({
path: '/node_modules/{paths*}',
method: 'GET',
handler: {
directory: {
path: NODE_MODULES
}
}
});

server.route({
path: '/specs',
method: 'GET',
handler: function (request, reply) {
var unit = join(ROOT, '/test/unit/');
glob(join(unit, 'specs/**/*.js'), function (er, files) {
var moduleIds = files
.filter(function (filename) {
return path.basename(filename).charAt(0) !== '_';
})
.map(function (filename) {
return path.relative(unit, filename).replace(/\\/g, '/').replace(/\.js$/, '');
});

return reply(moduleIds);
});
}
});
}
});
}

function run(port, quiet) {
return (new KbnServer({
'env': 'development',

'logging.quiet': quiet,
'kibana.server.port': port || 5601,
'plugins.paths': [
join(__dirname, 'dev_statics_plugin')
],
'plugins.scanDirs': [
join(__dirname, '..', 'plugins')
]
'plugins.paths': [ __dirname ],
'plugins.scanDirs': [ resolve('src/plugins') ],
'optimize.bundleDir': resolve('bundles'),
}))
.listen();
}

module.exports = kibanaPlugin;
module.exports.run = run;

if (require.main === module) {
run().done();
} else {
module.exports = run;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "dev_statics",
"name": "dev_server",
"version": "1.0.0"
}
4 changes: 2 additions & 2 deletions src/plugins/PLAN.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ module.exports = function (kibana) {
// of modules that this plugin provides to other plugins.
// For now this only describes the modules exported for
// the front-end
exports: {
uiExports: {

// an app is the highest level ui-component that a plugin
// can export. apps get an icon on the app page and the option
Expand Down Expand Up @@ -148,7 +148,7 @@ require('chrome')
})

require('routes').when('/', {
view: requrie('text!plugins/my-kibana-plugin/home.awesome.html')
view: requrie('plugins/my-kibana-plugin/home.awesome.html')
})
.otherwise({
redirect: '/'
Expand Down
19 changes: 19 additions & 0 deletions src/plugins/appSwitcher/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module.exports = function (kibana) {
return new kibana.Plugin({
uiExports: {
app: {
id: 'switcher',
main: 'plugins/appSwitcher/appSwitcher',
hidden: true,
defaultModules: {
angular: [],
require: [
'chrome',
'angular-bootstrap'
]
.concat(kibana.autoload.styles)
}
}
}
});
};
4 changes: 4 additions & 0 deletions src/plugins/appSwitcher/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "appSwitcher",
"version": "1.0.0"
}
Loading

0 comments on commit 522a00e

Please sign in to comment.