From 8b191e9e0af81e3c10bb1ede72c759a4a218abfc Mon Sep 17 00:00:00 2001
From: Jochen Saalfeld <privat@jochen-saalfeld.de>
Date: Thu, 1 Nov 2018 16:05:01 +0100
Subject: [PATCH] fixing urlPrefix in prod environment

---
 .travis.yml                                 | 58 ++++++++++++++++++---
 CHANGELOG.rst                               |  1 +
 DEVELOPMENT.rst                             | 17 +++---
 client/src/environments/environment.prod.ts |  3 +-
 4 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fab09b228..2c0b48bd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,21 +46,63 @@ matrix:
         packages:
           - google-chrome-stable
       cache:
-        yarn: true
         directories:
-          - $HOME/.yarn-cache
           - node_modules
       before_install:
         - sh -e /etc/init.d/xvfb start
         - export CHROME_BIN=/usr/bin/google-chrome
         - export DISPLAY=:99.0
-        - curl -o- -L https://yarnpkg.com/install.sh | bash
-        - export PATH="$HOME/.yarn/bin:$PATH"
-        - yarn global add @angular/cli
+        - npm install -g @angular/cli
         - ng --version
         - cd client
       install:
-        - yarn install
+        - npm install
       script:
-        - yarn run lint
-        - yarn run test --watch=false
+        - npm run lint
+        - ng test --watch=false
+
+    - language: node_js
+      node_js:
+        - "10.5"
+      apt:
+        sources:
+          - google-chrome
+        packages:
+          - google-chrome-stable
+      cache:
+        directories:
+          - node_modules
+      before_install:
+        - sh -e /etc/init.d/xvfb start
+        - export CHROME_BIN=/usr/bin/google-chrome
+        - export DISPLAY=:99.0
+        - npm install -g @angular/cli
+        - ng --version
+        - cd client
+      install:
+        - npm install
+      script:
+        - ng build
+
+    - language: node_js
+      node_js:
+        - "10.5"
+      apt:
+        sources:
+          - google-chrome
+        packages:
+          - google-chrome-stable
+      cache:
+        directories:
+          - node_modules
+      before_install:
+        - sh -e /etc/init.d/xvfb start
+        - export CHROME_BIN=/usr/bin/google-chrome
+        - export DISPLAY=:99.0
+        - npm install -g @angular/cli
+        - ng --version
+        - cd client
+      install:
+        - npm install
+      script:
+        - ng build --prod
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 067de6fb7..00b54d4b2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -18,6 +18,7 @@ Core:
    mode [#3799, #3817].
  - Changed format for elements send via autoupdate [#3926].
  - Add a change-id system to get only new elements [#3938].
+ - Switch from Yarn back to npm.
 
 Motions:
  - Option to customly sort motions [#3894].
diff --git a/DEVELOPMENT.rst b/DEVELOPMENT.rst
index b41d15d11..ce00f07f0 100644
--- a/DEVELOPMENT.rst
+++ b/DEVELOPMENT.rst
@@ -16,14 +16,13 @@ a. Check requirements
 '''''''''''''''''''''
 
 Make sure that you have installed `Python (>= 3.6) <https://www.python.org/>`_,
-`Node.js (>=4.x) <https://nodejs.org/>`_, `Yarn <https://yarnpkg.com/>`_ and
+`Node.js (>=10.x) <https://nodejs.org/>`_ and
 `Git <http://git-scm.com/>`_ on your system. You also need build-essential
 packages and header files and a static library for Python.
 
-For Ubuntu 16.04 e. g. follow `Yarn installation instructions
-<https://yarnpkg.com/en/docs/install>`_ and run::
+For Debian based systems (Ubuntu, etc) run::
 
-    $ sudo apt-get install git nodejs nodejs-legacy npm build-essential python3-dev
+    $ sudo apt-get install git nodejs npm build-essential python3-dev
 
 
 b. Get OpenSlides source code
@@ -81,13 +80,13 @@ Go in the client's directory in a second command-line interface::
 Install all dependencies and start the development server::
 
     $ npm install
-    $ yarn start
+    $ npm start
 
 Now the client is available under ``localhost:4200``.
 
 If you do not need to work with the client, you can build the client and let it be delivered by the server directly::
 
-    $ yarn build
+    $ npm build
 
 The client's address is now ``localhost:8000``.
 
@@ -131,15 +130,15 @@ b. Client tests and commands
 
 Change to the client's directory to run every client related command. Run client tests::
 
-    $ yarn test
+    $ npm test
 
 Fix the code format and lint it with::
 
-    $ yarn pretty-quick && yarn lint
+    npm run lint
 
 To extract translations run::
 
-    $ yarn extract
+    $ npm run extract
 
 OpenSlides in big mode
 ======================
diff --git a/client/src/environments/environment.prod.ts b/client/src/environments/environment.prod.ts
index 5d0833162..cd452f718 100644
--- a/client/src/environments/environment.prod.ts
+++ b/client/src/environments/environment.prod.ts
@@ -1,3 +1,4 @@
 export const environment = {
-    production: true
+    production: true,
+    urlPrefix: '/apps'
 };