add version query string when load locales.

.gitignore

@@ -44,4 +44,6 @@ yarn.lock
 .env.production.local
 npm-debug.log*
 yarn-debug.log*
-yarn-error.log*
+yarn-error.log*
+
+src/version.json

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 1.0.4
+- [x] 请求locales文件时加上hash值
+
 ## 1.0.3
 - [x] 修复语言文件覆盖的问题（将语言文件放到了linksFrontend库）
 

README.md

@@ -2,7 +2,7 @@
 
 通用评论系统及编辑器
 
-**`version 1.0.3`**
+**`version 1.0.4`**
 
 ```js
 import Comment, { Editor, RenderText } from 'comment';

config-overrides.js

@@ -1,7 +1,12 @@
 const { injectBabelPlugin, compose } = require('react-app-rewired');
 const rewireCssModules = require('react-app-rewire-css-modules');
 const rewireLess = require('react-app-rewire-less');
-
+const WebpackVersionFilePlugin = require('webpack-version-file-plugin');
+const execa = require('execa');
+const path = require('path');
+const gitHash = execa.sync('git', ['rev-parse', '--short', 'HEAD']).stdout;
+const gitNumCommits = Number(execa.sync('git', ['rev-list', 'HEAD', '--count']).stdout);
+const gitDirty = execa.sync('git', ['status', '-s', '-uall']).stdout.length > 0;
 
 module.exports = compose(
   rewireCssModules,
@@ -14,6 +19,18 @@ module.exports = function override(config, env) {
     rewireLess
   );
 
+  config.plugins.push(new WebpackVersionFilePlugin({
+    packageFile: path.join(__dirname, 'package.json'),
+    template: path.join(__dirname, 'version.ejs'),
+    outputFile: path.join(__dirname, '/src/version.json'),
+    extras: {
+      'githash': gitHash,
+      'gitNumCommits': gitNumCommits,
+      'timestamp': Date.now(),
+      'dirty': gitDirty
+    }
+  }));
+
   config = injectBabelPlugin(['import', { libraryName: 'antd', libraryDirectory: 'es', style: 'css' }], config);
   return rewires(config, env);
 };

lib/App.js

@@ -140,11 +140,12 @@ var App = function (_Component) {
       currentLocale = _lang.SUPPORT_LOCALES.find(function (item) {
         return item.value === currentLocale;
       }) ? currentLocale : "zh-CN";
+      var version = require('./version.json').hash;
       // 使用绝对路径
-      var languageURL = _constant.LANGUAGE_LINK + "/" + currentLocale + ".json";
+      var languageURL = _constant.LANGUAGE_LINK + "/" + currentLocale + ".json?v=" + version;
       return fetch(languageURL).then(function (response) {
         if (response.status >= 400) {
-          throw new Error('Bad response from server');
+          throw new Error("Bad response from server");
         }
         return response.json();
       }).then(function (data) {

lib/constant.js

@@ -33,5 +33,5 @@ var COMMENT_TYPE = exports.COMMENT_TYPE = {
 };
 
 // 线上静态库地址
-var LANGUAGE_LINK = exports.LANGUAGE_LINK = process.env.NODE_ENV === 'production' ? "//a.links123.cn/lang" : "//a.links123.net/lang";
+var LANGUAGE_LINK = exports.LANGUAGE_LINK = process.env.NODE_ENV === "production" ? "//a.links123.cn/lang" : "//a.links123.net/lang";
 //# sourceMappingURL=constant.js.map

lib/constant.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/constant.js"],"names":["ERROR_DEFAULT","LIMIT","OSS_ENDPOINT","OSS_BUCKET","DRIVER_LICENSE_PATH","OSS_LINK","MAX_UPLOAD_NUMBER","URL_REGEXP","REGEXP","AVATAR","IMAGE_SPLIT","IMAGE_PROCESS","IMAGE_PROCESS_SMALL","IMAGE_PROCESS_LARGE","COMMENT_TYPE","COMMENT","REPLY","LANGUAGE_LINK","process","env","NODE_ENV"],"mappings":";;;;;AAAO,IAAMA,wCAAgB,MAAtB;;AAEA,IAAMC,wBAAQ,EAAd,C,CAAkB;;AAElB,IAAMC,sCAAe,6BAArB;AACA,IAAMC,kCAAa,eAAnB;AACA,IAAMC,oDAAsB,UAA5B;;AAEA,IAAMC,8BAAW,6CAAjB;;AAEA,IAAMC,gDAAoB,CAA1B;;AAEA,IAAMC,kCAAa,oGAAnB;;AAEA,IAAMC,0BAAS,eAAf;;AAEA,IAAMC,0BAAS,EAAf;;AAEA,IAAMC,oCAAc,aAApB;;AAEA,IAAMC,wCAAgB,mCAAtB;AACA,IAAMC,oDAAsB,mCAA5B;AACA,IAAMC,oDAAsB,mCAA5B;;AAEA,IAAMC,sCAAe;AAC1BC,WAAS,SADiB;AAE1BC,SAAO;AAFmB,CAArB;;AAKP;AACO,IAAMC,wCAAgBC,QAAQC,GAAR,CAAYC,QAAZ,KAAyB,YAAzB,GAC3B,sBAD2B,GACF,uBADpB","file":"constant.js","sourcesContent":["export const ERROR_DEFAULT = \"出错了！\";\r\n\r\nexport const LIMIT = 10; // 默认 limit\r\n\r\nexport const OSS_ENDPOINT = \"oss-cn-beijing.aliyuncs.com\";\r\nexport const OSS_BUCKET = \"links-comment\";\r\nexport const DRIVER_LICENSE_PATH = \"/comment\";\r\n\r\nexport const OSS_LINK = \"//links-comment.oss-cn-beijing.aliyuncs.com\";\r\n\r\nexport const MAX_UPLOAD_NUMBER = 4;\r\n\r\nexport const URL_REGEXP = /((http(s)?:)?\\/\\/)?(www\\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%_+.~#?&//=]*)/g;\r\n\r\nexport const REGEXP = /\\[[^[\\]]+?\\]/g;\r\n\r\nexport const AVATAR = \"\";\r\n\r\nexport const IMAGE_SPLIT = \"IMAGE_SPLIT\";\r\n\r\nexport const IMAGE_PROCESS = \"?x-oss-process=image/resize,h_350\";\r\nexport const IMAGE_PROCESS_SMALL = \"?x-oss-process=image/resize,h_100\";\r\nexport const IMAGE_PROCESS_LARGE = \"?x-oss-process=image/resize,h_500\";\r\n\r\nexport const COMMENT_TYPE = {\r\n  COMMENT: \"comment\",\r\n  REPLY: \"reply\"\r\n};\r\n\r\n// 线上静态库地址\r\nexport const LANGUAGE_LINK = process.env.NODE_ENV === 'production' ?\r\n  \"//a.links123.cn/lang\" : \"//a.links123.net/lang\";\r\n"]}
+{"version":3,"sources":["../src/constant.js"],"names":["ERROR_DEFAULT","LIMIT","OSS_ENDPOINT","OSS_BUCKET","DRIVER_LICENSE_PATH","OSS_LINK","MAX_UPLOAD_NUMBER","URL_REGEXP","REGEXP","AVATAR","IMAGE_SPLIT","IMAGE_PROCESS","IMAGE_PROCESS_SMALL","IMAGE_PROCESS_LARGE","COMMENT_TYPE","COMMENT","REPLY","LANGUAGE_LINK","process","env","NODE_ENV"],"mappings":";;;;;AAAO,IAAMA,wCAAgB,MAAtB;;AAEA,IAAMC,wBAAQ,EAAd,C,CAAkB;;AAElB,IAAMC,sCAAe,6BAArB;AACA,IAAMC,kCAAa,eAAnB;AACA,IAAMC,oDAAsB,UAA5B;;AAEA,IAAMC,8BAAW,6CAAjB;;AAEA,IAAMC,gDAAoB,CAA1B;;AAEA,IAAMC,kCAAa,oGAAnB;;AAEA,IAAMC,0BAAS,eAAf;;AAEA,IAAMC,0BAAS,EAAf;;AAEA,IAAMC,oCAAc,aAApB;;AAEA,IAAMC,wCAAgB,mCAAtB;AACA,IAAMC,oDAAsB,mCAA5B;AACA,IAAMC,oDAAsB,mCAA5B;;AAEA,IAAMC,sCAAe;AAC1BC,WAAS,SADiB;AAE1BC,SAAO;AAFmB,CAArB;;AAKP;AACO,IAAMC,wCACXC,QAAQC,GAAR,CAAYC,QAAZ,KAAyB,YAAzB,GACI,sBADJ,GAEI,uBAHC","file":"constant.js","sourcesContent":["export const ERROR_DEFAULT = \"出错了！\";\r\n\r\nexport const LIMIT = 10; // 默认 limit\r\n\r\nexport const OSS_ENDPOINT = \"oss-cn-beijing.aliyuncs.com\";\r\nexport const OSS_BUCKET = \"links-comment\";\r\nexport const DRIVER_LICENSE_PATH = \"/comment\";\r\n\r\nexport const OSS_LINK = \"//links-comment.oss-cn-beijing.aliyuncs.com\";\r\n\r\nexport const MAX_UPLOAD_NUMBER = 4;\r\n\r\nexport const URL_REGEXP = /((http(s)?:)?\\/\\/)?(www\\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%_+.~#?&//=]*)/g;\r\n\r\nexport const REGEXP = /\\[[^[\\]]+?\\]/g;\r\n\r\nexport const AVATAR = \"\";\r\n\r\nexport const IMAGE_SPLIT = \"IMAGE_SPLIT\";\r\n\r\nexport const IMAGE_PROCESS = \"?x-oss-process=image/resize,h_350\";\r\nexport const IMAGE_PROCESS_SMALL = \"?x-oss-process=image/resize,h_100\";\r\nexport const IMAGE_PROCESS_LARGE = \"?x-oss-process=image/resize,h_500\";\r\n\r\nexport const COMMENT_TYPE = {\r\n  COMMENT: \"comment\",\r\n  REPLY: \"reply\"\r\n};\r\n\r\n// 线上静态库地址\r\nexport const LANGUAGE_LINK =\r\n  process.env.NODE_ENV === \"production\"\r\n    ? \"//a.links123.cn/lang\"\r\n    : \"//a.links123.net/lang\";\r\n"]}

lib/version.json

@@ -0,0 +1,8 @@
+{
+    "name":       "comment",
+    "buildDate":  1550239468846,
+    "version":    "1.0.3",
+    "numCommits": 129,
+    "hash":       "486ece3",
+    "dirty":      true
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "comment",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "lib/App.js",
   "description": "通用评论",
   "keywords": [
@@ -22,7 +22,8 @@
     "react-dom": "^16.4.1",
     "react-intl-universal": "^1.15.2",
     "react-scripts": "1.1.4",
-    "shortid": "^2.2.11"
+    "shortid": "^2.2.11",
+    "webpack-version-file-plugin": "^0.3.3"
   },
   "lint-staged": {
     "src/**/*.{js,jsx,json,css,less}": [

src/App.js

@@ -73,8 +73,9 @@ class App extends Component {
     currentLocale = SUPPORT_LOCALES.find(item => item.value === currentLocale)
       ? currentLocale
       : "zh-CN";
+    const version = require("./version.json").hash;
     // 使用绝对路径
-    const languageURL = `${LANGUAGE_LINK}/${currentLocale}.json`;
+    const languageURL = `${LANGUAGE_LINK}/${currentLocale}.json?v=${version}`;
     return fetch(languageURL)
       .then(response => {
         if (response.status >= 400) {

version.ejs

@@ -0,0 +1,8 @@
+{
+    "name":       "<%= package.name %>",
+    "buildDate":  <%= extras.timestamp %>,
+    "version":    "<%= package.version %>",
+    "numCommits": <%= extras.gitNumCommits %>,
+    "hash":       "<%= extras.githash %>",
+    "dirty":      <%= extras.dirty %>
+}