Skip to content

Commit 56a192d

Browse files
committed
Replace bower with yarn
1 parent 4cb4920 commit 56a192d

File tree

10 files changed

+160
-127
lines changed

10 files changed

+160
-127
lines changed

.gitignore

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,54 @@
1-
Gemfile.lock
2-
npm-debug.log
3-
bower_components/
4-
node_modules/
1+
# Parts of this file were adapted from
2+
# GitHub’s collection of .gitignore file templates
3+
# which are Copyright (c) 2016 GitHub, Inc.
4+
# and released under the MIT License.
5+
# For more details, visit the project page:
6+
# https://github.com/github/gitignore
7+
8+
# Logs
9+
logs
10+
*.log
11+
npm-debug.log*
12+
13+
# Runtime data
14+
pids
15+
*.pid
16+
*.seed
17+
*.pid.lock
18+
19+
# Directory for instrumented libs generated by jscoverage/JSCover
20+
lib-cov
21+
22+
# Coverage directory used by tools like istanbul
23+
coverage
24+
25+
# nyc test coverage
26+
.nyc_output
27+
28+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
29+
.grunt
30+
31+
# node-waf configuration
32+
.lock-wscript
33+
34+
# Compiled binary addons (http://nodejs.org/api/addons.html)
35+
build/Release
36+
37+
# Dependency directories
38+
node_modules
39+
jspm_packages
40+
41+
# Optional npm cache directory
42+
.npm
43+
44+
# Optional eslint cache
45+
.eslintcache
46+
47+
# Optional REPL history
48+
.node_repl_history
49+
50+
# Output of 'npm pack'
51+
*.tgz
52+
53+
# Yarn Integrity file
54+
.yarn-integrity

CHANGELOG.md

Lines changed: 0 additions & 38 deletions
This file was deleted.

Gemfile.lock

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
activesupport (4.2.7.1)
5+
i18n (~> 0.7)
6+
json (~> 1.7, >= 1.7.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
10+
config_curator (0.4.0)
11+
activesupport (~> 4.2)
12+
thor (~> 0.19)
13+
i18n (0.7.0)
14+
json (1.8.3)
15+
minitest (5.10.1)
16+
thor (0.19.4)
17+
thread_safe (0.3.5)
18+
tzinfo (1.2.2)
19+
thread_safe (~> 0.1)
20+
21+
PLATFORMS
22+
ruby
23+
24+
DEPENDENCIES
25+
config_curator (~> 0.4.0)
26+
27+
BUNDLED WITH
28+
1.13.6

README.md

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,21 @@ My Arch Linux configuration managed with [Config Curator] and [archutil].
1010

1111
## Requirements
1212

13-
* [Bower]
14-
* [Ruby] with [Bundler]
15-
* [Zsh]
13+
* [Node.js] and [Yarn].
14+
* [Ruby] with [Bundler].
15+
* [Zsh].
1616

1717
Note: these requirements are handled automatically
1818
when bootstrapping a new system (see the instructions below).
1919

20-
[Bower]: http://bower.io/
21-
[Bundler]: http://bundler.io/
20+
[Yarn]: https://yarnpkg.com/
21+
[Bundler]: https://bundler.io/
22+
[Node.js]: https://nodejs.org/
2223
[Ruby]: https://www.ruby-lang.org/
23-
[Zsh]: http://www.zsh.org/
24+
[Zsh]: https://www.zsh.org/
2425

2526
## Installation and Usage
2627

27-
If you prefer a clean start, clone the `minimal` branch:
28-
it has the same structure and tools but with
29-
a very minimal configuration.
30-
Tagged releases are based on that branch.
31-
3228
### Bootstrapping a new system
3329

3430
Follow the normal install process.
@@ -59,7 +55,7 @@ Update the mirrorlist with reflector, e.g.,
5955
# pacman -Su
6056
```
6157

62-
If this repository or any of the Bower dependencies are private,
58+
If this repository or any of the dependencies are private,
6359
generate an ssh key pair with
6460

6561
```
@@ -129,7 +125,7 @@ $ curl -L https://git.io/vJARg | sh
129125
$ cd ~/archrc
130126
```
131127

132-
Again, if this repository or any of the Bower dependencies are private,
128+
Again, if this repository or any of the dependencies are private,
133129
generate an ssh key pair with
134130

135131
```bash
@@ -198,8 +194,6 @@ configuration should be managed by a normal user.
198194

199195
You can continue using the system Ruby,
200196
or install Ruby with [rbenv] or [RVM].
201-
Bower should be installed manually using [npm].
202-
203197

204198
Install [Bundler] with
205199

@@ -210,7 +204,7 @@ $ gem install bundler
210204
Install dependencies with
211205

212206
```bash
213-
$ bower update
207+
$ yarn
214208
$ bundle update
215209
```
216210

@@ -238,7 +232,6 @@ Install packages with
238232
$ /usr/local/bin/archutil install --sets main user gui
239233
```
240234

241-
[npm]: https://www.npmjs.com/
242235
[rbenv]: https://github.com/sstephenson/rbenv
243236
[RVM]: https://rvm.io/
244237

bootstrap.zsh

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,31 +36,23 @@ pacin ruby
3636
pacin npm
3737

3838
ruby -e $curate_str >/dev/null 2>&1 || gem install --no-document config_curator
39-
npm install
39+
npm install yarn
40+
./node_modules/.bin/yarn
4041

4142
ruby -e $curate_str >/dev/null 2>&1 && \
42-
[[ -e node_modules/bower/bin/bower ]] && \
4343
puts 'Installed' 'Config Curator requirements'
4444

45-
puts 'Installing' 'Bower components'
46-
./node_modules/bower/bin/bower --config.analytics=false --allow-root install
47-
48-
if [[ -d bower_components ]]; then
49-
puts 'Installed' 'Bower components'
50-
fi
45+
puts 'Installing' 'Node modules'
46+
./node_modules/.bin/yarn
47+
puts 'Installed' 'Node modules'
5148

5249
puts 'Installing' 'Config'
5350

5451
$(ruby -e $curate_str) -v
5552

56-
if [[ -d bower_components ]]; then
57-
rm -rf bower_components
58-
puts 'Cleaned' 'Bower components'
59-
fi
60-
6153
if [[ -d node_modules ]]; then
6254
rm -rf node_modules
63-
puts 'Cleaned' 'npm modules'
55+
puts 'Cleaned' 'Node modules'
6456
fi
6557

6658
if [[ -z "${SUDO_COMMAND:-}" && -d /root/.gem ]]; then

bower.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

install.zsh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ else
1111
cmd='install'
1212
fi
1313

14-
echo "\n $ npm install"
15-
npm install
16-
[[ "$cmd" = 'update' ]] && echo "\n $ npm run update"
17-
[[ "$cmd" = 'update' ]] && npm run update
14+
echo "\n $ yarn"
15+
yarn
1816

1917
echo "\n$ bundle ${cmd}\n"
2018
$(rbenv which bundle) $cmd

0 commit comments

Comments
 (0)