Skip to content

Commit

Permalink
Merge branch 'release/v3.0-stable'
Browse files Browse the repository at this point in the history
  • Loading branch information
JOU-amjs committed Jul 22, 2024
2 parents f80ad81 + 9f60e81 commit 22b905a
Show file tree
Hide file tree
Showing 9 changed files with 368 additions and 198 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<img width="200px" src="https://alova.js.org/img/logo-text-vertical.svg" />
</p>

<p align="center"><b>Creative next-generation request tools, Extremely improve your API using efficiency and save brainpower
Just one step</b></p>
<p align="center"><b>Creative next-generation request tools.<br />Extremely improve your API using efficiency and save brainpower Just one step</b></p>

<p align="center">English | <a href="./README.zh-CN.md">Chinese</a></p>

Expand Down
2 changes: 1 addition & 1 deletion README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<img width="200px" src="https://alova.js.org/img/logo-text-vertical.svg" />
</p>

<p align="center"><b>创新的下一代请求工具极致地提升你的API接入效率,节约大脑,仅需一步</b></p>
<p align="center"><b>创新的下一代请求工具<br />极致地提升你的API接入效率,节约大脑,仅需一步</b></p>

<p align="center"><a href="./README.md">📑English</a> | 中文</p>

Expand Down
14 changes: 7 additions & 7 deletions examples/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@
"preview": "vite preview"
},
"dependencies": {
"@alova/mock": "beta",
"@alova/mock": "latest",
"@nordhealth/components": "^3.14.1",
"@nordhealth/css": "^3.2.1",
"alova": "beta",
"alova": "latest",
"clsx": "^2.1.1",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"trix": "^2.1.2"
"trix": "^2.1.3"
},
"devDependencies": {
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"autoprefixer": "^10.4.19",
"eslint": "^8.57.0",
"eslint-plugin-react": "^7.34.3",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.8",
"eslint-plugin-react-refresh": "^0.4.9",
"postcss": "^8.4.39",
"tailwindcss": "^3.4.4",
"vite": "^5.3.3"
"tailwindcss": "^3.4.6",
"vite": "^5.3.4"
}
}
4 changes: 2 additions & 2 deletions examples/server/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { createNodeSharedCacheSynchronizer } from '@alova/psc';
import { createNodePSCSynchronizer } from '@alova/psc';
import cluster from 'cluster';

const processesNumber = 3;
if (cluster.isPrimary) {
console.log('Master starting...');
// ensure start synchronizer in master process
createNodeSharedCacheSynchronizer();
createNodePSCSynchronizer();
for (let i = 0; i < processesNumber; i++) {
cluster.fork();
}
Expand Down
14 changes: 7 additions & 7 deletions examples/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
"@types/body-parser": "^1.19.5",
"@types/express": "^4.17.21",
"@types/hbs": "^4.0.4",
"@types/node": "^20.12.7",
"nodemon": "^3.0.3",
"@types/node": "^20.14.11",
"nodemon": "^3.1.4",
"ts-node": "^10.9.2",
"typescript": "^5.4.5"
"typescript": "^5.5.3"
},
"dependencies": {
"@alova/mock": "workspace:*",
"@alova/psc": "workspace:*",
"alova": "workspace:*",
"@alova/mock": "latest",
"@alova/psc": "latest",
"alova": "latest",
"body-parser": "^1.20.2",
"express": "^4.19.2",
"hbs": "^4.0.4"
"hbs": "^4.2.0"
}
}
4 changes: 2 additions & 2 deletions examples/server/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import retryRouter from './routes/retry';

const app = express();
const port = 3000;
const sourceBranch = 'next';
const sourceBranch = 'main';
const pkgName = 'server';

// disable Keep-Alive to random hit different process
Expand All @@ -27,7 +27,7 @@ hbs.registerPartials(__dirname + '/views/partials');
// set global variable
app.use((_, res, next) => {
res.locals.sourceUrl = `https://github.com/alovajs/alova/blob/${sourceBranch ? `${sourceBranch}/` : ''}examples/${pkgName}/routes`;
res.locals.docUrl = `https://alova.js.org${sourceBranch ? `/${sourceBranch}` : ''}`;
res.locals.docUrl = `https://alova.js.org`;
next();
});

Expand Down
12 changes: 6 additions & 6 deletions examples/svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
"preview": "vite preview"
},
"dependencies": {
"@alova/mock": "beta",
"@alova/mock": "latest",
"@nordhealth/components": "^3.14.1",
"@nordhealth/css": "^3.2.1",
"alova": "beta",
"alova": "latest",
"clsx": "^2.1.1",
"svelte": "^4.2.18",
"trix": "^2.1.2"
"trix": "^2.1.3"
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^3.1.1",
"autoprefixer": "^10.4.19",
"eslint-plugin-svelte": "^2.41.0",
"eslint-plugin-svelte": "^2.43.0",
"postcss": "^8.4.39",
"tailwindcss": "^3.4.4",
"vite": "^5.3.3"
"tailwindcss": "^3.4.6",
"vite": "^5.3.4"
}
}
8 changes: 4 additions & 4 deletions examples/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"@nordhealth/components": "^3.14.1",
"@nordhealth/css": "^3.2.1",
"alova": "beta",
"trix": "^2.1.2",
"vue": "^3.4.31"
"trix": "^2.1.3",
"vue": "^3.4.33"
},
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.5",
Expand All @@ -23,7 +23,7 @@
"eslint-config-standard": "^17.1.0",
"eslint-plugin-vue": "^9.27.0",
"postcss": "^8.4.39",
"tailwindcss": "^3.4.4",
"vite": "^5.3.3"
"tailwindcss": "^3.4.6",
"vite": "^5.3.4"
}
}
Loading

0 comments on commit 22b905a

Please sign in to comment.