From 6fdf53df27967abebb6391b69de6176a09d9e8b8 Mon Sep 17 00:00:00 2001 From: HutchGrant Date: Thu, 5 Nov 2020 15:36:45 -0500 Subject: [PATCH] fix: remove node_module seperate transform, instead use js/css with path resolver --- packages/cli/src/lifecycles/serve.js | 2 - packages/cli/src/transforms/transform.css.js | 1 + packages/cli/src/transforms/transform.js.js | 8 ++-- packages/cli/src/transforms/transform.node.js | 37 ------------------- .../cli/src/transforms/transform.tools.js | 2 - www/components/header/header.js | 6 +-- 6 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 packages/cli/src/transforms/transform.node.js diff --git a/packages/cli/src/lifecycles/serve.js b/packages/cli/src/lifecycles/serve.js index 1471787f1..8a3b7a1a0 100644 --- a/packages/cli/src/lifecycles/serve.js +++ b/packages/cli/src/lifecycles/serve.js @@ -10,7 +10,6 @@ const MarkdownTransform = require('../transforms/transform.md'); const CSSTransform = require('../transforms/transform.css'); const JSTransform = require('../transforms/transform.js'); const JSONTransform = require('../transforms/transform.json.js'); -const NodeTransform = require('../transforms/transform.node'); const AssetTransform = require('../transforms/transform.assets'); function getDevServer(compilation) { @@ -34,7 +33,6 @@ function getDevServer(compilation) { new HTMLTransform(request, compilation), new MarkdownTransform(request, compilation), new CSSTransform(request, compilation), - new NodeTransform(request, compilation), new JSTransform(request, compilation), new JSONTransform(request, compilation), new AssetTransform(request, compilation) diff --git a/packages/cli/src/transforms/transform.css.js b/packages/cli/src/transforms/transform.css.js index f4250039e..1505fc078 100644 --- a/packages/cli/src/transforms/transform.css.js +++ b/packages/cli/src/transforms/transform.css.js @@ -17,6 +17,7 @@ class CSSTransform extends TransformInterface { const cssPath = url.indexOf('/node_modules') >= 0 ? path.join(process.cwd(), url) : path.join(this.workspace, url); + const css = await fsp.readFile(cssPath, 'utf-8'); let body = '', contentType = ''; diff --git a/packages/cli/src/transforms/transform.js.js b/packages/cli/src/transforms/transform.js.js index 36bafedf0..9568ff9e2 100644 --- a/packages/cli/src/transforms/transform.js.js +++ b/packages/cli/src/transforms/transform.js.js @@ -11,15 +11,17 @@ class JSTransform extends TransformInterface { shouldTransform() { const { url } = this.request; - return this.extensions.indexOf(path.extname(url)) >= 0 && - url.indexOf('/node_modules') < 0 && url.indexOf('.json') < 0; + return this.extensions.indexOf(path.extname(url)) >= 0 && url.indexOf('.json') < 0; } async applyTransform() { return new Promise(async (resolve, reject) => { try { + const { url } = this.request; + const jsPath = url.indexOf('/node_modules') >= 0 + ? path.join(process.cwd(), url) + : path.join(this.workspace, this.request.url); - const jsPath = path.join(this.workspace, this.request.url); const body = await fsp.readFile(jsPath, 'utf-8'); resolve({ body, diff --git a/packages/cli/src/transforms/transform.node.js b/packages/cli/src/transforms/transform.node.js deleted file mode 100644 index 27dc487cd..000000000 --- a/packages/cli/src/transforms/transform.node.js +++ /dev/null @@ -1,37 +0,0 @@ -const path = require('path'); -const { promises: fsp } = require('fs'); -const TransformInterface = require('./transform.interface'); - -class NodeTransform extends TransformInterface { - - constructor(req, compilation) { - super(req, compilation, ['.js']); - } - - shouldTransform() { - return this.request.url.indexOf('/node_modules') >= 0; - } - - async applyTransform() { - let { url } = this.request; - return new Promise(async (resolve, reject) => { - try { - const modulePath = path.join(process.cwd(), url); - const body = await fsp.readFile(modulePath, 'utf-8'); // have to handle CJS vs ESM? - const contentType = url.indexOf('.js') > 0 - ? 'text/javascript' - : 'text/css'; // TODO eve components assume a bundler - - resolve({ - body, - contentType, - extension: '.js' - }); - } catch (e) { - reject(e); - } - }); - } -} - -module.exports = NodeTransform; \ No newline at end of file diff --git a/packages/cli/src/transforms/transform.tools.js b/packages/cli/src/transforms/transform.tools.js index 74ffe4b45..515025ed3 100644 --- a/packages/cli/src/transforms/transform.tools.js +++ b/packages/cli/src/transforms/transform.tools.js @@ -33,7 +33,6 @@ const getAppTemplateScripts = async (contents, userWorkspace) => { const headLinks = root.querySelectorAll('head link'); appTemplateContents = appTemplateContents.replace(/<\/page-outlet>/, body); - headScripts.forEach(script => { if (script.rawAttrs !== '') { appTemplateContents = appTemplateContents.replace(/<\/script>/, ` @@ -169,7 +168,6 @@ const getMetaContent = (url, config, contents) => { contents = contents.replace(/(.*)<\/title>/, ''); contents = contents.replace('<head>', `<head><title>${title}`); contents = contents.replace('', metaContent); - // console.log(contents); return contents; }; diff --git a/www/components/header/header.js b/www/components/header/header.js index 387dc1ed2..1a57d505c 100644 --- a/www/components/header/header.js +++ b/www/components/header/header.js @@ -1,7 +1,7 @@ import { css, html, LitElement, unsafeCSS } from 'lit-element'; // import client from '@greenwood/cli/data/client'; // import MenuQuery from '@greenwood/cli/data/queries/menu'; -// import '@evergreen-wc/eve-container'; +import '@evergreen-wc/eve-container'; import headerCss from './header.css'; // TODO import evergreenLogo from '../../assets/evergreen.svg'; import '../social-icons/social-icons.js'; @@ -51,7 +51,7 @@ class HeaderComponent extends LitElement { const { navigation } = this; return html`
- +
@@ -77,7 +77,7 @@ class HeaderComponent extends LitElement {
- +
`; /* eslint-enable */