fix: remove node_module seperate transform, instead use js/css with p…

…ath resolver
ProjectEvergreen · Nov 5, 2020 · 6fdf53d · 6fdf53d
1 parent a9b4788
commit 6fdf53d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 47 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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><\/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>(.*)<\/title>/, '');
   contents = contents.replace('<head>', `<head><title>${title}</title>`);
   contents = contents.replace('<meta-outlet></meta-outlet>', metaContent);
-  // console.log(contents);
 
   return contents;
 };

diff --git 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`
       <header class="header">
-        <!-- <eve-container fluid> -->
+        <eve-container fluid>
           <div class="head-wrap">
 
             <div class="brand">
@@ -77,7 +77,7 @@ class HeaderComponent extends LitElement {
             <app-social-icons></app-social-icons>
 
           </div>
-        <!-- </eve-container> -->
+        </eve-container>
       </header>
     `;
     /* eslint-enable */