From 5c389f5d187af15eda3bc90ad2898cd581f9797d Mon Sep 17 00:00:00 2001
From: peter <peter.millauer@gmail.com>
Date: Mon, 19 Aug 2019 17:05:24 +0200
Subject: [PATCH] dist

---
 .drone.yml                  |  2 +-
 Dockerfile                  |  4 +--
 package.json                |  4 +--
 src/backend/webpack.prod.js | 53 -------------------------------------
 tsconfig.frontend.json      |  7 -----
 tsconfig.json               |  2 +-
 6 files changed, 6 insertions(+), 66 deletions(-)
 delete mode 100644 src/backend/webpack.prod.js
 delete mode 100644 tsconfig.frontend.json

diff --git a/.drone.yml b/.drone.yml
index ef5923a..4dc31e6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -43,7 +43,7 @@ steps:
   - git config --global user.email "${DRONE_COMMIT_AUTHOR_EMAIL}"
   - git config --global user.name "${DRONE_COMMIT_AUTHOR}"
   - git clone https://gitea.frontblock.me/fb-dist/${DRONE_REPO_NAME}.git
-  - cp -r ./lib/* ./${DRONE_REPO_NAME}
+  - cp -r ./dist/* ./${DRONE_REPO_NAME}
   - cd ./${DRONE_REPO_NAME}
   - git add -A
   - git commit -m "drone tagged as version ${DRONE_TAG}" || true
diff --git a/Dockerfile b/Dockerfile
index 359b8b6..8a016a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 FROM node:alpine 
 
 WORKDIR /service 
-COPY lib /service/lib
+COPY dist /service/dist
 COPY node_modules /service/node_modules
 
 EXPOSE 8080 20000
-ENTRYPOINT ["node", "lib/FrontblockAdmin.js"]
\ No newline at end of file
+ENTRYPOINT ["node", "dist/FrontblockAdmin.js"]
\ No newline at end of file
diff --git a/package.json b/package.json
index a712471..7403459 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "scripts": {
     "tsc": "tsc",
-    "start": "npm run build; node lib/FrontblockAdmin.js",
+    "start": "npm run build; node dist/FrontblockAdmin.js",
     "build": "npm run clean; npm run build-backend; npm run webpack",
     "build-backend": "tsc; webpack --display-error-details --config src/backend/webpack.prod.js --progress --colors;",
     "build-frontend": "npm run build-dashboard",
@@ -12,7 +12,7 @@
     "build-widget": "rollup -c src/frontend/widget/rollup.config.js; mkdir -p plugins/PluginManager; cp FrontendPlugin.js plugins/PluginManager",
     "clean": "rm -rf lib static plugins data conf dist widget .rpt2_cache *.js *.ts src/frontend/dashboard/dist",
     "update-frontblock": "rm -rf node_modules/frontblock*; npm install",
-    "webpack": "webpack --mode production --entry ./lib/FrontblockLib.js --output ./lib/FrontblockLib.js"
+    "webpack": "webpack --mode production --entry ./dist/FrontblockLib.js --output ./dist/FrontblockLib.js"
   },
   "repository": {
     "type": "git",
diff --git a/src/backend/webpack.prod.js b/src/backend/webpack.prod.js
deleted file mode 100644
index e65aeb5..0000000
--- a/src/backend/webpack.prod.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const TerserPlugin = require('terser-webpack-plugin');
-
-const path = require('path');
-
-  
-  const FrontblockLib = {
-    mode: 'production',
-    entry: path.resolve(__dirname, '../../lib/FrontblockLib.js'),
-    output: {
-        path: path.resolve(__dirname, '../../static'),
-        filename: 'FrontblockLib.js',
-    },
-    module: {
-        rules: [
-          { test: /\FrontblockLib.ts/, use: 'ts-loader' }
-        ]
-    },
-    optimization: {
-      minimizer: [new TerserPlugin({
-        cache: true,
-        parallel: true,
-        terserOptions:{
-          mangle: false,
-          keep_classnames: true        
-        }
-      })],
-      splitChunks: {
-        cacheGroups: {
-          common: {
-            chunks: 'all',
-            minChunks: 2,
-            maxInitialRequests: 5,
-            minSize: 0,
-            name: 'common'
-          },
-          vendor: {
-            test: /node_modules/,
-            chunks: 'all',
-            name: 'vendor',
-            priority: 10,
-            enforce: true,
-            minChunks: 2
-          }
-        }
-      }
-    }
-  }
-
-
-module.exports = [
-  //Object.assign({}, angularPage),
-  Object.assign({}, FrontblockLib),
-];
\ No newline at end of file
diff --git a/tsconfig.frontend.json b/tsconfig.frontend.json
deleted file mode 100644
index 0fc7e02..0000000
--- a/tsconfig.frontend.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "extends": "./tsconfig.json",
-    "include": ["src/frontend/**/*"],
-    "exclude": [
-        "src/backend"
-    ]
-}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 4c77987..5863c4d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,7 +5,7 @@
       "target": "ESnext",
       "module": "commonjs",
       "declaration": true,
-      "outDir": "./lib",
+      "outDir": "./dist",
       "strict": true,
       "experimentalDecorators": true
     },