Skip to content

Commit ee1e086

Browse files
committed
Fix(webfont): use cloudflare hosted webfont.js for China region support
1 parent a067ce7 commit ee1e086

File tree

5 files changed

+308
-463
lines changed

5 files changed

+308
-463
lines changed

circle.yml renamed to .circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build:
1010
working_directory: ~
1111
docker:
12-
- image: circleci/node:10.7.0
12+
- image: circleci/node:10
1313
steps:
1414
- checkout
1515
- run:
@@ -19,7 +19,7 @@ jobs:
1919
name: Install Docker client
2020
command: |
2121
set -x
22-
VER="18.06.0-ce"
22+
VER="18.06.1-ce"
2323
curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz
2424
tar -xz -C /tmp -f /tmp/docker-$VER.tgz
2525
sudo cp -r /tmp/docker/* /usr/bin

.eslintrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"env": {
33
"browser": true,
44
"node": true,
5-
"es6": true,
6-
"jquery": true
5+
"es6": true
76
},
87
"extends": [
98
"airbnb"

frontend/public/index.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
};
4646
(function (d) {
4747
var wf = d.createElement('script'), s = d.scripts[0];
48-
wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js';
48+
wf.src = 'https://cdnjs.cloudflare.com/ajax/libs/webfont/1.6.28/webfontloader.js';
4949
wf.async = true;
5050
s.parentNode.insertBefore(wf, s);
5151
})(document);

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747
"@types/react-dom": "^16.0.7",
4848
"@types/react-i18next": "^7.8.2",
4949
"@types/react-loadable": "^5.4.1",
50-
"@types/react-redux": "^6.0.6",
50+
"@types/react-redux": "^6.0.7",
5151
"@types/react-router": "^4.0.30",
5252
"@types/react-router-dom": "^4.3.0",
5353
"@types/redux-logger": "^3.0.6",
5454
"@types/uuid": "^3.4.4",
5555
"@types/webpack-env": "^1.13.6",
5656
"add-asset-html-webpack-plugin": "^2.1.3",
57-
"awesome-typescript-loader": "^5.2.0",
57+
"awesome-typescript-loader": "^5.2.1",
5858
"axios": "^0.18.0",
5959
"babel-loader": "^8.0.2",
6060
"babel-plugin-prismjs": "^1.0.2",
@@ -77,7 +77,7 @@
7777
"history": "^4.7.2",
7878
"html-webpack-plugin": "^3.2.0",
7979
"http-status": "^1.2.0",
80-
"i18next": "^11.6.0",
80+
"i18next": "^11.7.0",
8181
"i18next-browser-languagedetector": "^2.2.3",
8282
"image-webpack-loader": "^4.3.1",
8383
"immutable": "4.0.0-rc.9",
@@ -94,10 +94,10 @@
9494
"postcss-preset-env": "^5.3.0",
9595
"prismjs": "^1.15.0",
9696
"progress-bar-webpack-plugin": "^1.11.0",
97-
"react": "^16.4.2",
97+
"react": "^16.5.0",
9898
"react-content-loader": "^3.1.2",
99-
"react-dom": "^16.4.2",
100-
"react-hot-loader": "^4.3.5",
99+
"react-dom": "^16.5.0",
100+
"react-hot-loader": "^4.3.6",
101101
"react-i18next": "^7.11.1",
102102
"react-loadable": "^5.5.0",
103103
"react-redux": "^5.0.7",
@@ -124,7 +124,7 @@
124124
"@types/jest": "^23.3.1",
125125
"@types/react-test-renderer": "^16.0.2",
126126
"babel-core": "^7.0.0-bridge.0",
127-
"commitlint": "^7.1.1",
127+
"commitlint": "^7.1.2",
128128
"commitlint-config-armour": "^1.2.1",
129129
"coveralls": "^3.0.2",
130130
"eslint": "^5.5.0",
@@ -136,13 +136,13 @@
136136
"husky": "1.0.0-rc.13",
137137
"identity-obj-proxy": "^3.0.0",
138138
"jest": "^23.5.0",
139-
"react-test-renderer": "^16.4.2",
139+
"react-test-renderer": "^16.5.0",
140140
"stylelint": "^9.5.0",
141141
"stylelint-config-standard": "^18.2.0",
142142
"ts-jest": "^23.1.4",
143143
"tslint": "^5.11.0",
144144
"tslint-react": "^3.6.0",
145-
"webpack-dev-server": "^3.1.7"
145+
"webpack-dev-server": "^3.1.8"
146146
},
147147
"browserslist": [
148148
"> 1%",

0 commit comments

Comments
 (0)