Skip to content

Commit

Permalink
Migrating project from bower to yarn (#2125)
Browse files Browse the repository at this point in the history
updating documentaion and travis checks

add yarn.lock and update node

test

added croppie back

upgrading node to v10

changing imports for croppie

fix lint error

added yarn.lock
  • Loading branch information
geetchoudhary authored and rajvaibhavdubey committed Sep 26, 2019
1 parent 36b5dd3 commit 4f9db59
Show file tree
Hide file tree
Showing 9 changed files with 13,785 additions and 63 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ matrix:

- language: node_js
node_js:
- "6"
- "10"

addons:
chrome: stable
Expand All @@ -53,9 +53,9 @@ matrix:
- cd frontend
- npm install
- npm install --save ember-colpick
- npm install -g bower
- npm install -g yarn
- npm install -g firebase-tools
- bower install
- yarn install
- ember g ember-colpick
- npm config set spin false

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PIP = $(PYBINARIES)/pip
HONCHO = $(PYBINARIES)/honcho

NPM ?= npm
BOWER ?= bower
YARN ?= YARN

clean.frontend:
rm -rf $(NODE_MODULES)
Expand All @@ -27,7 +27,7 @@ clean:
install:
$(PIP) install --ignore-installed -r $(API)/requirements.txt
$(NPM) --prefix $(FRONTEND) install
$(BOWER) install --config.cwd=$(FRONTEND)
$(YARN) install --config.cwd=$(FRONTEND)

test:
$(NPM) --prefix $(FRONTEND) test
Expand Down
2 changes: 1 addition & 1 deletion docs/frontend/installation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ To install the app, run the following commands in a command line:
* `git clone https://github.com/fossasia/badgeyay`
* `cd badgeyay/frontend`
* `npm install`
* `bower install`
* `yarn install`
## Running locally:

To run the app locally on your machine, run the following commands in a command line:
Expand Down
23 changes: 0 additions & 23 deletions frontend/bower.json

This file was deleted.

4 changes: 2 additions & 2 deletions frontend/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ module.exports = function(defaults) {
}
});

app.import('bower_components/Croppie/croppie.css');
app.import('bower_components/Croppie/croppie.min.js');
app.import('node_modules/croppie/croppie.css');
app.import('node_modules/croppie/croppie.min.js');
// Use `app.import` to add additional libraries to the generated
// output files.
//
Expand Down
26 changes: 0 additions & 26 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"build": "ember build",
"lint:js": "eslint ./*.js app config lib server tests",
"start": "ember serve --port=4200",
"test": "ember test"
"test": "ember test",
"postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'bower_components', 'junction') } catch (e) { }\""
},
"devDependencies": {
"@fortawesome/ember-fontawesome": "^0.1.2",
Expand Down Expand Up @@ -58,18 +59,21 @@
"torii": "^0.10.1"
},
"engines": {
"node": "^4.5 || 6.* || >= 7.*"
"node": "^4.5 || 6.* || >= 7.*",
"yarn": ">= 1.0.0"
},
"dependencies": {
"@bower_components/pace": "HubSpot/pace",
"async": "^2.6.1",
"babel-eslint": "^8.2.6",
"bower": "^1.8.4",
"croppie": "^2.6.2",
"bootstrap-slider": "~6.0.6",
"croppie": "^2.6.4",
"ember": "^1.0.3",
"ember-colpick": "^1.0.0",
"ember-suave": "^4.0.1",
"eslint": "^4.19.1",
"eslint-plugin-ember-suave": "^1.0.0",
"jquery-colpick": "^3.1.0",
"md5": "^2.2.1",
"minimatch": "^3.0.4",
"node-sass": "^4.9.2"
Expand Down
4 changes: 2 additions & 2 deletions frontend/semantic.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
"permission": false,
"autoInstall": true,
"rtl": false,
"version": "2.3.3"
}
"version": "2.4.2"
}
Loading

0 comments on commit 4f9db59

Please sign in to comment.