Skip to content

Commit

Permalink
feat: Add yarn@stable compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
wottpal committed Oct 13, 2023
1 parent 1839164 commit 07d8381
Show file tree
Hide file tree
Showing 7 changed files with 457 additions and 433 deletions.
6 changes: 6 additions & 0 deletions .changeset/rare-gifts-beam.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@inkathon/contracts': patch
'@inkathon/frontend': patch
---

Add compatability for using yarn (stable only, not classic v1) as the package manager. Note: npm is still not compatible as it lacks support for the workspace import protocol.
27 changes: 17 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# dependencies
# package management
**/node_modules
/.pnp
**/.pnp
.pnp.js

# yarn
.pnp.*
.yarn/*
yarn.lock
.yarnrc
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# misc
.DS_Store
Expand All @@ -21,10 +22,7 @@ yarn-error.log*

# local env files
.env
.env.local
.env.development.local
.env.test.local
.env.production.local
.env*.local

# vercel
.vercel
Expand All @@ -40,3 +38,12 @@ dist
# coverage
coverage
coverage.json

# VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-workspace
.history/
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
34 changes: 8 additions & 26 deletions contracts/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
### Rust ###

# Ignore build artifacts from the local tests sub-crate.
target/
debug/
Expand All @@ -12,21 +14,8 @@ Cargo.lock
# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb

# MacOS
.DS_Store


### Editors ###

# VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-workspace
.history/

# JetBrains
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
Expand Down Expand Up @@ -57,19 +46,6 @@ Cargo.lock
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

Expand Down Expand Up @@ -140,6 +116,12 @@ fabric.properties
# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
.idea/**/azureSettings.xml

### Custom ###

# misc
.DS_Store
*.pem

# Substrate Contracts Node Persistence Cache
.node-data

Expand Down
38 changes: 23 additions & 15 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
# package management
**/node_modules
**/.pnp
.pnp.js
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# testing
/coverage
Expand All @@ -16,21 +31,14 @@ next-env.d.ts
# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# local env files
.env
.env*.local

# vercel
.vercel
.gitsigners

# typescript
*.tsbuildinfo
dist
1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"@polkadot/util": "^12.5.1",
"@polkadot/util-crypto": "^12.5.1",
"@scio-labs/use-inkathon": "^0.0.8",
"framer-motion": "^10.16.4",
"next": "^13.5.4",
"next-seo": "^6.1.0",
"react": "^18.2.0",
Expand Down
Loading

0 comments on commit 07d8381

Please sign in to comment.