diff --git a/.github/workflows/bug-server.yml b/.github/workflows/bug-server.yml deleted file mode 100644 index a846966d..00000000 --- a/.github/workflows/bug-server.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Bug Server CI - -# 这里业务方根据需求设置 -on: - push: - branches: ['main'] - pull_request: - branches: ['main', 'develop', 'dev/**'] - -jobs: - build: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [18.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - - steps: - - uses: actions/checkout@v3 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - cache: 'npm' - cache-dependency-path: './common/config/rush/pnpm-lock.yaml' - - - name: Print All Github Environment Variables - run: env - - - name: Install rush - run: node common/scripts/install-run-rush.js install --bypass-policy - - - name: Build vutils-extension - run: node common/scripts/install-run-rush.js build --only @visactor/vutils-extension - - - name: Build VChart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js run -p @visactor/vchart -s build:ci - - - name: Run CI - working-directory: ./packages/vchart - env: - BUG_SERVER_TOKEN: ${{ secrets.BUG_SERVER_TOKEN }} - run: node ../../common/scripts/install-run-rushx.js ci diff --git a/.github/workflows/hotfix-release.yml b/.github/workflows/hotfix-release.yml deleted file mode 100644 index 573ecadc..00000000 --- a/.github/workflows/hotfix-release.yml +++ /dev/null @@ -1,124 +0,0 @@ -name: hotfix release CI - -on: - push: - branches: - - 'hotfix/[0-9]+.[0-9]+.[0-9]+' - -jobs: - build: - runs-on: macOS-latest - permissions: - contents: write - pull-requests: write - - strategy: - matrix: - node-version: [18.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - - steps: - - uses: actions/checkout@v3 - - run: | - git config user.name ${{ github.actor }} - git config user.email ${{ github.actor }}@users.noreply.github.com - - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - cache: 'npm' - cache-dependency-path: './common/config/rush/pnpm-lock.yaml' - - # Install rush - - name: Install rush - run: node common/scripts/install-run-rush.js install --bypass-policy - - - name: Parse semver version from branch name - id: semver_parser - uses: xile611/read-package-version-action@main - with: - path: packages/vchart - semver_string: ${{ github.ref_name }} - semver_pattern: '^hotfix/(.*)$' # ^v?(.*)$ by default - - - name: update nextBump of version policies - uses: xile611/set-next-bump-of-rush@main - with: - release_version: ${{ steps.semver_parser.outputs.full }} - write_next_bump: true - - - name: Update version - run: node common/scripts/install-run-rush.js version --bump - - - name: Build vutils-extension && vchart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js build --to @visactor/vchart - - # run bugserver after the build of main packages - - name: Run Bugserver - working-directory: ./packages/vchart - env: - BUG_SERVER_TOKEN: ${{ secrets.BUG_SERVER_TOKEN }} - run: node ../../common/scripts/install-run-rushx.js ci - - - name: Build react-vchart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js build --only @visactor/react-vchart - - - name: Build taro-vchart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js build --only @visactor/taro-vchart - - - name: Build lark-vchart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js build --only @visactor/lark-vchart - - - name: Build wx-vchart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js build --only @visactor/wx-vchart - - - name: Publish to npm - env: - NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} - NPM_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} - run: node common/scripts/install-run-rush.js publish --publish --include-all --tag hotfix - - - name: Update shrinkwrap - run: node common/scripts/install-run-rush.js update - - - name: Get npm version - id: package-version - uses: xile611/read-package-version-action@main - with: - path: packages/vchart - - - name: Commit & Push changes - run: | - git add . - git commit -m 'build: prelease version ${{ steps.package-version.outputs.current_version }}' -n - git push origin ${{ github.ref_name }} - - - name: Collect changelog of rush - uses: xile611/collect-rush-changlog@main - id: changelog - with: - version: ${{ steps.package-version.outputs.current_version }} - - - name: Create Release for Tag - id: release_tag - uses: ncipollo/release-action@v1.12.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag: v${{ steps.package-version.outputs.current_version }} - commit: ${{ github.ref_name }} - prerelease: false - body: | - ${{ steps.changelog.outputs.markdown }} - draft: true # diff --git a/.github/workflows/label.yml b/.github/workflows/labeler.yml similarity index 100% rename from .github/workflows/label.yml rename to .github/workflows/labeler.yml diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index c1f7857e..e37a6348 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -37,7 +37,7 @@ jobs: id: semver_parser uses: xile611/read-package-version-action@main with: - path: packages/vchart + path: packages/vmind semver_string: ${{ github.ref_name }} semver_pattern: '^pre-release/(.*)$' # ^v?(.*)$ by default @@ -49,16 +49,6 @@ jobs: NODE_OPTIONS: '--max_old_space_size=4096' run: node common/scripts/install-run-rush.js build --only tag:package - - name: Build lark-vchart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js build --only @visactor/lark-vchart - - - name: Build wx-vchart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js build --only @visactor/wx-vchart - - name: Publish to npm env: NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} @@ -72,7 +62,7 @@ jobs: id: package-version uses: xile611/read-package-version-action@main with: - path: packages/vchart + path: packages/vmind - name: Commit & Push changes uses: actions-js/push@master diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 74d4b9a0..0e041622 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: id: semver_parser uses: xile611/read-package-version-action@main with: - path: packages/vchart + path: packages/vmind semver_string: ${{ github.ref_name }} semver_pattern: '^release/(.*)$' # ^v?(.*)$ by default @@ -51,37 +51,10 @@ jobs: - name: Update version run: node common/scripts/install-run-rush.js version --bump - - name: Build vutils-extension && vchart + - name: Build packages env: NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js build --to @visactor/vchart - - # run bugserver after the build of main packages - - name: Run Bugserver - working-directory: ./packages/vchart - env: - BUG_SERVER_TOKEN: ${{ secrets.BUG_SERVER_TOKEN }} - run: node ../../common/scripts/install-run-rushx.js ci - - - name: Build react-vchart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js build --only @visactor/react-vchart - - - name: Build taro-vchart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js build --only @visactor/taro-vchart - - - name: Build lark-vchart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js build --only @visactor/lark-vchart - - - name: Build wx-vchart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js build --only @visactor/wx-vchart + run: node common/scripts/install-run-rush.js build --only tag:package - name: Publish to npm env: @@ -96,7 +69,7 @@ jobs: id: package-version uses: xile611/read-package-version-action@main with: - path: packages/vchart + path: packages/vmind - name: Commit & Push changes run: | diff --git a/.github/workflows/size-limit.yml b/.github/workflows/size-limit.yml deleted file mode 100644 index 32acb707..00000000 --- a/.github/workflows/size-limit.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: 'size' - -on: - pull_request: - branches: ['main', 'develop', 'dev/**'] - -jobs: - size: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18.x] - - steps: - - uses: actions/checkout@v1 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - cache: 'npm' - cache-dependency-path: './common/config/rush/pnpm-lock.yaml' - - - name: Install rush - run: node common/scripts/install-run-rush.js install --bypass-policy - - - name: Build vutils-extension - run: node common/scripts/install-run-rush.js build --only @visactor/vutils-extension - - - name: Build VChart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js run -p @visactor/vchart -s build:ci - - # action below will calculate pr base branch without skip_step which might cause error - # - uses: andresz1/size-limit-action@v1 - # with: - # github_token: ${{ secrets.GITHUB_TOKEN }} - # directory: packages/vchart/ - # skip_step: build - - name: Size Limit - run: | - cd packages/vchart - npm run size diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index a029fc90..4595279c 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -23,7 +23,7 @@ jobs: days-before-stale: 730 days-before-close: 7 stale-issue-message: 'This issue has been automatically marked as stale because it did not have recent activity. It will be closed in 7 days if no further activity occurs. If you wish not to mark it as stale, please leave a comment in this issue.' - close-issue-message: 'This issue has been automatically closed because it did not have recent activity. If this remains to be a problem with the latest version of @VisActor/VChart, please open a new issue and link this to it. Thanks!' + close-issue-message: 'This issue has been automatically closed because it did not have recent activity. If this remains to be a problem with the latest version of @VisActor/VMind, please open a new issue and link this to it. Thanks!' close-issue-reason: 'not_planned' stale-issue-label: 'stale_issue' stale-pr-message: 'This PR has been automatically marked as stale because it has not had recent activity. It will be closed in 7 days if no further activity occurs. If you wish not to mark it as stale, please leave a comment in this PR. We are sorry for this but 2 years is a long time and the code base has been changed a lot. Thanks for your contribution anyway.' diff --git a/.github/workflows/sync-main-to-develop.yml b/.github/workflows/sync-main-to-develop.yml index 356cac98..ca1f370d 100644 --- a/.github/workflows/sync-main-to-develop.yml +++ b/.github/workflows/sync-main-to-develop.yml @@ -42,7 +42,7 @@ jobs: id: package-version uses: xile611/read-package-version-action@main with: - path: packages/vchart + path: packages/vmind - name: Create a new branch run: | diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index bdf746ba..7bfb55d4 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -30,12 +30,7 @@ jobs: # Install rush - name: Install rush run: node common/scripts/install-run-rush.js install --bypass-policy - - name: Build vutils-extension - run: node common/scripts/install-run-rush.js build --only @visactor/vutils-extension - - name: Build VChart - env: - NODE_OPTIONS: '--max_old_space_size=4096' - run: node common/scripts/install-run-rush.js run -p @visactor/vchart -s build:ci + - name: Compile run: node common/scripts/install-run-rush.js compile --only tag:package - name: Test diff --git a/.gitignore b/.gitignore index 716c4993..1222cc77 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,7 @@ cjs build build-es5 *.zip - +packages/calculator/lib *.zip stats.html @@ -101,3 +101,5 @@ docs/public/documents # env files .env.local +packages/calculator/tsconfig.cjs.tsbuildinfo +packages/calculator/tsconfig.esm.tsbuildinfo diff --git a/common/config/rush/command-line.json b/common/config/rush/command-line.json index 43f5ac1d..88e6e667 100644 --- a/common/config/rush/command-line.json +++ b/common/config/rush/command-line.json @@ -87,21 +87,14 @@ "commandKind": "global", "name": "start", "summary": "Start the development server", - "description": "Run this command to start vchart development server", - "shellCommand": "rush run -p @visactor/vchart -s start" - }, - { - "commandKind": "global", - "name": "react", - "summary": "Start the development server of react-vchart demo", - "description": "Run this command to start react-vchart development server", - "shellCommand": "rush run -p @visactor/react-vchart -s start" + "description": "Run this command to start VMind development server", + "shellCommand": "rush run -p @visactor/vmind -s start" }, { "commandKind": "global", "name": "vmind", - "summary": "Start the development server of react-vchart demo", - "description": "Run this command to start react-vchart development server", + "summary": "Start the development server", + "description": "Run this command to start VMind development server", "shellCommand": "rush run -p @visactor/vmind -s start" }, { @@ -119,13 +112,6 @@ "summary": "Start the document development server", "description": "Run this command to start document development server", "shellCommand": "rush run -p @internal/docs -s start" - }, - { - "commandKind": "global", - "name": "types", - "summary": "Build the types of vchart", - "description": "Run this command to build the types of vchart", - "shellCommand": "rush run -p @visactor/vchart -s build:types" } ], "parameters": [ @@ -176,7 +162,9 @@ "longName": "--message", "shortName": "-m", "description": "Write a message for change", - "associatedCommands": ["change-all"], + "associatedCommands": [ + "change-all" + ], "argumentName": "MESSAGE", "required": false }, @@ -185,7 +173,9 @@ "longName": "--not-commit", "shortName": "-n", "description": "not commit after run rush change", - "associatedCommands": ["change-all"], + "associatedCommands": [ + "change-all" + ], "required": false }, { @@ -193,7 +183,9 @@ "longName": "--type", "shortName": "-t", "description": "The bump type of change: major, minor, patch, none", - "associatedCommands": ["change-all"], + "associatedCommands": [ + "change-all" + ], "alternatives": [ { "name": "patch", diff --git a/common/scripts/hotfix-release.js b/common/scripts/hotfix-release.js index 9cecc351..a4b840a6 100644 --- a/common/scripts/hotfix-release.js +++ b/common/scripts/hotfix-release.js @@ -16,12 +16,12 @@ function run() { let hotfixType = ''; const cwd = process.cwd(); const rushJson = getPackageJson(path.join(__dirname, '../../rush.json')); - const package = rushJson.projects.find((project) => project.packageName === '@visactor/vchart'); - + const package = rushJson.projects.find((project) => project.packageName === '@visactor/vmind'); + if (!package) { return; } - const pkgJsonPath = path.join( __dirname, '../../', package.projectFolder, 'package.json') + const pkgJsonPath = path.join(__dirname, '../../', package.projectFolder, 'package.json') const pkgJson = getPackageJson(pkgJsonPath) const currentVersion = pkgJson.version; const preReleaseName = ''; @@ -64,10 +64,6 @@ function run() { stdio: 'inherit', shell: false, }); - spawnSync('sh', ['-c', `rush build --only @visactor/lark-vchart`], { - stdio: 'inherit', - shell: false, - }); // 3. publish to npm spawnSync('sh', ['-c', `rush publish --publish --include-all --tag ${hotfixType}`], { @@ -82,7 +78,7 @@ function run() { }); if (package) { - const pkgJsonPath = path.join( __dirname, '../../', package.projectFolder, 'package.json') + const pkgJsonPath = path.join(__dirname, '../../', package.projectFolder, 'package.json') const pkgJson = getPackageJson(pkgJsonPath) // 5. add the the changes diff --git a/common/scripts/pre-release.js b/common/scripts/pre-release.js index 407f9650..dac9064f 100644 --- a/common/scripts/pre-release.js +++ b/common/scripts/pre-release.js @@ -18,14 +18,14 @@ function run() { let preReleaseType = ''; const cwd = process.cwd(); const rushJson = getPackageJson(path.join(__dirname, '../../rush.json')); - const package = rushJson.projects.find((project) => project.packageName === '@visactor/vchart'); + const package = rushJson.projects.find((project) => project.packageName === '@visactor/vmind'); let regRes = null; if (typeof preReleaseName === 'string' && preReleaseName && (regRes = preReleaseNameReg.exec(preReleaseName))) { preReleaseType = regRes[2]; } else if (!preReleaseName) { if (package) { - const pkgJsonPath = path.join( __dirname, '../../', package.projectFolder, 'package.json') + const pkgJsonPath = path.join(__dirname, '../../', package.projectFolder, 'package.json') const pkgJson = getPackageJson(pkgJsonPath) const currentVersion = pkgJson.version; @@ -60,10 +60,6 @@ function run() { stdio: 'inherit', shell: false, }); - spawnSync('sh', ['-c', `rush build --only @visactor/lark-vchart`], { - stdio: 'inherit', - shell: false, - }); // 3. publish to npm spawnSync('sh', ['-c', `rush publish --publish --include-all --tag ${preReleaseType}`], { @@ -78,7 +74,7 @@ function run() { }); if (package) { - const pkgJsonPath = path.join( __dirname, '../../', package.projectFolder, 'package.json') + const pkgJsonPath = path.join(__dirname, '../../', package.projectFolder, 'package.json') const pkgJson = getPackageJson(pkgJsonPath) // 5. add the the changes diff --git a/common/scripts/release.js b/common/scripts/release.js index e29a6719..ca28a779 100644 --- a/common/scripts/release.js +++ b/common/scripts/release.js @@ -30,10 +30,6 @@ function run() { stdio: 'inherit', shell: false, }); - spawnSync('sh', ['-c', `rush build --only @visactor/lark-vchart`], { - stdio: 'inherit', - shell: false, - }); // 3. publish to npm spawnSync('sh', ['-c', 'rush publish --publish --include-all'], { @@ -48,10 +44,10 @@ function run() { }); const rushJson = getPackageJson(path.join(__dirname, '../../rush.json')); - const package = rushJson.projects.find((project) => project.name === '@visactor/vchart'); + const package = rushJson.projects.find((project) => project.name === '@visactor/vmind'); if (package) { - const pkgJsonPath = path.join( __dirname, '../../', project.projectFolder, 'package.json') + const pkgJsonPath = path.join(__dirname, '../../', project.projectFolder, 'package.json') const pkgJson = getPackageJson(pkgJsonPath) // 5. add tag diff --git a/common/scripts/set-prerelease-version.js b/common/scripts/set-prerelease-version.js index 664642e7..6b8e50f2 100644 --- a/common/scripts/set-prerelease-version.js +++ b/common/scripts/set-prerelease-version.js @@ -8,12 +8,12 @@ const setJsonFileByKey = require('./set-json-file'); function writePrereleaseVersion(nextBump, preReleaseName, nextVersionStr, buildName) { const rushJson = getPackageJson(path.join(__dirname, '../../rush.json')); const projects = rushJson.projects; - const mainPackage = projects.find((project) => project.packageName === '@visactor/vchart'); + const mainPackage = projects.find((project) => project.packageName === '@visactor/vmind'); if (!mainPackage) { return; } - + const mainPkgJsonPath = path.join(__dirname, '../../', mainPackage.projectFolder, 'package.json') const mainPkgJson = getPackageJson(mainPkgJsonPath) const mainVersion = mainPkgJson.version; @@ -53,7 +53,7 @@ function writePrereleaseVersion(nextBump, preReleaseName, nextVersionStr, buildN console.log(`next version is ${nextVersion}`); projects.forEach(project => { - const pkgJsonPath = path.join( __dirname, '../../', project.projectFolder, 'package.json') + const pkgJsonPath = path.join(__dirname, '../../', project.projectFolder, 'package.json') let jsonFile = fs.readFileSync(pkgJsonPath, { encoding: 'utf-8' }) const pkgJson = JSON.parse(jsonFile); @@ -85,8 +85,8 @@ function writePrereleaseVersion(nextBump, preReleaseName, nextVersionStr, buildN fs.writeFileSync(pkgJsonPath, jsonFile) }); - + } -module.exports = writePrereleaseVersion; \ No newline at end of file +module.exports = writePrereleaseVersion; diff --git a/common/scripts/version-policies.js b/common/scripts/version-policies.js index c7925718..ef4f9151 100644 --- a/common/scripts/version-policies.js +++ b/common/scripts/version-policies.js @@ -15,11 +15,11 @@ const parseNextBumpFromVersion = ( ) => { const res = parseVersion(versionString); - if (res) { + if (res) { if (res.patch === 0) { return res.minor == 0 ? MAJOR : MINOR; } - + return PATCH } @@ -43,34 +43,34 @@ const writeNextBump = ( } const readNextBumpFromChanges = () => { - const changeRoot = path.join(__dirname, '../changes/@visactor/vchart'); + const changeRoot = path.join(__dirname, '../changes/@visactor/vmind'); const filenames = fs.readdirSync(changeRoot); if (filenames && filenames.length) { - const changeType = []; + const changeType = []; - filenames.forEach(fileName => { - const json = JSON.parse(fs.readFileSync(path.join(changeRoot, fileName)).toString()); + filenames.forEach(fileName => { + const json = JSON.parse(fs.readFileSync(path.join(changeRoot, fileName)).toString()); - if (json.changes && json.changes.length) { - json.changes.forEach(change => { - if (change.type && !changeType.includes(change.type)) { - changeType.push(change.type); - } - }) - } - }); + if (json.changes && json.changes.length) { + json.changes.forEach(change => { + if (change.type && !changeType.includes(change.type)) { + changeType.push(change.type); + } + }) + } + }); - return changeType.includes(MAJOR) ? MAJOR : changeType.includes(MINOR) ? MINOR : PATCH; - } else { - process.exit(1); - } + return changeType.includes(MAJOR) ? MAJOR : changeType.includes(MINOR) ? MINOR : PATCH; + } else { + process.exit(1); + } } const checkAndUpdateNextBump = (version) => { let nextBump = PATCH; - if (version && NEXT_BUMPMS.includes(version)) { + if (version && NEXT_BUMPMS.includes(version)) { nextBump = version; } else if (version) { nextBump = parseNextBumpFromVersion(version); diff --git a/packages/calculator/jest.config.ts b/packages/calculator/jest.config.ts new file mode 100644 index 00000000..3d2d6023 --- /dev/null +++ b/packages/calculator/jest.config.ts @@ -0,0 +1,32 @@ +module.exports = { + preset: 'ts-jest', + runner: 'jest-electron/runner', + testEnvironment: 'jest-electron/environment', + testMatch: ['/src/**/*.test.(ts|tsx)'], + silent: true, + globals: { + 'ts-jest': { + isolatedModules: true, + resolveJsonModule: true, + esModuleInterop: true, + experimentalDecorators: true, + module: 'ESNext', + tsconfig: './tsconfig.test.json' + } + }, + verbose: true, + collectCoverage: true, + coverageReporters: ['json-summary', 'lcov', 'text'], + coveragePathIgnorePatterns: ['node_modules', '__tests__', 'interface.ts', '.d.ts', 'typings', 'vite'], + collectCoverageFrom: [ + '**/src/**', + '!**/cjs/**', + '!**/build/**', + '!**/esm/**', + '!**/node_modules/**', + '!**/__tests__/**', + '!**/types/**', + '!**/interface.ts', + '!**/vite/**' + ] +}; diff --git a/packages/calculator/tsconfig.json b/packages/calculator/tsconfig.json index e92b6048..655834fb 100644 --- a/packages/calculator/tsconfig.json +++ b/packages/calculator/tsconfig.json @@ -2,7 +2,7 @@ "extends": "@internal/ts-config/tsconfig.base.json", "compilerOptions": { "declaration": true, //Generates corresponding d.ts files. - + "composite": true, "baseUrl": ".", "rootDir": "src", "outDir": "es", diff --git a/packages/calculator/tsconfig.test.json b/packages/calculator/tsconfig.test.json new file mode 100644 index 00000000..e68bcbbf --- /dev/null +++ b/packages/calculator/tsconfig.test.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "paths": { + } + }, + "references": [] +} diff --git a/packages/vmind/jest.config.js b/packages/vmind/jest.config.js index d9d660da..b9b8e822 100644 --- a/packages/vmind/jest.config.js +++ b/packages/vmind/jest.config.js @@ -5,7 +5,7 @@ module.exports = { preset: 'ts-jest', runner: 'jest-electron/runner', testEnvironment: 'jest-electron/environment', - testMatch: ['/src/**/*.test.(js|ts)'], + testMatch: ['/__tests__/unit/*.test.(js|ts)'], silent: true, globals: { 'ts-jest': { diff --git a/packages/vmind/package.json b/packages/vmind/package.json index e56651f2..cfedba4e 100644 --- a/packages/vmind/package.json +++ b/packages/vmind/package.json @@ -56,9 +56,8 @@ "react": "^18.0.0", "react-dom": "^18.0.0", "react-router-dom": "6.9.0", - "@visactor/vchart": "1.9.0", - "@visactor/vrender-core": "0.17.19", - "@visactor/vutils-extension": "1.9.0", + "@visactor/vchart": "^1.9.0", + "@visactor/vrender-core": "^0.17.19", "@rollup/plugin-dynamic-import-vars": "~2.1.0", "@ffmpeg/core": "^0.11.0", "@ffmpeg/ffmpeg": "^0.11.6", @@ -68,7 +67,7 @@ }, "dependencies": { "@visactor/chart-advisor": "0.1.10", - "@visactor/vrender-core": "0.17.19", + "@visactor/vrender-core": "^0.17.19", "@visactor/vdataset": "~0.17.4", "@visactor/vutils": "~0.17.4", "axios": "^1.4.0", diff --git a/rush.json b/rush.json index 37b8399d..93434047 100644 --- a/rush.json +++ b/rush.json @@ -67,7 +67,7 @@ { "packageName": "@visactor/calculator", "projectFolder": "packages/calculator", - "shouldPublish": false, + "shouldPublish": true, "tags": [ "package" ]