Fix test setup (#2)

* Fix test setup

* Update tsconfig target to ES2021

Author: puehringer

config/tsconfig.template.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "ES2020",
-    "target": "ES2019",
+    "target": "ES2021",
     "importHelpers": true,
     "sourceMap": true,
     "declaration": true,

package.json

@@ -146,8 +146,7 @@
     "yeoman-generator": "4"
   },
   "devDependencies": {
-    "@types/yargs": "^17.0.10",
-    "install-local-dependencies": "^0.2.3"
+    "@types/yargs": "^17.0.10"
   },
   "peerDependencies": {
     "@types/react": "^16.9.23",

tests/workspace.test.js

@@ -19,11 +19,11 @@ describe('workspace', () => {
   };
 
   beforeAll(() => {
-    // Install dependencies via install-local-dependencies as npm does not install transitive deps properly if it is a relative path: https://github.com/pnpm/pnpm/issues/3102
+    // Install dependencies
     if (!fs.existsSync(resolve(templateDir, 'node_modules'))) {
       // eslint-disable-next-line no-console
       console.log('Installing local dependencies in the template folder');
-      execSync('install-local-dependencies', {
+      execSync('yarn install', {
         cwd: templateDir,
         stdio: 'inherit',
       });

tests_fixtures/workspace_template/.gitignore

@@ -1,3 +1,12 @@
 node_modules/
 bundles/
-package-lock.json
+package-lock.json
+
+# yarn
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

tests_fixtures/workspace_template/.localdependenciesrc

@@ -1,4 +1,3 @@
 {
-  "defaultApp": "demo",
-  "modules": []
+  "defaultApp": "demo"
 }

tests_fixtures/workspace_template/.yarn/releases/yarn-3.2.2.cjs

@@ -28,3 +28,13 @@ node_modules/
 /tests/**/*.map 
 *.css
 package-lock.json
+
+
+# yarn
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

tests_fixtures/workspace_template/.yo-rc-workspace.json

@@ -15,31 +15,37 @@
     "url": "[email protected]:datavisyn/visyn_scripts.git"
   },
   "scripts": {
-    "build": "npm run clean && npm run compile",
-    "clean": "rimraf build dist lib",
+    "all": "yarn run lint:fix && yarn run test && yarn run build && yarn run dist",
+    "build": "yarn run clean && yarn run compile && yarn run copy",
+    "clean": "visyn_scripts clean build dist lib",
     "compile:watch": "visyn_scripts compile --watch",
     "compile": "visyn_scripts compile",
     "copy": "visyn_scripts copy",
+    "cy:open": "cypress open",
+    "cy:run": "cypress run",
+    "delete-dependencies": "visyn_scripts clean node_modules",
+    "predist": "yarn run lint && yarn run test && yarn run build",
+    "dist": "mkdir lib && cd dist && tar cvzf ../lib/marketplace360.tar.gz *",
     "docs": "visyn_scripts docs",
     "lint:fix": "visyn_scripts lint --fix",
     "lint": "visyn_scripts lint",
-    "postcompile": "npm run copy",
-    "posttest": "npm run lint",
-    "prebuild": "npm run test",
-    "test:watch": "visyn_scripts test --watch",
-    "test": "visyn_scripts test"
+    "prepack": "yarn run build",
+    "start": "visyn_scripts start --env workspace_mode=single",
+    "storybook:build": "NODE_OPTIONS=--max_old_space_size=4096 build-storybook",
+    "storybook": "NODE_OPTIONS=--max_old_space_size=4096 start-storybook -p 6006",
+    "test": "visyn_scripts test",
+    "webpack:dev": "visyn_scripts build --mode development --env workspace_mode=single",
+    "webpack:prod": "visyn_scripts build --mode production --env workspace_mode=single"
   },
   "dependencies": {
-    "tdp_core": "git+ssh://[email protected]:datavisyn/tdp_core#visyn_scripts",
-    "visyn_scripts": "git+ssh://[email protected]:datavisyn/visyn_scripts#develop"
+    "tdp_core": "git+ssh://[email protected]:datavisyn/tdp_core#develop"
   },
-  "devDependencies": {},
   "visyn": {
     "entries": {
       "app": {
-        "js": "dist/index.initialize.js",
+        "js": "src/index.initialize.tsx",
         "html": "index.html",
-        "template": "dist/index.template.ejs",
+        "template": "src/index.template.ejs",
         "chunkName": "app",
         "excludeChunks": []
       }

tests_fixtures/workspace_template/demo/.gitignore

@@ -8,14 +8,20 @@
     "url": "https://www.datavisyn.io"
   },
   "scripts": {
-    "build": "visyn_scripts build --mode production",
     "build:demo": "cd demo && npm run build",
-    "copy:demo": "cd demo && npm run copy"
+    "copy:demo": "cd demo && npm run copy",
+    "delete-dependencies:demo": "cd demo && npm run delete-dependencies",
+    "postinstall": "npm-run-all --parallel 'delete-dependencies:*'",
+    "start": "visyn_scripts start",
+    "build": "npm run webpack:prod",
+    "webpack:dev": "visyn_scripts build --mode development",
+    "webpack:prod": "visyn_scripts build --mode production"
   },
   "dependencies": {
     "demo": "file:./demo"
   },
   "devDependencies": {
+    "npm-run-all": "^4.1.5",
     "visyn_scripts": "file:../../"
   }
 }