Skip to content

Commit

Permalink
impr(deps): bump dependencies + fix documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
litil committed Jun 7, 2023
1 parent 0579dc0 commit 2d9a94c
Show file tree
Hide file tree
Showing 5 changed files with 3,059 additions and 9 deletions.
2 changes: 1 addition & 1 deletion demo/demo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ pre {
}

// specific stuff
#installation {
#iframing-authorization {
padding-top: 40px;
}

Expand Down
13 changes: 10 additions & 3 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,25 @@ <h1>Aircall Everywhere SDK</h1>
</div>

<div class="container">
<h2 id="Note on Iframing">Iframing Authorization</h2>
<h2 id="iframing-authorization">Iframing Authorization</h2>

<div class="row">
<div class="left">
<p>
<<<<<<< Updated upstream
For <b>security</b> purpose, we are now whitelisting domains that are iframing us. If you are a customer, please contact <a href="https://support.aircall.io/">Aircall Support</a>.<br>
=======
For security purposes, we are now whitelisting domains that use Aircall Everywhere SDK. If you are a customer, please contact <a href="https://support.aircall.io/">Aircall Support</a>.<br>
>>>>>>> Stashed changes
If you are a partner creating an integration, you can ask for permission using [email protected].
</p>
</div>
</div>
<<<<<<< Updated upstream
</h2>
<h2 id="installation">Installation</h2>
=======

<h2>Installation</h2>
>>>>>>> Stashed changes

<div class="row">
<div class="left">
Expand Down
23 changes: 23 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
},
"homepage": "https://aircall.github.io/aircall-everywhere/",
"devDependencies": {
<<<<<<< Updated upstream
"@babel/core": "^7.22.1",
"@babel/preset-env": "^7.22.4",
"@babel/template": "^7.21.9",
Expand All @@ -56,5 +57,27 @@
"dependencies": {
"aircall-everywhere": "^1.8.0",
"sass": "^1.62.1"
=======
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.11.5",
"@babel/template": "^7.10.4",
"@babel/types": "7.22.4",
"babel-loader": "9.1.2",
"babel-plugin-rewire": "^1.2.0",
"copy-webpack-plugin": "^6.2.0",
"css-loader": "6.8.1",
"gh-pages": "^3.1.0",
"html-webpack-plugin": "5.5.1",
"husky": "^4.3.0",
"jest": "^26.4.2",
"prettier": "^2.1.2",
"pretty-quick": "^3.0.2",
"sass": "^1.62.1",
"sass-loader": "13.3.1",
"style-loader": "3.3.3",
"webpack": "5.85.1",
"webpack-cli": "5.1.3",
"webpack-dev-server": "4.15.0"
>>>>>>> Stashed changes
}
}
4 changes: 4 additions & 0 deletions scripts/webpack/webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@ module.exports = () => {
};

const _devServer = {
<<<<<<< Updated upstream
static: {
directory: path.join(__dirname, '../../demo_dist'),
},

=======
static: path.join(__dirname, '../../demo_dist'),
>>>>>>> Stashed changes
compress: true,
port: 8080,
};
Expand Down
Loading

0 comments on commit 2d9a94c

Please sign in to comment.