Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: generated project uses Nx 18 #60

Merged
merged 1 commit into from
Apr 22, 2024
Merged

feat: generated project uses Nx 18 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"@clack/prompts": "^0.7.0",
"@inquirer/prompts": "^4.3.0",
"@nx/devkit": "18.1.3",
"@nx/devkit": "18.3.3",
"@solana/web3.js": "^1.91.1",
"@swc/helpers": "~0.5.7",
"commander": "^11.1.0",
Expand All @@ -30,33 +30,33 @@
"yargs": "^17.7.2"
},
"devDependencies": {
"@nx/eslint": "18.1.3",
"@nx/eslint-plugin": "18.1.3",
"@nx/jest": "18.1.3",
"@nx/js": "18.1.3",
"@nx/next": "18.1.3",
"@nx/plugin": "18.1.3",
"@nx/react": "18.1.3",
"@nx/webpack": "18.1.3",
"@nx/workspace": "18.1.3",
"@nx/eslint": "^18.3.3",
"@nx/eslint-plugin": "18.3.3",
"@nx/jest": "18.3.3",
"@nx/js": "18.3.3",
"@nx/next": "18.3.3",
"@nx/plugin": "18.3.3",
"@nx/react": "18.3.3",
"@nx/webpack": "18.3.3",
"@nx/workspace": "18.3.3",
"@swc-node/register": "~1.9.0",
"@swc/cli": "~0.3.10",
"@swc/core": "~1.4.11",
"@types/jest": "^29.5.12",
"@types/node": "20.11.30",
"@typescript-eslint/eslint-plugin": "7.4.0",
"@typescript-eslint/parser": "7.4.0",
"@typescript-eslint/eslint-plugin": "7.7.0",
"@typescript-eslint/parser": "7.7.0",
"eslint": "8.57.0",
"eslint-config-prettier": "^9.1.0",
"husky": "^9.0.11",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^15.2.2",
"nx": "18.1.3",
"nx": "18.3.3",
"prettier": "^2.6.2",
"ts-jest": "^29.1.2",
"ts-node": "^10.9.2",
"typescript": "5.3.3",
"typescript": "5.4.5",
"verdaccio": "^5.30.2"
},
"lint-staged": {
Expand Down
6 changes: 3 additions & 3 deletions packages/create-solana-dapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"description": "Get up and running fast with Solana dApps",
"dependencies": {
"@clack/prompts": "^0.7.0",
"@nx/devkit": "17.2.7",
"@nx/devkit": "18.3.3",
"commander": "^11.1.0",
"create-nx-workspace": "17.2.7",
"nx": "17.2.7",
"create-nx-workspace": "18.3.3",
"nx": "18.3.3",
"tmp": "0.2.1",
"tslib": "^2.3.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/preset-anchor/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This library is a preset for [create-solana-dapp](https://npm.im/create-solana-d
```bash
NX generate @solana-developers/preset-anchor:anchor-application [name] [options,...]

From: @solana-developers/preset-anchor (v0.0.1)
From: @solana-developers/preset-anchor
Name: anchor-application (aliases: application, preset)

Generate an Anchor application
Expand All @@ -29,7 +29,7 @@ Options:
```bash
NX generate @solana-developers/preset-anchor:anchor-template [name] [options,...]

From: @solana-developers/preset-anchor (v0.0.1)
From: @solana-developers/preset-anchor
Name: anchor-template (aliases: template)

Generate an Anchor template
Expand Down
1 change: 1 addition & 0 deletions packages/preset-anchor/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ export default {
},
moduleFileExtensions: ['ts', 'js', 'html'],
coverageDirectory: '../../coverage/packages/preset-anchor',
testEnvironment: 'node',
}
6 changes: 3 additions & 3 deletions packages/preset-anchor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"version": "0.0.1",
"description": "This library is a preset for create-solana-dapp that adds anchor support to your project.",
"dependencies": {
"@nx/devkit": "17.2.7",
"@nx/js": "17.2.7",
"@nx/jest": "17.2.7",
"@nx/devkit": "18.3.3",
"@nx/js": "18.3.3",
"@nx/jest": "18.3.3",
"@solana-developers/preset-common": "*",
"@solana/web3.js": "^1.90.0",
"tslib": "^2.3.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-anchor/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"command": "npm dist-tag add @solana-developers/preset-anchor@{args.ver} {args.tag}"
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
Expand Down
14 changes: 6 additions & 8 deletions ...src/generators/anchor-application/__snapshots__/anchor-application-generator.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,8 @@ exports[`anchor-application generator should generate app with "basic" template
""version": "0.0.1",",
""dependencies": {",
""@coral-xyz/anchor": "^0.30.0",",
""@solana/web3.js": "1.90.0"",
""@solana/web3.js": "1.91.7"",
"},",
""type": "commonjs",",
""main": "./index.cjs",",
""module": "./index.js",",
""private": true",
Expand Down Expand Up @@ -277,6 +276,7 @@ exports[`anchor-application generator should generate app with "basic" template
""$schema": "../node_modules/nx/schemas/project-schema.json",",
""sourceRoot": "anchor-app/src",",
""projectType": "library",",
""tags": [],",
""targets": {",
""build": {",
""executor": "@nx/rollup:rollup",",
Expand Down Expand Up @@ -325,8 +325,7 @@ exports[`anchor-application generator should generate app with "basic" template
""jestConfig": "anchor-app/jest.config.ts"",
"}",
"}",
"},",
""tags": []",
"}",
"}",
],
"isBinary": false,
Expand Down Expand Up @@ -741,9 +740,8 @@ exports[`anchor-application generator should generate app with "counter" templat
""version": "0.0.1",",
""dependencies": {",
""@coral-xyz/anchor": "^0.30.0",",
""@solana/web3.js": "1.90.0"",
""@solana/web3.js": "1.91.7"",
"},",
""type": "commonjs",",
""main": "./index.cjs",",
""module": "./index.js",",
""private": true",
Expand Down Expand Up @@ -868,6 +866,7 @@ exports[`anchor-application generator should generate app with "counter" templat
""$schema": "../node_modules/nx/schemas/project-schema.json",",
""sourceRoot": "anchor-app/src",",
""projectType": "library",",
""tags": [],",
""targets": {",
""build": {",
""executor": "@nx/rollup:rollup",",
Expand Down Expand Up @@ -916,8 +915,7 @@ exports[`anchor-application generator should generate app with "counter" templat
""jestConfig": "anchor-app/jest.config.ts"",
"}",
"}",
"},",
""tags": []",
"}",
"}",
],
"isBinary": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-common/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ presets.
```bash
NX generate @solana-developers/preset-common:common-template [name] [options,...]

From: @solana-developers/preset-common (v0.0.1)
From: @solana-developers/preset-common
Name: common-template

Generate Common templates
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.1",
"description": "This library is a preset for create-solana-dapp with shared code for the other presets.",
"dependencies": {
"@nx/devkit": "18.1.3",
"@nx/devkit": "18.3.3",
"ts-morph": "^22.0.0",
"tslib": "^2.3.0"
},
Expand Down
20 changes: 10 additions & 10 deletions packages/preset-common/src/utils/package-versions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@ export const packageVersion = {
anchor: '^0.30.0',
},
'@tailwindcss': {
typography: '0.5.10',
typography: '0.5.12',
},
'@solana': {
'spl-token': '0.4.1',
'spl-token': '0.4.6',
'wallet-adapter-base': '^0.9.23',
'wallet-adapter-react': '^0.15.35',
'wallet-adapter-react-ui': '^0.9.35',
'web3.js': '1.90.0',
'web3.js': '1.91.7',
},
'@swc-node': {
core: '1.12.0',
register: '1.8.0',
core: '1.13.0',
register: '1.9.0',
},
'@tabler': {
'icons-react': '2.47.0',
'icons-react': '3.2.0',
},
'@tanstack': {
'react-query': '5.24.1',
'react-query-next-experimental': '5.24.1',
'react-query': '5.31.0',
'react-query-next-experimental': '5.31.0',
},
'react-hot-toast': '2.4.1',
'crypto-browserify': '3.12.0',
'stream-browserify': '3.0.0',
bs58: '5.0.0',
buffer: '6.0.3',
daisyui: '4.7.2',
daisyui: '4.10.2',
encoding: '0.1.13',
jotai: '2.6.5',
jotai: '2.8.0',
}
4 changes: 2 additions & 2 deletions packages/preset-next/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This library is a preset for [create-solana-dapp](https://npm.im/create-solana-d
```bash
NX generate @solana-developers/preset-next:next-application [name] [options,...]

From: @solana-developers/preset-next (v0.0.1)
From: @solana-developers/preset-next
Name: next-application (aliases: application, preset)

Generate a Next.js application
Expand All @@ -37,7 +37,7 @@ Options:
```bash
NX generate @solana-developers/preset-next:next-template [name] [options,...]

From: @solana-developers/preset-next (v0.0.1)
From: @solana-developers/preset-next
Name: next-template (aliases: template)

Generate a Next.js template
Expand Down
10 changes: 5 additions & 5 deletions packages/preset-next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"version": "0.0.1",
"description": "This library is a preset for create-solana-dapp that adds next.js support to your project.",
"dependencies": {
"@nx/devkit": "17.2.7",
"@nx/jest": "17.2.7",
"@nx/js": "17.2.7",
"@nx/linter": "17.2.7",
"@nx/next": "17.2.7",
"@nx/devkit": "18.3.3",
"@nx/jest": "18.3.3",
"@nx/js": "18.3.3",
"@nx/eslint": "18.3.3",
"@nx/next": "18.3.3",
"@solana-developers/preset-anchor": "*",
"@solana-developers/preset-common": "*",
"@solana-developers/preset-react": "*",
Expand Down
Loading
Loading