#45: npm scripts npmLink and npmUnlink handles all crosslinking, and …

…is integrated with gradle task npmInstall, so it's better to use that than 'npm i'

build.gradle

@@ -75,13 +75,17 @@ Marker file, indicating that the npmInstall gradle task has been run in the root
   }
 }
 
+task npmPreInstall(type: NpmTask) {
+  args=['run', 'npmUnlink']
+}
 task npmPostInstall(type: NpmTask) {
   args=['run', 'npmLink']
 }
 
 npmInstall.enabled = false;
 npmInstall.dependsOn npmPostInstall
 npmPostInstall.dependsOn npmDoInstall
+npmDoInstall.dependsOn npmPreInstall
 
 
 ///////////////////////////////////////////////////

package.json

@@ -13,23 +13,31 @@
     "clean": "run-script-os",
     "clean:win32": "gradlew clean --info",
     "clean:default": "./gradlew clean --info",
-    "cleanNpm": "run-script-os",
-    "cleanNpm:win32": "gradlew cleanNpm --info",
-    "cleanNpm:default": "./gradlew cleanNpm --info",
+    "cleanNpm": "(npm run npmUnlink && rimraf node_modules) || exit 0",
     "test": "run-script-os",
     "test:win32": "gradlew test --info",
     "test:default": "./gradlew test --info",
     "build": "run-script-os",
     "build:win32": "gradlew build --info",
     "build:default": "./gradlew build --info",
     "npmLink": "npm run npmLink:buildcomponents && npm run npmLink:client && npm run npmLink:constants && npm run npmLink:externals && npm run npmLink:nashornpolyfills && npm run npmLink:regions && npm run npmLink:react4xp",
