From: Jérôme Benoit Date: Sat, 13 Feb 2021 17:50:08 +0000 (+0100) Subject: Merge branch 'master' of github.com:LucasBrazi06/ev-simulator into rollup X-Git-Tag: v1.0.1-0~104^2~6^2~2 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=26a2f9b564a6edfddc776890f52d48378bafde48;p=e-mobility-charging-stations-simulator.git Merge branch 'master' of github.com:LucasBrazi06/ev-simulator into rollup Signed-off-by: Jérôme Benoit --- 26a2f9b564a6edfddc776890f52d48378bafde48 diff --cc package-lock.json index d891e902,3c273600..98175782 --- a/package-lock.json +++ b/package-lock.json @@@ -726,18 -682,18 +726,6 @@@ "integrity": "sha1-nbVjk33YaRX2kJK8QyWdL0hXjkE=", "dev": true }, -- "@types/strip-bom": { -- "version": "3.0.0", -- "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz", -- "integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=", -- "dev": true -- }, -- "@types/strip-json-comments": { -- "version": "0.0.30", -- "resolved": "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz", -- "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==", -- "dev": true -- }, "@types/uuid": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz", @@@ -1175,12 -1113,12 +1163,6 @@@ } } }, -- "arg": { -- "version": "4.1.3", -- "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", -- "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", -- "dev": true -- }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@@ -3197,12 -3123,12 +3179,6 @@@ "sha.js": "^2.4.8" } }, -- "create-require": { -- "version": "1.1.1", -- "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", -- "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", -- "dev": true -- }, "cross-argv": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/cross-argv/-/cross-argv-1.0.0.tgz", @@@ -3885,12 -3759,12 +3861,6 @@@ "minimist": "^1.1.1" } }, -- "diff": { -- "version": "4.0.2", -- "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", -- "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", -- "dev": true -- }, "diffie-hellman": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", @@@ -3998,15 -3872,15 +3968,6 @@@ } } }, -- "dynamic-dedupe": { -- "version": "0.3.0", -- "resolved": "https://registry.npmjs.org/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz", -- "integrity": "sha1-BuRMIj9eTpTXjvnbI6ZRXOL5YqE=", -- "dev": true, -- "requires": { -- "xtend": "^4.0.0" -- } -- }, "ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", @@@ -7193,12 -7037,12 +7248,6 @@@ } } }, -- "make-error": { -- "version": "1.3.6", -- "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", -- "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", -- "dev": true -- }, "make-iterator": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", @@@ -11126,12 -10867,12 +11175,6 @@@ "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=", "dev": true }, -- "tree-kill": { -- "version": "1.2.2", -- "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", -- "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", -- "dev": true -- }, "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", @@@ -11143,129 -10884,129 +11186,6 @@@ "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" }, -- "ts-node": { -- "version": "9.1.1", -- "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz", -- "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==", -- "dev": true, -- "requires": { -- "arg": "^4.1.0", -- "create-require": "^1.1.0", -- "diff": "^4.0.1", -- "make-error": "^1.1.1", -- "source-map-support": "^0.5.17", -- "yn": "3.1.1" -- } -- }, -- "ts-node-dev": { -- "version": "1.1.1", -- "resolved": "https://registry.npmjs.org/ts-node-dev/-/ts-node-dev-1.1.1.tgz", -- "integrity": "sha512-kAO8LUZgXZSY0+PucMPsQ0Bbdv0x+lgbN7j8gcD4PuTI4uKC6YchekaspmYTBNilkiu+rQYkWJA7cK+Q8/B0tQ==", -- "dev": true, -- "requires": { -- "chokidar": "^3.4.0", -- "dateformat": "~1.0.4-1.2.3", -- "dynamic-dedupe": "^0.3.0", -- "minimist": "^1.2.5", -- "mkdirp": "^1.0.4", -- "resolve": "^1.0.0", -- "rimraf": "^2.6.1", -- "source-map-support": "^0.5.12", -- "tree-kill": "^1.2.2", -- "ts-node": "^9.0.0", -- "tsconfig": "^7.0.0" -- }, -- "dependencies": { -- "anymatch": { -- "version": "3.1.1", -- "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", -- "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", -- "dev": true, -- "requires": { -- "normalize-path": "^3.0.0", -- "picomatch": "^2.0.4" -- } -- }, -- "binary-extensions": { -- "version": "2.1.0", -- "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", -- "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", -- "dev": true -- }, -- "chokidar": { -- "version": "3.4.3", -- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", -- "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", -- "dev": true, -- "requires": { -- "anymatch": "~3.1.1", -- "braces": "~3.0.2", -- "fsevents": "~2.1.2", -- "glob-parent": "~5.1.0", -- "is-binary-path": "~2.1.0", -- "is-glob": "~4.0.1", -- "normalize-path": "~3.0.0", -- "readdirp": "~3.5.0" -- } -- }, -- "dateformat": { -- "version": "1.0.12", -- "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", -- "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", -- "dev": true, -- "requires": { -- "get-stdin": "^4.0.1", -- "meow": "^3.3.0" -- } -- }, -- "fsevents": { -- "version": "2.1.3", -- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", -- "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", -- "dev": true, -- "optional": true -- }, -- "is-binary-path": { -- "version": "2.1.0", -- "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", -- "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", -- "dev": true, -- "requires": { -- "binary-extensions": "^2.0.0" -- } -- }, -- "readdirp": { -- "version": "3.5.0", -- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", -- "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", -- "dev": true, -- "requires": { -- "picomatch": "^2.2.1" -- } -- }, -- "rimraf": { -- "version": "2.7.1", -- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", -- "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", -- "dev": true, -- "requires": { -- "glob": "^7.1.3" -- } -- } -- } -- }, -- "tsconfig": { -- "version": "7.0.0", -- "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz", -- "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==", -- "dev": true, -- "requires": { -- "@types/strip-bom": "^3.0.0", -- "@types/strip-json-comments": "0.0.30", -- "strip-bom": "^3.0.0", -- "strip-json-comments": "^2.0.0" -- } -- }, "tslib": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", @@@ -12044,12 -11779,12 +11964,6 @@@ "camelcase": "^5.0.0", "decamelize": "^1.2.0" } -- }, -- "yn": { -- "version": "3.1.1", -- "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", -- "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", -- "dev": true } } } diff --cc package.json index 7c609d5c,b4fe270f..0012bda5 --- a/package.json +++ b/package.json @@@ -30,10 -28,9 +28,10 @@@ "start:flameprof": "cross-env NODE_ENV=production clinic flame -- node -r source-map-support/register dist/start.js", "start:bubbleprof": "cross-env NODE_ENV=production clinic bubbleprof -- node -r source-map-support/register dist/start.js", "grunt": "grunt", + "rollup": "rollup --config", "build": "npm run grunt", "build:mta": "mbt build", - "build:clean": "rimraf ./dist", + "build:watch": "npm run grunt -- ts:buildWatch", "lint": "cross-env TIMING=1 eslint --ext .js,.ts src", "lint:fix": "cross-env TIMING=1 eslint --fix --ext .js,.ts src", "import-sort": "npx import-sort-cli --write 'src/**/*.ts{,x}'", @@@ -73,12 -73,6 +74,10 @@@ "grunt-ts": "^6.0.0-beta.22", "mbt": "^1.1.0", "npm-check": "^5.9.2", - "rimraf": "^3.0.2", + "rollup": "^2.39.0", + "rollup-plugin-copy": "^3.3.0", + "rollup-plugin-delete": "^2.0.0", + "rollup-plugin-typescript2": "^0.29.0", - "ts-node-dev": "^1.1.1", "typescript": "^4.1.5" } }