Improve website build process (#773)

.gitignore

@@ -1,6 +1,3 @@
-assets/demo/mobiledoc.js
-assets/demo/mobiledoc.css
-
 # Logs
 logs
 *.log
@@ -52,7 +49,6 @@ Session.vim
 keys.txt
 export.sh
 /dist
+/website
 /tmp
-/docs
-
-server.sh
+server.sh

bin/build-website.sh

@@ -4,17 +4,11 @@ echo "Clearing $(pwd)/website"
 rm -rf website
 mkdir website
 
-echo "Copying $(pwd)/assets/* to $(pwd)/website/"
-cp -R assets/* website/
+echo "Copying demo code to website"
+cp -r demo website
 
-echo "Copying $(pwd)/dist/* to $(pwd)/website/"
-cp -R dist/* website/
+echo "Copying build files to demo"
+cp -r dist/mobiledoc.* website/demo
 
-echo "Copying $(pwd)/docs to $(pwd)/website/demo/docs"
-mkdir -p website/demo/docs
-cp -R docs/* website/demo/docs/
-
-CURRENT_SHA="$(git rev-parse HEAD)"
-git add website/
-git commit -m "built website from $CURRENT_SHA"
-echo "Built and committed as $CURRENT_SHA"
+echo "Copying docs to website"
+cp -r dist/docs website/demo

bin/deploy-website.sh

@@ -1,4 +1,13 @@
 #!/bin/bash
 
+git branch -D gh-pages
+git checkout -b gh-pages
+
+CURRENT_SHA="$(git rev-parse HEAD)"
+git add website/ -f
+git commit -m "Built website from $CURRENT_SHA"
+
 git push origin `git subtree split --prefix website`:gh-pages --force
 echo "Deployed to http://bustle.github.io/mobiledoc-kit/demo/"
+
+git checkout master

package.json

@@ -15,6 +15,7 @@
     "test": "npm run format && npm run build && testem ci -f testem.js",
     "lint": "prettier src/**/*.{js,ts} --check && eslint src/**/*.{js,ts}",
     "format": "prettier src --write",
+    "clean": "rm -rf dist",
     "build": "rollup -c",
     "build:docs": "typedoc",
     "build:website": "npm run build:docs && npm run build && ./bin/build-website.sh",
@@ -77,9 +78,5 @@
     "printWidth": 120,
     "semi": false,
     "singleQuote": true
-  },
-  "volta": {
-    "node": "12.14.1",
-    "yarn": "1.22.4"
   }
 }

rollup.config.js

@@ -26,7 +26,12 @@ function commonPlugins() {
 export default args => [
   {
     input: 'src/js/index.ts',
-    plugins: commonPlugins(),
+    plugins: [
+      ...commonPlugins(),
+      copy({
+        targets: [{ src: 'src/css/mobiledoc-kit.css', dest: 'dist', rename: 'mobiledoc.css' }],
+      }),
+    ],
     output: {
       file: 'dist/mobiledoc.js',
       format: 'es',
@@ -53,14 +58,13 @@ export default args => [
       }),
       copy({
         targets: [
-          { src: 'dist/mobiledoc.js', dest: 'assets/demo' },
-          { src: 'src/css/mobiledoc-kit.css', dest: 'dist', rename: 'mobiledoc.css' },
-          { src: 'src/css/mobiledoc-kit.css', dest: 'assets/demo/', rename: 'mobiledoc.css' },
+          { src: 'demo', dest: 'website' },
+          { src: 'dist/*', dest: 'website/demo' },
         ],
       }),
       args.watch &&
         serve({
-          contentBase: '',
+          contentBase: 'website',
           // eslint-disable-next-line no-process-env
           port: process.env.PORT || 4200,
         }),

typedoc.json

@@ -1,5 +1,5 @@
 {
   "entryPoints": ["src/js/index.ts"],
-  "out": "website/demo/docs",
+  "out": "dist/docs",
   "excludePrivate": true
 }