From f7e13e7f025f369bffe8e87f90c18b332b5389f9 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Sun, 8 May 2022 11:44:07 -0400 Subject: [PATCH 01/10] rename spec to match pattern --- test/cases/metadata/{metadata.js => metadata.spec.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/cases/metadata/{metadata.js => metadata.spec.js} (100%) diff --git a/test/cases/metadata/metadata.js b/test/cases/metadata/metadata.spec.js similarity index 100% rename from test/cases/metadata/metadata.js rename to test/cases/metadata/metadata.spec.js From 96a6dec31d74cb945f9e388c1fe089c14aa946b7 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Mon, 9 May 2022 20:30:28 -0400 Subject: [PATCH 02/10] remove duplicate flag from ci actions --- .github/workflows/ci-win.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml index 226c3067..4f8e6ac4 100644 --- a/.github/workflows/ci-win.yml +++ b/.github/workflows/ci-win.yml @@ -25,7 +25,7 @@ jobs: yarn lint - name: Test run: | - yarn test --parallel + yarn test - name: Build run: | yarn clean && yarn build \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e28e38f9..78f99046 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: yarn lint - name: Test run: | - yarn test --parallel + yarn test - name: Build run: | yarn clean && yarn build \ No newline at end of file From 3d6e74680dc1c45e8fb8627055b0535ac4f2830e Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Mon, 9 May 2022 20:31:46 -0400 Subject: [PATCH 03/10] debugging --- test/cases/metadata/metadata.spec.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/cases/metadata/metadata.spec.js b/test/cases/metadata/metadata.spec.js index 5ea9a3fc..52d12979 100644 --- a/test/cases/metadata/metadata.spec.js +++ b/test/cases/metadata/metadata.spec.js @@ -14,7 +14,6 @@ * pages/ * index.js */ - import chai from 'chai'; import { renderToString } from '../../../src/wcc.js'; @@ -27,6 +26,9 @@ describe('Run WCC For ', function() { before(async function() { const { metadata } = await renderToString(new URL('./src/pages/index.js', import.meta.url)); + console.debug({ metadata }); + console.debug('the keyyyyyssss!!!!', Object.keys(metadata)); + assetMetadata = metadata; }); From 8ad54384cc9f26e7298c0cbee9a5b5fc86f7c884 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Mon, 9 May 2022 20:35:07 -0400 Subject: [PATCH 04/10] no parallel --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 19b66008..8139cfa6 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "example:ssg": "node ./examples/ssg.js", "example:ssr": "node ./examples/ssr.js", "start": "yarn develop", - "test": "c8 mocha --parallel", + "test": "c8 mocha", "test:tdd": "yarn test --watch" }, "dependencies": { From 01f3c0f98ee5fd5f885aafc5c6beb31dbb226236 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Mon, 9 May 2022 20:57:53 -0400 Subject: [PATCH 05/10] reset deps each run --- src/wcc.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/wcc.js b/src/wcc.js index f75f3c2a..164c8f2e 100644 --- a/src/wcc.js +++ b/src/wcc.js @@ -7,7 +7,7 @@ import { parseFragment, serialize } from 'parse5'; import fs from 'node:fs/promises'; -const deps = []; +let deps; async function renderComponentRoots(tree) { for (const node of tree.childNodes) { @@ -93,6 +93,8 @@ async function initializeCustomElement(elementURL, tagName, attrs = []) { } async function renderToString(elementURL, fragment = true) { + deps = []; + const elementInstance = await initializeCustomElement(elementURL); const elementHtml = elementInstance.getInnerHTML({ includeShadowRoots: false }); const elementTree = parseFragment(elementHtml); From 93e2da7d13ab87db5d9e0af0fef1964c634f0b08 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Mon, 9 May 2022 21:05:45 -0400 Subject: [PATCH 06/10] refactor build script --- build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.js b/build.js index 1f924d20..31d98995 100644 --- a/build.js +++ b/build.js @@ -11,6 +11,7 @@ async function init() { const distRoot = './dist'; const pagesRoot = './docs/pages'; const pages = await fs.readdir(new URL(pagesRoot, import.meta.url)); + const { html, metadata } = await renderToString(new URL('./docs/index.js', import.meta.url), false); // await fs.rm(distRoot, { recursive: true, force: true }); // await fs.mkdir('./dist', { recursive: true }); @@ -34,9 +35,8 @@ async function init() { const contentFilter = content.substring(content.indexOf('

wcc

'), content.indexOf('

Overview

') + 17); content = content.replace(contentFilter, ''); } - - const { html } = await renderToString(new URL('./docs/index.js', import.meta.url), false); + console.debug({ metadata }); // const lazyJs = []; // const eagerJs = []; From 689a5a37c31ef172cba7d63b5304d2fbdbbe1e57 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Mon, 9 May 2022 21:08:14 -0400 Subject: [PATCH 07/10] restore --parallel --- build.js | 1 - package.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.js b/build.js index 31d98995..74e2184f 100644 --- a/build.js +++ b/build.js @@ -36,7 +36,6 @@ async function init() { content = content.replace(contentFilter, ''); } - console.debug({ metadata }); // const lazyJs = []; // const eagerJs = []; diff --git a/package.json b/package.json index 8139cfa6..f45ec37b 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "example:ssg": "node ./examples/ssg.js", "example:ssr": "node ./examples/ssr.js", "start": "yarn develop", - "test": "c8 mocha", + "test": "c8 mocha --parallel", "test:tdd": "yarn test --watch" }, "dependencies": { From fc2d7711620d71429d281ac58eec06fd37f53d83 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Mon, 9 May 2022 21:10:05 -0400 Subject: [PATCH 08/10] fix lint --- build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.js b/build.js index 74e2184f..e4f99f94 100644 --- a/build.js +++ b/build.js @@ -11,7 +11,7 @@ async function init() { const distRoot = './dist'; const pagesRoot = './docs/pages'; const pages = await fs.readdir(new URL(pagesRoot, import.meta.url)); - const { html, metadata } = await renderToString(new URL('./docs/index.js', import.meta.url), false); + const { html } = await renderToString(new URL('./docs/index.js', import.meta.url), false); // await fs.rm(distRoot, { recursive: true, force: true }); // await fs.mkdir('./dist', { recursive: true }); From 80d0863e6343a56980a7cc8c428b2ce07b95654a Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Mon, 9 May 2022 21:12:38 -0400 Subject: [PATCH 09/10] remove console logging --- test/cases/metadata/metadata.spec.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/cases/metadata/metadata.spec.js b/test/cases/metadata/metadata.spec.js index 52d12979..4c2b7902 100644 --- a/test/cases/metadata/metadata.spec.js +++ b/test/cases/metadata/metadata.spec.js @@ -25,9 +25,6 @@ describe('Run WCC For ', function() { before(async function() { const { metadata } = await renderToString(new URL('./src/pages/index.js', import.meta.url)); - - console.debug({ metadata }); - console.debug('the keyyyyyssss!!!!', Object.keys(metadata)); assetMetadata = metadata; }); From 831ca0aa3f60fc632e92a23671823b28aff6d49f Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Tue, 10 May 2022 20:35:52 -0400 Subject: [PATCH 10/10] better name --- src/wcc.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wcc.js b/src/wcc.js index 164c8f2e..c08c4197 100644 --- a/src/wcc.js +++ b/src/wcc.js @@ -7,13 +7,13 @@ import { parseFragment, serialize } from 'parse5'; import fs from 'node:fs/promises'; -let deps; +let definitions; async function renderComponentRoots(tree) { for (const node of tree.childNodes) { if (node.tagName && node.tagName.indexOf('-') > 0) { const { tagName } = node; - const { moduleURL } = deps[tagName]; + const { moduleURL } = definitions[tagName]; const elementInstance = await initializeCustomElement(moduleURL, tagName, node.attrs); const shadowRootHtml = elementInstance.getInnerHTML({ includeShadowRoots: true }); @@ -59,7 +59,7 @@ async function registerDependencies(moduleURL) { const tagName = node.expression.arguments[0].value; - deps[tagName] = { + definitions[tagName] = { instanceName: node.expression.arguments[1].name, moduleURL }; @@ -83,7 +83,7 @@ async function initializeCustomElement(elementURL, tagName, attrs = []) { elementInstance.setAttribute(attr.name, attr.value); if (attr.name === 'hydrate') { - deps[tagName].hydrate = attr.value; + definitions[tagName].hydrate = attr.value; } }); @@ -93,7 +93,7 @@ async function initializeCustomElement(elementURL, tagName, attrs = []) { } async function renderToString(elementURL, fragment = true) { - deps = []; + definitions = []; const elementInstance = await initializeCustomElement(elementURL); const elementHtml = elementInstance.getInnerHTML({ includeShadowRoots: false }); @@ -104,7 +104,7 @@ async function renderToString(elementURL, fragment = true) { return { html: elementInstance.getInnerHTML({ includeShadowRoots: fragment }), - metadata: deps + metadata: definitions }; }