Skip to content
This repository has been archived by the owner on Apr 24, 2019. It is now read-only.

Remove Bower and use npm for all dependencies #125

Merged
merged 1 commit into from
Nov 21, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*.sublime-*

dist
bower_components
node_modules
test/coverage
test/dist
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### HEAD

* Remove Bower and use npm for all dependencies
* Remove Sass and replace with Pleeease
* Update karma tasks to better reflect actual propose
* Copy files that are needed in dest via grunt copy
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ module.exports = function (grunt) {
*/
grunt.registerTask('build', [
'jshint',
'modernizr',
'modernizr:build',
'pleeease:build',
'imagemin',
'copy',
Expand Down
12 changes: 4 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,23 @@ You will need to install Node.js, if you haven't already.

After you've set this stuff up please run

$ npm install -g grunt-cli bower
$ npm install -g grunt-cli

This installs the Grunt command line tools and bower.
This installs the Grunt command line tools.
Afterwards please run

$ npm install

in your project's directory.
This will install all the things you need for running the grunt-tasks
automatically and all Bower components defined in `bower.json`.

Also it will create a folder `components` which holds all vendor dependencies
managed by Bower.

automatically.

### Troubleshooting

If running the install does not work, please try running it as with
admin-rights:

$ sudo npm install -g grunt-cli bower i
$ sudo npm install -g grunt-cli i


## Browser support
Expand Down
9 changes: 0 additions & 9 deletions bower.json

This file was deleted.

2 changes: 1 addition & 1 deletion docs/TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

## Contents of INIT

* [Toolchain](toolchain.md) — The tools we use: GruntJS, Bower, RequireJS.
* [Toolchain](toolchain.md) — The tools we use: GruntJS, RequireJS and more.
* [HTML5 Boilerplate](html5-boilerplate.md) — More about the famous front-end template.
* [CSS](css.md) — How to use CSS in INIT.
* [JavaScript](js.md) — A guide to the default JavaScript with RequireJS.
Expand Down
2 changes: 1 addition & 1 deletion docs/extend.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
## General

INIT is built modular so you can extend the project with your own code or plugins.
As we are using NPM, GruntJS and bower it is straight forward to extend the project with existing components.
As we are using npm and GruntJS it is straight forward to extend the project with existing components.

## Examples

Expand Down
10 changes: 5 additions & 5 deletions docs/toolchain.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

We use a couple of tools that help us write better code:

* Bower
* npm
* Grunt
* RequireJS
* Karma (with Jasmine)

## Bower
[Bower](http://bower.io/) is a package management utility for the front-end. We use it to load all front-end dependencies for our projects.
You can easily install more components. Please refer to Bower's docs for more information.
## npm
[npm](https://www.npmjs.org/) is a package management utility provided by bower. We use it to load all front-end and development dependencies for our projects.
You can easily install more components. Please refer to npm's docs for more information.

## Grunt
[Grunt](http://gruntjs.com/) is a build tool. We use a couple of tasks to help us build a production-ready version of our code. Please read more about our usage of Grunt [in the according doc](grunt.md).
Expand All @@ -20,4 +20,4 @@ You can easily install more components. Please refer to Bower's docs for more in
[RequireJS](http://requirejs.org/) is a JavaScript module loader that helps your organize your dependency-management within JavaScript.

## Karma
[Karma](http://karma-runner.github.io/) is a testrunner, running JavaScript unit tests in different browsers. INIT makes use of Karma with [Jasmine](http://jasmine.github.io/) as testing library.
[Karma](http://karma-runner.github.io/) is a testrunner, running JavaScript unit tests in different browsers. INIT makes use of Karma with [Jasmine](http://jasmine.github.io/) as testing library. Please also see [_How to write tests_](writing-tests.md) for more information.
10 changes: 1 addition & 9 deletions docs/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,11 @@ Apart from that we make use of GruntJS and you might want to install it globally

$ npm i -g grunt-cli

Same goes for Bower:

$ npm i -g bower

Now we need to install the GruntJS modules we want to use within the project and the components that are predefined:

$ npm i

It will create a directory called `node_modules` with the dependencies for our Grunt tasks and another folder called `components` which holds all vendor dependencies managed by Bower.
It will create a directory called `node_modules` with the dependencies for our Grunt tasks and Front-End components.

### Troubleshooting

Expand All @@ -46,7 +42,3 @@ If running the install does not work, please try running it as admin:
$ sudo npm install -g grunt-cli

You'll need to enter your admin password.

If Bower does not install, please first report this to us and then install it manually:

$ bower i
17 changes: 12 additions & 5 deletions grunt/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ module.exports = {
srcDir: 'src/',
destDir: 'dist/',

requirejs: '../../bower_components/requirejs/require',

requirejs: '../../node_modules/requirejs/require',

// All files that should be checked with JSHint
jsHintFiles: [
Expand All @@ -30,7 +31,12 @@ module.exports = {
'src/js/**/*.js'
],
config: 'src/js/config.js',
dest: 'dist/<%= pkg.version %>/main.min.js'
dest: 'dist/<%= pkg.version %>/main.min.js',
libs: [
'node_modules/grunt-modernizr/lib/modernizr-dev.js',
'node_modules/jquery/dist/jquery.min.js',
'node_modules/requirejs/require.js'
]
},

// CSS files
Expand All @@ -45,7 +51,8 @@ module.exports = {

// Modernizr files
modernizr: {
src: 'bower_components/modernizr/modernizr.js',
dev: 'node_modules/grunt-modernizr/lib/modernizr-dev.js',
devDest: 'dist/js/modernizr.js',
dest: 'dist/<%= pkg.version %>/modernizr.min.js'
},

Expand Down Expand Up @@ -75,8 +82,8 @@ module.exports = {
src: 'temp/**/*.html',
dest: 'src/',
maincss: 'css/main.css',
modernizr: '../bower_components/modernizr/modernizr.js',
mainjs: '<script data-main="js/config" src="../bower_components/requirejs/require.js"></script>'
modernizr: '../node_modules/modernizr/modernizr.js',
mainjs: '<script data-main="js/config" src="../node_modules/requirejs/require.js"></script>'
}
}
};
16 changes: 12 additions & 4 deletions grunt/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,31 @@ var projectConfig = require('./config');
* @return {Array} Array of all files to include
*/
var getIncludeFiles = function () {
var files = [{
pattern: 'bower_components/**/*.js',
included: false
}];
var files = [];

// Add JavaScript libs
projectConfig.js.libs.forEach(function (element) {
files.push({
pattern: element,
included: false
});
});

// Add own JS files
projectConfig.js.files.forEach(function (element) {
files.push({
pattern: element,
included: false
});
});

// Add tests
files.push({
pattern: projectConfig.tests.src,
included: false
});

// And test config
files.push(projectConfig.tests.config);

return files;
Expand Down
2 changes: 1 addition & 1 deletion grunt/options/modernizr.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var config = require('../config');

module.exports = {
build: {
devFile: config.modernizr.src,
devFile: config.modernizr.dev,
outputFile: config.modernizr.dest,

extra: {
Expand Down
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,15 @@
"url": "https://github.com/use-init/init/issues"
},
"license": "MIT",
"scripts": {
"postinstall": "bower install"
},
"engines": {
"node": ">=0.10"
},
"dependencies": {
"normalize.css": "3.0.2"
"jquery": "1.11.1",
"normalize.css": "3.0.2",
"requirejs": "2.1.15"
},
"devDependencies": {
"bower": "1.3.12",
"glob": "4.0.6",
"grunt": "0.4.5",
"grunt-contrib-clean": "0.6.0",
Expand Down
4 changes: 2 additions & 2 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->

<link rel="stylesheet" href="css/main.css">
<script src="../bower_components/modernizr/modernizr.js"></script>
<script src="../node_modules/modernizr/modernizr.js"></script>
</head>
<body>
<!--[if lte IE 7]>
Expand Down Expand Up @@ -44,7 +44,7 @@ <h1 role="banner">INIT</h1>
</footer>

<!-- Load scripts -->
<script data-main="js/config" src="../bower_components/requirejs/require.js"></script>
<script data-main="js/config" src="../node_modules/requirejs/require.js"></script>

<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
<script>
Expand Down
2 changes: 1 addition & 1 deletion src/js/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require.config({
deps: ['plugins/console', 'main'],

paths: {
jquery: '../../bower_components/jquery/dist/jquery.min'
jquery: '../../node_modules/jquery/dist/jquery.min'
// More additional paths here
},

Expand Down
2 changes: 1 addition & 1 deletion test/test-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
baseUrl: 'http://localhost:9876/base/src/js',

deps: [
'../../bower_components/modernizr/modernizr',
'../../node_modules/grunt-modernizr/lib/modernizr-dev',
'config'
]
});
Expand Down