From 580e574c841fb9b0ba9d37a50bd5a0f787799ff2 Mon Sep 17 00:00:00 2001
From: August Skare <post@augustskare.no>
Date: Fri, 19 Oct 2018 15:02:15 +0100
Subject: Feature/build step (#2)

* BundleAnalyzerPlugin

* lazy load highlight.js

* seperate bundles for each page

* prerender apps to html on build

* preload important font files

* dont prerender code copy button

* fix woff2 variant of font

* added missing doctype

* remove metatags component
---
 packages/dev-tools-pages/ts/pages/Trace.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'packages/dev-tools-pages/ts/pages/Trace.tsx')

diff --git a/packages/dev-tools-pages/ts/pages/Trace.tsx b/packages/dev-tools-pages/ts/pages/Trace.tsx
index 5dddf027e..be5acdac4 100644
--- a/packages/dev-tools-pages/ts/pages/Trace.tsx
+++ b/packages/dev-tools-pages/ts/pages/Trace.tsx
@@ -1,7 +1,8 @@
 import * as React from 'react';
+import { render, hydrate } from 'react-dom';
 
 import context from 'ts/context/trace';
-import Base from './Base';
+import Base from 'ts/components/Base';
 import Container from 'ts/components/Container';
 import Main from 'ts/components/Main';
 import ContentBlock from 'ts/components/ContentBlock';
@@ -11,7 +12,7 @@ import InlineCode from 'ts/components/InlineCode';
 import List from 'ts/components/List';
 import TraceComponent from 'ts/components/Trace';
 
