Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
Haroenv authored Oct 3, 2018
2 parents 1b92e66 + adee769 commit 70f31fd
Show file tree
Hide file tree
Showing 8 changed files with 1,913 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ bower_components
*.iml
.idea
.vscode
netlify-dist/
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,18 @@ env:
- TEST_SUITE=integration BROWSER='internet explorer:11'
- TEST_SUITE=integration BROWSER='MicrosoftEdge'
- TEST_SUITE=integration BROWSER='chrome'
- TEST_SUITE=examples
global:
- secure: wuQpdVaYsj4JGZcYGPPMa6GQHA6RFCEDm1F9IOTOJLAPo9XS3+gcwU3uFqZONf9+f/l7LrF0tpsl1BTDiAQJkig1Z851mPNj0XaMWnBL+2cyfJPzAYBIj18A7xKnyvRWXKtTeDo5l6DKYiA86VQmZSQWulUVYzr7qeIWvONLqrqLpW2Gl910khy2sDO6LJSHqTvXcEwRtL6sIf0O93wxIwGuZM1EBAmZsorvZYSH3wILhT98Jj458OMxm8u2CgoFjjI62tNAksRGJ8E6iDNJOHyGPFxAQhGoqAQWBspHCQWt9aOFGNweig+ReulE9g0Oqfpy2YeE6XYb3rZyUjgDFSBWj4fnwUDqBInn30s4t4tmd0LLrc9VbMg/BkdoPlMMl+FAo/g/82tkAkIoFPfx/ZAlQ3zcVs3L3hPkh3597RWoXLdNIuRqquxaFGadumLRVUZElreMCEQUbk1mOEkbLf/tgW60ZUL9fJbl0qJK0uPXFX/sufxYVC1YfuRX3RpUL1bME8KyhW+zXTkz+x6AqosQYcsdXAzU4VWVJc5fyYjb8rSNMyWkmx+2T4w/DX6nF9ii6ybKm5sN3Z4LBB5ih73/MlKQLxqZTBKYJ5V8MdkTq2raW9nUB+WARd+UOBbmPnsYU3wqW+rXPgwiaVIj6ew6QsCgjQsLWswYwRb6oN8=
- secure: OluVlPpTgaAr1O/dzRvgBBk0M3w8uu1G3wRq9b3AdcldKuLf0kUoCrlh9cyBmowj+JgrfZ1DAyOFKwcyQAhb/HN+ha7BwRf4PNkb2/n5vlDeY7tE9ULuS9ROXIhrskVYUUh391ghQvbw45M7rrUyyJyo+B6Kv4RrwQObcpv9D/M81JRx4QfAAgrNNsCFTwjaf0DFMnmTXyXKIBusqa2DJxb7xslw1Kcu+qEYNWNB8wPoV9O3LOyfPIL5zt6j1HgUim998QBDNaI2rispH2lSPh6vKbomMlfDEDFCVHTmdKqbIb1TC/1/HlHiL5Kgesysev3QtfFjprTYwFZHXwElSrGYeFB+br11RQvOd8L7TCrGIdhGlBQLA6sISiohNrpZ6yGvsA+8JmMMsdOOO+wkHgQkWpzyFFdt+/Ek8+WeP04TsYAh1EPS3FGFeC/1ZqaazYITUaaNXaBqIp3Em07RB1eqyiu7KuO2wY74K3Y4fIAX3l6Od/E+DnUZhrUwwxZ+MnUx+SSZ4oGg4hL8OBrG0f/gaRwOWx/ieqyrcvzIpXYecKrxpYGzsM1NsbVzBiSsCSIt3lYbVxVVJiEjRLKb8L0QVvj4K4yfyQAAjWhcmz+MyCDLnFroaCmmohPF/gorsiaqEuiqTqXyFOAiMsEjZK513UMvPXK4lWWRt3a1/PI=
- secure: IDIoTyLjgu8yxGhvx2xCgdZWkLB900LnseELvetSm2RtbgQrpWd8yOh33JOK1ZQpiZcfJDWP6abuNmep7bR5p0KJLM8masMVHUiKbCJ1aF/79+poFObV+r4ibUjJn6bDKmn5ryaLeVTKHZMymUN2TUkkbF8OjKNU6LcDkoBRIm96YvAw4VRzFLS2HNlUOsD0eztQrxHi1YA8aEAHT0xcIe0o95qz9380UHKCKRMAkxav615R+3nYYPbTdYbk8/KHmaWWBLe1J8gN8fBFRQWsrWfcafhoVcNNePRKbppmBevxLOwe5qnK1OUlzSl1B0SriGtZdxfZTO3S3fJc90pHkPkHVOVcU7jjmte38uOQGbkgBA5j1c30dGcTocgHTGtQmFmXcn/t39hA6dGZk+Pu454Q5Owkg40cQQ6bMDgsO0VwbCE4RxCGE/2xcQeI+wE1wgSvGcFNprdUu7mLBWJePr+aBPUTQZWmGmwtkaSAZvpyq7ugZ4s/t1w53K6jG7MstYsjSINLo1qpB4IkMpganqAWuTzLwSCI5Nmx4EMX2kwt+IEJL3urJFjHjowqqeoFwqTGS4iegIGj0RMWI2XcMHPBThylJD0A5ig7jirS0IPktgF7q9wZg5flqRgugu2e2AywDNSfBNXE6iffl5dRimh4uIg/0URAQAk8TpKhlt4=
- secure: pkJy89qKiNosG74EODLK3LOtUOu/mFOMwlMQ65sEIpoJkXGnNiDFSTxkdV1uA5seAUg6HM+u2z94Axo3FbKkM4b8y85rKYi8YbP3w1UCnDjQzRSbqLq0eYaiDK5pTtilddurRzEF7pYLazRC2TYg76QNHzoSWDgE1ZOmLBQt8YOn7QMCTAH2H1upAmMcEiWCTkCru616/WD3WTPsxPQLB841LdsSa2UAJh3RerdOR4E4BGQ5XoNvSRhv/Tlufhobq3stGovYHAzim58ODZonQzgPDRN+FgnRyJRXBLN0KOjknIKeD8BUq/UV6m/kM7HS+eJgVVLgPvG2Cm+dZTYrjZl9A/dzNpvtl2fla0w9alE4wh3qMyooD8SCyPoP3ijkIYoqKM8dDncUD/Wlc/3N+wOn7tP1dPMdXxuWcPugL14Nto+ZftRZcGSlT50EvrELqblJ+k0H1/kN6bd45syKp6WTVyHrlSRr2aq4fs9IKNa+2ss1dM8iDLyfwOG24oZm3TaDl1RjbwuxiB1OvjfhNvxWYkAHnJmkfu2kvHen2L0WHT8xaVs0W9IqKPbO/pCGxYGb+z29G4no+FZ2WWnNaNWOV7Ur3eDwj/0B9JKyi0t/NBiXw7SQ3hQWR9S/xwhDyAin4StmDzRx4bAdnjV5ycIetGcP3qYDP5LuTkljNJU=
- secure: kn/miFmdfndFNHSeDdB/oAJKCTCqK9bk97dDymsG3SPgKmWaY2YU5wUvGaJKBrRSnzUlEbAbx5z7kvjZIWVD5JQ0xDqOIE9xi/Qe5r7heNZxaNhFCIRAK4KJIaRbT0xz8xWMzWkUmwbJTZjvUMLqV7CucTQRBeu72OjP/t6DzKe9HJWKk+tG/nrkV7NnquaPasHLO+U6Ef2SVBQfcPW5RX3wt03DN7BNVEZZu2SJIM4YaEauPp/Wy9Z3EHMDWZLq6XiI7FBH7oG4OVFpZN48TtUasqDQfdgev1lu6sfE+BADhxkwbeg4iswmsVEW7+3jN639NeRZ6gsH8LR+QIf38MB232sevOvUeqIwwyYl1yMrXIUPYbdY4ELY1H1m7qriq3vHL/0EhDJ/3POk4yfGxDt4JnS0cGCu8ygicSKn4fl3G9XY/tONuwwjGg0YGlbhgYD4Z9sgNfdhgp6DQ+a0zQIwLbGhYBT9CSzwsyHEVrPXkwLPG8tISRFIDkB6Oz1eFYnB1vPejbvOzGG8jDdseuU/Q4GV+Y5acpdqidJunyUcQKdeZAvOdsVFlefU6hTfA73dTpdtpFOwqbd0kBKr9TGbck919lJom3IkGTbi3O4VdQb29EU3M0uMaFHtrpHeaMQFECrOSGcdH/viWAuyPcdGv6Oq42+uq8tkjObjUOM=
node_js: stable
before_script:
- yarn build
script: yarn test:ci
- yarn build
script:
- yarn test:ci
cache: yarn
addons:
sauce_connect: true
24 changes: 24 additions & 0 deletions examples/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Autocomplete.js example</title>
<style>
html {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
}
</style>
</head>
<body>
Welcome to the Autocomplete.js examples:
<ol>
<li><a href="../examples/basic.html">Basic example</a></li>
<li><a href="../examples/basic_angular.html">Basic Angular.js example</a></li>
<li><a href="../examples/basic_jquery.html">Basic jQuery example</a></li>
<li><small><a href="../test/playground.html">Test playground</a></small></li>
<li><small><a href="../test/playground_angular.html">Test playground (Angular.js)</a></small></li>
<li><small><a href="../test/playground_jquery.html">Test playground (jQuery)</a></small></li> </ol>
</body>
</html>
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"eslint": "1.5.1",
"eslint-config-airbnb": "0.1.0",
"eslint-config-algolia": "3.0.0",
"execa": "^1.0.0",
"grunt": "^1.0.1",
"grunt-banner": "^0.6.0",
"grunt-cli": "1.2.0",
Expand Down Expand Up @@ -57,8 +58,10 @@
"karma-webpack": "^2.0.3",
"mocha": "^3.4.1",
"mversion": "^1.10.1",
"netlify": "^2.0.1",
"node-static": "^0.7.8",
"phantomjs-prebuilt": "^2.1.12",
"replace-in-file": "^3.4.2",
"semver": "^5.3.0",
"sinon": "^1.17.6",
"webpack": "^1.13.2",
Expand All @@ -73,7 +76,8 @@
"test": "karma start --single-run && grunt lint",
"test:watch": "karma start",
"test:ci": "./test/ci.sh",
"release": "./release.sh"
"release": "./scripts/release.sh",
"docs:netlify": "./scripts/netlify-deploy.js"
},
"version": "0.31.0",
"main": "index.js",
Expand Down
75 changes: 75 additions & 0 deletions scripts/netlify-deploy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
#!/usr/bin/env node
'use strict';
/* eslint-disable no-console */
const execa = require('execa');
const replace = require('replace-in-file');
const NetlifyAPI = require('netlify');

