Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 0 additions & 86 deletions .circleci/config.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 8 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: publish

on: workflow_dispatch

jobs:
publish:
uses: datavisyn/github-workflows/.github/workflows/publish-node.yml@main
secrets: inherit
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
2 changes: 1 addition & 1 deletion config/tsconfig.template.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"module": "ES2020",
"target": "ES2019",
"target": "ES2021",
"importHelpers": true,
"sourceMap": true,
"declaration": true,
Expand Down
9 changes: 9 additions & 0 deletions config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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/],
};
};
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "visyn_scripts",
"description": "",
"version": "1.0.0",
"version": "1.0.1",
"author": {
"name": "datavisyn GmbH",
"email": "contact@datavisyn.io",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions tests/workspace.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
});
Expand Down
10 changes: 9 additions & 1 deletion tests_fixtures/workspace_template/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
node_modules/
bundles/
package-lock.json

# yarn
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
7 changes: 0 additions & 7 deletions tests_fixtures/workspace_template/.localdependenciesrc

This file was deleted.

783 changes: 783 additions & 0 deletions tests_fixtures/workspace_template/.yarn/releases/yarn-3.2.2.cjs

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions tests_fixtures/workspace_template/.yo-rc-workspace.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"defaultApp": "demo",
"modules": []
"defaultApp": "demo"
}
12 changes: 10 additions & 2 deletions tests_fixtures/workspace_template/demo/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ __pycache__/
*.pot
*.pyc
*.swp
*.lock
# due to using tox and pytest
.tox
.cache
Expand All @@ -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
30 changes: 18 additions & 12 deletions tests_fixtures/workspace_template/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,37 @@
"url": "git@github.com: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://git@github.com:datavisyn/tdp_core#develop",
"visyn_scripts": "git+ssh://git@github.com:datavisyn/visyn_scripts#develop"
"tdp_core": "git+ssh://git@github.com: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": []
}
Expand Down
Loading