Skip to content

Commit

Permalink
chore: align with skeleton, replace gulp with npm scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
web-padawan committed Mar 20, 2019
1 parent 3f85b2e commit 579701d
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 96 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ jobs:
script:
- if [[ "$POLYMER" = "2" ]]; then
npm -q i && npm i -q --no-save bower polymer-cli && bower -q i &&
gulp lint version:check &&
polymer lint --rules polymer-2 --input ./src/*.html ./theme/**/*.html &&
if [[ "$TRAVIS_EVENT_TYPE" != "pull_request" && "$TRAVIS_BRANCH" != quick/* ]]; then
if [[ "$TEST_SUITE" = "visual_tests" ]]; then
npm i -q --no-save gemini@^4.0.0 gemini-sauce gemini-polyserve &&
Expand All @@ -45,14 +43,16 @@ script:
wct --env saucelabs;
fi;
else
npm run check &&
npm run lint &&
xvfb-run -s '-screen 0 1024x768x24' wct;
fi &&
if [[ "$TRAVIS_EVENT_TYPE" = "cron" && "$TEST_SUITE" = "unit_tests" ]]; then
wct --env saucelabs-cron;
fi;
fi
- if [[ "$POLYMER" = "3" ]]; then
npm --no-save -q install -g yarn bower magi-cli web-component-tester polymer-modulizer@0.4.1 &&
npm --no-save -q install -g yarn bower magi-cli web-component-tester polymer-modulizer &&
rm -rf node_modules &&
magi p3-convert --out . --import-style=name &&
yarn install --flat &&
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ To use the Material theme, import the correspondent file from the `theme/materia

## Following the coding style

We are using [ESLint](http://eslint.org/) for linting JavaScript code. You can check if your code is following our standards by running `gulp lint`, which will automatically lint all `.js` files as well as JavaScript snippets inside `.html` files.
We are using [ESLint](http://eslint.org/) for linting JavaScript code. You can check if your code is following our standards by running `npm run lint`, which will automatically lint all `.js` files as well as JavaScript snippets inside `.html` files.


## Big Thanks
Expand Down
1 change: 0 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"**/.*",
"node_modules",
"bower_components",
"gulpfile.js",
"package-lock.json",
"wct.conf.js"
],
Expand Down
88 changes: 0 additions & 88 deletions gulpfile.js

This file was deleted.

19 changes: 16 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,26 @@
"src",
"theme"
],
"devDependencies": {
"@vaadin/vaadin-component-dev-dependencies": "^1.0.0"
"husky": {
"hooks": {
"pre-commit": "npm run lint"
}
},
"scripts": {
"test": "wct",
"check": "npm-run-all --parallel check:*",
"check:bower": "magi check-bower",
"check:version": "magi check-version",
"lint": "npm-run-all --parallel lint:*",
"lint:css": "stylelint *.html src/*.html demo/*.html theme/**/*.html test/*html",
"lint:html": "eslint *.html src demo test --ext .html",
"lint:js": "eslint *.js test",
"lint:polymer": "polymer lint --rules polymer-2 --input ./src/*.html ./theme/**/*.html",
"prestart": "polymer analyze vaadin-* > analysis.json",
"start": "polymer serve --port 3000 --open",
"preversion": "gulp version:update"
"preversion": "magi update-version"
},
"devDependencies": {
"@vaadin/vaadin-component-dev-dependencies": "^3.0.0"
}
}

0 comments on commit 579701d

Please sign in to comment.