Merge branch 'typescript' into trunk

Signed-off-by: Hrishikesh Patil <[email protected]>

.cli-dev.js

@@ -6,7 +6,7 @@
 
 const http = require('http');
 const path = require('path');
-const broadcastemCore = require('./index');
+const broadcastemCore = require('./dist/index');
 const fs = require('fs');
 const os = require('os');
 
@@ -124,8 +124,7 @@ function onListening() {
  * Start Express app from the CLI flags
  */
 
-broadcastemCore
-	.init(argv)
+broadcastemCore(argv)
 	.then(app => {
 		/**
 		 * Create HTTP server.

.gitlab-ci.yml

@@ -21,6 +21,11 @@ Build Latest:
     needs: []
     script:
         - yarn install --frozen-lockfile
+        - yarn global add typescript
+        - tsc
+    artifacts:
+        paths:
+            - dist/
 
 Test Latest API:
     stage: testing

.npmignore

@@ -31,7 +31,6 @@ bower_components
 
 # Compiled binary addons (https://nodejs.org/api/addons.html)
 build/Release
-dist
 
 # Dependency directories
 node_modules/
@@ -62,11 +61,18 @@ typings/
 .next
 
 # uploaded files
-uploads/*
+uploads/
 
 # test files
-tests/*
-dummy/*
+tests/
+dummy/
+
+# source files
+src/
+
+# dot files
+.*
+tsconfig.json
 
 #Junit test results
 test-results.xml

CHANGELOG

@@ -1,3 +1,9 @@
+v5.0.0
+
+Migrate main files of module to typescript
+Hotfix for uploads broken in browser in v4.0.0
+Change module load method
+
 v4.0.0
 
 Remove inbuilt CLI file

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "broadcastem-core",
-	"version": "4.0.0",
+	"version": "5.0.0",
 	"description": "The core module for Broadcast 'em application",
 	"keywords": [
 		"broadcast",
@@ -9,7 +9,8 @@
 		"file share",
 		"cli"
 	],
-	"main": "index.js",
+	"main": "dist/index.js",
+	"typings": "dist/index.d.ts",
 	"scripts": {
 		"dev:cli": "node .cli-dev.js",
 		"test:Startup": "node tests/Startup/index.js",
@@ -23,21 +24,27 @@
 	"license": "MIT",
 	"homepage": "https://gitlab.com/riskycase/broadcastem-core/-/wikis/home",
 	"dependencies": {
+		"archiver": "^5.3.0",
 		"busboy": "^0.3.1",
 		"express": "^4.17.1",
-		"express-easy-zip": "^1.1.5",
 		"morgan": "^1.10.0",
 		"uikit": "^3.6.5",
 		"unzip-stream": "^0.3.1"
 	},
 	"devDependencies": {
+		"@types/archiver": "^5.1.0",
+		"@types/busboy": "^0.2.3",
+		"@types/express": "^4.17.11",
+		"@types/morgan": "^1.9.2",
+		"@types/unzip-stream": "^0.3.0",
 		"chai": "^4.2.0",
 		"chai-http": "^4.3.0",
 		"dev-null": "^0.1.1",
 		"husky": "^4.3.6",
 		"mocha": "^8.2.1",
 		"mocha-junit-reporter": "^2.0.0",
 		"prettier": "^2.2.1",
+		"typescript": "^4.2.3",
 		"yargs": "^16.2.0"
 	}
 }

public/script/root.js

@@ -106,7 +106,7 @@ const bar = document.getElementById('js-progressbar');
  */
 function uploadObject(zip) {
 	return {
-		url: zip ? '/upload' : '/upload/zip',
+		url: zip ? '/upload/zip' : '/upload',
 		multiple: true,
 		type: 'multipart/form-data',
 		loadStart: setBarValue,
@@ -118,7 +118,7 @@ function uploadObject(zip) {
 			}, 1000);
 			alert(
 				`${
-					zip ? 'Files uploaded' : 'Zips uploaded and extracted'
+					zip ? 'Zips uploaded and extracted' : 'Files uploaded'
 				}, will be available for sharing now`
 			);
 			loadFiles();