Skip to content

Commit

Permalink
moved several deps from bower to npm
Browse files Browse the repository at this point in the history
  • Loading branch information
vasiliy-t committed Jul 19, 2016
1 parent b12d839 commit 8bb706a
Show file tree
Hide file tree
Showing 10 changed files with 72 additions and 123 deletions.
10 changes: 0 additions & 10 deletions .bowerrc

This file was deleted.

3 changes: 0 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
bower_components
bower.json
.bowerrc
build
cache
CHANGELOG.md
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
node_modules/
bower_components/
web/
.idea
*.swp
Expand Down
76 changes: 29 additions & 47 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ module.exports = function (grunt) {
sass: {
options: {
includePaths: [
'bower_components/foundation/scss',
'bower_components/font-awesome/scss/',
'bower_components/sass-flex-mixin/',
'bower_components/angularjs-datepicker/src/css/'
'node_modules/foundation-sites/scss',
'node_modules/font-awesome/scss',
'node_modules/sass-flex-mixin/',
'node_modules/angularjs-datepicker/src/css/'
]
},
dist: {
Expand Down Expand Up @@ -46,175 +46,157 @@ module.exports = function (grunt) {
{
flatten: false,
expand: true,
cwd: 'bower_components/twemoji/svg/',
cwd: 'node_modules/twemoji/svg/',
src: ['**/*.svg'],
dest: 'web/images/twemoji/svg/',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/twemoji/twemoji.min.js'],
src: ['node_modules/twemoji/twemoji.npm.js'],
dest: 'web/assets/js/twemoji.min.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/markdown-it-emoji/dist/markdown-it-emoji.min.js'],
src: ['node_modules/markdown-it-emoji/dist/markdown-it-emoji.min.js'],
dest: 'web/assets/js/markdown-it-emoji.min.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-mocks/angular-mocks.js'],
dest: 'web/assets/js/angular-mocks.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/reconnectingWebsocket/reconnecting-websocket.js'],
dest: 'web/assets/js/reconnecting-websocket.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/markdown-it/dist/markdown-it.js'],
src: ['node_modules/markdown-it/dist/markdown-it.js'],
dest: 'web/assets/js/markdown-it.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/a0-angular-storage/dist/angular-storage.js'],
src: ['node_modules/angular-storage/dist/angular-storage.js'],
dest: 'web/assets/js/angular-storage.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-lodash/angular-lodash.js'],
src: ['node_modules/angular-lodash/angular-lodash.js'],
dest: 'web/assets/js/angular-lodash.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/lodash/lodash.js'],
src: ['node_modules/lodash/lodash.js'],
dest: 'web/assets/js/lodash.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-foundation/src/topbar/topbar.js'],
src: ['node_modules/angular-mm-foundation/src/topbar/topbar.js'],
dest: 'web/assets/js/topbar.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-foundation/src/dropdownToggle/dropdownToggle.js'],
src: ['node_modules/angular-mm-foundation/src/dropdownToggle/dropdownToggle.js'],
dest: 'web/assets/js/dropdownToggle.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-foundation/src/position/position.js'],
src: ['node_modules/angular-mm-foundation/src/position/position.js'],
dest: 'web/assets/js/position.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-foundation/src/typeahead/typeahead.js'],
src: ['node_modules/angular-mm-foundation/src/typeahead/typeahead.js'],
dest: 'web/assets/js/typeahead.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-foundation/src/bindHtml/bindHtml.js'],
src: ['node_modules/angular-mm-foundation/src/bindHtml/bindHtml.js'],
dest: 'web/assets/js/bindHtml.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-foundation/src/mediaQueries/mediaQueries.js'],
src: ['node_modules/angular-mm-foundation/src/mediaQueries/mediaQueries.js'],
dest: 'web/assets/js/mediaQueries.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-foundation/src/tabs/tabs.js'],
src: ['node_modules/angular-mm-foundation/src/tabs/tabs.js'],
dest: 'web/assets/js/tabs.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/marked/lib/marked.js'],
dest: 'web/assets/js/marked.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-loading-bar/build/loading-bar.js'],
src: ['node_modules/angular-loading-bar/build/loading-bar.js'],
dest: 'web/assets/js/loading-bar.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-loading-bar/build/loading-bar.css'],
src: ['node_modules/angular-loading-bar/build/loading-bar.css'],
dest: 'web/assets/css/loading-bar.css',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-foundation/src/transition/transition.js'],
src: ['node_modules/angular-mm-foundation/src/transition/transition.js'],
dest: 'web/assets/js/transition.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/ng-sortable/dist/ng-sortable.js'],
src: ['node_modules/ng-sortable/dist/ng-sortable.js'],
dest: 'web/assets/js/ng-sortable.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular/angular.js'],
src: ['node_modules/angular/angular.js'],
dest: 'web/assets/js/angular.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angular-ui-router/release/angular-ui-router.min.js'],
src: ['node_modules/angular-ui-router/release/angular-ui-router.min.js'],
dest: 'web/assets/js/angular-ui-router.js',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/ng-sortable/dist/ng-sortable.min.css'],
src: ['node_modules/ng-sortable/dist/ng-sortable.min.css'],
dest: 'web/assets/css/ng-sortable.min.css',
filter: 'isFile'
},
{
flatten: true,
src: ['bower_components/angularjs-datepicker/dist/angular-datepicker.min.js'],
src: ['node_modules/angularjs-datepicker/dist/angular-datepicker.min.js'],
dest: 'web/assets/js/angularjs-datepicker.min.js',
filter: 'isFile'
},
{
flatten: false,
expand: true,
cwd: 'bower_components/angular-foundation/template',
cwd: 'node_modules/angular-mm-foundation/template',
src: '**',
dest: 'web/template/',
filter: 'isFile'
},
{
flatten: true,
expand: true,
cwd: 'bower_components/foundation/js/foundation/',
cwd: 'node_modules/foundation-sites/js/foundation/',
src: '**',
dest: 'web/assets/js',
filter: 'isFile'
},
{
flatten: true,
expand: true,
cwd: 'bower_components/font-awesome/fonts/',
cwd: 'node_modules/font-awesome/fonts/',
src: '**',
dest: 'web/assets/fonts/',
filter: 'isFile'
Expand Down
16 changes: 4 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,15 @@ node_modules/: package.json
-v $$HOME/node_cache:/cache \
-w $(CWD) \
-e HOME=/cache \
leanlabs/npm-builder:latest npm install
node:6.3.0-wheezy npm run install

bower_components/: bower.json
@docker run --rm \
-v $(CURDIR):$(CWD) \
-v $$HOME/node_cache:/cache \
-w $(CWD) \
-e HOME=cache \
leanlabs/npm-builder bower install --allow-root

build: node_modules/ bower_components/
build: node_modules/
@docker run --rm \
-v $(CURDIR):$(CWD) \
-v $$HOME/node_cache:/cache \
-w $(CWD) \
-e HOME=/cache \
leanlabs/npm-builder grunt build
node:6.3.0-wheezy npm run build

templates/templates.go: $(find $(CURDIR)/templates -name "*.html" -type f)
@docker run --rm \
Expand Down Expand Up @@ -98,7 +90,7 @@ watch: build
-v $$HOME/node_cache:/cache \
-w $(CWD) \
-e HOME=/cache \
leanlabs/npm-builder grunt watch
node:6.3.0-wheezy npm run watch

tmp/go/pkg/:
@docker run --rm \
Expand Down
31 changes: 0 additions & 31 deletions bower.json

This file was deleted.

51 changes: 36 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
{
"name": "gitlab-kanban-client",
"version": "0.0.1",
"repository": "gitlab.com/vasiliy-t/gitlab-kanban-client",
"devDependencies": {
"bower": "1.4.1",
"grunt": "~0.4.1",
"grunt-cli": "~0.1.13",
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-concat": "~0.5.0",
"grunt-contrib-watch": "~0.5.3",
"grunt-contrib-uglify": "~0.7.0",
"grunt-sass": "1.0.0",
"grunt-contrib-connect": "~0.8.0",
"grunt-connect-proxy": "~0.1.11"
}
"name": "kanban",
"version": "0.0.1",
"repository": "gitlab.com/leanlabsio/kanban",
"scripts": {
"install": "npm install",
"build": "grunt build",
"watch": "grunt watch"
},
"devDependencies": {
"grunt": "~0.4.1",
"grunt-cli": "~0.1.13",
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-concat": "~0.5.0",
"grunt-contrib-watch": "~0.5.3",
"grunt-contrib-uglify": "~0.7.0",
"grunt-sass": "1.0.0",
"grunt-contrib-connect": "~0.8.0",
"grunt-connect-proxy": "~0.1.11"
},
"dependencies": {
"angular": "=1.5.6",
"angular-lodash": "https://github.com/EMSSConsulting/angular-lodash.git#68a726c",
"foundation-sites": "5.5.2",
"angular-foundation": "https://github.com/pineconellc/angular-foundation.git#8f3f260",
"angular-loading-bar": "=0.5.2",
"angular-storage": "=0.0.6",
"angular-ui-router": "=0.3.0",
"angularjs-datepicker": "=0.2.15",
"font-awesome": "=4.6.3",
"markdown-it": "=5.0.2",
"markdown-it-emoji": "=1.1.0",
"ng-sortable": "=1.3.6",
"sass-flex-mixin": "=1.0.3",
"lodash": "=4.13.1",
"twemoji": "=2.1.0"
}
}
2 changes: 1 addition & 1 deletion src/markdown/plugins/emoji.plugin.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(function(twemoji) {
window.md_twemoji_plugin = function(md) {
md.renderer.rules.emoji = function(token, idx) {
return twemoji.parse(token[idx].content, {base: "/", folder: "images/twemoji/svg", ext: ".svg"});
return twemoji.parse(token[idx].content, {folder: "svg", ext: ".svg"});
};
};
}(window.twemoji));
2 changes: 1 addition & 1 deletion src/scss/_avatars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@
.#{$key}-ava {
background-color: $key-color-9 !important;
}
}
}
3 changes: 1 addition & 2 deletions templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@
<script src="/{{ .Version }}/assets/js/angular-lodash.js"></script>
<script src="/{{ .Version }}/assets/js/markdown-it-emoji.min.js"></script>
<script src="/{{ .Version }}/assets/js/markdown-it.js"></script>
<script src="/{{ .Version }}/assets/js/reconnecting-websocket.js"></script>
<script src="/{{ .Version }}/assets/js/angularjs-datepicker.min.js"></script>
<script src="/{{ .Version }}/assets/js/twemoji.min.js"></script>
<script src="//twemoji.maxcdn.com/twemoji.min.js"></script>

<script src="/{{ .Version }}/assets/js/transition.js"></script>
<script src="/{{ .Version }}/assets/js/position.js"></script>
Expand Down

0 comments on commit 8bb706a

Please sign in to comment.