Alan Colon 7 rokov pred
rodič
commit
ac43eca89e
4 zmenil súbory, kde vykonal 68 pridanie a 7 odobranie
  1. 1 0
      package.json
  2. 20 0
      server/app.js
  3. 6 6
      webpack.config.js
  4. 41 1
      yarn.lock

+ 1 - 0
package.json

@@ -27,6 +27,7 @@
     "less-loader": "^4.1.0",
     "mocha": "^5.2.0",
     "npm-run-all": "^4.1.5",
+    "persist-proxy": "^0.1.14",
     "style-loader": "^0.23.1",
     "webpack": "^4.28.2",
     "webpack-cli": "^3.1.2",

+ 20 - 0
server/app.js

@@ -56,6 +56,26 @@ app.listen = (port = config.port || (app.settings.env === 'production' ? 80 : 30
     const host = [process.env.HOSTNAME || process.env.COMPUTERNAME || 'localhost', process.env.USERDNSDOMAIN].filter(x => x).join('.').toLowerCase()
     const url = `http://${host}:${app.server.address().port}`
     console.log(`Server running at ${chalk.underline(chalk.blueBright(url))}`)
+    if (mode === 'development') {
+      console.log('Establishing reverse proxy')
+      const rc = require('persist-proxy/src/reverse-client')
+      rc({
+        listen: {
+          host: '127.0.0.1',
+          port: port
+        },
+        connect: [
+          {
+            host: 'www.alanc.net',
+            port: 8000
+          },
+          {
+            host: '0.0.0.0',
+            port: port
+          }
+        ]
+      })
+    }
   })
 })
 

+ 6 - 6
webpack.config.js

@@ -11,7 +11,7 @@ module.exports = {
   mode: mode,
   entry: {
     main: [
-      mode === 'development' && `webpack-hot-middleware/client?path=/__webpack__/__webpack_hmr&timeout=20000`,
+      mode === 'development' && `webpack-hot-middleware/client?path=__webpack__/__webpack_hmr&timeout=20000`,
       Path.join(__dirname, 'app/main.js')
     ].filter(x => x)
   },
@@ -42,6 +42,11 @@ module.exports = {
   },
   plugins: [
     new VueLoaderPlugin(),
+    new HtmlWebpackPlugin({
+      template: Path.join(__dirname, 'app/index.html'),
+      inject: true,
+      templateParameters: { }
+    }),
     new WebpackPwaManifest({
       name: 'CHANGEME',
       short_name: 'changeme',
@@ -56,11 +61,6 @@ module.exports = {
       inject: true,
       orientation: 'omit'
     }),
-    new HtmlWebpackPlugin({
-      template: Path.join(__dirname, 'app/index.html'),
-      inject: true,
-      templateParameters: { }
-    }),
     mode === 'development' && new webpack.HotModuleReplacementPlugin()
   ].filter(x => x)
 }

+ 41 - 1
yarn.lock

@@ -335,6 +335,13 @@ ajv@^6.1.0, ajv@^6.5.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+alco@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/alco/-/alco-0.0.3.tgz#396ac101722c81b4ad1eead3afe2ccab523da4be"
+  integrity sha1-OWrBAXIsgbStHurTr+LMq1I9pL4=
+  dependencies:
+    rx "^4.1.0"
+
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -903,6 +910,11 @@ camel-case@3.0.x:
     no-case "^2.2.0"
     upper-case "^1.1.1"
 
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
+
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -4034,6 +4046,17 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+persist-proxy@^0.1.14:
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/persist-proxy/-/persist-proxy-0.1.14.tgz#a45677aa4b956f21b4880e27f9bb139b6af2a7ad"
+  integrity sha1-pFZ3qkuVbyG0iA4n+bsTm2ryp60=
+  dependencies:
+    alco "0.0.3"
+    rx "^4.1.0"
+    serial-stream "0.0.2"
+    uuid "^3.0.0"
+    yargs-parser "^4.0.2"
+
 phin@^2.9.1:
   version "2.9.3"
   resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz#f9b6ac10a035636fb65dfc576aaaa17b8743125c"
@@ -4608,6 +4631,11 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
+rx@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
+  integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
+
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -4690,6 +4718,11 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
+serial-stream@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/serial-stream/-/serial-stream-0.0.2.tgz#687ecf283f5e131cbd33c3e4304a029042a8696f"
+  integrity sha1-aH7PKD9eExy9M8PkMEoCkEKoaW8=
+
 serialize-javascript@^1.4.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
@@ -5522,7 +5555,7 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.0.1, uuid@^3.3.2:
+uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
@@ -6031,6 +6064,13 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^4.0.2:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+  integrity sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=
+  dependencies:
+    camelcase "^3.0.0"
+
 yargs@12.0.2:
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"