Skip to content

Commit 79079b4

Browse files
committed
Remove hawtio dependency
1 parent 0964cfa commit 79079b4

8 files changed

+7065
-4006
lines changed

Gruntfile.js

+55-8
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,51 @@ module.exports = function (grunt) {
3636
},
3737
concat: {
3838
options: {
39-
separator: ';'
39+
separator: ';\n'
4040
},
4141
ui: {
42-
src: ['src/**/*UI.module.js', 'dist/scripts/templates.js', 'src/components/**/*.js', 'src/filters/**/*.js', 'src/ui-services/**/*.js'],
42+
src: [
43+
'src/pluginLoader.js',
44+
'src/*UI.module.js',
45+
'dist/scripts/templates.js',
46+
'src/components/**/*.js',
47+
'src/filters/**/*.js',
48+
'src/ui-services/**/*.js'
49+
],
4350
dest: 'dist/origin-web-common-ui.js'
4451
},
4552
services: {
46-
src: ['src/**/*Services.module.js', 'src/services/**/*.js', 'src/constants/**/*.js'],
53+
src: [
54+
'src/pluginLoader.js',
55+
'src/*Services.module.js',
56+
'src/services/**/*.js',
57+
'src/constants/**/*.js'
58+
],
4759
dest: 'dist/origin-web-common-services.js'
4860
},
4961
dist: {
50-
src: ['src/**/*.module.js', 'dist/scripts/templates.js', 'src/**/*.js'],
62+
src: [
63+
'src/pluginLoader.js',
64+
'src/*.module.js',
65+
'dist/scripts/templates.js',
66+
'src/constants/**/*.js',
67+
'src/filters/**/*.js',
68+
'src/services/**/*.js',
69+
'src/ui-services/**/*.js',
70+
'src/components/**/*.js'
71+
],
5172
dest: 'dist/origin-web-common.js'
5273
}
5374
},
5475
copy: {
5576
main: {
5677
files: [
57-
{expand: true, cwd: 'src/styles/', src: ['*'], dest: 'dist/less/'}
78+
{
79+
expand: true,
80+
cwd: 'src/styles/',
81+
src: ['*'],
82+
dest: 'dist/less/'
83+
}
5884
]
5985
}
6086
},
@@ -71,7 +97,10 @@ module.exports = function (grunt) {
7197
},
7298
options: {
7399
cleancss: true,
74-
paths: ['src/styles', 'bower_components/']
100+
paths: [
101+
'src/styles',
102+
'bower_components/'
103+
]
75104
}
76105
}
77106
},
@@ -129,17 +158,35 @@ module.exports = function (grunt) {
129158
src: 'dist/origin-web-common.js',
130159
dest: 'dist/origin-web-common.min.js'
131160
}
161+
132162
}
133163
});
134164

135165
// You can specify which modules to build as arguments of the build task.
136166
grunt.registerTask('build', 'Create bootstrap build files', function () {
137-
grunt.task.run(['clean', 'ngtemplates', 'concat', 'copy', 'ngAnnotate', 'less', 'uglify:build', 'test']);
167+
grunt.task.run([
168+
'clean',
169+
'ngtemplates',
170+
'concat',
171+
'copy',
172+
'ngAnnotate',
173+
'less',
174+
'uglify:build',
175+
'test'
176+
]);
138177
});
139178

140179
// Runs all the tasks of build with the exception of tests
141180
grunt.registerTask('deploy', 'Prepares the project for deployment. Does not run unit tests', function () {
142-
grunt.task.run(['clean', 'ngtemplates', 'concat', 'copy', 'ngAnnotate', 'less', 'uglify:build']);
181+
grunt.task.run([
182+
'clean',
183+
'ngtemplates',
184+
'concat',
185+
'copy',
186+
'ngAnnotate',
187+
'less',
188+
'uglify:build'
189+
]);
143190
});
144191

145192
grunt.registerTask('default', ['build']);

bower.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@
3030
"angular": "~1.5.11",
3131
"angular-sanitize": "~1.5.11",
3232
"angular-utf8-base64": "~0.0.5",
33-
"hawtio-core": "~2.0.37",
34-
"hawtio-extension-service": "~2.0.2",
3533
"hopscotch": "~0.2.7",
3634
"jquery": "~3.2.1",
35+
"js-logger": "~0.9.14",
3736
"kubernetes-label-selector": "~2.1.1",
3837
"lodash": "~4.17.4",
3938
"patternfly": ">=3.27.2 <4.0",

0 commit comments

Comments
 (0)