Merge branch 'openSourcePPaaS' into openSourcePPaaSScripting

.gitignore

@@ -11,3 +11,10 @@
 /test-*.json
 /integration.json
 node_modules
+.nyc_output
+testmerge.json
+.env.local*
+.env.development.local*
+.env.test.local*
+.env.production.local*
+

package.json

@@ -10,31 +10,39 @@
     "./controller"
   ],
   "scripts": {
-    "start": "cd controller && next start -p 8081",
-    "dev": "cd controller && next dev",
+    "start": "npm-run-all --parallel startagent startcontroller",
+    "startcontroller": "cd controller && npm run start",
+    "startagent": "cd agent && npm run start",
+    "dev": "cd controller && npm run dev",
     "build": "npm run lint && npm run build:common && npm run build:agent && npm run build:controller",
-    "storybook": "cd controller && storybook dev -s ../public -p 5002",
-    "build-storybook": "cd controller && storybook build -s ../public",
+    "storybook": "cd controller && npm run storybook",
+    "build-storybook": "cd controller && npm run build-storybook",
     "lint": "node --max_old_space_size=4096 ./node_modules/eslint/bin/eslint.js --fix . --ext .ts,.tsx",
     "linterror": "node --max_old_space_size=4096 ./node_modules/eslint/bin/eslint.js . --ext .ts,.tsx --max-warnings 0",
-    "fix:install": "rimraf \"node_modules/@types/react-native/\"",
     "build:common": "cd common && npm run build",
     "build:agent": "cd agent && npm run build",
     "build:controller": "cd controller && npm run build",
     "build:react": "cd controller && npm run build:react",
-    "build:test": "cd controller && npm run build:test",
-    "test": "npm run linterror && npm run test:common && npm run test:agent && npm run test:controller",
+    "build:controller:test": "cd controller && npm run build:test",
+    "build:test": "npm-run-all --parallel build:common build:agent build:controller:test",
+    "testonly:common": "cd common && npm run testonly",
+    "testonly:agent": "cd agent && npm run testonly",
+    "testonly:controller": "cd controller && npm run testonly",
+    "testonly": "npm-run-all --parallel testonly:common testonly:agent testonly:controller",
+    "testmerge": "mkdir -p .nyc_output && cp common/.nyc_output/*.json .nyc_output/ && cp agent/.nyc_output/*.json .nyc_output/ && cp controller/.nyc_output/*.json .nyc_output/ && nyc merge .nyc_output testmerge.json && nyc report --reporter=lcov --reporter=text",
+    "test": "npm-run-all --serial linterror build:test testonly && npm run testmerge",
+    "testslow": "npm run linterror && npm run test:common && npm run test:agent && npm run test:controller",
     "test:common": "cd common && npm run test",
     "test:agent": "cd agent && npm run test",
     "test:controller": "cd controller && npm run test",
     "acceptance": "npm run acceptance:agent && npm run acceptance:controller",
     "acceptance:agent": "cd agent && npm run acceptance",
     "acceptance:controller": "cd agent && npm run acceptance",
-    "integration": "npm run lint && npm run integration:common && npm run integration:agent && npm run integration:controller",
+    "integration": "npm-run-all --serial lint integration:common integration:agent integration:controller testmerge",
     "integration:common": "cd common && npm run integration",
     "integration:agent": "cd agent && npm run integration",
     "integration:controller": "cd controller && npm run integration",
-    "coverage": "npm run lint && npm run coverage:common && npm run coverage:agent && npm run coverage:controller",
+    "coverage": "npm-run-all --serial lint coverage:common coverage:agent coverage:controller testmerge",
     "coverage:common": "cd common && npm run integration",
     "coverage:agent": "cd agent && npm run integration",
     "coverage:controller": "cd controller && npm run integration",
@@ -76,7 +84,9 @@
     "@typescript-eslint/parser": "^6.0.0",
     "chai": "^4.3.7",
     "eslint": "^8.40.0",
+    "jsdom-global": "^3.0.2",
     "mocha": "^10.2.0",
+    "npm-run-all2": "^6.0.6",
     "nyc": "^15.1.0",
     "typescript": "~5.2.0"
   }