Skip to content

Commit

Permalink
Merge branch 'main' into template/vue3_ts
Browse files Browse the repository at this point in the history
  • Loading branch information
@keyding
keyding authored Aug 8, 2024
2 parents c1e318f + a3988b7 commit 636a389
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 26 deletions.
13 changes: 7 additions & 6 deletions packages/create-app/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,12 @@ const templates = [
display: '[dapp] svelte + express.js',
color: magenta,
},
{
name: 'nextjs-dapp',
display: '[dapp] next.js',
color: blue,
},
// FIXME: @zhanghan add this template in the future
// {
// name: 'nextjs-dapp',
// display: '[dapp] next.js',
// color: blue,
// },
// {
// name: 'react-gun-dapp',
// display: '[dapp] react + gun.js + express.js',
Expand Down Expand Up @@ -305,7 +306,7 @@ async function init() {

const scaffoldSpinner = ora('Creating project...\n').start();
// name 是用户输入的项目名称
let name = packageName || targetDir;
let name = projectName || packageName || targetDir;
if (['.', './'].includes(name)) {
name = defaultProjectName;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/create-app/templates/express-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"license": "ISC",
"dependencies": {
"@arcblock/did-auth-storage-nedb": "^1.7.1",
"@blocklet/sdk": "^1.16.28",
"@blocklet/sdk": "^1.16.29",
"@ocap/client": "^1.18.128",
"dotenv-flow": "^4.1.0",
"express": "^4.19.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/create-app/templates/nestjs-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"dependencies": {
"@arcblock/did-auth-storage-nedb": "^1.7.1",
"@blocklet/sdk": "^1.16.28",
"@blocklet/sdk": "^1.16.29",
"@nestjs/common": "^10.3.9",
"@nestjs/core": "^10.3.9",
"@nestjs/platform-express": "^10.3.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-app/templates/nextjs-dapp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"dependencies": {
"@arcblock/did-auth": "^1.18.128",
"@arcblock/did-auth-storage-nedb": "^1.7.1",
"@blocklet/sdk": "^1.16.28",
"@blocklet/sdk": "^1.16.29",
"@ocap/client": "^1.18.128",
"@ocap/mcrypto": "^1.18.128",
"@ocap/wallet": "^1.18.128",
Expand Down
4 changes: 2 additions & 2 deletions packages/create-app/templates/react-dapp-ts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"dependencies": {
"@arcblock/did-auth": "^1.18.128",
"@arcblock/did-auth-storage-nedb": "^1.7.1",
"@blocklet/sdk": "^1.16.28",
"@blocklet/sdk": "^1.16.29",
"@ocap/client": "^1.18.128",
"@ocap/mcrypto": "^1.18.128",
"@ocap/wallet": "^1.18.128",
Expand All @@ -54,7 +54,7 @@
"devDependencies": {
"@arcblock/eslint-config": "^0.3.2",
"@arcblock/eslint-config-ts": "^0.3.2",
"@blocklet/js-sdk": "^1.16.28",
"@blocklet/js-sdk": "^1.16.29",
"@types/cookie-parser": "^1.4.7",
"@types/cors": "^2.8.17",
"@types/dotenv-flow": "^3.3.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/create-app/templates/react-dapp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"dependencies": {
"@arcblock/did-auth": "^1.18.128",
"@arcblock/did-auth-storage-nedb": "^1.7.1",
"@blocklet/sdk": "^1.16.28",
"@blocklet/sdk": "^1.16.29",
"@ocap/client": "^1.18.128",
"@ocap/mcrypto": "^1.18.128",
"@ocap/wallet": "^1.18.128",
Expand All @@ -55,7 +55,7 @@
},
"devDependencies": {
"@arcblock/eslint-config": "^0.3.2",
"@blocklet/js-sdk": "^1.16.28",
"@blocklet/js-sdk": "^1.16.29",
"@vitejs/plugin-react": "^4.3.1",
"bumpp": "^9.4.1",
"cross-env": "^7.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-app/templates/react-gun-dapp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"dependencies": {
"@arcblock/did-auth": "^1.18.128",
"@arcblock/did-auth-storage-nedb": "^1.7.1",
"@blocklet/sdk": "^1.16.28",
"@blocklet/sdk": "^1.16.29",
"@ocap/client": "^1.18.128",
"@ocap/mcrypto": "^1.18.128",
"@ocap/wallet": "^1.18.128",
Expand Down
4 changes: 2 additions & 2 deletions packages/create-app/templates/solidjs-dapp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"license": "MIT",
"devDependencies": {
"@blocklet/js-sdk": "^1.16.28",
"@blocklet/js-sdk": "^1.16.29",
"bumpp": "^9.4.1",
"cross-env": "^7.0.3",
"eslint": "^8.57.0",
Expand All @@ -42,7 +42,7 @@
"dependencies": {
"@arcblock/did-auth": "^1.18.128",
"@arcblock/did-auth-storage-nedb": "^1.7.1",
"@blocklet/sdk": "^1.16.28",
"@blocklet/sdk": "^1.16.29",
"@ocap/client": "^1.18.128",
"@ocap/mcrypto": "^1.18.128",
"@ocap/wallet": "^1.18.128",
Expand Down
4 changes: 2 additions & 2 deletions packages/create-app/templates/svelte-dapp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"@arcblock/did-auth": "^1.18.128",
"@arcblock/did-auth-storage-nedb": "^1.7.1",
"@blocklet/sdk": "^1.16.28",
"@blocklet/sdk": "^1.16.29",
"@ocap/client": "^1.18.128",
"@ocap/mcrypto": "^1.18.128",
"@ocap/wallet": "^1.18.128",
Expand All @@ -31,7 +31,7 @@
"express-async-errors": "^3.1.1"
},
"devDependencies": {
"@blocklet/js-sdk": "^1.16.28",
"@blocklet/js-sdk": "^1.16.29",
"@sveltejs/vite-plugin-svelte": "3.1.1",
"bumpp": "^9.4.1",
"cross-env": "^7.0.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/create-app/templates/todo-list-example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"dependencies": {
"@arcblock/did-auth": "^1.18.128",
"@arcblock/did-auth-storage-nedb": "^1.7.1",
"@blocklet/sdk": "^1.16.28",
"@blocklet/sdk": "^1.16.29",
"@did-space/client": "^0.5.11",
"@did-space/core": "^0.5.11",
"@ocap/client": "^1.18.128",
Expand All @@ -56,12 +56,12 @@
"nanoid": "^5.0.7"
},
"devDependencies": {
"@arcblock/did-connect": "^2.10.12",
"@arcblock/did-connect": "^2.10.13",
"@arcblock/eslint-config": "^0.3.2",
"@arcblock/eslint-config-ts": "^0.3.2",
"@arcblock/ux": "^2.10.12",
"@blocklet/js-sdk": "^1.16.28",
"@blocklet/ui-react": "^2.10.12",
"@arcblock/ux": "^2.10.13",
"@blocklet/js-sdk": "^1.16.29",
"@blocklet/ui-react": "^2.10.13",
"@emotion/react": "^11.13.0",
"@emotion/styled": "^11.13.0",
"@mui/icons-material": "^5.15.21",
Expand Down
4 changes: 2 additions & 2 deletions packages/create-app/templates/vue-dapp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"dependencies": {
"@arcblock/did-auth": "^1.18.128",
"@arcblock/did-auth-storage-nedb": "^1.7.1",
"@blocklet/sdk": "^1.16.28",
"@blocklet/sdk": "^1.16.29",
"@ocap/client": "^1.18.128",
"@ocap/mcrypto": "^1.18.128",
"@ocap/wallet": "^1.18.128",
Expand All @@ -33,7 +33,7 @@
"express-async-errors": "^3.1.1"
},
"devDependencies": {
"@blocklet/js-sdk": "^1.16.28",
"@blocklet/js-sdk": "^1.16.29",
"@vitejs/plugin-vue": "^5.1.1",
"bumpp": "^9.4.1",
"cross-env": "^7.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-app/templates/vue2-dapp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"dependencies": {
"@arcblock/did-auth": "^1.18.128",
"@arcblock/did-auth-storage-nedb": "^1.7.1",
"@blocklet/sdk": "^1.16.28",
"@blocklet/sdk": "^1.16.29",
"@ocap/client": "^1.18.128",
"@ocap/mcrypto": "^1.18.128",
"@ocap/wallet": "^1.18.128",
Expand Down

0 comments on commit 636a389

Please sign in to comment.