Skip to content

Remove bower as a dependency #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jurgensweere wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove bower as a dependency #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
node_modules
out
.tmp
bower_components
frontend
15 changes: 3 additions & 12 deletions Gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ var runSequence = require('run-sequence');

// Provide a browsersync session for hot reloading
var browserSync = require('browser-sync').create();
var wiredep = require('wiredep').stream;

// Setup Paths and Patterns
var develop = './app/';
Expand Down Expand Up @@ -48,7 +47,7 @@ var paths = {
sass: production + assets + '/css',
js: production + assets + '/scripts',
},
bower: ['/bower_components']
npm: ['/node_modules']
};

var devAssets = [
Expand All @@ -64,7 +63,7 @@ var config = {
sass: {
errLogToConsole: true,
outputStyle: 'expanded',
includePaths: paths.bower
includePaths: paths.npm
},
autoprefixer: {
browsers: [
Expand All @@ -85,7 +84,7 @@ gulp.task('serve', ['dev-sass', 'dev-js', 'dev-html'], function() {
server: {
baseDir: serve,
routes: {
"/bower_components": "bower_components"
"/node_modules": "node_modules"
},
middleware: function (req, res, next) {
res.setHeader('Access-Control-Allow-Origin', '*');
Expand Down Expand Up @@ -138,14 +137,6 @@ gulp.task('watch', function() {
return gulp;
});

// Use wiredep to implement used bower components (Experimental...)
gulp.task('bower', function () {
return gulp
.src(paths.develop.html)
.pipe(wiredep())
.pipe(gulp.dest(serve));
});

gulp.task('dev-clean', function(){
return gulp
.src(serve, config.clean)
Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,17 @@ The app contains the following functionality out of the box:
Make sure you have the following packages available globally:
- [NodeJS](https://nodejs.org/en/download/package-manager/)
- [Gulp CLI](http://gulpjs.com/)
- [Bower](https://bower.io/)
- [Electron-Forge](https://beta.electronforge.io/)

In case of doubt, run:
```
npm install -g gulp-cli bower electron-forge
npm install -g gulp-cli electron-forge
```

## Installation

```
npm install && bower install
npm install
```

## Run App
Expand Down
8 changes: 4 additions & 4 deletions app/assets/scss/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

/* Dependencies
========================================================================= */
@import 'bower_components/animate.css/source/base';
@import 'bower_components/angular-material/angular-material.scss';
@import 'bower_components/material-color/material-color';
@import 'bower_components/Ionicons/scss/ionicons';
@import 'node_modules/animate.css/source/base';
@import 'node_modules/angular-material/angular-material.scss';
@import 'node_modules/material-design-color/material-color';
@import 'node_modules/Ionicons/scss/ionicons';



Expand Down
18 changes: 9 additions & 9 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@

<!-- build:js js/vendor.js -->
<!-- bower:js -->
<script type="text/javascript" src="../bower_components/moment/moment.js"></script>
<script type="text/javascript" src="../bower_components/localforage/dist/localforage.js"></script>
<script type="text/javascript" src="../node_modules/moment/moment.js"></script>
<script type="text/javascript" src="../node_modules/localforage/dist/localforage.js"></script>
<!-- endbower -->
<!-- endbuild -->

<!-- bower:js -->
<script type="text/javascript" src="../bower_components/angular/angular.js"></script>
<script type="text/javascript" src="../node_modules/angular/angular.js"></script>
<!-- endbower -->

<!-- build:js js/angular-package.js -->
<!-- bower:js -->
<script type="text/javascript" src="../bower_components/angular-md5/angular-md5.min.js"></script>
<script type="text/javascript" src="../bower_components/angular-animate/angular-animate.js"></script>
<script type="text/javascript" src="../bower_components/angular-aria/angular-aria.js"></script>
<script type="text/javascript" src="../bower_components/angular-material/angular-material.js"></script>
<script type="text/javascript" src="../bower_components/angular-socket-io/socket.js"></script>
<script type="text/javascript" src="../bower_components/angular-electron/angular-electron.js"></script>
<script type="text/javascript" src="../node_modules/angular-md5/angular-md5.min.js"></script>
<script type="text/javascript" src="../node_modules/angular-animate/angular-animate.js"></script>
<script type="text/javascript" src="../node_modules/angular-aria/angular-aria.js"></script>
<script type="text/javascript" src="../node_modules/angular-material/angular-material.js"></script>
<script type="text/javascript" src="../node_modules/angular-socket-io/socket.js"></script>
<script type="text/javascript" src="../node_modules/angular-electron/angular-electron.js"></script>
<!-- endbower -->
<!-- endbuild -->

Expand Down
38 changes: 0 additions & 38 deletions bower.json
View file
Open in desktop

This file was deleted.

16 changes: 14 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,23 @@
"gulp-useref": "^3.1.2",
"jshint": "^2.9.4",
"jshint-stylish": "^2.2.1",
"main-bower-files": "^2.13.1",
"node-notifier": "^5.1.2",
"require-dir": "^0.3.1",
"run-sequence": "^1.2.2",
"wiredep": "^4.0.0"
"angular-aria": "1.6.4",
"angular-animate": "1.6.4",
"angular-electron": "^0.2.1",
"angular-localforage": "^1.3.5",
"angular-material-icons": "^0.7.1",
"angular-md5": "^0.1.10",
"angular-material": "^1.1.3",
"animate.css": "^3.5.2",
"ionicons": "^2.0.1",
"angular-socket-io": "^0.7.0",
"js-md5": "^0.4.2",
"moment": "^2.18.1",
"localforage": "^1.5.0",
"material-design-color": "^2.3.2"
},
"devDependencies": {
"babel-preset-stage-0": "^6.22.0",
Expand Down