Merge pull request #95 from MathHubInfo/devel

Release version 16.0.0

Author: tkw1536

.babelrc

@@ -1,12 +1,6 @@
 {
-    "presets": ["@babel/preset-env"], 
-    "plugins": [
-        "syntax-dynamic-import", 
-        "@babel/plugin-proposal-object-rest-spread"
-    ], 
-    "env": {
-        "production": {
-            "presets": ["minify"]
-        }
-    }
+    "presets": [
+      "next/babel",
+      "@zeit/next-typescript/babel"
+    ]
 }

.dockerignore

@@ -0,0 +1,34 @@
+## Please think carefully before adding a new item to Dockerignore
+## and sync this with .gitignore
+
+# Distribution files
+dist/
+out/
+
+# Generated static assets
+src/assets/generated
+
+# Dependencies -- Yarn && NPM
+node_modules/
+.yarn-integrity
+.npm
+
+# Build Cache
+.next
+
+# Lots of log files
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime Data Files
+pids
+*.pid
+*.seed
+*.pid.lock
+.eslintcache
+
+# And in case somewant wants to debug by hand
+.node_repl_history

.gitignore

@@ -3,15 +3,18 @@
 
 # Distribution files
 dist/
-lib/
+out/
+
+# Generated static assets
+src/assets/generated
 
 # Dependencies -- Yarn && NPM
 node_modules/
 .yarn-integrity
 .npm
 
 # Build Cache
-.awcache
+.next
 
 # Lots of log files
 logs

.travis.yml

@@ -5,9 +5,7 @@ node_js:
     - 9
     - 8
 install: yarn
-env:
-  - WEBPACK_CONFIG="webpack.config.js"
-  - WEBPACK_CONFIG="webpack.config.prod.js"
 script:
+  - yarn tsc
   - yarn lint
-  - yarn webpack --config=$WEBPACK_CONFIG
+  - yarn dist

Dockerfile

@@ -1,44 +1,60 @@
-# We need a node image with yarn
-FROM node as builder
+### Dockerfile for MathHub-Frontend
+
+# Start from nodejs
+FROM node
+
+# We have a lot of configurations that can be made
+# at compile time, but will be needed at runtime
+
+ARG MATHHUB_THEME="classic"
+ENV MATHHUB_THEME=${MATHHUB_THEME}
 
-# The URL to MMT to use in the build
 ARG MMT_URL="/:mathhub/"
 ENV MMT_URL=${MMT_URL}
 
-ARG BROWSER_ROUTER="/"
-ENV BROWSER_ROUTER=${BROWSER_ROUTER}
-
 ARG NEWS_URL="/news.json"
 ENV NEWS_URL=${NEWS_URL}
 
 ARG GLOSSARY_URL=""
 ENV GLOSSARY_URL=${GLOSSARY_URL}
 
-ARG RUNTIME_CONFIG_URL="/config.json"
-ENV RUNTIME_CONFIG_URL=${RUNTIME_CONFIG_URL}
+ARG TRANSLATION_URL=""
+ENV TRANSLATION_URL=${TRANSLATION_URL}
 
 ARG UPSTREAM_BASE_URL="http://compositor:80/"
 ENV UPSTREAM_BASE_URL=${UPSTREAM_BASE_URL}
 
-# Add all of the app into /app/
-ADD assets/ /app/assets/
-ADD build/ /app/build
-ADD src/ app/src/
-ADD .babelrc /app/
-ADD LICENSE.txt /app/
-ADD package.json /app/
-ADD tsconfig.json /app/
-ADD tsconfig.server.json /app/
-ADD webpack.config.js /app/
-ADD webpack.config.prod.js /app/
-ADD tslint.json /app/
-ADD yarn.lock /app/
-
-
-# Install and run build
-WORKDIR  /app/
-RUN yarn && yarn dist && yarn sdist
+ARG RUNTIME_CONFIG_URL="/config.json"
+ENV RUNTIME_CONFIG_URL=${RUNTIME_CONFIG_URL}
+
+
+# We will place all our code into /app/
+WORKDIR /app/
+
+# Add the dependency files first, then install them
+# This will take advantage of caching if the deps did not
+# change
+ADD package.json /app/package.json
+ADD yarn.lock /app/yarn.lock
+RUN yarn install
+
+# Add all the remaining source code
+ADD config /app/config/
+ADD pages /app/pages/
+ADD src /app/src
+ADD static /app/static
+
+ADD .babelrc /app/.babelrc
+ADD .gitignore /app/.gitignore
+ADD LICENSE.txt /app/LICENSE.txt
+ADD next.config.js next.config.js
+ADD README.md /app/README.md
+ADD tsconfig.json /app/tsconfig.json
+ADD tslint.json /app/tslint.json
+
+# Generate a distribution
+RUN mkdir -p /app/src/assets/generated && yarn mklegal && yarn build
 
 # and set up the server
 EXPOSE 8043
-CMD [ "yarn", "--silent", "server", "dist/", "8043", "0.0.0.0" ]
+CMD [ "yarn", "start", "--port", "8043", "--hostname", "0.0.0.0" ]

LICENSE.txt

@@ -633,8 +633,8 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -658,4 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.