Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fetch most dependencies via NPM #377

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fetch most dependencies via NPM #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69a3789
add the package-lock.json
tinogo Jan 28, 2019
0c8c402
unversion most of the bundled libs and load them via NPM instead
tinogo Jan 28, 2019
692e9d7
move the sass packages to the devDependencies
tinogo Jan 28, 2019
4e0b9e9
update node-sass to fix possible security vulnerabilities
tinogo Jan 29, 2019
06b859d
remove the obsolete sass package
tinogo Jan 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions connectors/php/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/vendor
composer.json
102 changes: 77 additions & 25 deletions gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
module.exports = function(grunt) {
module.exports = function (grunt) {
grunt.initConfig({
copy: {
main: {
files: [
{
expand: true,
flatten: true,
src: ['node_modules/codemirror/theme/*'],
dest: 'src/css/codemirror-theme',
filter: 'isFile'
},
{
expand: true,
flatten: true,
src: ['node_modules/highlightjs/highlight.pack.min.js'],
dest: 'src/js',
filter: 'isFile'
},
]
}
},
sass: {
options: {
outputStyle: 'compressed',
Expand All @@ -11,7 +31,9 @@ module.exports = function(grunt) {
dist: {
files: {
'src/css/libs-main.css': 'src/scss/libs-main.scss',
'src/css/filemanager.min.css': 'src/css/filemanager.css'
'src/css/codemirror.min.css': 'src/scss/codemirror.scss',
'src/css/filemanager.min.css': 'src/css/filemanager.css',
'src/css/highlight.min.css': 'node_modules/highlightjs/styles/default.css'
}
}
},
Expand All @@ -27,36 +49,65 @@ module.exports = function(grunt) {
'libs/lazyload/dist/lazyload.min.js': ['libs/lazyload/dist/lazyload.js'],
'src/js/filemanager.min.js': ['src/js/filemanager.js'],
'src/js/libs-main.js': [
'libs/jquery-1.11.3.min.js',
'node_modules/jquery/dist/jquery.min.js',
<!-- drag&drop + selectable build (includes customizations for RichFilemanager) -->
'libs/jquery-ui/jquery-ui.js',
'libs/jquery-ui.js',
'libs/jquery-browser.js',
'libs/knockout-3.4.0.js',
'libs/jquery-mousewheel/jquery.mousewheel.min.js',
'libs/jquery.splitter/dist/jquery-splitter.js',
'libs/jquery.contextmenu/dist/jquery.contextMenu.min.js',
'node_modules/knockout/build/output/knockout-latest.js',
'node_modules/jquery-mousewheel/jquery.mousewheel.js',
'node_modules/jquery-splitter/dist/jquery-splitter.min.js',
'node_modules/jquery-contextmenu/dist/jquery.contextMenu.min.js',
'libs/alertify.js/dist/js/alertify.js',
'libs/clipboard.js/dist/clipboard.min.js',
'libs/jquery.fileDownload/jquery.fileDownload.js',
'libs/javascript-templates/js/tmpl.min.js',
'libs/toast/lib/toast.min.js',
'node_modules/clipboard/dist/clipboard.min.js',
'node_modules/jquery-file-download/src/Scripts/jquery.fileDownload.js',
'node_modules/blueimp-tmpl/js/tmpl.min.js',
'node_modules/pyrsmk-toast/lib/toast.min.js',
'libs/cldrjs/cldr.js',
'libs/cldrjs/cldr/event.js',
'libs/cldrjs/cldr/supplemental.js',
'libs/globalizejs/globalize.js',
'libs/globalizejs/globalize/number.js',
'libs/globalizejs/globalize/date.js',
'libs/purl/purl.js'
'node_modules/globalize/dist/globalize.js',
'node_modules/globalize/dist/globalize/number.js',
'node_modules/globalize/dist/globalize/date.js',
'node_modules/@allmarkedup/purl/purl.js'
],
'src/js/libs-fileupload.js': [
'libs/jQuery-File-Upload/js/vendor/jquery.ui.widget.js',
'libs/jQuery-File-Upload/js/canvas-to-blob.min.js',
'libs/jQuery-File-Upload/js/load-image.all.min.js',
'libs/jQuery-File-Upload/js/jquery.iframe-transport.js',
'libs/jQuery-File-Upload/js/jquery.fileupload.js',
'libs/jQuery-File-Upload/js/jquery.fileupload-process.js',
'libs/jQuery-File-Upload/js/jquery.fileupload-image.js',
'libs/jQuery-File-Upload/js/jquery.fileupload-validate.js'
'node_modules/blueimp-load-image/js/load-image.js',
'node_modules/blueimp-load-image/js/load-image-meta.js',
'node_modules/blueimp-load-image/js/load-image-exif.js',
'node_modules/blueimp-file-upload/js/vendor/jquery.ui.widget.js',
'node_modules/blueimp-file-upload/js/canvas-to-blob.min.js',
'node_modules/blueimp-file-upload/js/load-image.all.min.js',
'node_modules/blueimp-file-upload/js/jquery.iframe-transport.js',
'node_modules/blueimp-file-upload/js/jquery.fileupload.js',
'node_modules/blueimp-file-upload/js/jquery.fileupload-process.js',
'node_modules/blueimp-file-upload/js/jquery.fileupload-image.js',
'node_modules/blueimp-file-upload/js/jquery.fileupload-validate.js'
],
'src/js/markdown-it.min.js': [
'node_modules/markdown-it/dist/markdown-it.js',
'node_modules/markdown-it-footnote/dist/markdown-it-footnote.js',
'node_modules/markdown-it-replace-link/dist/markdown-it-replace-link.js'
],
'src/js/jquery.mCustomScrollbar.min.js': [
'node_modules/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.js'
],
'src/js/codemirror.min.js': [
'node_modules/codemirror/lib/codemirror.js',
'node_modules/codemirror/addon/selection/active-line.js',
],
'src/js/codemirror-modes.min.js': [
'node_modules/codemirror/addon/mode/overlay.js',
'node_modules/codemirror/mode/javascript/javascript.js',
'node_modules/codemirror/mode/css/css.js',
'node_modules/codemirror/mode/xml/xml.js',
'node_modules/codemirror/mode/htmlmixed/htmlmixed.js',
'node_modules/codemirror/mode/clike/clike.js',
'node_modules/codemirror/mode/php/php.js',
'node_modules/codemirror/mode/sql/sql.js',
'node_modules/codemirror/mode/markdown/markdown.js',
'node_modules/codemirror/mode/gfm/gfm.js',
'node_modules/codemirror/mode/shell/shell.js',
'node_modules/codemirror/mode/meta/meta.js',
]
}
}
Expand All @@ -66,8 +117,9 @@ module.exports = function(grunt) {

// load plugins
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-sass');

// default tasks
grunt.registerTask('default', ['uglify', 'sass']);
grunt.registerTask('default', ['copy', 'uglify', 'sass']);
};
7 changes: 0 additions & 7 deletions libs/CodeMirror/.editorconfig
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions libs/CodeMirror/.gitattributes
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions libs/CodeMirror/.npmignore
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions libs/CodeMirror/.travis.yml
View file
Open in desktop

This file was deleted.

Loading