Update website build

Author: rkalis

Dockerfile

@@ -3,21 +3,17 @@ FROM node:10 as build
 
 WORKDIR /app
 
-# Install and cache app dependencies
-COPY website/package.json /app/package.json
-COPY website/yarn.lock /app/yarn.lock
-RUN yarn
-
-# Invalidate cache from here on
+# Invalidate cache
 ADD "http://worldtimeapi.org/api/timezone/Europe/Amsterdam.txt" skipcache
 
+# Add app
+COPY website /app
+RUN yarn
+
 # Remove potentially cached Docusaurus files
 RUN rm -rf /app/.docusaurus
 RUN rm -rf /app/build
 
-# Add app
-COPY website /app
-
 # Generate build
 RUN yarn build
 

website/docs/basics/about.md

@@ -5,4 +5,4 @@ sidebar_label: About CashScript
 
 CashScript is a high-level programming language for smart contracts on Bitcoin Cash. It offers a strong abstraction layer over Bitcoin Cash' native virtual machine, Bitcoin Script. Its syntax is based on Ethereum's smart contract language Solidity, but its functionality is very different since smart contracts on Bitcoin Cash differ greatly from smart contracts on Ethereum. For a detailed comparison of them, refer to the blog post [*Smart Contracts on Ethereum, Bitcoin and Bitcoin Cash*](https://kalis.me/smart-contracts-eth-btc-bch/).
 
-If you're interested to see what kind of things can be built with CashScript, you can look at the [Showcase](/docs/showcase) or [Examples](/docs/examples). If you just want to dive into CashScript, refer to the [Getting Started page](/docs/basics/getting-started) and other pages in the documentation.
+If you're interested to see what kind of things can be built with CashScript, you can look at the [Showcase](/docs/showcase) or [Examples](/docs/language/examples). If you just want to dive into CashScript, refer to the [Getting Started page](/docs/basics/getting-started) and other pages in the documentation.

website/docs/basics/getting-started.md

@@ -21,7 +21,7 @@ CashScript only offers a JavaScript SDK, but CashScript contracts can be integra
 :::
 
 ## Writing your first smart contract
-There are some examples available on the [Examples page](/docs/examples), that can be used to take inspiration from. Further examples of the JavaScript integration can be found on [GitHub](https://github.com/Bitcoin-com/cashscript/tree/master/examples). A simple example is included below.
+There are some examples available on the [Examples page](/docs/language/examples), that can be used to take inspiration from. Further examples of the JavaScript integration can be found on [GitHub](https://github.com/Bitcoin-com/cashscript/tree/master/examples). A simple example is included below.
 
 ```solidity
 pragma cashscript ^0.4.0;
@@ -41,7 +41,7 @@ contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) {
 ```
 
 :::tip
-Read more about the CashScript language syntax in the [Language Description](/docs/language).
+Read more about the CashScript language syntax in the [Language Description](/docs/language/contracts).
 :::
 
 ## Integrating into JavaScript
@@ -78,5 +78,5 @@ async function run() {
 ```
 
 :::tip
-Read more about the JavaScript SDK in the [SDK documentation](/docs/sdk).
+Read more about the JavaScript SDK in the [SDK documentation](/docs/sdk/instantiation).
 :::

website/docusaurus.config.js

@@ -22,7 +22,7 @@ module.exports = {
         src: 'img/logo.svg',
       },
       links: [
-        {to: '/docs/', label: 'Docs', position: 'right'},
+        {to: '/docs/basics/about', label: 'Docs', position: 'right'},
         {
           href: 'https://github.com/Bitcoin-com/cashscript',
           label: 'GitHub',
@@ -38,11 +38,11 @@ module.exports = {
           items: [
             {
               label: 'Getting Started',
-              to: '/docs/getting-started',
+              to: '/docs/basics/getting-started',
             },
             {
               label: 'Examples',
-              to: '/docs/examples',
+              to: '/docs/language/examples',
             },
           ],
         },
@@ -112,6 +112,19 @@ module.exports = {
     ],
   ],
   plugins: [
-    path.resolve(__dirname, './src/plugins/redirects'),
+    [
+      '@docusaurus/plugin-client-redirects',
+      {
+        fromExtensions: ['html'],
+        redirects: [
+          { from: ['/docs', '/docs/about', '/docs/basics'], to: '/docs/basics/about'},
+          { from: '/docs/language', to: '/docs/language/contracts' },
+          { from: '/docs/sdk', to: '/docs/sdk/instantiation' },
+          { from: '/docs/guides', to: '/docs/guides/covenants' },
+          { from: '/docs/getting-started', to: '/docs/basics/getting-started' },
+          { from: '/docs/examples', to: '/docs/language/examples' },
+        ],
+      },
+    ],
   ],
 };

website/package.json

@@ -9,8 +9,9 @@
     "deploy": "docusaurus deploy"
   },
   "dependencies": {
-    "@docusaurus/core": "^2.0.0-alpha.54",
-    "@docusaurus/preset-classic": "^2.0.0-alpha.54",
+    "@docusaurus/core": "^2.0.0-alpha.58",
+    "@docusaurus/plugin-client-redirects": "^2.0.0-alpha.58",
+    "@docusaurus/preset-classic": "^2.0.0-alpha.58",
     "classnames": "^2.2.6",
     "prism-react-renderer": "^1.1.1",
     "react": "^16.8.4",