Skip to content

Commit

Permalink
Merge pull request #671 from vaadin/p3-preview
Browse files Browse the repository at this point in the history
P3 preview
  • Loading branch information
tomivirkki authored Jun 20, 2018
2 parents fdde920 + a62a249 commit 724ca71
Show file tree
Hide file tree
Showing 48 changed files with 995 additions and 993 deletions.
14 changes: 14 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
bower_components
demo
.eslintrc.json
.stylelintrc
.travis.yml
.gemini.yml
wct.conf.js
analysis.json
bower.json
gulpfile.js
index.html
screenshot.png
ISSUE_TEMPLATE.md
vaadin-directory-description.md
52 changes: 30 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: true
dist: trusty
language: node_js
node_js: 8.9
node_js: 8.11

cache:
directories:
Expand All @@ -11,34 +11,42 @@ addons:
firefox: latest
chrome: stable

install:
- npm install
- bower install

before_script:
- gulp lint version:check
- polymer lint --rules polymer-2 --input ./src/*.html ./theme/**/*.html
- xvfb-run -s '-screen 0 1024x768x24' wct

env:
- TEST_SUITE=visual_tests
- TEST_SUITE=unit_tests
- POLYMER=2 TEST_SUITE=unit_tests
- POLYMER=2 TEST_SUITE=visual_tests
- POLYMER=3

script:
- if [[ "$TRAVIS_EVENT_TYPE" != "pull_request" && "$TRAVIS_BRANCH" != quick/* ]]; then
if [[ "$TEST_SUITE" = "visual_tests" ]]; then
npm i --no-save gemini@^4.0.0 gemini-sauce gemini-polyserve &&
gemini test test/visual && gemini test test/visual -c .gemini-chrome.yml;
- 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 &&
gemini test test/visual && gemini test test/visual -c .gemini-chrome.yml;
else
wct --env saucelabs;
fi;
else
xvfb-run -s '-screen 0 1024x768x24' wct;
fi &&
if [[ "$TEST_SUITE" = "unit_tests" ]]; then
wct --env saucelabs;
if [[ "$TRAVIS_EVENT_TYPE" = "cron" && "$TEST_SUITE" = "unit_tests" ]]; then
wct --env saucelabs-cron;
fi;
fi
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then
if [[ "$TEST_SUITE" = "unit_tests" ]]; then
wct --env saucelabs-cron;
- if [[ "$POLYMER" = "3" ]]; then
npm --no-save -q install -g yarn bower magi-cli web-component-tester &&
(cd .. && git clone --depth 1 -b vaadin-components-rc git://github.com/web-padawan/polymer-modulizer.git && cd polymer-modulizer && npm -q link) &&
rm -rf node_modules &&
magi p3-convert --out . --import-style=name &&
yarn install --flat &&
if [[ "$TRAVIS_EVENT_TYPE" != "pull_request" && "$TRAVIS_BRANCH" != quick/* ]]; then
wct --module-resolution=node --npm --env saucelabs;
else
xvfb-run -s '-screen 0 1024x768x24' wct --module-resolution=node --npm;
fi;
fi

after_success:
- cat ${TRAVIS_BUILD_DIR}/coverage/lcov.info | coveralls
- "cat ${TRAVIS_BUILD_DIR}/coverage/lcov.info | coveralls"
38 changes: 37 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
|
[API documentation ↗](https://vaadin.com/components/vaadin-combo-box/html-api)

[<vaadin-combo-box>](https://vaadin.com/components/vaadin-combo-box) is a [Polymer](http://polymer-project.org) element combining a dropdown list with an input field for filtering the list of items, part of the [Vaadin components](https://vaadin.com/components).
[<vaadin-combo-box>](https://vaadin.com/components/vaadin-combo-box) is a Web Component combining a dropdown list with an input field for filtering the list of items, part of the [Vaadin components](https://vaadin.com/components).

<!--
```
Expand Down Expand Up @@ -45,6 +45,42 @@

[<img src="https://raw.githubusercontent.com/vaadin/vaadin-combo-box/master/screenshot.png" width="208" alt="Screenshot of vaadin-combo-box" />](https://vaadin.com/components/vaadin-combo-box)

## Installation

The Vaadin components are distributed as Bower and npm packages.
Please note that the version range is the same, as the API has not changed.
You should not mix Bower and npm versions in the same application, though.

Unlike the official Polymer Elements, the converted Polymer 3 compatible Vaadin components
are only published on npm, not pushed to GitHub repositories.

### Polymer 2 and HTML Imports Compatible Version

Install `vaadin-combo-box`:

```sh
bower i vaadin/vaadin-combo-box --save
```

Once installed, import it in your application:

```html
<link rel="import" href="bower_components/vaadin-combo-box/vaadin-combo-box.html">
```
### Polymer 3 and ES Modules Compatible Version

Install `vaadin-combo-box`:

```sh
npm i @vaadin/vaadin-combo-box --save
```

Once installed, import it in your application:

```js
import '@vaadin/vaadin-combo-box/vaadin-combo-box.js';
```

## Getting Started

Vaadin components use the Lumo theme by default.
Expand Down
20 changes: 10 additions & 10 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
"iron-list": "^2.0.2",
"iron-resizable-behavior": "^2.0.0",
"polymer": "^2.0.0",
"vaadin-control-state-mixin": "^2.0.0",
"vaadin-overlay": "^3.1.0",
"vaadin-text-field": "^2.1.0",
"vaadin-themable-mixin": "^1.1.0",
"vaadin-lumo-styles": "vaadin/vaadin-lumo-styles#^1.0.0",
"vaadin-material-styles": "vaadin/vaadin-material-styles#^1.0.0",
"vaadin-item": "^2.1.0",
"vaadin-element-mixin": "vaadin/vaadin-element-mixin#^1.0.1"
"vaadin-control-state-mixin": "vaadin/vaadin-control-state-mixin#^2.1.0",
"vaadin-overlay": "vaadin/vaadin-overlay#^3.1.0",
"vaadin-text-field": "vaadin/vaadin-text-field#^2.1.0",
"vaadin-themable-mixin": "vaadin/vaadin-themable-mixin#^1.2.0",
"vaadin-lumo-styles": "vaadin/vaadin-lumo-styles#^1.1.0",
"vaadin-material-styles": "vaadin/vaadin-material-styles#^1.1.0",
"vaadin-item": "vaadin/vaadin-item#^2.1.0",
"vaadin-element-mixin": "vaadin/vaadin-element-mixin#^1.1.0"
},
"devDependencies": {
"iron-ajax": "^2.0.0",
Expand All @@ -59,8 +59,8 @@
"paper-input": "^2.0.0",
"paper-styles": "^2.0.0",
"test-fixture": "^3.0.0",
"vaadin-button": "^2.1.0",
"vaadin-button": "vaadin/vaadin-button#^2.1.0",
"web-component-tester": "^6.1.5",
"vaadin-demo-helpers": "^1.0.0"
"vaadin-demo-helpers": "vaadin/vaadin-demo-helpers#^2.0.0"
}
}
Loading

0 comments on commit 724ca71

Please sign in to comment.