Skip to content

Commit

Permalink
Fix(webfont): use cloudflare hosted webfont.js for China region support
Browse files Browse the repository at this point in the history
  • Loading branch information
Armour committed Sep 7, 2018
1 parent a067ce7 commit ee1e086
Show file tree
Hide file tree
Showing 5 changed files with 308 additions and 463 deletions.
4 changes: 2 additions & 2 deletions circle.yml → .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build:
working_directory: ~
docker:
- image: circleci/node:10.7.0
- image: circleci/node:10
steps:
- checkout
- run:
Expand All @@ -19,7 +19,7 @@ jobs:
name: Install Docker client
command: |
set -x
VER="18.06.0-ce"
VER="18.06.1-ce"
curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz
tar -xz -C /tmp -f /tmp/docker-$VER.tgz
sudo cp -r /tmp/docker/* /usr/bin
Expand Down
3 changes: 1 addition & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"env": {
"browser": true,
"node": true,
"es6": true,
"jquery": true
"es6": true
},
"extends": [
"airbnb"
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
};
(function (d) {
var wf = d.createElement('script'), s = d.scripts[0];
wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js';
wf.src = 'https://cdnjs.cloudflare.com/ajax/libs/webfont/1.6.28/webfontloader.js';
wf.async = true;
s.parentNode.insertBefore(wf, s);
})(document);
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
"@types/react-dom": "^16.0.7",
"@types/react-i18next": "^7.8.2",
"@types/react-loadable": "^5.4.1",
"@types/react-redux": "^6.0.6",
"@types/react-redux": "^6.0.7",
"@types/react-router": "^4.0.30",
"@types/react-router-dom": "^4.3.0",
"@types/redux-logger": "^3.0.6",
"@types/uuid": "^3.4.4",
"@types/webpack-env": "^1.13.6",
"add-asset-html-webpack-plugin": "^2.1.3",
"awesome-typescript-loader": "^5.2.0",
"awesome-typescript-loader": "^5.2.1",
"axios": "^0.18.0",
"babel-loader": "^8.0.2",
"babel-plugin-prismjs": "^1.0.2",
Expand All @@ -77,7 +77,7 @@
"history": "^4.7.2",
"html-webpack-plugin": "^3.2.0",
"http-status": "^1.2.0",
"i18next": "^11.6.0",
"i18next": "^11.7.0",
"i18next-browser-languagedetector": "^2.2.3",
"image-webpack-loader": "^4.3.1",
"immutable": "4.0.0-rc.9",
Expand All @@ -94,10 +94,10 @@
"postcss-preset-env": "^5.3.0",
"prismjs": "^1.15.0",
"progress-bar-webpack-plugin": "^1.11.0",
"react": "^16.4.2",
"react": "^16.5.0",
"react-content-loader": "^3.1.2",
"react-dom": "^16.4.2",
"react-hot-loader": "^4.3.5",
"react-dom": "^16.5.0",
"react-hot-loader": "^4.3.6",
"react-i18next": "^7.11.1",
"react-loadable": "^5.5.0",
"react-redux": "^5.0.7",
Expand All @@ -124,7 +124,7 @@
"@types/jest": "^23.3.1",
"@types/react-test-renderer": "^16.0.2",
"babel-core": "^7.0.0-bridge.0",
"commitlint": "^7.1.1",
"commitlint": "^7.1.2",
"commitlint-config-armour": "^1.2.1",
"coveralls": "^3.0.2",
"eslint": "^5.5.0",
Expand All @@ -136,13 +136,13 @@
"husky": "1.0.0-rc.13",
"identity-obj-proxy": "^3.0.0",
"jest": "^23.5.0",
"react-test-renderer": "^16.4.2",
"react-test-renderer": "^16.5.0",
"stylelint": "^9.5.0",
"stylelint-config-standard": "^18.2.0",
"ts-jest": "^23.1.4",
"tslint": "^5.11.0",
"tslint-react": "^3.6.0",
"webpack-dev-server": "^3.1.7"
"webpack-dev-server": "^3.1.8"
},
"browserslist": [
"> 1%",
Expand Down
Loading

0 comments on commit ee1e086

Please sign in to comment.