Giancarlo 7 years ago
parent
commit
63f35255b0

+ 17 - 19
package.json

@@ -6,35 +6,33 @@
 	"author": "Open Mind",
 	"author": "Open Mind",
 	"scripts": {
 	"scripts": {
 		"clean": "shx --silent rm -rf deploy.tar.gz tmp node_modules ui/admin/node_modules src_minified assets/frontend assets/admin Site.log cfg/*.old ui/*/masterpage.tpl fbtpl *.tgz",
 		"clean": "shx --silent rm -rf deploy.tar.gz tmp node_modules ui/admin/node_modules src_minified assets/frontend assets/admin Site.log cfg/*.old ui/*/masterpage.tpl fbtpl *.tgz",
-		"preinstall": "node scripts/preinstall.js",
-		"postinstall": "node scripts/postinstall.js",
 		"buildDev": "webpack --mode=none --display-error-details",
 		"buildDev": "webpack --mode=none --display-error-details",
 		"buildProd": "webpack --mode=production --display-error-details",
 		"buildProd": "webpack --mode=production --display-error-details",
 		"watch": "webpack --mode=none --display-error-details --watch",
 		"watch": "webpack --mode=none --display-error-details --watch",
 		"pack": "npm pack"
 		"pack": "npm pack"
 	},
 	},
-	"globalDependencies": [
-		"acorn",
-		"clean-webpack-plugin",
-		"css-loader",
-		"file-loader",
-		"html-webpack-plugin",
-		"html-webpack-prefix-plugin",
-		"mini-css-extract-plugin",
-		"node-sass",
-		"optimize-css-assets-webpack-plugin",
-		"sass-loader",
-		"terser-webpack-plugin",
-		"url-loader",
-		"webpack",
-		"webpack-cli",
-		"shx"
-	],
 	"dependencies": {
 	"dependencies": {
 		"bootstrap": "^4.3.1",
 		"bootstrap": "^4.3.1",
 		"jquery": "^3.4.1",
 		"jquery": "^3.4.1",
 		"popper.js": "^1.15.0"
 		"popper.js": "^1.15.0"
 	},
 	},
