Skip to content

Commit

Permalink
Removed Bower, added frontpack/composer-assets-plugin (BC break)
Browse files Browse the repository at this point in the history
  • Loading branch information
janpecha committed Jan 22, 2017
1 parent d8fb13b commit 6b6ebcb
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/vendor
app/config/config.local.neon
*.sublime-workspace
bower_components/
www/dtf/_components/
2 changes: 1 addition & 1 deletion app/presenters/templates/@layout.latte
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
};
</script>
<link rel="stylesheet/less" type="text/css" href="{$basePath}/dtf/styles.less">
<script src="{$basePath}/dtf/bower_components/less/dist/less.js"></script>
<script src="{$basePath}/dtf/_components/frontpack/less/less.js"></script>
{/if}

<link rel="shortcut icon" href="{$basePath}/favicon.ico">
Expand Down
14 changes: 13 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@
"homepage": "https://www.janpecha.cz/"
}
],
"config": {
"assets-dir": "www/dtf/_components",
"assets-files": {
"nette/forms": "src/assets/netteForms.js",
"components/jquery": "jquery.js"
}
},
"require": {
"php": ">= 5.6.0",
"nette/application": "^2.4",
Expand All @@ -28,6 +35,11 @@
"inteve/forms": "dev-master",
"inteve/application": "dev-master",
"janpecha/leanmapper-extension": "^0.9",
"nextras/migrations": "^3.0"
"nextras/migrations": "^3.0",
"frontpack/composer-assets-plugin": "^0.9.0",
"components/jquery": "^1.12"
},
"require-dev": {
"frontpack/less": "^2.7"
}
}
8 changes: 0 additions & 8 deletions www/dtf/bower.json

This file was deleted.

4 changes: 2 additions & 2 deletions www/dtf/scripts.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!--#include file="bower_components/jquery/dist/jquery.js" -->
<!--#include file="bower_components/nette-forms/src/assets/netteForms.js" -->
<!--#include file="_components/components/jquery/jquery.js" -->
<!--#include file="_components/nette/forms/netteForms.js" -->
<!--#include file="js/main.js" -->

0 comments on commit 6b6ebcb

Please sign in to comment.