const client = new NetlifyAPI(process.env.NETLIFY_API_KEY);

function logStdOut(opts) {
console.log(opts.stdout);
}

if (!process.env.NETLIFY_API_KEY || !process.env.NETLIFY_SITE_ID) {
throw new Error(
'Both NETLIFY_API_KEY and NETLIFY_SITE_ID are required. ' +
'They can be found on ' +
'https://app.netlify.com/sites/autocompletejs-playgrounds/settings/general' +
' and https://app.netlify.com/account/applications'
);
}

execa('yarn', ['build'])
.then(logStdOut)
.then(() => execa('rm', ['-rf', 'netlify-dist']))
.then(() => execa('mkdir', ['-p', 'netlify-dist/examples']))
.then(() => execa('cp', ['-r', 'examples', 'netlify-dist']))
.then(() => execa('mv', ['netlify-dist/examples/index.html', 'netlify-dist']))
.then(() =>
replace({
files: 'netlify-dist/index.html',
from: /href="\.\./g,
to: 'href=".'
})
)
.then(() => execa('mkdir', ['-p', 'netlify-dist/test']))
.then(() =>
execa('cp', [
'test/playground.css',
'test/playground.html',
'test/playground_angular.html',
'test/playground_jquery.html',
'netlify-dist/test'
])
)
.then(() => execa('cp', ['-r', 'dist', 'netlify-dist']))
.then(() =>
replace({
files: [
'netlify-dist/examples/basic.html',
'netlify-dist/examples/basic_angular.html',
'netlify-dist/examples/basic_jquery.html'
],
from: /https:\/\/cdn.jsdelivr.net\/autocomplete.js\/0/g,
to: '../dist'
})
)
.then(() =>
client.deploy(process.env.NETLIFY_SITE_ID, 'netlify-dist', {
draft: true,
message: process.env.TRAVIS_COMMIT_MESSAGE || ''
})
)
.then(({deploy: {id, name, deploy_ssl_url: url}}) =>
console.log(
'🕸 site is available at ' +
url +
'\n\n' +
'Deploy details available at https://app.netlify.com/sites/' +
name +
'/deploys/' +
id
)
);

File renamed without changes.
2 changes: 2 additions & 0 deletions test/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ elif [ "$TRAVIS_SECURE_ENV_VARS" == "true" -a "$TEST_SUITE" == "integration" ];
static -p 8080 &
sleep 3 &&
./node_modules/mocha/bin/mocha --harmony -R spec ./test/integration/test.js
elif [ "$TEST_SUITE" == "examples" ]; then
yarn docs:netlify
else
echo "Not running any tests"
fi
Loading

0 comments on commit 70f31fd

Please sign in to comment.