Commit 6a04605a authored by bbaer's avatar bbaer
Browse files

Switched from bower to npm only

parent 920f3ec3
......@@ -19,7 +19,7 @@ module.exports = function (grunt) {
bootstrap: {
files: [
{
cwd: 'bower_components/bootstrap/dist/css/',
cwd: 'node_modules/bootstrap/dist/css/',
src: [
'bootstrap.min.css',
'bootstrap-theme.min.css'
......@@ -30,7 +30,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/bootstrap/dist/js/',
cwd: 'node_modules/bootstrap/dist/js/',
src: [
'bootstrap.min.js'
],
......@@ -39,7 +39,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/bootstrap/dist/fonts/',
cwd: 'node_modules/bootstrap/dist/fonts/',
expand: true,
src: [
'*'
......@@ -52,7 +52,7 @@ module.exports = function (grunt) {
bootstrap_dev: {
files: [
{
cwd: 'bower_components/bootstrap/dist/css/',
cwd: 'node_modules/bootstrap/dist/css/',
src: [
'bootstrap.min.css',
'bootstrap-theme.min.css'
......@@ -63,7 +63,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/bootstrap/dist/js/',
cwd: 'node_modules/bootstrap/dist/js/',
src: [
'bootstrap.min.js'
],
......@@ -72,7 +72,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/bootstrap/dist/fonts/',
cwd: 'node_modules/bootstrap/dist/fonts/',
expand: true,
src: [
'*'
......@@ -85,7 +85,7 @@ module.exports = function (grunt) {
bootstrap_validator: {
files: [
{
cwd: 'bower_components/bootstrap-validator/dist/',
cwd: 'node_modules/bootstrap-validator/dist/',
src: [
'validator.min.js'
],
......@@ -94,7 +94,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/bootstrap-validator/dist/',
cwd: 'node_modules/bootstrap-validator/dist/',
src: [
'validator.min.js'
],
......@@ -107,7 +107,7 @@ module.exports = function (grunt) {
jquery: {
files: [
{
cwd: 'bower_components/jquery/dist/',
cwd: 'node_modules/jquery/dist/',
src: [
'jquery.min.js'
],
......@@ -116,7 +116,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/jquery/dist/',
cwd: 'node_modules/jquery/dist/',
src: [
'jquery.min.js'
],
......@@ -129,7 +129,7 @@ module.exports = function (grunt) {
jquery_tablesorter: {
files: [
{
cwd: 'bower_components/tablesorter/dist/js/',
cwd: 'node_modules/tablesorter/dist/js/',
src: [
'jquery.tablesorter.min.js'
],
......@@ -138,7 +138,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/tablesorter/dist/js/',
cwd: 'node_modules/tablesorter/dist/js/',
src: [
'jquery.tablesorter.min.js',
'jquery.tablesorter.widgets.min.js',
......@@ -153,7 +153,7 @@ module.exports = function (grunt) {
ChartJS: {
files: [
{
cwd: 'bower_components/Chart.js/dist/',
cwd: 'node_modules/chart.js/dist/',
src: [
'Chart.min.js'
],
......@@ -162,7 +162,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/Chart.js/dist/',
cwd: 'node_modules/chart.js/dist/',
src: [
'Chart.min.js'
],
......@@ -175,7 +175,7 @@ module.exports = function (grunt) {
jqwidgets: {
files: [
{
cwd: 'bower_components/jqwidgets/jqwidgets/',
cwd: 'node_modules/jqwidgets-framework/jqwidgets/',
src: [
'jqx-all.js',
'globalization/globalize.js'
......@@ -185,7 +185,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/jqwidgets/jqwidgets/styles/',
cwd: 'node_modules/jqwidgets-framework/jqwidgets/styles/',
src: [
'jqx.base.css',
'jqx.bootstrap.css'
......@@ -195,7 +195,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/jqwidgets/jqwidgets/styles/',
cwd: 'node_modules/jqwidgets-framework/jqwidgets/styles/',
src: [
'images/**'
],
......@@ -207,7 +207,7 @@ module.exports = function (grunt) {
jqwidgets_devel: {
files: [
{
cwd: 'bower_components/jqwidgets/jqwidgets/',
cwd: 'node_modules/jqwidgets-framework/jqwidgets/',
src: [
'jqx-all.js',
'globalization/globalize.js'
......@@ -217,7 +217,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/jqwidgets/jqwidgets/styles/',
cwd: 'node_modules/jqwidgets-framework/jqwidgets/styles/',
src: [
'jqx.base.css',
'jqx.bootstrap.css'
......@@ -227,7 +227,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/jqwidgets/jqwidgets/styles/',
cwd: 'node_modules/jqwidgets-framework/jqwidgets/styles/',
src: [
'images/**'
],
......@@ -239,7 +239,7 @@ module.exports = function (grunt) {
tinymce: {
files: [
{
cwd: 'bower_components/tinymce/',
cwd: 'node_modules/tinymce/',
src: [
'tinymce.min.js'
],
......@@ -248,7 +248,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/tinymce/',
cwd: 'node_modules/tinymce/',
src: [
'themes/*/theme.min.js',
'plugins/*/plugin.min.js',
......@@ -263,7 +263,7 @@ module.exports = function (grunt) {
tinymce_devel: {
files: [
{
cwd: 'bower_components/tinymce/',
cwd: 'node_modules/tinymce/',
src: [
'tinymce.min.js'
],
......@@ -272,7 +272,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/tinymce/',
cwd: 'node_modules/tinymce/',
src: [
'themes/*/theme.min.js',
'plugins/*/plugin.min.js',
......@@ -287,7 +287,7 @@ module.exports = function (grunt) {
eventEmitter: {
files: [
{
cwd: 'bower_components/eventEmitter/',
cwd: 'node_modules/wolfy87-eventemitter/',
src: [
'EventEmitter.min.js'
],
......@@ -296,7 +296,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/eventEmitter/',
cwd: 'node_modules/wolfy87-eventemitter/',
src: [
'EventEmitter.min.js'
],
......@@ -331,7 +331,7 @@ module.exports = function (grunt) {
typeahead: {
files: [
{
cwd: 'bower_components/corejs-typeahead/dist',
cwd: 'node_modules/corejs-typeahead/dist',
src: [
"typeahead.bundle.min.js"
],
......@@ -340,7 +340,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/corejs-typeahead/dist',
cwd: 'node_modules/corejs-typeahead/dist',
src: [
"typeahead.bundle.min.js"
],
......@@ -353,7 +353,7 @@ module.exports = function (grunt) {
codemirror: {
files: [
{
cwd: 'bower_components/codemirror/lib',
cwd: 'node_modules/codemirror/lib',
src: [
"codemirror.js"
],
......@@ -362,7 +362,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/codemirror/lib',
cwd: 'node_modules/codemirror/lib',
src: [
"codemirror.js"
],
......@@ -371,7 +371,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/codemirror/lib',
cwd: 'node_modules/codemirror/lib',
src: [
"codemirror.css"
],
......@@ -380,7 +380,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/codemirror/lib',
cwd: 'node_modules/codemirror/lib',
src: [
"codemirror.css"
],
......@@ -389,7 +389,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/codemirror/mode',
cwd: 'node_modules/codemirror/mode',
src: [
"**"
],
......@@ -398,7 +398,7 @@ module.exports = function (grunt) {
flatten: false
},
{
cwd: 'bower_components/codemirror/mode',
cwd: 'node_modules/codemirror/mode',
src: [
"**"
],
......
......@@ -23,8 +23,8 @@ all: archive t3sphinx
doc: phpdoc jsdoc plantuml
maintainer-clean:
rm -f .bowerpackages .doc_plantuml .npmpackages .phpdocinstall .plantuml_install .support .support_plantuml
rm -rf doc/jsdoc doc/phpdoc doc/plantuml support bower_components node_modules .python_virtualenv build-dist
rm -f .doc_plantuml .npmpackages .phpdocinstall .plantuml_install .support .support_plantuml
rm -rf doc/jsdoc doc/phpdoc doc/plantuml support node_modules .python_virtualenv build-dist
archive: clean qfq.zip
......@@ -77,9 +77,8 @@ t3sphinx: .virtual_env
plantuml:
cd doc/diagram ; $(MAKE)
bootstrap: .phpdocinstall .npmpackages .bowerpackages .plantuml_install .virtual_env .sonar_scanner
bootstrap: .phpdocinstall .npmpackages .plantuml_install .virtual_env
npm update
bower update
grunt default
jsdoc: .npmpackages
......@@ -114,10 +113,6 @@ phpdoc: .phpdocinstall
npm install
touch $@
.bowerpackages: bower.json
bower --silent install
touch $@
.support:
mkdir -p support
touch $@
......
{
"name": "qfq",
"authors": [
"Carsten Rose <carsten.rose@math.uzh.ch>"
],
"description": "",
"main": "",
"moduleType": [],
"license": "MIT",
"homepage": "",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"bootstrap": "^3.3.6",
"jqwidgets": "4.2.1",
"tablesorter": "jquery.tablesorter#^2.25.6",
"eventEmitter": "^4.3.0",
"bootstrap-validator": "^0.11.5",
"Chart.js": "^2.1.2",
"tinymce": "tinymce-dist#^4.4.3",
"corejs-typeahead": "^1.1.1",
"codemirror": "^5.24.0"
}
}
{
"name": "qfq",
"version": "0.1.0",
"devDependencies": {
"version": "1.0.0",
"dependencies": {
"bootlint": "^0.14.2",
"jquery": "latest",
"popper.js": "^1.14.3",
"grunt": "^1.0.1",
"grunt-concat-in-order": "^0.2.6",
"grunt-contrib-concat": "^1.0.1",
......@@ -16,9 +18,21 @@
"selenium-webdriver": "^3.3.0",
"mocha": "^3.2.0",
"should": "^11.2.1",
"chromedriver": "latest"
"chromedriver": "latest",
"bootstrap": "^3.3.6",
"wolfy87-eventemitter": "^4.3.0",
"tinymce": "^4.4.3",
"codemirror": "^5.24.0",
"chart.js": "^2.1.2",
"tablesorter": "^2.25.6",
"bootstrap-validator": "^0.11.5",
"jqwidgets-framework": "4.2.1",
"corejs-typeahead": "^1.1.1"
},
"devDependencies": {},
"scripts": {
"test": "mocha tests/selenium/test*.js"
}
},
"license": "ISC",
"repository": "https://git.math.uzh.ch/typo3/qfq"
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment