Skip to content

Commit

Permalink
update dependencies, node, browsers, travis
Browse files Browse the repository at this point in the history
apply prettier
  • Loading branch information
jhchen committed Apr 10, 2020
1 parent 9361535 commit 1ccface
Show file tree
Hide file tree
Showing 9 changed files with 5,887 additions and 3,094 deletions.
15 changes: 11 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
language: node_js
node_js: '8.9'
node_js: '10'
script:
- npm run build
- travis_retry npm run travis
sudo: false
dist: trusty
os:
- linux
dist: xenial
cache:
directories:
- dist
- node_modules
env:
matrix:
global:
- PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
jobs:
- BROWSER=mac-chrome-latest
- BROWSER=mac-firefox-latest
- BROWSER=mac-safari-latest
Expand All @@ -18,3 +22,6 @@ env:
- BROWSER=windows-edge-latest
- BROWSER=ios-latest
- BROWSER=android-latest
jobs:
allow_failures:
- env: BROWSER=android-latest
34 changes: 17 additions & 17 deletions _develop/browsers.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
const desktop = {
'mac-chrome-latest': ['OS X 10.13', 'chrome', '67.0'],
'mac-firefox-latest': ['OS X 10.13', 'firefox', '60.0'],
'mac-safari-latest': ['OS X 10.13', 'safari', '11.1'],
'mac-chrome-previous': ['OS X 10.12', 'chrome', '66.0'],
'mac-firefox-previous': ['OS X 10.12', 'firefox', '59.0'],
'mac-safari-previous': ['OS X 10.12', 'safari', '10.1'],
'mac-chrome-latest': ['macOS 10.15', 'chrome', '80.0'],
'mac-firefox-latest': ['macOS 10.15', 'firefox', '74.0'],
'mac-safari-latest': ['macOS 10.15', 'safari', '13.0'],
'mac-chrome-previous': ['macOS 10.14', 'chrome', '79.0'],
'mac-firefox-previous': ['macOS 10.14', 'firefox', '73.0'],
'mac-safari-previous': ['macOS 10.14', 'safari', '12.0'],

'windows-chrome-latest': ['Windows 10', 'chrome', '67.0'],
'windows-firefox-latest': ['Windows 10', 'firefox', '60.0'],
'windows-edge-latest': ['Windows 10', 'microsoftedge', '16.16299'],
'windows-chrome-previous': ['Windows 8.1', 'chrome', '66.0'],
'windows-firefox-previous': ['Windows 8.1', 'firefox', '59.0'],
'windows-edge-previous': ['Windows 10', 'microsoftedge', '15.15063'],
'windows-chrome-latest': ['Windows 10', 'chrome', '80.0'],
'windows-firefox-latest': ['Windows 10', 'firefox', '74.0'],
'windows-edge-latest': ['Windows 10', 'microsoftedge', '80.0'],
'windows-chrome-previous': ['Windows 8.1', 'chrome', '79.0'],
'windows-firefox-previous': ['Windows 8.1', 'firefox', '74.0'],
'windows-edge-previous': ['Windows 10', 'microsoftedge', '79.0'],
};

const mobile = {
'ios-latest': ['iPhone X Simulator', 'iOS', '11.3', 'Safari'],
'ios-previous': ['iPhone 7 Plus Simulator', 'iOS', '10.3', 'Safari'],
'ios-latest': ['iPhone 11 Simulator', 'iOS', '13.2', 'Safari'],
'ios-previous': ['iPhone X Simulator', 'iOS', '12.4', 'Safari'],

'android-latest': ['Android GoogleAPI Emulator', 'Android', '7.1', 'Chrome'],
'android-latest': ['Android GoogleAPI Emulator', 'Android', '10.0', 'Chrome'],
'android-previous': [
'Android GoogleAPI Emulator',
'Android',
'6.0',
'9.0',
'Chrome',
],
};
Expand All @@ -40,7 +40,7 @@ Object.keys(mobile).forEach(key => {
module.exports[key] = {
base: 'SauceLabs',
browserName: mobile[key][3],
appiumVersion: '1.8.1',
appiumVersion: '1.16.0',
deviceName: mobile[key][0],
deviceOrientation: 'portrait',
platformVersion: mobile[key][2],
Expand Down
11 changes: 2 additions & 9 deletions _develop/karma.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module.exports = config => {
browsers: ['Chrome'],

client: {
useIframe: false,
useIframe: true,
},

coverageReporter: {
Expand Down Expand Up @@ -60,14 +60,7 @@ module.exports = config => {
config.browserDisconnectTimeout = 10000;
config.browserDisconnectTolerance = 3;
config.browserNoActivityTimeout = 60000;
config.browserSocketTimeout = 40000;
config.captureTimeout = 120000;
// MS Edge does not work in an iframe
if (
process.env.BROWSER.indexOf('ios') > -1 ||
process.env.BROWSER.indexOf('android') > -1 ||
process.env.BROWSER.indexOf('firefox') > -1
) {
config.client.useIframe = true;
}
}
};
6 changes: 3 additions & 3 deletions docs/_includes/standalone/bubble.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- head -->
<link rel="stylesheet" href="{{site.cdn}}{{site.version}}/quill.bubble.css">
<link rel="stylesheet" href="{{site.cdn}}{{site.version}}/quill.bubble.css" />
<style>
.standalone-container {
margin: 50px auto;
Expand All @@ -18,7 +18,7 @@
<script>
var quill = new Quill('#bubble-container', {
placeholder: 'Compose an epic...',
theme: 'bubble'
theme: 'bubble',
});
</script>
<!-- script -->
<!-- script -->
15 changes: 9 additions & 6 deletions docs/_includes/standalone/full.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<!-- head -->
<link rel="stylesheet" href="{{site.katex}}/katex.min.css">
<link rel="stylesheet" href="{{site.highlightjs}}/styles/monokai-sublime.min.css">
<link rel="stylesheet" href="{{site.cdn}}{{site.version}}/quill.snow.css">
<link rel="stylesheet" href="{{site.katex}}/katex.min.css" />
<link
rel="stylesheet"
href="{{site.highlightjs}}/styles/monokai-sublime.min.css"
/>
<link rel="stylesheet" href="{{site.cdn}}{{site.version}}/quill.snow.css" />
<style>
body > #standalone-container {
margin: 50px auto;
Expand Down Expand Up @@ -68,10 +71,10 @@
var quill = new Quill('#editor-container', {
modules: {
syntax: true,
toolbar: '#toolbar-container'
toolbar: '#toolbar-container',
},
placeholder: 'Compose an epic...',
theme: 'snow'
theme: 'snow',
});
</script>
<!-- script -->
<!-- script -->
13 changes: 8 additions & 5 deletions docs/_includes/standalone/snow.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<!-- head -->
<link rel="stylesheet" href="{{site.katex}}/katex.min.css">
<link rel="stylesheet" href="{{site.highlightjs}}/styles/monokai-sublime.min.css">
<link rel="stylesheet" href="{{site.cdn}}{{site.version}}/quill.snow.css">
<link rel="stylesheet" href="{{site.katex}}/katex.min.css" />
<link
rel="stylesheet"
href="{{site.highlightjs}}/styles/monokai-sublime.min.css"
/>
<link rel="stylesheet" href="{{site.cdn}}{{site.version}}/quill.snow.css" />
<style>
.standalone-container {
margin: 50px auto;
Expand All @@ -22,7 +25,7 @@
<script>
var quill = new Quill('#snow-container', {
placeholder: 'Compose an epic...',
theme: 'snow'
theme: 'snow',
});
</script>
<!-- script -->
<!-- script -->
Loading

0 comments on commit 1ccface

Please sign in to comment.