Skip to content

Commit

Permalink
Remove bower
Browse files Browse the repository at this point in the history
  • Loading branch information
pirhoo committed Jan 4, 2018
1 parent 9208acd commit df1ad11
Show file tree
Hide file tree
Showing 10 changed files with 133 additions and 66 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ coverage
# Dependency directory
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
node_modules
bower_components
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@

## Installation

Install `node` and `npm` then run:
Install `node` and `yarn` then run:

```
npm install
bower install
yarn
```

You can now start serving static files with gulp!
Expand Down
27 changes: 0 additions & 27 deletions bower.json

This file was deleted.

2 changes: 1 addition & 1 deletion gulp/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ gulp.task('fonts', function () {
});

gulp.task('swf', [], function () {
return gulp.src('bower_components/**/*.swf')
return gulp.src('node_modules/@bower_components/**/*.swf')
.pipe($.flatten())
.pipe(gulp.dest('dist/assets/swf'))
.pipe($.size());
Expand Down
4 changes: 1 addition & 3 deletions gulp/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ function browserSyncInit(baseDir, files, browser) {
var routes = null;
if(baseDir === 'src' || (util.isArray(baseDir) && baseDir.indexOf('src') !== -1)) {
routes = {
// Should be '/bower_components': '../bower_components'
// Waiting for https://github.com/shakyShane/browser-sync/issues/308
'/bower_components': 'bower_components'
'/bower_components': 'node_modules/@bower_components'
};
}

Expand Down
32 changes: 26 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
{
"name": "iframe-scaffolder",
"version": "1.0.0",
"dependencies": {},
"repository": "https://github.com/pirhoo/iframe-scaffolder/",
"staticRemote": "[email protected]:pirhoo/iframe-scaffolder.git",
"facebookAppId": "883059891808177",
"dependencies": {
"@bower_components/angular": "angular/bower-angular#1.3.20",
"@bower_components/angular-animate": "angular/bower-angular-animate#1.3.x",
"@bower_components/angular-aria": "angular/bower-angular-aria#^1.3.15 || >1.4.0-beta.0",
"@bower_components/angular-bootstrap": "angular-ui/bootstrap-bower#0.13.1",
"@bower_components/angular-material": "angular/bower-material#~0.10.0",
"@bower_components/angular-mocks": "angular/bower-angular-mocks#1.3.x",
"@bower_components/angular-sanitize": "angular/bower-angular-sanitize#1.3.x",
"@bower_components/angular-ui-router": "angular-ui/angular-ui-router-bower#0.2.15",
"@bower_components/angular-ui-sortable": "angular-ui/ui-sortable#~0.13.0",
"@bower_components/angular-ui-utils": "angular-ui/ui-utils#bower-validate",
"@bower_components/angular-zeroclipboard": "lisposter/angular-zeroclipboard#~0.3.2",
"@bower_components/angularjs-socialshare": "720kb/angular-socialshare#~0.1.13",
"@bower_components/bootstrap": "twbs/bootstrap#3.3.1",
"@bower_components/jquery": "jquery/jquery-dist#2.x.x",
"@bower_components/jquery-ui": "components/jqueryui#>=1.9",
"@bower_components/modernizr": "Modernizr/Modernizr#2.8.x",
"@bower_components/velocity": "julianshapiro/velocity#~1.2.2",
"@bower_components/zeroclipboard": "zeroclipboard/zeroclipboard#>=2"
},
"repository": "https://github.com/googletrends/iframe-scaffolder/",
"staticRemote": "[email protected]:googletrends/iframe-scaffolder.git",
"facebookAppId": "1491916714459281",
"devDependencies": {
"gulp": "^3.9.1",
"gulp-autoprefixer": "^0.0.6",
Expand Down Expand Up @@ -44,9 +63,10 @@
"gulp-gh-pages": "~0.4.0"
},
"engines": {
"node": ">=8.9.4"
"node": ">=8.9.4",
"yarn": ">= 1.0.0"
},
"scripts": {
"postinstall": "bower install"
"postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'bower_components', 'junction') } catch (e) { }\""
}
}
46 changes: 23 additions & 23 deletions src/app/bootstrap.loader.less
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
// Core variables and mixins
@import "bootstrap.variables.less";
@import "../../bower_components/bootstrap/less/mixins.less";
@import "../../node_modules/@bower_components/bootstrap/less/mixins.less";

// Reset and dependencies
@import "../../bower_components/bootstrap/less/normalize.less";
@import "../../bower_components/bootstrap/less/print.less";
@import "../../node_modules/@bower_components/bootstrap/less/normalize.less";
@import "../../node_modules/@bower_components/bootstrap/less/print.less";

// Core CSS
@import "../../bower_components/bootstrap/less/scaffolding.less";
@import "../../bower_components/bootstrap/less/type.less";
@import "../../bower_components/bootstrap/less/grid.less";
@import "../../bower_components/bootstrap/less/forms.less";
@import "../../bower_components/bootstrap/less/buttons.less";
@import "../../node_modules/@bower_components/bootstrap/less/scaffolding.less";
@import "../../node_modules/@bower_components/bootstrap/less/type.less";
@import "../../node_modules/@bower_components/bootstrap/less/grid.less";
@import "../../node_modules/@bower_components/bootstrap/less/forms.less";
@import "../../node_modules/@bower_components/bootstrap/less/buttons.less";

// Components
@import "../../bower_components/bootstrap/less/dropdowns.less";
@import "../../bower_components/bootstrap/less/button-groups.less";
@import "../../bower_components/bootstrap/less/input-groups.less";
@import "../../bower_components/bootstrap/less/navs.less";
@import "../../bower_components/bootstrap/less/navbar.less";
@import "../../bower_components/bootstrap/less/pager.less";
@import "../../bower_components/bootstrap/less/labels.less";
@import "../../bower_components/bootstrap/less/thumbnails.less";
@import "../../bower_components/bootstrap/less/media.less";
@import "../../bower_components/bootstrap/less/list-group.less";
@import "../../bower_components/bootstrap/less/panels.less";
@import "../../bower_components/bootstrap/less/wells.less";
@import "../../node_modules/@bower_components/bootstrap/less/dropdowns.less";
@import "../../node_modules/@bower_components/bootstrap/less/button-groups.less";
@import "../../node_modules/@bower_components/bootstrap/less/input-groups.less";
@import "../../node_modules/@bower_components/bootstrap/less/navs.less";
@import "../../node_modules/@bower_components/bootstrap/less/navbar.less";
@import "../../node_modules/@bower_components/bootstrap/less/pager.less";
@import "../../node_modules/@bower_components/bootstrap/less/labels.less";
@import "../../node_modules/@bower_components/bootstrap/less/thumbnails.less";
@import "../../node_modules/@bower_components/bootstrap/less/media.less";
@import "../../node_modules/@bower_components/bootstrap/less/list-group.less";
@import "../../node_modules/@bower_components/bootstrap/less/panels.less";
@import "../../node_modules/@bower_components/bootstrap/less/wells.less";

// Components w/ JavaScript
@import "../../bower_components/bootstrap/less/tooltip.less";
@import "../../node_modules/@bower_components/bootstrap/less/tooltip.less";

// Utility classes
@import "../../bower_components/bootstrap/less/utilities.less";
@import "../../bower_components/bootstrap/less/responsive-utilities.less";
@import "../../node_modules/@bower_components/bootstrap/less/utilities.less";
@import "../../node_modules/@bower_components/bootstrap/less/responsive-utilities.less";
2 changes: 1 addition & 1 deletion src/app/bootstrap.variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.

//** Load fonts from this directory.
@icon-font-path: '../bower_components/bootstrap/fonts/';
@icon-font-path: '../node_modules/@bower_components/bootstrap/fonts/';
//** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular";
//** Element ID within SVG icon file.
Expand Down
2 changes: 1 addition & 1 deletion src/app/index.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Vendors
@import (less) "../../bower_components/angular-material/angular-material.css";
@import (less) "../../node_modules/@bower_components/angular-material/angular-material.css";
@import "bootstrap.loader.less";
@import "//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css";
// Internal
Expand Down
78 changes: 78 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,80 @@
# yarn lockfile v1


"@bower_components/angular-animate@angular/bower-angular-animate#1.3.x":
version "1.3.20"
resolved "https://codeload.github.com/angular/bower-angular-animate/tar.gz/a0d4208f770315df80866fcb449eff913efbbbdc"

"@bower_components/angular-aria@angular/bower-angular-aria#^1.3.15 || >1.4.0-beta.0":
version "1.6.8"
resolved "https://codeload.github.com/angular/bower-angular-aria/tar.gz/26fb0805952e485b55c7873c8050f75a54b700be"

"@bower_components/angular-bootstrap@angular-ui/bootstrap-bower#0.13.1":
version "0.13.1"
resolved "https://codeload.github.com/angular-ui/bootstrap-bower/tar.gz/92d5b56d34e4087c7c88d0d50e93913a14270f2d"

"@bower_components/angular-material@angular/bower-material#~0.10.0":
version "0.10.1"
resolved "https://codeload.github.com/angular/bower-material/tar.gz/44f067ad06830daf69a173706e7dee92edb4b1fa"

"@bower_components/angular-mocks@angular/bower-angular-mocks#1.3.x":
version "1.3.20"
resolved "https://codeload.github.com/angular/bower-angular-mocks/tar.gz/67e8eeedf5514e5f8240ca69de5bdfe3701e687c"

"@bower_components/angular-sanitize@angular/bower-angular-sanitize#1.3.x":
version "1.3.20"
resolved "https://codeload.github.com/angular/bower-angular-sanitize/tar.gz/1072923abc9a6bc076e0625ae115b7b8f3ed70d1"

"@bower_components/angular-ui-router@angular-ui/angular-ui-router-bower#0.2.15":
version "0.0.0"
resolved "https://codeload.github.com/angular-ui/angular-ui-router-bower/tar.gz/90ce66133afc3572a8d7556d6d3fcee0efd8bb13"

"@bower_components/angular-ui-sortable@angular-ui/ui-sortable#~0.13.0":
version "0.0.0"
resolved "https://codeload.github.com/angular-ui/ui-sortable/tar.gz/0311efe8c8f0771b7f02d56e3a9dc675dcaa8d4f"

"@bower_components/angular-ui-utils@angular-ui/ui-utils#bower-validate":
version "0.0.0"
resolved "https://codeload.github.com/angular-ui/ui-utils/tar.gz/e3994d4e80e1487f486c98a94c12d3b9ff7614a1"

"@bower_components/angular-zeroclipboard@lisposter/angular-zeroclipboard#~0.3.2":
version "0.0.0"
resolved "https://codeload.github.com/lisposter/angular-zeroclipboard/tar.gz/70ab4f8d34bd493b653ab11a1a958121b14d01de"

"@bower_components/angular@angular/bower-angular#1.3.20":
version "1.3.20"
resolved "https://codeload.github.com/angular/bower-angular/tar.gz/0cd10f27471310fe07167b00f8a4242c6bba4df2"

"@bower_components/angularjs-socialshare@720kb/angular-socialshare#~0.1.13":
version "0.1.20"
resolved "https://codeload.github.com/720kb/angular-socialshare/tar.gz/2e14fac535c778f49ebc3558bd1d72d64ce3d064"

"@bower_components/bootstrap@twbs/bootstrap#3.3.1":
version "3.3.1"
resolved "https://codeload.github.com/twbs/bootstrap/tar.gz/9a7e365c2c4360335d25246dac11afb1f577210a"

"@bower_components/jquery-ui@components/jqueryui#>=1.9":
version "1.12.1"
resolved "https://codeload.github.com/components/jqueryui/tar.gz/44ecf3794cc56b65954cc19737234a3119d036cc"

"@bower_components/jquery@jquery/jquery-dist#2.x.x":
version "2.2.4"
resolved "https://codeload.github.com/jquery/jquery-dist/tar.gz/c0185ab7c75aab88762c5aae780b9d83b80eda72"

"@bower_components/modernizr@Modernizr/Modernizr#2.8.x":
version "0.0.0"
resolved "https://codeload.github.com/Modernizr/Modernizr/tar.gz/d6bb30c0f12ebb3ddd01e90b0bf435e1c34e6f11"

"@bower_components/velocity@julianshapiro/velocity#~1.2.2":
version "1.2.3"
resolved "https://codeload.github.com/julianshapiro/velocity/tar.gz/1ad0a8196fa973f96e347a9b7f5bdaf7498ed1a6"
dependencies:
jquery ">= 1.4.3"

"@bower_components/zeroclipboard@zeroclipboard/zeroclipboard#>=2":
version "2.3.0"
resolved "https://codeload.github.com/zeroclipboard/zeroclipboard/tar.gz/9ddfc4623bda247f3647733f7ca3bed5bd5e4972"

"@types/node@^6.0.46":
version "6.0.95"
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.95.tgz#0d027612a77c55b84497ff90a4a7d597e5ac0fab"
Expand Down Expand Up @@ -3992,6 +4066,10 @@ jpegtran-bin@^3.0.0:
bin-wrapper "^3.0.0"
logalot "^2.0.0"

"jquery@>= 1.4.3":
version "3.2.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"

js-yaml@~2.1.0:
version "2.1.3"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-2.1.3.tgz#0ffb5617be55525878063d7a16aee7fdd282e84c"
Expand Down

0 comments on commit df1ad11

Please sign in to comment.