From c70f14419ab7a5c5e1aa1b3788b8528f2a3b63e9 Mon Sep 17 00:00:00 2001 From: d98762625 Date: Fri, 5 Jul 2019 09:44:01 +0100 Subject: [PATCH] rename dishTranslationTypes --- .travis.yml | 2 +- Gruntfile.js | 25 +------------------ package.json | 3 +-- src/core/Dish.mjs | 2 +- .../DishBigNumber.mjs | 4 +-- .../DishByteArray.mjs | 4 +-- .../DishFile.mjs | 4 +-- .../DishHTML.mjs | 0 .../DishJSON.mjs | 4 +-- .../DishListFile.mjs | 5 ++-- .../DishNumber.mjs | 4 +-- .../DishString.mjs | 4 +-- .../DishType.mjs} | 8 +++--- .../index.mjs | 0 14 files changed, 23 insertions(+), 46 deletions(-) rename src/core/{dishTranslationTypes => dishTypes}/DishBigNumber.mjs (89%) rename src/core/{dishTranslationTypes => dishTypes}/DishByteArray.mjs (85%) rename src/core/{dishTranslationTypes => dishTypes}/DishFile.mjs (90%) rename src/core/{dishTranslationTypes => dishTypes}/DishHTML.mjs (100%) rename src/core/{dishTranslationTypes => dishTypes}/DishJSON.mjs (87%) rename src/core/{dishTranslationTypes => dishTypes}/DishListFile.mjs (92%) rename src/core/{dishTranslationTypes => dishTypes}/DishNumber.mjs (88%) rename src/core/{dishTranslationTypes => dishTypes}/DishString.mjs (87%) rename src/core/{dishTranslationTypes/DishTranslationType.mjs => dishTypes/DishType.mjs} (78%) rename src/core/{dishTranslationTypes => dishTypes}/index.mjs (100%) diff --git a/.travis.yml b/.travis.yml index 50229a91..de8a1d1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ script: - grunt test - grunt test-node - grunt docs - - NODE_ENV=production grunt node + - npm run node-prod - grunt prod --msg="$COMPILE_MSG" - xvfb-run --server-args="-screen 0 1200x800x24" grunt testui before_deploy: diff --git a/Gruntfile.js b/Gruntfile.js index dd8520f8..21cd0e94 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,7 +6,6 @@ const BundleAnalyzerPlugin = require("webpack-bundle-analyzer").BundleAnalyzerPl const NodeExternals = require("webpack-node-externals"); const glob = require("glob"); const path = require("path"); -const UglifyJSWebpackPlugin = require("uglifyjs-webpack-plugin"); /** * Grunt configuration for building the app in various formats. @@ -91,7 +90,7 @@ module.exports = function (grunt) { return typeof importScripts === "function"; }, ENVIRONMENT_IS_NODE: function() { - return typeof process === "object" && typeof require === "function"; + return typeof process === "object" && process.versions !== null && process.versions.node !== null && typeof require === "function"; }, ENVIRONMENT_IS_WEB: function() { return typeof window === "object"; @@ -226,17 +225,6 @@ module.exports = function (grunt) { maxChunks: 1 }) ], - optimization: { - minimizer: NODE_PROD ? [ - new UglifyJSWebpackPlugin({ - cache: true, - parallel: true, - uglifyOptions: { - "keep_fnames": true, - } - }) - ] : [] - } }, nodeRepl: { mode: NODE_PROD ? "production" : "development", @@ -257,17 +245,6 @@ module.exports = function (grunt) { maxChunks: 1 }) ], - optimization: { - minimizer: NODE_PROD ? [ - new UglifyJSWebpackPlugin({ - parallel: true, - cache: true, - uglifyOptions: { - "keep_fnames": true, - } - }) - ] : [] - } } }, "webpack-dev-server": { diff --git a/package.json b/package.json index 677249cd..ef31ee5f 100644 --- a/package.json +++ b/package.json @@ -158,7 +158,6 @@ "testui": "grunt testui", "docs": "grunt docs", "lint": "grunt lint", - "newop": "node --experimental-modules src/core/config/scripts/newOperation.mjs", - "postinstall": "[ -f node_modules/crypto-api/src/crypto-api.mjs ] || npx j2m node_modules/crypto-api/src/crypto-api.js" + "newop": "node --experimental-modules src/core/config/scripts/newOperation.mjs" } } diff --git a/src/core/Dish.mjs b/src/core/Dish.mjs index 71d7f725..9cc12222 100755 --- a/src/core/Dish.mjs +++ b/src/core/Dish.mjs @@ -19,7 +19,7 @@ import { DishListFile, DishNumber, DishString, -} from "./dishTranslationTypes"; +} from "./dishTypes"; /** diff --git a/src/core/dishTranslationTypes/DishBigNumber.mjs b/src/core/dishTypes/DishBigNumber.mjs similarity index 89% rename from src/core/dishTranslationTypes/DishBigNumber.mjs rename to src/core/dishTypes/DishBigNumber.mjs index ab14c4c9..d6e19f20 100644 --- a/src/core/dishTranslationTypes/DishBigNumber.mjs +++ b/src/core/dishTypes/DishBigNumber.mjs @@ -4,14 +4,14 @@ * @license Apache-2.0 */ -import DishTranslationType from "./DishTranslationType"; +import DishType from "./DishType"; import Utils from "../Utils"; import BigNumber from "bignumber.js"; /** * translation methods for BigNumber Dishes */ -class DishBigNumber extends DishTranslationType { +class DishBigNumber extends DishType { /** * convert the given value to a ArrayBuffer diff --git a/src/core/dishTranslationTypes/DishByteArray.mjs b/src/core/dishTypes/DishByteArray.mjs similarity index 85% rename from src/core/dishTranslationTypes/DishByteArray.mjs rename to src/core/dishTypes/DishByteArray.mjs index a8440310..8e668882 100644 --- a/src/core/dishTranslationTypes/DishByteArray.mjs +++ b/src/core/dishTypes/DishByteArray.mjs @@ -4,12 +4,12 @@ * @license Apache-2.0 */ -import DishTranslationType from "./DishTranslationType"; +import DishType from "./DishType"; /** * Translation methods for ArrayBuffer Dishes */ -class DishByteArray extends DishTranslationType { +class DishByteArray extends DishType { /** * convert the given value to a ArrayBuffer diff --git a/src/core/dishTranslationTypes/DishFile.mjs b/src/core/dishTypes/DishFile.mjs similarity index 90% rename from src/core/dishTranslationTypes/DishFile.mjs rename to src/core/dishTypes/DishFile.mjs index 151b19b6..f78110ef 100644 --- a/src/core/dishTranslationTypes/DishFile.mjs +++ b/src/core/dishTypes/DishFile.mjs @@ -4,13 +4,13 @@ * @license Apache-2.0 */ -import DishTranslationType from "./DishTranslationType"; +import DishType from "./DishType"; import Utils from "../Utils"; /** * Translation methods for file Dishes */ -class DishFile extends DishTranslationType { +class DishFile extends DishType { /** * convert the given value to an ArrayBuffer diff --git a/src/core/dishTranslationTypes/DishHTML.mjs b/src/core/dishTypes/DishHTML.mjs similarity index 100% rename from src/core/dishTranslationTypes/DishHTML.mjs rename to src/core/dishTypes/DishHTML.mjs diff --git a/src/core/dishTranslationTypes/DishJSON.mjs b/src/core/dishTypes/DishJSON.mjs similarity index 87% rename from src/core/dishTranslationTypes/DishJSON.mjs rename to src/core/dishTypes/DishJSON.mjs index 3c4d339c..e15475bf 100644 --- a/src/core/dishTranslationTypes/DishJSON.mjs +++ b/src/core/dishTypes/DishJSON.mjs @@ -4,13 +4,13 @@ * @license Apache-2.0 */ -import DishTranslationType from "./DishTranslationType"; +import DishType from "./DishType"; import Utils from "../Utils"; /** * Translation methods for JSON dishes */ -class DishJSON extends DishTranslationType { +class DishJSON extends DishType { /** * convert the given value to a ArrayBuffer diff --git a/src/core/dishTranslationTypes/DishListFile.mjs b/src/core/dishTypes/DishListFile.mjs similarity index 92% rename from src/core/dishTranslationTypes/DishListFile.mjs rename to src/core/dishTypes/DishListFile.mjs index 3fc2d5d2..c0df542d 100644 --- a/src/core/dishTranslationTypes/DishListFile.mjs +++ b/src/core/dishTypes/DishListFile.mjs @@ -4,13 +4,14 @@ * @license Apache-2.0 */ -import DishTranslationType from "./DishTranslationType"; +import DishType from "./DishType"; import Utils from "../Utils.mjs"; + /** * Translation methods for ListFile Dishes */ -class DishListFile extends DishTranslationType { +class DishListFile extends DishType { /** * convert the given value to a ArrayBuffer diff --git a/src/core/dishTranslationTypes/DishNumber.mjs b/src/core/dishTypes/DishNumber.mjs similarity index 88% rename from src/core/dishTranslationTypes/DishNumber.mjs rename to src/core/dishTypes/DishNumber.mjs index 14768c54..0bd6ffc1 100644 --- a/src/core/dishTranslationTypes/DishNumber.mjs +++ b/src/core/dishTypes/DishNumber.mjs @@ -5,13 +5,13 @@ */ -import DishTranslationType from "./DishTranslationType"; +import DishType from "./DishType"; import Utils from "../Utils"; /** * Translation methods for number dishes */ -class DishNumber extends DishTranslationType { +class DishNumber extends DishType { /** * convert the given value to a ArrayBuffer diff --git a/src/core/dishTranslationTypes/DishString.mjs b/src/core/dishTypes/DishString.mjs similarity index 87% rename from src/core/dishTranslationTypes/DishString.mjs rename to src/core/dishTypes/DishString.mjs index fcfb2d30..3e32cfaa 100644 --- a/src/core/dishTranslationTypes/DishString.mjs +++ b/src/core/dishTypes/DishString.mjs @@ -5,13 +5,13 @@ */ -import DishTranslationType from "./DishTranslationType"; +import DishType from "./DishType"; import Utils from "../Utils"; /** * Translation methods for string dishes */ -class DishString extends DishTranslationType { +class DishString extends DishType { /** * convert the given value to a ArrayBuffer diff --git a/src/core/dishTranslationTypes/DishTranslationType.mjs b/src/core/dishTypes/DishType.mjs similarity index 78% rename from src/core/dishTranslationTypes/DishTranslationType.mjs rename to src/core/dishTypes/DishType.mjs index 0a7db1bd..849b5756 100644 --- a/src/core/dishTranslationTypes/DishTranslationType.mjs +++ b/src/core/dishTypes/DishType.mjs @@ -8,7 +8,7 @@ /** * Abstract class for dish translation methods */ -class DishTranslationType { +class DishType { /** * Warn translations dont work without value from bind @@ -24,7 +24,7 @@ class DishTranslationType { * @param {*} value */ static toArrayBuffer() { - throw new Error("toByteArray has not been implemented"); + throw new Error("toArrayBuffer has not been implemented"); } /** @@ -32,8 +32,8 @@ class DishTranslationType { * @param {boolean} notUTF8 */ static fromArrayBuffer(notUTF8=undefined) { - throw new Error("toType has not been implemented"); + throw new Error("fromArrayBuffer has not been implemented"); } } -export default DishTranslationType; +export default DishType; diff --git a/src/core/dishTranslationTypes/index.mjs b/src/core/dishTypes/index.mjs similarity index 100% rename from src/core/dishTranslationTypes/index.mjs rename to src/core/dishTypes/index.mjs