Skip to content

Commit

Permalink
Merge pull request #761 from LucidSamuel/lucid-patch
Browse files Browse the repository at this point in the history
fixed anonymous-board-message example
  • Loading branch information
barriebyron authored Dec 7, 2023
2 parents a8fadf3 + 615da0e commit ca54c72
Show file tree
Hide file tree
Showing 14 changed files with 4,671 additions and 4,903 deletions.
14 changes: 11 additions & 3 deletions examples/zkapps/anonymous-message-board/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,19 @@ module.exports = {
node: true,
jest: true,
},
extends: ['eslint:recommended', 'plugin:snarkyjs/recommended'],
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
'plugin:o1js/recommended',
],
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 'latest',
},
plugins: ['@typescript-eslint', 'snarkyjs'],
rules: {},
plugins: ['@typescript-eslint', 'o1js'],
rules: {
'no-constant-condition': 'off',
'prefer-const': 'off',
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
timeout-minutes: 10
steps:
- name: Set up NodeJS
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: '16'
- name: Git checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: NPM ci, build, & test
run: |
npm ci
npm install
npm run build --if-present
npm test
env:
Expand Down
4 changes: 0 additions & 4 deletions examples/zkapps/anonymous-message-board/.husky/pre-commit

This file was deleted.

3 changes: 3 additions & 0 deletions examples/zkapps/anonymous-message-board/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ src

# System
.DS_Store

# Never reveal your keys!
keys
2 changes: 1 addition & 1 deletion examples/zkapps/anonymous-message-board/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# zkApp: o1js Tutorial Message
# zkApp: Anonymous Message Board Tutorial

This template uses TypeScript.

Expand Down
2 changes: 1 addition & 1 deletion examples/zkapps/anonymous-message-board/config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": 1,
"networks": {}
"deployAliases": {}
}
4 changes: 2 additions & 2 deletions examples/zkapps/anonymous-message-board/jest-resolver.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ module.exports = (request, options) => {
return options.defaultResolver(request, {
...options,
packageFilter: (pkg) => {
// When importing snarkyjs, we specify the Node ESM import as Jest by default imports the web version
if (pkg.name === 'snarkyjs') {
// When importing o1js, we specify the Node ESM import as Jest by default imports the web version
if (pkg.name === 'o1js') {
return {
...pkg,
main: pkg.exports.node.import,
Expand Down
7 changes: 6 additions & 1 deletion examples/zkapps/anonymous-message-board/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ export default {
useESM: true,
},
},
testTimeout: 1_000_000,
transform: {
'^.+\\.(t)s$': 'ts-jest',
'^.+\\.(j)s$': 'babel-jest',
},
resolver: '<rootDir>/jest-resolver.cjs',
transformIgnorePatterns: [
'<rootDir>/node_modules/(?!snarkyjs/node_modules/tslib)',
'<rootDir>/node_modules/(?!(tslib|o1js/node_modules/tslib))',
],
modulePathIgnorePatterns: ['<rootDir>/build/'],
moduleNameMapper: {
'^(\\.{1,2}/.+)\\.js$': '$1',
},
};
Loading

1 comment on commit ca54c72

@vercel
Copy link

@vercel vercel bot commented on ca54c72 Dec 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

07-oracles – ./examples/zkapps/07-oracles/oracle

07-oracles-minadocs.vercel.app
07-oracles.vercel.app
07-oracles-git-main-minadocs.vercel.app

Please sign in to comment.