+	"devDependencies": {
+		"acorn": "^6.1.1",
+		"clean-webpack-plugin": "^3.0.0",
+		"css-loader": "^2.1.1",
+		"file-loader": "^3.0.1",
+		"html-webpack-plugin": "^3.2.0",
+		"html-webpack-prefix-plugin": "^1.1.0",
+		"mini-css-extract-plugin": "^0.7.0",
+		"node-sass": "^4.12.0",
+		"optimize-css-assets-webpack-plugin": "^5.0.1",
+		"sass-loader": "^7.1.0",
+		"shx": "^0.3.2",
+		"terser-webpack-plugin": "^1.3.0",
+		"url-loader": "^1.1.2",
+		"webpack": "^4.32.2",
+		"webpack-cli": "^3.3.2"
+	},
 	"files": [
 	"files": [
 		"index.php",
 		"index.php",
 		"src",
 		"src",

+ 0 - 14
scripts/postinstall.js

@@ -1,14 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const {execSync} = require('child_process');
-
-let packageJson = JSON.parse(fs.readFileSync('package.json'));
-
-let missingPackages = packageJson.globalDependencies.filter(moduleName => !fs.existsSync(`node_modules/${moduleName}/package.json`));
-
-if (missingPackages.length > 0) {
-	let packageToLink = packageJson.globalDependencies.join(' ');
-
-	execSync(`npm link ${packageToLink}`);
-}

+ 0 - 10
scripts/preinstall.js

@@ -1,10 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const {execSync} = require('child_process');
-
-let packageJson = JSON.parse(fs.readFileSync('package.json'));
-
-let globalDependencies = packageJson.globalDependencies.join(' ');
-
-execSync(`npm i -g ${globalDependencies}`);

+ 0 - 1
src/OpenMind/FindBox/FindBoxCoreSystem.php

@@ -336,7 +336,6 @@ class FindBoxCoreSystem
 
 
 		$svgNode = $svgTemplate->getElementsByTagName('svg');
 		$svgNode = $svgTemplate->getElementsByTagName('svg');
 		if ($svgNode->length > 0) {
 		if ($svgNode->length > 0) {
-			$svgNode[0]->setAttribute('class', 'w-100 h-100'); // Just fit everywhere
 			$svgNode[0]->removeAttribute('transform');
 			$svgNode[0]->removeAttribute('transform');
 		}
 		}
 
 

File diff suppressed because it is too large
+ 0 - 5
ui/admin/assets/css/bootstrap.min.css


+ 15 - 17
ui/admin/package.json

@@ -6,27 +6,10 @@
 	"description": "OM-Link Admin Module",
 	"description": "OM-Link Admin Module",
 	"author": "Open Mind",
 	"author": "Open Mind",
 	"scripts": {
 	"scripts": {
-		"postinstall": "node ../../scripts/postinstall.js",
 		"buildDev": "webpack --mode=none --display-error-details",
 		"buildDev": "webpack --mode=none --display-error-details",
 		"buildProd": "webpack --mode=production --display-error-details",
 		"buildProd": "webpack --mode=production --display-error-details",
 		"watch": "webpack --mode=none --display-error-details --watch"
 		"watch": "webpack --mode=none --display-error-details --watch"
 	},
 	},
-	"globalDependencies": [
-		"acorn",
-		"clean-webpack-plugin",
-		"css-loader",
-		"file-loader",
-		"html-webpack-plugin",
-		"html-webpack-prefix-plugin",
-		"mini-css-extract-plugin",
-		"node-sass",
-		"optimize-css-assets-webpack-plugin",
-		"sass-loader",
-		"terser-webpack-plugin",
-		"url-loader",
-		"webpack",
-		"webpack-cli"
-	],
 	"dependencies": {
 	"dependencies": {
 		"bootstrap": "4.2.1",
 		"bootstrap": "4.2.1",
 		"datatables.net": "^1.10.19",
 		"datatables.net": "^1.10.19",
@@ -42,5 +25,20 @@
 		"pdfmake": "^0.1.56",
 		"pdfmake": "^0.1.56",
 		"popper.js": "^1.15.0",
 		"popper.js": "^1.15.0",
 		"toastr": "^2.1.4"
 		"toastr": "^2.1.4"
+	},
+	"devDependencies": {
+		"clean-webpack-plugin": "^3.0.0",
+		"css-loader": "^2.1.1",
+		"file-loader": "^3.0.1",
+		"html-webpack-plugin": "^3.2.0",
+		"html-webpack-prefix-plugin": "^1.1.0",
+		"mini-css-extract-plugin": "^0.7.0",
+		"node-sass": "^4.12.0",
+		"optimize-css-assets-webpack-plugin": "^5.0.1",
+		"sass-loader": "^7.1.0",
+		"terser-webpack-plugin": "^1.3.0",
+		"url-loader": "^1.1.2",
+		"webpack": "^4.32.2",
+		"webpack-cli": "^3.3.2"
 	}
 	}
 }
 }

+ 1 - 1
ui/admin/webpack.config.js

@@ -2,7 +2,7 @@ const path = require("path");
 const TerserJSPlugin = require('terser-webpack-plugin');
 const TerserJSPlugin = require('terser-webpack-plugin');
 const HtmlPlugin = require("html-webpack-plugin");
 const HtmlPlugin = require("html-webpack-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const CleanWebpackPlugin = require("clean-webpack-plugin/dist/clean-webpack-plugin");
+const {CleanWebpackPlugin} = require("clean-webpack-plugin/dist/clean-webpack-plugin");
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const webpack = require("webpack");
 const webpack = require("webpack");
 
 

+ 1 - 1
webpack.config.js

@@ -2,7 +2,7 @@ const path = require("path");
 const TerserJSPlugin = require('terser-webpack-plugin');
 const TerserJSPlugin = require('terser-webpack-plugin');
 const HtmlPlugin = require("html-webpack-plugin");
 const HtmlPlugin = require("html-webpack-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const CleanWebpackPlugin = require("clean-webpack-plugin");
+const {CleanWebpackPlugin} = require("clean-webpack-plugin");
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const webpack = require("webpack");
 const webpack = require("webpack");
 
 

Some files were not shown because too many files changed in this diff