-    "npmLink:buildcomponents": "node_modules/.bin/symlink-dir node_modules packages/buildcomponents/node_modules && node_modules/.bin/symlink-dir packages/buildcomponents node_modules/react4xp-build-components",
-    "npmLink:client": "node_modules/.bin/symlink-dir node_modules packages/client/node_modules && node_modules/.bin/symlink-dir packages/client node_modules/react4xp-runtime-client",
-    "npmLink:constants": "node_modules/.bin/symlink-dir node_modules packages/constants/node_modules && node_modules/.bin/symlink-dir packages/constants node_modules/react4xp-buildconstants",
-    "npmLink:externals": "node_modules/.bin/symlink-dir node_modules packages/externals/node_modules && node_modules/.bin/symlink-dir packages/externals node_modules/react4xp-runtime-externals",
-    "npmLink:nashornpolyfills": "node_modules/.bin/symlink-dir node_modules packages/nashornpolyfills/node_modules && node_modules/.bin/symlink-dir packages/nashornpolyfills node_modules/react4xp-runtime-nashornpolyfills",
-    "npmLink:regions": "node_modules/.bin/symlink-dir node_modules packages/regions/node_modules && node_modules/.bin/symlink-dir packages/regions node_modules/react4xp-regions",
-    "npmLink:react4xp": "node_modules/.bin/symlink-dir node_modules packages/react4xp/node_modules && node_modules/.bin/symlink-dir packages/react4xp node_modules/react4xp"
+    "npmLink:buildcomponents": "cd packages/buildcomponents && npm link && cd ../.. && npm link react4xp-build-components && rimraf packages/buildcomponents/node_modules && node_modules/.bin/symlink-dir node_modules packages/buildcomponents/node_modules",
+    "npmLink:client": "cd packages/client && npm link && cd ../.. && npm link react4xp-runtime-client && rimraf packages/client/node_modules && node_modules/.bin/symlink-dir node_modules packages/client/node_modules",
+    "npmLink:constants": "cd packages/constants && npx babel src/bin -d bin && npm link && cd ../.. && npm link react4xp-buildconstants && rimraf packages/constants/node_modules && node_modules/.bin/symlink-dir node_modules packages/constants/node_modules",
+    "npmLink:externals": "cd packages/externals && npm link && cd ../.. && npm link react4xp-runtime-externals && rimraf packages/externals/node_modules && node_modules/.bin/symlink-dir node_modules packages/externals/node_modules",
+    "npmLink:nashornpolyfills": "cd packages/nashornpolyfills && npm link && cd ../.. && npm link react4xp-runtime-nashornpolyfills && rimraf packages/nashornpolyfills/node_modules && node_modules/.bin/symlink-dir node_modules packages/nashornpolyfills/node_modules",
+    "npmLink:regions": "cd packages/regions && npm link && cd ../.. && npm link react4xp-regions && rimraf packages/regions/node_modules && node_modules/.bin/symlink-dir node_modules packages/regions/node_modules",
+    "npmLink:react4xp": "cd packages/react4xp && npm link && cd ../.. && npm link react4xp && rimraf packages/react4xp/node_modules && node_modules/.bin/symlink-dir node_modules packages/react4xp/node_modules",
+    "npmUnlink": "(rimraf node_modules/react4xp-build-components && rimraf packages/buildcomponents/node_modules && rimraf node_modules/react4xp-runtime-client && rimraf packages/client/node_modules && rimraf node_modules/react4xp-buildconstants && rimraf packages/constants/node_modules && rimraf node_modules/react4xp-runtime-externals && rimraf packages/externals/node_modules && rimraf node_modules/react4xp-runtime-nashornpolyfills && rimraf packages/nashornpolyfills/node_modules && rimraf node_modules/react4xp-regions && rimraf packages/regions/node_modules && rimraf node_modules/react4xp && rimraf packages/react4xp/node_modules) || exit 0",
+    "npmUpdate": "rimraf node_modules && npm i && npm update && npm update --dev && npm audit fix && npm run npmUpdate:sub && npm run npmInstall",
+    "npmUpdate:sub": "npm run npmUpdate:buildcomponents && npm run npmUpdate:client && npm run npmUpdate:constants && npm run npmUpdate:externals && npm run npmUpdate:nashornpolyfills && npm run npmUpdate:regions && npm run npmUpdate:react4xp",
+    "npmUpdate:buildcomponents": "rimraf packages/buildcomponents/node_modules && cd packages/buildcomponents && npm update && npm update --dev && npm audit fix && cd ../.. && rimraf packages/buildcomponents/node_modules",
+    "npmUpdate:client": "rimraf packages/client/node_modules && cd packages/client && npm update && npm update --dev && npm audit fix && cd ../.. && rimraf packages/client/node_modules",
+    "npmUpdate:constants": "rimraf packages/constants/node_modules && cd packages/constants && npm update && npm update --dev && npm audit fix && cd ../.. && rimraf packages/constants/node_modules",
+    "npmUpdate:externals": "rimraf packages/externals/node_modules && cd packages/externals && npm update && npm update --dev && npm audit fix && cd ../.. && rimraf packages/externals/node_modules",
+    "npmUpdate:nashornpolyfills": "rimraf packages/nashornpolyfills/node_modules && cd packages/nashornpolyfills && npm update && npm update --dev && npm audit fix && cd ../.. && rimraf packages/nashornpolyfills/node_modules",
+    "npmUpdate:regions": "rimraf packages/regions/node_modules && cd packages/regions && npm update && npm update --dev && npm audit fix && cd ../.. && rimraf packages/regions/node_modules",
+    "npmUpdate:react4xp": "rimraf packages/react4xp/node_modules && cd packages/react4xp && npm update && npm update --dev && npm audit fix && cd ../.. && rimraf packages/react4xp/node_modules"
   },
   "author": "Espen Norderud",
   "license": "Apache-2.0",
@@ -76,6 +84,7 @@
     "react-dom": "^17.0.1",
     "react-redux": "^6.0.1",
     "redux": "^4.0.5",
+    "rimraf": "^3.0.2",
     "run-script-os": "^1.1.5",
     "stats-webpack-plugin": "^0.7.0",
     "symlink-dir": "^4.1.0",