Skip to content

Commit

Permalink
Switch to using Yarn (#881)
Browse files Browse the repository at this point in the history
* Switch to using Yarn

* Yarn in Readme

* Keep node.js

* Carret

* Oups

* revert link

* Yarn
  • Loading branch information
lipis committed Jun 16, 2018
1 parent a1f04ff commit 0e745ec
Show file tree
Hide file tree
Showing 9 changed files with 6,097 additions and 12,704 deletions.
7 changes: 5 additions & 2 deletions .gitignore
@@ -1,9 +1,9 @@
*.pyc
*.pyo
.DS_Store
.git*
.hg*
.idea
*.pyc
*.pyo
bower_components
main/index.yaml
main/lib
Expand All @@ -12,4 +12,7 @@ main/static/dev
main/static/ext
main/static/min
node_modules
npm-debug.log
package-lock.json
temp/
yarn-error.log
7 changes: 4 additions & 3 deletions README.md
Expand Up @@ -11,7 +11,7 @@ The latest version is always accessible from [https://gae-init.appspot.com](http
## Requirements

- [Google App Engine SDK for Python][]
- [Node.js][], [pip][], [virtualenv][]
- [Node.js][], [Yarn][], [pip][], [virtualenv][]
- [macOS][] or [Linux][] or [Windows][]

Make sure you have all of the above or refer to the docs on how to [install the requirements](http://docs.gae-init.appspot.com/requirement/).
Expand All @@ -37,15 +37,15 @@ gulp help

```bash
cd /path/to/project-name
npm install
yarn
gulp
```

If something goes wrong you can always do:

```bash
gulp reset
npm install
yarn
gulp
```

Expand Down Expand Up @@ -105,3 +105,4 @@ gulp deploy --project=foo --version=bar --no-promote
[tutorial]: http://docs.gae-init.appspot.com/tutorial/
[virtualenv]: http://www.virtualenv.org/
[windows]: http://windows.microsoft.com/
[yarn]: https://yarnpkg.com/
2 changes: 1 addition & 1 deletion bin/test_hello_world.sh
Expand Up @@ -4,5 +4,5 @@
cd ~
git clone https://github.com/gae-init/gae-init.git hello-world
cd hello-world
npm install
yarn
gulp
2 changes: 1 addition & 1 deletion gulp/tasks/clean.coffee
Expand Up @@ -29,7 +29,7 @@ gulp.task 'clean:venv', false, ->


gulp.task 'reset',
'Complete reset of project. Run "npm install" after this procedure.',
'Complete reset of project. Run "yarn install" after this procedure.',
['clean', 'clean:dev', 'clean:min', 'clean:venv'], ->
del paths.dep.bower_components
del paths.dep.node_modules
Expand Down
7 changes: 4 additions & 3 deletions gulp/tasks/dep.coffee
@@ -1,14 +1,15 @@
fs = require 'fs'
gulp = require('gulp-help') require 'gulp'
yarn = require('gulp-yarn')
main_bower_files = require 'main-bower-files'
$ = require('gulp-load-plugins')()
paths = require '../paths'


gulp.task 'npm', false, ->
gulp.src 'package.json'
gulp.task 'yarn', false, ->
gulp.src ['./package.json', './yarn.lock']
.pipe $.plumber()
.pipe $.start()
.pipe yarn()


gulp.task 'bower', false, ->
Expand Down
2 changes: 1 addition & 1 deletion gulp/tasks/watch.coffee
Expand Up @@ -24,7 +24,7 @@ gulp.task 'watch', false, ->
$.watch 'requirements.txt', ->
$.sequence('pip')()
$.watch 'package.json', ->
$.sequence('npm')()
$.sequence('yarn')()
$.watch 'bower.json', ->
$.sequence('ext_watch_rebuild')()
$.watch 'gulp/config.coffee', ->
Expand Down

0 comments on commit 0e745ec

Please sign in to comment.