Merge branch 'feature/remove-bower' into 'develop'
Feature/remove bower See merge request !49
This commit is contained in:
commit
a482920f44
|
@ -16,7 +16,6 @@ build_job:
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- npm install
|
- npm install
|
||||||
- $NPMPATH/bower install
|
|
||||||
- $NPMPATH/grunt
|
- $NPMPATH/grunt
|
||||||
tags:
|
tags:
|
||||||
- javascript
|
- javascript
|
||||||
|
@ -34,7 +33,6 @@ cleanup_build_job:
|
||||||
stage: cleanup_build
|
stage: cleanup_build
|
||||||
script:
|
script:
|
||||||
- rm -rf node_modules
|
- rm -rf node_modules
|
||||||
- rm -rf bower_components
|
|
||||||
- rm -rf dist
|
- rm -rf dist
|
||||||
when: on_failure
|
when: on_failure
|
||||||
|
|
||||||
|
@ -74,5 +72,4 @@ cleanup_job:
|
||||||
stage: cleanup
|
stage: cleanup
|
||||||
script:
|
script:
|
||||||
- rm -rf node_modules
|
- rm -rf node_modules
|
||||||
- rm -rf bower_components
|
|
||||||
when: always
|
when: always
|
||||||
|
|
|
@ -25,10 +25,10 @@ module.exports = function (grunt) {
|
||||||
},
|
},
|
||||||
libs: {
|
libs: {
|
||||||
src: [
|
src: [
|
||||||
'bower_components/jquery/dist/jquery.js',
|
'node_modules/jquery/dist/jquery.js',
|
||||||
'bower_components/jquery-ui/ui/core.js',
|
'node_modules/jquery-ui/ui/core.js',
|
||||||
'bower_components/jquery-ui/ui/widget.js',
|
'node_modules/jquery-ui/ui/widget.js',
|
||||||
'bower_components/jquery-cookie/jquery.cookie.js'
|
'node_modules/jquery.cookie/jquery.cookie.js'
|
||||||
],
|
],
|
||||||
dest: 'dist/libs.js'
|
dest: 'dist/libs.js'
|
||||||
},
|
},
|
||||||
|
|
13
bower.json
13
bower.json
|
@ -1,13 +0,0 @@
|
||||||
{
|
|
||||||
"name": "uhr",
|
|
||||||
"version": "8.0.4-dev.0",
|
|
||||||
"dependencies": {
|
|
||||||
"jquery": "~2.1.3",
|
|
||||||
"jquery-ui": "~1.11.2",
|
|
||||||
"jquery-cookie": "~1.4.1"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"mocha": "~2.3.3",
|
|
||||||
"chai": "~3.3.0"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,4 +1,4 @@
|
||||||
/*! uhr - v8.0.3 - 2016-06-27
|
/*! uhr - v8.0.4-dev.0 - 2016-06-27
|
||||||
* http://bärneruhr.ch/
|
* http://bärneruhr.ch/
|
||||||
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
||||||
(function($) {
|
(function($) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,4 +1,4 @@
|
||||||
/*! uhr - v8.0.3 - 2016-06-27
|
/*! uhr - v8.0.4-dev.0 - 2016-06-27
|
||||||
* http://bärneruhr.ch/
|
* http://bärneruhr.ch/
|
||||||
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
||||||
(function($) {
|
(function($) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,4 +1,4 @@
|
||||||
/*! uhr - v8.0.3 - 2016-06-27
|
/*! uhr - v8.0.4-dev.0 - 2016-06-27
|
||||||
* http://bärneruhr.ch/
|
* http://bärneruhr.ch/
|
||||||
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
||||||
(function($) {
|
(function($) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,4 +1,4 @@
|
||||||
/*! uhr - v8.0.3 - 2016-06-27
|
/*! uhr - v8.0.4-dev.0 - 2016-06-27
|
||||||
* http://bärneruhr.ch/
|
* http://bärneruhr.ch/
|
||||||
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
||||||
(function($) {
|
(function($) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,4 +1,4 @@
|
||||||
/*! uhr - v8.0.3 - 2016-06-27
|
/*! uhr - v8.0.4-dev.0 - 2016-06-27
|
||||||
* http://bärneruhr.ch/
|
* http://bärneruhr.ch/
|
||||||
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
|
||||||
(function($) {
|
(function($) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -1,5 +1,5 @@
|
||||||
CACHE MANIFEST
|
CACHE MANIFEST
|
||||||
# Version 8.0.3
|
# Version 8.0.4-dev.0
|
||||||
|
|
||||||
/
|
/
|
||||||
dist/jquery.uhr.base.min.js
|
dist/jquery.uhr.base.min.js
|
||||||
|
|
10
package.json
10
package.json
|
@ -22,8 +22,12 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
|
"dependencies": {
|
||||||
|
"jquery": "~2.1.3",
|
||||||
|
"jquery-ui": "github:jquery/jquery-ui#1.11.4",
|
||||||
|
"jquery.cookie": "~1.4.1"
|
||||||
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"bower": "^1.5.3",
|
|
||||||
"grunt": "~0.4.5",
|
"grunt": "~0.4.5",
|
||||||
"grunt-cli": "^0.1.13",
|
"grunt-cli": "^0.1.13",
|
||||||
"grunt-contrib-clean": "~0.6.0",
|
"grunt-contrib-clean": "~0.6.0",
|
||||||
|
@ -39,6 +43,8 @@
|
||||||
"jshint-stylish": "~2.0.1",
|
"jshint-stylish": "~2.0.1",
|
||||||
"load-grunt-tasks": "~3.3.0",
|
"load-grunt-tasks": "~3.3.0",
|
||||||
"phantomjs": "^1.9.18",
|
"phantomjs": "^1.9.18",
|
||||||
"time-grunt": "~1.2.1"
|
"time-grunt": "~1.2.1",
|
||||||
|
"mocha": "~2.3.3",
|
||||||
|
"chai": "~3.3.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue