cleanup and fixes for xarc/webapp packages (electrode-io#1686)

yishengjiang99 · Jul 12, 2020 · 6a6f36b · 6a6f36b
1 parent e60105d
commit 6a6f36b
Show file tree

Hide file tree

Showing 63 changed files with 1,224 additions and 68 deletions.
diff --git a/packages/subapp-server/lib/fastify-plugin.js b/packages/subapp-server/lib/fastify-plugin.js
@@ -49,7 +49,7 @@ module.exports = {
             request
           });
 
-          const data =  context.result;
+          const data = context.result;
           const status = data.status;
 
           if (data instanceof Error) {

diff --git a/packages/subapp-server/package.json b/packages/subapp-server/package.json
@@ -28,8 +28,7 @@
   ],
   "dependencies": {
     "@hapi/boom": "^7.4.1",
-    "@xarc/webapp": "../../packages/xarc-webapp",
-    "@xarc/jsx-renderer": "^1.0.0",
+    "@xarc/webapp": "^1.0.0",
     "filter-scan-dir": "^1.0.9",
     "http-status-codes": "^1.3.0",
     "optional-require": "^1.0.0",
@@ -49,7 +48,7 @@
   },
   "fyn": {
     "dependencies": {
-      "@xarc/webapp": "../../packages/xarc-webapp",
+      "@xarc/webapp": "../xarc-webapp",
       "subapp-util": "../subapp-util",
       "@xarc/jsx-renderer": "../xarc-jsx-renderer"
     }

diff --git a/packages/xarc-jsx-renderer/package.json b/packages/xarc-jsx-renderer/package.json
@@ -70,7 +70,7 @@
     "trailingComma": "none"
   },
   "dependencies": {
-    "@xarc/render-context": "../xarc-render-context",
+    "@xarc/render-context": "^1.0.0",
     "lodash": "^4.17.15",
     "munchy": "^1.0.7",
     "optional-require": "^1.0.0",

diff --git a/packages/xarc-jsx-renderer/tsconfig.json b/packages/xarc-jsx-renderer/tsconfig.json
@@ -15,10 +15,5 @@
     "strictFunctionTypes": true,
     "jsx": "react"
   },
-  "include": [
-    "src",
-    "../xarc-render-context/src/symbols.ts",
-    "../xarc-render-context/src/TokenModule.ts",
-    "../xarc-render-context/src/load-handler.ts"
-  ]
+  "include": ["src"]
 }
diff --git a/packages/xarc-simple-renderer/package.json b/packages/xarc-simple-renderer/package.json
@@ -36,7 +36,7 @@
     "typedoc": "^0.17.4",
     "typescript": "^3.8.3",
     "xstdout": "^0.1.1",
-    "@xarc/render-context": "../../packages/xarc-render-context"
+    "@xarc/render-context": "^1.0.0"
   },
   "mocha": {
     "require": [
@@ -79,5 +79,10 @@
     "functions": 100,
     "lines": 100,
     "cache": false
+  },
+  "fyn": {
+    "devDependencies": {
+      "@xarc/render-context": "../xarc-render-context"
+    }
   }
 }
