From 6e274675be76c6d0219e6cd1ae5562936734263c Mon Sep 17 00:00:00 2001
From: Martin Guillon <martin.guillon@akylas.fr>
Date: Mon, 7 Sep 2020 15:18:29 +0200
Subject: [PATCH] chore: fixed npm scripts

---
 package.json | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 76a10d0d4..eecd9da3f 100644
--- a/package.json
+++ b/package.json
@@ -16,23 +16,23 @@
     "apps-ui:android":"cd apps/ui && tns debug android --no-hmr --emulator --env.testing",
     "apps-ui:clean":"cd apps/ui && rimraf -- hooks node_modules platforms package-lock.json webpack.config.js && ${NPM:npm} i && rimraf -- package-lock.json",
     "core:lint":"cd packages/core && eslint -c .eslintrc --ignore-pattern **/node_modules/** --ignore-pattern !packages/core/**",
-    "core:test":"cd packages/core && jest --config jest.config.js",
-    "core:setup":"cd packages/core && nx run webpack:build",
-    "core:build":"tsc --build packages/core/tsconfig.lib.json --outDir dist/packages/core && copyfiles -u packages/core/*.md dist/packages/core",
+    "core:test":"cd packages/core && jest",
+    "core:setup":"npm run webpack:build",
+    "core:build":"tsc -p packages/core/tsconfig.lib.json --outDir dist/packages/core && copyfiles -u packages/core/*.md packages/core/package.json dist/packages/core",
     "core:build.npm":"npm run core:build && copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/**/*.d.ts\" dist && copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/js-libs/**/*\" dist && copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/cli-hooks/**/*.js\" dist && copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/platforms/**/*\" dist && copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/fetch/**/*\" dist && copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/css/**/*\" dist && copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/css-value/**/*\" dist && cd dist/packages/core && npm pack && mv *.tgz ..",
-    "core:unit":"tsc -p packages/core/__tests__ && mocha --config=packages/core/__tests__/.mocharc.yml",
-    "core:unit.watch":"tsc -p packages/core/__tests__ && mocha --watch --config=packages/core/__tests__/.mocharc.yml",
-    "core-compat:build":"cd packages/core-compat && rimraf -- node_modules package-lock.json && ${NPM:npm} i  && tsc -p tsconfig.json && mv \"$(npm pack | tail -n 1)\" ../../dist/packages/tns-core-modules.tgz",
+    "core:unit":"cd packages/core/__tests__ && tsc && mocha",
+    "core:unit.watch":"cd packages/core/__tests__ && tsc && mocha --watch",
+    "core-compat:build":"cd packages/core-compat && rimraf node_modules package-lock.json && $npm_package_config_npm_alias i  && tsc -p tsconfig.json && mv \"$(npm pack | tail -n 1)\" ../../dist/packages/tns-core-modules.tgz",
     "types-ios:lint":"cd packages/types-ios && eslint -c .eslintrc --ignore-pattern **/node_modules/** --ignore-pattern !packages/types-ios/**",
     "types-ios:test":"cd packages/types-ios && jest --config jest.config.js --ignore-pattern **/node_modules/** --ignore-pattern !packages/types-ios/**",
-    "types-ios:build":"cd packages/types-ios && tsc -p tsconfig.lib.json && copyfiles package.json *.md ../dist/packages/types-ios",
+    "types-ios:build":"rimraf dist/packages/types-ios && cpy '**/*' '../../../dist/packages/types-ios' --cwd=packages/types-ios/src --parents && cpy 'package.json' '*.md' '../../dist/packages/types-ios' --cwd=packages/types-ios --parents",
     "types-android:lint":"cd packages/types-android && eslint -c .eslintrc --ignore-pattern **/node_modules/** --ignore-pattern !packages/types-android/**",
     "types-android:test":"cd packages/types-android && jest --config jest.config.js --ignore-pattern **/node_modules/** --ignore-pattern !packages/types-android/**",
-    "types-android:build":"cd packages/types-android && tsc -p tsconfig.lib.json && copyfiles package.json *.md ../dist/packages/types-android",
+    "types-android:build":"rimraf dist/packages/types-android && cpy '**/*' '../../../dist/packages/types-android' --cwd=packages/types-android/src --parents && cpy 'package.json' '*.md' '../../dist/packages/types-android' --cwd=packages/types-android --parents",
     "ui-mobile-base:build":"cd packages/ui-mobile-base && ./build.sh && copyfiles dist/package/platforms/* ../../packages/core/platforms",
     "webpack:lint":"cd packages/webpack && eslint -c .eslintrc --ignore-pattern **/node_modules/** --ignore-pattern !packages/webpack/**",
     "webpack:test":"cd packages/webpack && npm run tsc && npm run jasmine",
-    "webpack:build":"npm run setup && mkdir -p ../../dist/packages && mv \"$(npm pack | tail -n 1)\" ../../dist/packages/nativescript-webpack.tgz"
+    "webpack:build":"cd packages/webpack npm run setup && mkdir -p ../../dist/packages && mv \"$(npm pack | tail -n 1)\" ../../dist/packages/nativescript-webpack.tgz"
   },
   "private": true,
   "dependencies": {
@@ -55,6 +55,7 @@
     "chai": "^4.2.0",
     "conventional-changelog-cli": "^2.0.34",
     "copyfiles": "^2.3.0",
+    "cpy-cli": "^3.1.1",
     "css": "^3.0.0",
     "css-tree": "^1.0.0-alpha.39",
     "dotenv": "~8.2.0",
@@ -78,7 +79,8 @@
     "ts-jest": "~26.1.1",
     "ts-node": "~8.10.2",
     "ts-patch": "^1.2.5",
-    "tslint": "~6.1.2",
+    "tslib": "~2.0.1",
+    "tslint": "~6.1.3",
     "typescript": "~3.9.7",
     "webpack": "~4.44.1",
     "webpack-cli": "~3.3.12"