Skip to content

Commit

Permalink
refactor: move src to packages/web
Browse files Browse the repository at this point in the history
  • Loading branch information
uyarn committed Jan 25, 2025
1 parent 46cedda commit f16c72e
Show file tree
Hide file tree
Showing 15 changed files with 1,881 additions and 1,878 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ script/test/cypress
_site
temp*
static/
src/_common
packages/web/_common
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ cypress-coverage
instrumented
cy-report
.history
src/**/_example-js/
packages/web/**/_example-js/
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"lint:tsc": "tsc -p ./tsconfig.dev.json ",
"generate:usage": "node script/generate-usage/index.js",
"generate:coverage-badge": "npm run test:coverage && node script/generate-coverage.js",
"generate:jsx-demo": "npx babel src/**/_example --extensions '.tsx' --config-file ./babel.config.demo.js --relative --out-dir ../_example-js --out-file-extension=.jsx",
"format:jsx-demo": "npx eslint src/**/_example-js/*.jsx --fix && npx prettier --write src/**/_example-js/*.jsx",
"generate:jsx-demo": "npx babel packages/web/**/_example --extensions '.tsx' --config-file ./babel.config.demo.js --relative --out-dir ../_example-js --out-file-extension=.jsx",
"format:jsx-demo": "npx eslint packages/web/**/_example-js/*.jsx --fix && npx prettier --write packages/web/**/_example-js/*.jsx",
"test": "vitest run && npm run test:snap",
"test:ui": "vitest --ui",
"test:snap": "cross-env NODE_ENV=test-snap vitest run",
Expand Down
6 changes: 3 additions & 3 deletions script/generate-usage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ export default function Usage() {
`;
// 自动化生成 live demo 脚本
function genUsage() {
for (let name of Object.keys(config)) {
for (const name of Object.keys(config)) {
try {
const fileFolderPath = path.resolve(__dirname, `../../src/${name}/_usage`);
const fileFolderPath = path.resolve(__dirname, `../../packages/web/${name}/_usage`);
fs.mkdirSync(fileFolderPath);
} catch {}

try {
const data = renderUsageStr(config[name]);
const filePath = path.resolve(__dirname, `../../src/${name}/_usage/index.jsx`);
const filePath = path.resolve(__dirname, `../../packages/web/${name}/_usage/index.jsx`);
fs.writeFileSync(filePath, prettier.format(data, { parser: 'babel', tabWidth: 2 }));
} catch (err) {
console.error(`${name} usage 组件生成失败...`, err);
Expand Down
6 changes: 3 additions & 3 deletions site/plugin-tdoc/md-to-react.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ async function customRender({ source, file, md }) {
};

// md filename
const reg = file.match(/src\/(\w+-?\w+)\/(\w+-?\w+)\.?(\w+-?\w+)?\.md/);
const reg = file.match(/packages\/web\/(\w+-?\w+)\/(\w+-?\w+)\.?(\w+-?\w+)?\.md/);
const componentName = reg && reg[1];

// split md
Expand All @@ -221,7 +221,7 @@ async function customRender({ source, file, md }) {
const usageObj = compileUsage({
componentName,
usage: pageData.usage,
demoPath: path.posix.resolve(__dirname, `../../src/${componentName}/_usage/index.jsx`),
demoPath: path.posix.resolve(__dirname, `../../packages/web/${componentName}/_usage/index.jsx`),
});
if (usageObj) {
mdSegment.usage = usageObj;
Expand All @@ -247,7 +247,7 @@ async function customRender({ source, file, md }) {

// 设计指南内容 不展示 design Tab 则不解析
if (pageData.isComponent && pageData.tdDocTabs.some((item) => item.tab === 'design')) {
const designDocPath = path.resolve(__dirname, `../../src/_common/docs/web/design/${componentName}.md`);
const designDocPath = path.resolve(__dirname, `../../packages/web/_common/docs/web/design/${componentName}.md`);

if (fs.existsSync(designDocPath)) {
const designDocLastUpdated =
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/Demo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import Button from 'tdesign-react/button';
import { Link, useLocation } from 'react-router-dom';

export const demoFiles = import.meta.glob('../../../src/**/_example/*.tsx', { eager: true });
export const demoFiles = import.meta.glob('../../../packages/web/**/_example/*.tsx', { eager: true });

const demoObject = {};
Object.keys(demoFiles).forEach((key) => {
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/Playground.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ReactDOM from 'react-dom';
import Button from 'tdesign-react/button';
import 'tdesign-react/style/index.js';

const demoFiles = import.meta.glob('../../../src/**/_example/*.jsx', { eager: true });
const demoFiles = import.meta.glob('../../../packages/web/**/_example/*.jsx', { eager: true });
const demoObject = {};
const componentList = new Set();
Object.keys(demoFiles).forEach((key) => {
Expand Down
2 changes: 1 addition & 1 deletion site/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default ({ mode }) =>
'@': resolvePath('../'),
'@site': resolvePath('./'),
'@docs': resolvePath('./docs'),
'@components': resolvePath('./packages/web'),
'@components': resolvePath('./src/components'),
'@common': resolvePath('../packages/web/_common'),
'tdesign-react/es': resolvePath('../packages/web'),
'tdesign-react': resolvePath('../packages/web'),
Expand Down
4 changes: 2 additions & 2 deletions test/config/cypress.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"baseUrl": "http://127.0.0.1:15000",
"integrationFolder": "./",
"componentFolder": "./src",
"testFiles": ["./src/**/*.spec.*"],
"componentFolder": "./packages/web",
"testFiles": ["./packages/web/**/*.spec.*"],
"fileServerFolder": "test/scripts/cypress",
"fixturesFolder": "test/scripts/cypress/fixtures",
"pluginsFile": "test/scripts/cypress/plugins/index.js",
Expand Down
10 changes: 5 additions & 5 deletions test/config/jest.base.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ module.exports = {
collectCoverage: true,
coverageReporters: ['json', 'html'],
testURL: 'http://localhost/',
testPathIgnorePatterns: ['/node_modules/', '.history', '<rootDir>/src/_common'],
testPathIgnorePatterns: ['/node_modules/', '.history', '<rootDir>/packages/web/_common'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.json',
babelConfig: true,
},
},
collectCoverageFrom: [
'<rootDir>/src/**/*.{ts,tsx,js,jsx}',
'<rootDir>/packages/web/**/*.{ts,tsx,js,jsx}',
'!**/node_modules/**',
'!**/_common/**',
'!**/__tests__/**',
Expand All @@ -38,10 +38,10 @@ module.exports = {
// 测试工具便捷引入
'^@test/(.*)': '<rootDir>/test/$1',
// 组件 alias
'^tdesign-react/es': '<rootDir>/src',
'^tdesign-react(.*)': '<rootDir>/src$1',
'^tdesign-react/es': '<rootDir>/packages/web',
'^tdesign-react(.*)': '<rootDir>/packages/web$1',
// common
"^@common/(.*)": "<rootDir>/src/_common/$1",
'^@common/(.*)': '<rootDir>/packages/web/_common/$1',
},
watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
};
2 changes: 1 addition & 1 deletion test/config/jest.unit.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ module.exports = {
],
coverageDirectory: '<rootDir>/test/unit/coverage',
modulePathIgnorePatterns: ['<rootDir>/test/unit/coverage/'],
testMatch: ['<rootDir>/src/**/__tests__/**/*.test.{ts,tsx}'],
testMatch: ['<rootDir>/packages/web/**/__tests__/**/*.test.{ts,tsx}'],
};
Loading

0 comments on commit f16c72e

Please sign in to comment.