fixes #629

flexn-io · Jan 3, 2021 · e771528 · e771528
1 parent 98f0d69
commit e771528
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 465 deletions.
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -67,14 +67,14 @@
         "react-native-vector-icons": "7.1.0",
         "react-native-web": "0.13.12",
         "react-native-web-image-loader": "0.0.5",
-        "renative": "~0.31.0-RC"
+        "renative": "~0.32.0-RC"
     },
     "devDependencies": {
         "@rnv/engine-lightning": "~0.32.0-RC",
         "@rnv/engine-rn": "~0.32.0-RC",
         "@rnv/engine-rn-electron": "~0.32.0-RC",
         "@rnv/engine-rn-next": "~0.32.0-RC",
-        "@rnv/engine-rn-web": "~0.31.0-RC",
+        "@rnv/engine-rn-web": "~0.32.0-RC",
         "@rnv/integration-docker": "0.1.0-alpha.0",
         "@rnv/integration-vercel": "0.2.0-alpha.0",
         "babel-jest": "24.9.0",
@@ -85,10 +85,10 @@
         "jest-junit": "10.0.0",
         "jest-transform-stub": "2.0.0",
         "jetifier": "1.6.5",
-        "renative-template-blank": "^0.31.0-alpha.11",
-        "renative-template-hello-world": "^0.31.0-alpha.11",
-        "renative-template-kitchen-sink": "^0.31.0-alpha.11",
-        "rnv": "~0.31.0-RC",
+        "renative-template-blank": "~0.32.0-RC",
+        "renative-template-hello-world": "~0.32.0-RC",
+        "renative-template-kitchen-sink": "~0.32.0-RC",
+        "rnv": "~0.32.0-RC",
         "wait-on": "5.0.1",
         "xcode": "2.1.0"
     },

