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.

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

Use SnarkyJS version of 0.9.* #376

Merged
merged 14 commits into from
Mar 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
npm run build --if-present
npm run test
cd templates/project-ts
npm ci || true
npm install || true
npm run test
env:
CI: true
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zkapp-cli",
"version": "0.7.2",
"version": "0.7.3",
"description": "CLI to create a zkApp (\"zero-knowledge app\") for Mina Protocol.",
"keywords": [
"cli",
Expand Down Expand Up @@ -45,7 +45,7 @@
"mina-signer": "^1.1.0",
"ora": "^5.4.1",
"shelljs": "^0.8.5",
"snarkyjs": "^0.9.2",
"snarkyjs": "0.9.*",
"table": "^6.8.0",
"yargs": "^17.5.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/lib/example.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ async function example(example) {
// `/dev/null` on linux or 'NUL' on windows is the only way to silence Husky's install log msg.
await step(
'NPM install',
`npm ci --silent > ${isWindows ? 'NUL' : '"/dev/null" 2>&1'}`
`npm install --silent > ${isWindows ? 'NUL' : '"/dev/null" 2>&1'}`
);

// process.cwd() is full path to user's terminal + path/to/name.
Expand Down
5 changes: 2 additions & 3 deletions src/lib/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,11 @@ async function project({ name, ui }) {
}

// `/dev/null` on Mac or Linux and 'NUL' on Windows is the only way to silence
// Husky's install log msg. (Note: The contract project template commits
// package-lock.json so we can use `npm ci` for faster installation.)
// Husky's install log msg.

await step(
'NPM install',
`npm ci --silent > ${isWindows ? 'NUL' : '"/dev/null" 2>&1'}`
`npm install --silent > ${isWindows ? 'NUL' : '"/dev/null" 2>&1'}`
);

// Build the template contract so it can be imported into the ui scaffold
Expand Down
2 changes: 1 addition & 1 deletion templates/project-ts/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v2
- name: NPM ci, build, & test
run: |
npm ci
npm install
npm run build --if-present
npm test
env:
Expand Down
4 changes: 2 additions & 2 deletions templates/project-ts/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ export default {
},
resolver: '<rootDir>/jest-resolver.cjs',
transformIgnorePatterns: [
'<rootDir>/node_modules/(?!snarkyjs/node_modules/tslib)',
'<rootDir>/node_modules/(?!(tslib|snarkyjs/node_modules/tslib))',
],
modulePathIgnorePatterns: ['<rootDir>/build/'],
moduleNameMapper: {
'^(\\.{1,2}/.+)\\.js$': '$1',
}
},
};
Loading