-function Trace(props: any) {
+function Trace() {
     return (
         <Base context={context}>
             <TraceComponent />
@@ -52,4 +53,10 @@ const artifactAdapter = new SolCompilerArtifactAdapter(artifactsDir, contractsDi
     );
 }
 
-export default Trace;
+const root = document.getElementById('app');
+
+if (root.hasChildNodes()) {
+    hydrate(<Trace />, root);
+} else {
+    render(<Trace />, root);
+}
-- 
cgit v1.2.3


From 97c54f84f0b0f3daf41773690cc79296c983b346 Mon Sep 17 00:00:00 2001
From: August Skare <post@augustskare.no>
Date: Mon, 22 Oct 2018 13:15:54 +0200
Subject: remove container from all pages

---
 packages/dev-tools-pages/ts/pages/Trace.tsx | 56 ++++++++++++++---------------
 1 file changed, 26 insertions(+), 30 deletions(-)

(limited to 'packages/dev-tools-pages/ts/pages/Trace.tsx')

diff --git a/packages/dev-tools-pages/ts/pages/Trace.tsx b/packages/dev-tools-pages/ts/pages/Trace.tsx
index be5acdac4..b55c03005 100644
--- a/packages/dev-tools-pages/ts/pages/Trace.tsx
+++ b/packages/dev-tools-pages/ts/pages/Trace.tsx
@@ -3,7 +3,6 @@ import { render, hydrate } from 'react-dom';
 
 import context from 'ts/context/trace';
 import Base from 'ts/components/Base';
-import Container from 'ts/components/Container';
 import Main from 'ts/components/Main';
 import ContentBlock from 'ts/components/ContentBlock';
 import { Tabs, TabBlock } from 'ts/components/Tabs';
@@ -16,39 +15,36 @@ function Trace() {
     return (
         <Base context={context}>
             <TraceComponent />
-            <Container>
-                <Main>
-                    <ContentBlock title="Required steps">
-                        <List items={['Step 1', 'Step 2']} />
-                    </ContentBlock>
-                    <ContentBlock title="Prerequisites">
-                        <Code>npm install @0x/sol-trace --save</Code>
-                        <p>
-                            Sol-trace is a subprovider that needs to be prepended to your{' '}
-                            <a href="#">provider engine</a>. Depending on your project setup, you will need to use a
-                            specific ArtifactAdapter. Sol-trace ships with the{' '}
-                            <InlineCode>SolCompilerArtifactAdapter</InlineCode> for use with Sol-compiler and{' '}
-                            <InlineCode>TruffleArtifactAdapter</InlineCode> for use with the Truffle framework. You can
-                            also write your own and support any artifact format.
-                        </p>
-                    </ContentBlock>
+            <Main>
+                <ContentBlock title="Required steps">
+                    <List items={['Step 1', 'Step 2']} />
+                </ContentBlock>
+                <ContentBlock title="Prerequisites">
+                    <Code>npm install @0x/sol-trace --save</Code>
+                    <p>
+                        Sol-trace is a subprovider that needs to be prepended to your <a href="#">provider engine</a>.
+                        Depending on your project setup, you will need to use a specific ArtifactAdapter. Sol-trace
+                        ships with the <InlineCode>SolCompilerArtifactAdapter</InlineCode> for use with Sol-compiler and{' '}
+                        <InlineCode>TruffleArtifactAdapter</InlineCode> for use with the Truffle framework. You can also
+                        write your own and support any artifact format.
+                    </p>
+                </ContentBlock>
 
-                    <ContentBlock title="Installation">
-                        <Tabs>
-                            <TabBlock title="Sol-compiler">
-                                <Code language="js">
-                                    {`import { SolCompilerArtifactAdapter } from '@0x/sol-trace';
+                <ContentBlock title="Installation">
+                    <Tabs>
+                        <TabBlock title="Sol-compiler">
+                            <Code language="js">
+                                {`import { SolCompilerArtifactAdapter } from '@0x/sol-trace';
 
 // Both artifactsDir and contractsDir are optional and will be fetched from compiler.json if not passed in
 const artifactAdapter = new SolCompilerArtifactAdapter(artifactsDir, contractsDir);`}
-                                </Code>
-                            </TabBlock>
-                            <TabBlock title="Truffle">Truffle</TabBlock>
-                            <TabBlock title="Custom">Custom</TabBlock>
-                        </Tabs>
-                    </ContentBlock>
-                </Main>
-            </Container>
+                            </Code>
+                        </TabBlock>
+                        <TabBlock title="Truffle">Truffle</TabBlock>
+                        <TabBlock title="Custom">Custom</TabBlock>
+                    </Tabs>
+                </ContentBlock>
+            </Main>
         </Base>
     );
 }
-- 
cgit v1.2.3


From 8cf720986eb464a39e634ca59c4c3b20b3cd368d Mon Sep 17 00:00:00 2001
From: August Skare <post@augustskare.no>
Date: Mon, 22 Oct 2018 13:18:51 +0200
Subject: rename Main to Content

---
 packages/dev-tools-pages/ts/pages/Trace.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/dev-tools-pages/ts/pages/Trace.tsx')

diff --git a/packages/dev-tools-pages/ts/pages/Trace.tsx b/packages/dev-tools-pages/ts/pages/Trace.tsx
index b55c03005..4bdc68e95 100644
--- a/packages/dev-tools-pages/ts/pages/Trace.tsx
+++ b/packages/dev-tools-pages/ts/pages/Trace.tsx
@@ -3,7 +3,7 @@ import { render, hydrate } from 'react-dom';
 
 import context from 'ts/context/trace';
 import Base from 'ts/components/Base';
-import Main from 'ts/components/Main';
+import Content from 'ts/components/Content';
 import ContentBlock from 'ts/components/ContentBlock';
 import { Tabs, TabBlock } from 'ts/components/Tabs';
 import Code from 'ts/components/Code';
@@ -15,7 +15,7 @@ function Trace() {
     return (
         <Base context={context}>
             <TraceComponent />
-            <Main>
+            <Content>
                 <ContentBlock title="Required steps">
                     <List items={['Step 1', 'Step 2']} />
                 </ContentBlock>
@@ -44,7 +44,7 @@ const artifactAdapter = new SolCompilerArtifactAdapter(artifactsDir, contractsDi
                         <TabBlock title="Custom">Custom</TabBlock>
                     </Tabs>
                 </ContentBlock>
-            </Main>
+            </Content>
         </Base>
     );
 }
-- 
cgit v1.2.3


From 00afb2440dfe41f19c40030de60ffd274a782a04 Mon Sep 17 00:00:00 2001
From: August Skare <post@augustskare.no>
Date: Mon, 22 Oct 2018 13:24:43 +0200
Subject: remove contentBlock from content component

---
 packages/dev-tools-pages/ts/pages/Trace.tsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/dev-tools-pages/ts/pages/Trace.tsx')

diff --git a/packages/dev-tools-pages/ts/pages/Trace.tsx b/packages/dev-tools-pages/ts/pages/Trace.tsx
index 4bdc68e95..961f4534f 100644
--- a/packages/dev-tools-pages/ts/pages/Trace.tsx
+++ b/packages/dev-tools-pages/ts/pages/Trace.tsx
@@ -16,6 +16,7 @@ function Trace() {
         <Base context={context}>
             <TraceComponent />
             <Content>
+                <ContentBlock main title="Get started" />
                 <ContentBlock title="Required steps">
                     <List items={['Step 1', 'Step 2']} />
                 </ContentBlock>
-- 
cgit v1.2.3