diff --git a/packages/app/renative.json b/packages/app/renative.json
@@ -79,19 +79,19 @@
     },
     "templates": {
         "renative-template-hello-world": {
-            "version": "^0.31.0-alpha.11",
+            "version": "~0.32.0-RC",
             "webpack": {
                 "moduleAliases": true
             }
         },
         "renative-template-blank": {
-            "version": "^0.31.0-alpha.11",
+            "version": "~0.32.0-RC",
             "webpack": {
                 "moduleAliases": true
             }
         },
         "renative-template-kitchen-sink": {
-            "version": "^0.31.0-alpha.11",
+            "version": "~0.32.0-RC",
             "webpack": {
                 "moduleAliases": true
             }

diff --git a/packages/rnv-engine-lightning/package.json b/packages/rnv-engine-lightning/package.json
@@ -26,8 +26,8 @@
     },
     "dependencies": {
         "babel-loader": "8.0.5",
-        "html-webpack-harddisk-plugin": "0.2.0",
-        "html-webpack-plugin": "3.2.0"
+        "html-webpack-harddisk-plugin": "1.0.2",
+        "html-webpack-plugin": "4.5.1"
     },
     "devDependencies": {
         "@babel/cli": "7.8.3",

diff --git a/packages/rnv-engine-rn-electron/templates/platforms/_shared/template.js b/packages/rnv-engine-rn-electron/templates/platforms/_shared/template.js
@@ -12,13 +12,13 @@ const DEFAULT_CONFIG = {
     },
 };
 
-const merge = require('deepmerge');
 const indent = level => '    '.repeat(level);
 const removeBlankLines = string => string.replace(/^\s*\n/gm, '');
 const constructMetaTags = tags => Object.keys(tags).map(tag => `<meta name="${tag}" ${tags[tag]} />`);
 
 const htmlTemp = (options) => {
-    const config = merge(DEFAULT_CONFIG, options);
+    const config = Object.assign(DEFAULT_CONFIG, options);
+    config.metaTags = Object.assign(DEFAULT_CONFIG.metaTags, options.metaTags || {});
     const {
         docType, title, metaTags, htmlTag, contentType, isDebug, debug, debugIp, platform, environment, linkTags, debugPort, remoteDebugScript
     } = config;

diff --git a/packages/rnv-engine-rn-next/package.json b/packages/rnv-engine-rn-next/package.json
@@ -31,8 +31,8 @@
         "@zeit/next-css": "1.0.1",
         "babel-loader": "8.0.5",
         "babel-preset-expo": "8.0.0",
-        "html-webpack-harddisk-plugin": "0.2.0",
-        "html-webpack-plugin": "3.2.0",
+        "html-webpack-harddisk-plugin": "1.0.2",
+        "html-webpack-plugin": "4.5.1",
         "next": "9.5.3",
         "next-compose-plugins": "2.2.0",
         "next-fonts": "1.4.0",

diff --git a/packages/rnv-engine-rn-web/package.json b/packages/rnv-engine-rn-web/package.json
@@ -27,8 +27,8 @@
     },
     "dependencies": {
         "babel-loader": "8.0.5",
-        "html-webpack-harddisk-plugin": "0.2.0",
-        "html-webpack-plugin": "3.2.0"
+        "html-webpack-harddisk-plugin": "1.0.2",
+        "html-webpack-plugin": "4.5.1"
     },
     "devDependencies": {
         "@babel/cli": "7.8.3",

diff --git a/packages/rnv-engine-rn-web/templates/platforms/_shared/template.js b/packages/rnv-engine-rn-web/templates/platforms/_shared/template.js
@@ -11,13 +11,14 @@ const DEFAULT_CONFIG = {
         'theme-color': 'content="#000000"',
     },
 };
-const merge = require('deepmerge');
 const indent = level => '    '.repeat(level);
 const removeBlankLines = string => string.replace(/^\s*\n/gm, '');
 const constructMetaTags = tags => Object.keys(tags).map(tag => `<meta name="${tag}" ${tags[tag]} />`);
 
 const htmlTemp = (options) => {
-    const config = merge(DEFAULT_CONFIG, options);
+    const config = Object.assign(DEFAULT_CONFIG, options);
+    config.metaTags = Object.assign(DEFAULT_CONFIG.metaTags, options.metaTags || {});
+
     const {
         docType, title, metaTags, htmlTag, contentType, isDebug, debug, debugIp, platform, environment, linkTags, debugPort, remoteDebugScript
     } = config;

diff --git a/packages/rnv-engine-roku/package.json b/packages/rnv-engine-roku/package.json
@@ -29,8 +29,8 @@
         "@next/bundle-analyzer": "9.4.4",
         "babel-loader": "8.0.5",
         "babel-preset-expo": "8.0.0",
-        "html-webpack-harddisk-plugin": "0.2.0",
-        "html-webpack-plugin": "3.2.0",
+        "html-webpack-harddisk-plugin": "1.0.2",
+        "html-webpack-plugin": "4.5.1",
         "next": "9.5.3",
         "next-compose-plugins": "2.2.0",
         "next-fonts": "1.4.0",

diff --git a/packages/rnv/package.json b/packages/rnv/package.json
@@ -112,8 +112,8 @@
         "file-loader": "1.1.11",
         "ftp-deploy": "2.3.3",
         "get-installed-path": "4.0.8",
-        "html-webpack-harddisk-plugin": "0.2.0",
-        "html-webpack-plugin": "3.2.0",
+        "html-webpack-harddisk-plugin": "1.0.2",
+        "html-webpack-plugin": "4.5.1",
         "icon-toolkit": "0.0.9",
         "inquirer": "6.3.1",
         "iocane": "4.0.0",
@@ -142,7 +142,7 @@
         "svg2js": "0.0.4-alpha1",
         "tar": "4.4.10",
         "url-loader": "1.1.1",
-        "webpack": "4.20.2",
+        "webpack": "^4.44.2",
         "webpack-bundle-analyzer": "3.5.1",
         "webpack-cli": "3.1.2",
         "webpack-dev-server": "3.2.1",