1.2.0

BrianWalkerToretto · Jan 19, 2020 · 8bdb41f · 8bdb41f
1 parent d1e9d0d
commit 8bdb41f
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 28 deletions.
diff --git a/README-cn.md b/README-cn.md
@@ -138,6 +138,9 @@ rows  |  0   | number  | 水印行数 | N
 cols  |  0   | number  | 水印列数 | N
 
 ### 版本及功能
++ version 1.2.0（正式版） 更新时间：2020.01.19
+  + 修复默认样式：opacity默认值由0.8改为1;
+  + react服务器渲染优化：服务器端渲染时返回Fragment
 + version 1.1.6（正式版） 更新时间：2020.01.17
   + 修复ie11防删除失效bug（replaceChild有延迟）
   + 压缩：减少1-2k大小

diff --git a/README.md b/README.md
@@ -137,6 +137,9 @@ rows  |  0   | number  | watermark lines | N
 cols  |  0   | number  | watermark columns | N
 
 ### Version and features
++ version 1.2.0 (official version) update time：2020.01.19
+  + Repair the default styles: opacity default value from 0.8 to 1;
+  + React server render optimization: return Fragment when server side render
 + version 1.1.6 (official version) update time：2020.01.17
   + fixed ie11 anti-deletion bug (replaceChild has delay)
   + compression: reduces size by 1-2k

diff --git a/dist/native/index.js b/dist/native/index.js
diff --git a/dist/react/index.js b/dist/react/index.js
diff --git a/dist/vue/index.js b/dist/vue/index.js
diff --git a/dist/watermark.js b/dist/watermark.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@brian-walker-toretto/watermark",
-  "version": "1.1.6",
+  "version": "1.2.0",
   "description": "canvas/svg watermark",
   "main": "dist/watermark.js",
   "keywords": [
@@ -37,7 +37,9 @@
     "url": "https://github.com/BrianWalkerToretto/watermark/issues"
   },
   "homepage": "https://github.com/BrianWalkerToretto/watermark#readme",
-  "dependencies": {},
+  "dependencies": {
+    "react": "^16.11.0"
+  },
   "devDependencies": {
     "@babel/core": "^7.6.4",
     "@babel/plugin-proposal-class-properties": "^7.5.5",
@@ -77,7 +79,6 @@
     "postcss-loader": "^3.0.0",
     "postcss-reporter": "^6.0.1",
     "prettier": "^1.18.2",
-    "react": "^16.11.0",
     "react-dom": "^16.11.0",
     "react-hot-loader": "^4.12.15",
     "rimraf": "^3.0.0",

diff --git a/src/styles/index.js b/src/styles/index.js
@@ -1,6 +1,6 @@
 const index = 0;
 const zIndex = 99;
-const show = 'pointer-events: none !important;display: block !important;overflow: hidden;visibility: visible !important;opacity: 0.8 !important;';
+const show = 'pointer-events: none !important;display: block !important;overflow: hidden;visibility: visible !important;opacity: 1 !important;';
 
 export { show };
 export default `position: absolute;top: ${

diff --git a/webpack/node-environment-judge-plugin.js b/webpack/node-environment-judge-plugin.js
@@ -29,17 +29,12 @@ class NodeEnvironmentJudgePlugin {
       for (var filePathName in compilation.assets) {
         if(/.js$/ig.test(filePathName)){
           let content = compilation.assets[filePathName].source() || '';
-          // 模块开始前添加node判断，用于服务器端渲染
-          const text = `try{ if(typeof global === 'object' && window !== global){return null;} }catch(e){return null;}`;
-          // const text = `
-          // // react vue
-          // try{
-          //   if(typeof global === 'object' && window !== global){
-          //     return arguments[0] && arguments[0].Fragment || null;
-          //   }
-          // }catch(e){
-          //   return arguments[0] && arguments[0].Fragment || null;
-          // }`;
+          // 模块开始前添加node判断，用于服务器端渲染::优化了react服务器渲染，然后vue服务器渲染没有优化
+          // const text = `try{ if(typeof global === 'object' && window !== global){return null;} }catch(e){return null;}`;
+          const env = `typeof global === 'object' && window !== global`;
+          const fragment = 'arguments[0] && arguments[0].Fragment || null;';
+          const text = `try{if(${env}){return ${fragment}}}catch(e){return ${fragment}}`;
+
           content = content.replace(/\.*\)\{(\.*)return/i, `){${text}return`)
           // 重写指定输出模块内容
           compilation.assets[filePathName] = {