diff --git a/packages/xarc-webapp/package.json b/packages/xarc-webapp/package.json
@@ -17,10 +17,10 @@
     "webapp"
   ],
   "dependencies": {
-    "@xarc/jsx-renderer": "file:../xarc-jsx-renderer",
+    "@xarc/jsx-renderer": "^1.0.0",
     "@xarc/module-dev": "^2.1.1",
-    "@xarc/render-context": "file:../xarc-render-context",
-    "@xarc/simple-renderer": "file:../xarc-simple-renderer",
+    "@xarc/render-context": "^1.0.0",
+    "@xarc/simple-renderer": "^1.0.0",
     "ts-node": "^8.10.2",
     "typescript": "^3.9.5",
     "xclap": "^0.2.51",

diff --git a/packages/xarc-webapp/src/webapp.ts b/packages/xarc-webapp/src/webapp.ts
@@ -62,7 +62,7 @@ function initializeTemplate(
     asyncTemplate.initializeRenderer();
   } else {
     const templateFullPath = resolvePath(tmplFile);
-    const template = resolvePath(tmplFile);
+    const template = require(templateFullPath);
     asyncTemplate = new JsxRenderer({
       templateFullPath: Path.dirname(templateFullPath),
       template: _.get(template, "default", template),

diff --git a/packages/xarc-webapp/test/data/bad-content.js b/packages/xarc-webapp/test/data/bad-content.js
@@ -0,0 +1,3 @@
+/* eslint-disable */
+
+require("foo-blah");
diff --git a/packages/xarc-webapp/test/data/chunk-selector.js b/packages/xarc-webapp/test/data/chunk-selector.js
@@ -0,0 +1,32 @@
+"use strict";
+
+const FOO_BUNDLE = {
+  css: "foo",
+  js: "foo"
+};
+const BAR_BUNDLE = {
+  css: "bar",
+  js: "bar"
+};
+const DEFAULT_BUNDLE = {
+  css: "home",
+  js: "home"
+};
+const MULTI_BUNDLE = {
+  css: ["foo", "bar"],
+  js: "home"
+};
+
+module.exports = request => {
+  if (request.path.endsWith("/foo")) {
+    return FOO_BUNDLE;
+  } else if (request.path.endsWith("/bar")) {
+    return BAR_BUNDLE;
+  } else if (request.path.endsWith("/multi-chunk")) {
+    return MULTI_BUNDLE;
+  } else if (request.path.endsWith("/empty")) {
+    return {};
+  }
+
+  return DEFAULT_BUNDLE;
+};
diff --git a/packages/xarc-webapp/test/data/critical.css b/packages/xarc-webapp/test/data/critical.css
@@ -0,0 +1,3 @@
+body {
+  color: green;
+}
diff --git a/packages/xarc-webapp/test/data/foo.js b/packages/xarc-webapp/test/data/foo.js
@@ -0,0 +1 @@
+module.exports = "hello";
diff --git a/packages/xarc-webapp/test/data/icon-stats-empty.json b/packages/xarc-webapp/test/data/icon-stats-empty.json
@@ -0,0 +1,3 @@
+{
+  "empty": true
+}
diff --git a/packages/xarc-webapp/test/data/icon-stats-test-pwa.json b/packages/xarc-webapp/test/data/icon-stats-test-pwa.json
@@ -0,0 +1,7 @@
+{
+  "html": [
+    "<meta name=\"mobile-web-app-capable\" content=\"yes\">",
+    "<meta name=\"application-name\" content=\"Electrode\">",
+    "<link rel=\"icon\" href=\"\/js\/favicon-32x32.png\">"
+  ]
+}
diff --git a/packages/xarc-webapp/test/data/index-1.html b/packages/xarc-webapp/test/data/index-1.html
@@ -0,0 +1,38 @@
+<!--%{INITIALIZE}-->
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <!--%{META_TAGS}-->
+  <!--%{PAGE_TITLE}-->
+  <!--%{CRITICAL_CSS}-->
+  <!--%{WEBAPP_HEADER_BUNDLES}-->
+  <!--%{ user-header-token }-->
+</head>
+
+<body>
+  <div>test html-1</div>
+  <!--%{user-spot-token}-->
+  <div class="js-content">
+    <!--%{user-token-unhandled}-->
+    <!--%{SSR_CONTENT}-->
+  </div>
+  <!--%{PREFETCH_BUNDLES}-->
+  <!--%{user-promise-token}-->
+  <!--%{WEBAPP_BODY_BUNDLES}-->
+  <script>
+    if (window.webappStart) webappStart();
+  </script>
+  <!--%{#../fixtures/custom-1}-->
+  <!--%{user-token-1}-->
+  <!--%{user-token-2}-->
+  <noscript>
+    <h4>JavaScript is Disabled</h4>
+    <p>Sorry, this webpage requires JavaScript to function correctly.</p>
+    <p>Please enable JavaScript in your browser and reload the page.</p>
+  </noscript>
+</body>
+
+</html>
diff --git a/packages/xarc-webapp/test/data/index-2.html b/packages/xarc-webapp/test/data/index-2.html
@@ -0,0 +1,32 @@
+<!--%{INITIALIZE}-->
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <!--%{INITIALIZE_HELMET}-->
+  <!--%{META_TAGS}-->
+  <!--%{PAGE_TITLE}-->
+  <!--%{CRITICAL_CSS}-->
+  <!--%{WEBAPP_HEADER_BUNDLES}-->
+</head>
+
+<body>
+  <div>test html-2</div>
+  <div class="js-content">
+    <!--%{SSR_CONTENT}-->
+  </div>
+  <!--%{PREFETCH_BUNDLES}-->
+  <!--%{WEBAPP_BODY_BUNDLES}-->
+  <script>
+    if (window.webappStart) webappStart();
+  </script>
+  <noscript>
+    <h4>JavaScript is Disabled</h4>
+    <p>Sorry, this webpage requires JavaScript to function correctly.</p>
+    <p>Please enable JavaScript in your browser and reload the page.</p>
+  </noscript>
+</body>
+
+</html>
diff --git a/packages/xarc-webapp/test/data/perf-1.html b/packages/xarc-webapp/test/data/perf-1.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!--%{INITIALIZE}-->
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <!--%{META_TAGS}-->
+  <!--%{PAGE_TITLE}-->
+  <!--%{CRITICAL_CSS}-->
+  <!--%{WEBAPP_HEADER_BUNDLES}-->
+</head>
+<!--%{HEAD_CLOSED}-->
+
+<body>
+  <div>test perf 1 html</div>
+  <!--%{user-spot-token}-->
+  <div class="js-content">
+    <!--%{SSR_CONTENT}-->
+  </div>
+  <!--%{AFTER_SSR_CONTENT}-->
+  <!--%{PREFETCH_BUNDLES}-->
+  <!--%{user-promise-token}-->
+  <!--%{WEBAPP_BODY_BUNDLES}-->
+  <script>
+    if (window.webappStart) webappStart();
+  </script>
+  <!--%{#../fixtures/custom-1}-->
+  <!--%{user-token-1}-->
+  <!--%{user-token-2}-->
+  <noscript>
+    <h4>JavaScript is Disabled</h4>
+    <p>Sorry, this webpage requires JavaScript to function correctly.</p>
+    <p>Please enable JavaScript in your browser and reload the page.</p>
+  </noscript>
+</body>
+<!--%{BODY_CLOSED}-->
+
+</html>
+<!--%{HTML_CLOSED}-->
diff --git a/packages/xarc-webapp/test/data/stats-test-multibundle.json b/packages/xarc-webapp/test/data/stats-test-multibundle.json
@@ -0,0 +1,71 @@
+{
+  "assetsByChunkName": {
+    "foo": [
+      "foo.bundle.f07a873ce87fc904a6a5.js",
+      "foo.style.f07a873ce87fc904a6a5.css"
+    ],
+    "bar": [
+      "bar.bundle.f07a873ce87fc904a6a5.js",
+      "bar.style.f07a873ce87fc904a6a5.css"
+    ],
+    "home": [
+      "home.bundle.f07a873ce87fc904a6a5.js",
+      "home.style.f07a873ce87fc904a6a5.css"
+    ]
+  },
+  "assets": [{
+     "name": "foo.style.f07a873ce87fc904a6a5.css",
+      "size": 888,
+      "chunks": [
+        0
+      ],
+      "chunkNames": [
+        "foo"
+      ]
+  }, {
+    "name": "foo.bundle.f07a873ce87fc904a6a5.js",
+    "size": 888,
+    "chunks": [
+      0
+    ],
+    "chunkNames": [
+      "foo"
+    ]
+  }, {
+     "name": "bar.style.f07a873ce87fc904a6a5.css",
+      "size": 888,
+      "chunks": [
+        0
+      ],
+      "chunkNames": [
+        "bar"
+      ]
+  }, {
+    "name": "bar.bundle.f07a873ce87fc904a6a5.js",
+    "size": 888,
+    "chunks": [
+      0
+    ],
+    "chunkNames": [
+      "bar"
+    ]
+  }, {
+     "name": "home.style.f07a873ce87fc904a6a5.css",
+      "size": 888,
+      "chunks": [
+        0
+      ],
+      "chunkNames": [
+        "home"
+      ]
+  }, {
+    "name": "home.bundle.f07a873ce87fc904a6a5.js",
+    "size": 888,
+    "chunks": [
+      0
+    ],
+    "chunkNames": [
+      "home"
+    ]
+  }]
+}
diff --git a/packages/xarc-webapp/test/data/stats-test-one-bundle.json b/packages/xarc-webapp/test/data/stats-test-one-bundle.json
@@ -0,0 +1,27 @@
+{
+  "assetsByChunkName": {
+    "bundle": [
+      "bundle.f07a873ce87fc904a6a5.js",
+      "style.f07a873ce87fc904a6a5.css"
+    ]
+  },
+  "assets": [{
+     "name": "style.f07a873ce87fc904a6a5.css",
+      "size": 888,
+      "chunks": [
+        0
+      ],
+      "chunkNames": [
+        "main"
+      ]
+  }, {
+    "name": "bundle.f07a873ce87fc904a6a5.js",
+    "size": 888,
+    "chunks": [
+      0
+    ],
+    "chunkNames": [
+      "main"
+    ]
+  }]
+}
diff --git a/packages/xarc-webapp/test/data/stats-test-pwa.json b/packages/xarc-webapp/test/data/stats-test-pwa.json
@@ -0,0 +1,36 @@
+{
+  "assetsByChunkName": {
+    "bundle": [
+      "bundle.f07a873ce87fc904a6a5.js",
+      "style.f07a873ce87fc904a6a5.css"
+    ],
+    "bar": [
+      "bar.bundle.f07a873ce87fc904a6a5.js",
+      "bar.style.f07a873ce87fc904a6a5.css"
+    ]
+  },
+  "assets": [{
+     "name": "style.f07a873ce87fc904a6a5.css",
+      "size": 888,
+      "chunks": [
+        0
+      ],
+      "chunkNames": [
+        "bundle"
+      ]
+  }, {
+    "name": "bundle.f07a873ce87fc904a6a5.js",
+    "size": 888,
+    "chunks": [
+      0
+    ],
+    "chunkNames": [
+      "bundle"
+    ]
+  }, {
+    "name": "manifest.json",
+    "size": 888,
+    "chunks": [],
+    "chunkNames": []
+  }]
+}