Merge pull request #6 from datavisyn/release-1.0.1

Release 1.0.1

.github/workflows/build.yml

@@ -4,5 +4,5 @@ on: [push, workflow_dispatch]
 
 jobs:
   build:
-    uses: datavisyn/github-workflows/.github/workflows/build-node.yml@node16
+    uses: datavisyn/github-workflows/.github/workflows/build-node.yml@main
     secrets: inherit

.github/workflows/publish.yml

@@ -0,0 +1,8 @@
+name: publish
+
+on: workflow_dispatch
+
+jobs:
+  publish:
+    uses: datavisyn/github-workflows/.github/workflows/publish-node.yml@main
+    secrets: inherit

bin/commands/generator/workspace/templates/processed/.vscode/launch.json

@@ -25,19 +25,13 @@
                 "port": 9222,
                 "request": "attach",
                 "type": "chrome",
-                "urlFilter": "http://localhost/*",
-                "sourceMapPathOverrides": {
-                    "webpack://<%- workspace %>/*": "${workspaceFolder}/*"
-                }
+                "urlFilter": "http://localhost/*"
           },
           {
                 "name": "Launch Chrome",
                 "request": "launch",
                 "type": "chrome",
-                "url": "http://localhost:8080",
-                "sourceMapPathOverrides": {
-                    "webpack://<%- workspace %>/*": "${workspaceFolder}/*"
-                }
+                "url": "http://localhost:8080"
           }
         ]
     }

config/tsconfig.template.json

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

config/webpack.config.js

@@ -407,6 +407,13 @@ module.exports = (env, argv) => {
           // match the requirements. When no loader matches it will fall
           // back to the "file" loader at the end of the loader list.
           oneOf: [
+            // Add ability to inline assets (like .md files) directly into the bundle.
+            // This is done by adding ?raw to the import, like import Content from './content.md?raw';
+            // See https://webpack.js.org/guides/asset-modules/#replacing-inline-loader-syntax for more details.
+            {
+              resourceQuery: /raw/,
+              type: 'asset/source',
+            },
             // "url" loader works like "file" loader except that it embeds assets
             // smaller than specified limit in bytes as data URLs to avoid requests.
             // A missing `test` is equivalent to a match.
@@ -732,5 +739,7 @@ module.exports = (env, argv) => {
           statsOptions: { source: false },
         }),
     ].filter(Boolean),
+    // Ignore some warnings, like failing to parse source maps
+    ignoreWarnings: [/Failed to parse source map/],
   };
 };

package.json

@@ -1,7 +1,7 @@
 {
   "name": "visyn_scripts",
   "description": "",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": {
     "name": "datavisyn GmbH",
     "email": "[email protected]",
@@ -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,11 @@
 node_modules/
 bundles/
-package-lock.json
+
+# yarn
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

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

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

tests_fixtures/workspace_template/demo/.gitignore

@@ -17,7 +17,6 @@ __pycache__/
 *.pot
 *.pyc
 *.swp
-*.lock
 # due to using tox and pytest
 .tox
 .cache
@@ -27,4 +26,13 @@ node_modules/
 /src/**/*.map
 /tests/**/*.map 
 *.css
-package-lock.json
+
+
+# yarn
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

tests_fixtures/workspace_template/demo/package.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#develop",
-    "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": []
       }