Skip to content
Open
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
14 changes: 10 additions & 4 deletions packages/actions/build.tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
{
"extends": "../../tsconfig.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"declaration": true,
"declarationDir": "dist/types",
"moduleResolution": "Node16"
"moduleResolution": "nodenext",
"module": "ESNext",
"outDir": "dist"
},
"include": ["src"],
"files": ["./hardhat.config.ts"]
"include": [
"src"
],
"files": [
"./hardhat.config.ts"
]
}
6 changes: 3 additions & 3 deletions packages/actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"main": "dist/index.node.js",
"types": "dist/types/src/index.d.ts",
"engines": {
"node": ">=16.14.0"
"node": ">=20.0.0"
},
"files": [
"dist/",
Expand All @@ -31,8 +31,8 @@
"circom"
],
"scripts": {
"build": "rimraf dist && rollup -c rollup.config.ts --configPlugin typescript",
"build:watch": "rollup -c rollup.config.ts -w --configPlugin typescript",
"build": "rimraf dist && rollup -c rollup.config.ts --configPlugin typescript --bundleConfigAsCjs",
"build:watch": "rollup -c rollup.config.ts -w --configPlugin typescript --bundleConfigAsCjs",
"pre:publish": "yarn build",
"compile:contracts": "hardhat compile",
"test:contracts": "GOOGLE_APPLICATION_CREDENTIALS=\"../backend/serviceAccountKey.json\" && NODE_ENV=prod && TS_NODE_FILES=true hardhat test test/unit/contract.test.ts",
Expand Down
8 changes: 5 additions & 3 deletions packages/actions/rollup.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as fs from "fs"
import typescript from "rollup-plugin-typescript2"
import typescript from "@rollup/plugin-typescript"
import cleanup from "rollup-plugin-cleanup"
import autoExternal from "rollup-plugin-auto-external"

Expand All @@ -13,7 +13,7 @@ const banner = `/**
* @see [Github]{@link ${pkg.homepage}}
*/`

export default {
const config = {
input: "src/index.ts",
output: [
{ file: pkg.exports.require, format: "cjs", banner, exports: "auto" },
Expand All @@ -24,8 +24,10 @@ export default {
autoExternal(),
(typescript as any)({
tsconfig: "./build.tsconfig.json",
useTsconfigDeclarationDir: true
sourceMap: true
}),
cleanup({ comments: "jsdoc" })
]
}

export default config
13 changes: 10 additions & 3 deletions packages/actions/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,15 @@
"compilerOptions": {
"baseUrl": ".",
"skipLibCheck": true,
"moduleResolution": "Node16"
"moduleResolution": "nodenext",
"module": "nodenext"
},
"include": ["src/**/*", "test/**/*", "rollup.config.ts"],
"files": ["./hardhat.config.ts"]
"include": [
"src/**/*",
"test/**/*",
"rollup.config.ts"
],
"files": [
"./hardhat.config.ts"
]
}
7 changes: 5 additions & 2 deletions packages/backend/build.tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"baseUrl": ".",
"declaration": true,
"declarationDir": "dist/types",
"moduleResolution": "Node16"
"moduleResolution": "node",
"module": "esnext"
},
"include": ["src"]
"include": [
"src"
]
}
8 changes: 4 additions & 4 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"types": "dist/types/types/index.d.ts",
"engines": {
"node": "16"
"node": "20"
},
"files": [
"dist/",
Expand All @@ -32,8 +32,8 @@
"circom"
],
"scripts": {
"build": "rimraf dist && rollup -c rollup.config.ts --configPlugin typescript",
"build:watch": "rollup -c rollup.config.ts -w --configPlugin typescript",
"build": "rimraf dist && rollup -c rollup.config.ts --configPlugin typescript --bundleConfigAsCjs",
"build:watch": "rollup -c rollup.config.ts -w --configPlugin typescript --bundleConfigAsCjs",
"firebase:login": "firebase login",
"firebase:logout": "firebase logout",
"firebase:init": "firebase init",
Expand All @@ -51,13 +51,13 @@
},
"devDependencies": {
"@firebase/rules-unit-testing": "^2.0.7",
"@rollup/plugin-typescript": "^11.1.6",
"@types/rollup-plugin-auto-external": "^2.0.2",
"@types/uuid": "^9.0.1",
"firebase-functions-test": "^3.1.0",
"firebase-tools": "^12.0.0",
"rollup-plugin-auto-external": "^2.0.0",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-typescript2": "^0.34.1",
"typescript": "^5.0.4"
},
"dependencies": {
Expand Down
3 changes: 1 addition & 2 deletions packages/backend/rollup.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as fs from "fs"
import typescript from "rollup-plugin-typescript2"
import typescript from "@rollup/plugin-typescript"
import cleanup from "rollup-plugin-cleanup"
import autoExternal from "rollup-plugin-auto-external"

Expand All @@ -23,7 +23,6 @@ export default {
autoExternal(),
(typescript as any)({
tsconfig: "./build.tsconfig.json",
useTsconfigDeclarationDir: true
}),
cleanup({ comments: "jsdoc" })
]
Expand Down
9 changes: 7 additions & 2 deletions packages/backend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
"compilerOptions": {
"baseUrl": ".",
"skipLibCheck": true,
"moduleResolution": "Node16"
"moduleResolution": "node",
"module": "commonjs"
},
"include": ["src/**/*", "test/**/*", "rollup.config.ts"]
"include": [
"src/**/*",
"test/**/*",
"rollup.config.ts"
]
}
6 changes: 4 additions & 2 deletions packages/phase2cli/build.tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
"baseUrl": ".",
"target": "es2020",
"module": "ESNext",
"moduleResolution": "Node16",
"moduleResolution": "nodenext",
"allowSyntheticDefaultImports": true,
"declaration": true,
"declarationDir": "dist/types"
},
"include": ["src"]
"include": [
"src"
]
}
2 changes: 1 addition & 1 deletion packages/phase2cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"scripts": {
"build": "rimraf dist && rollup -c rollup.config.ts --configPlugin typescript",
"build:watch": "rollup -c rollup.config.ts -w --configPlugin typescript",
"start": "ts-node --esm ./src/index.ts",
"start": "node --loader ts-node/esm ./src/index.ts",
"auth": "yarn start auth",
"auth:siwe": "yarn start auth-siwe",
"auth:bandada": "yarn start auth-bandada",
Expand Down
9 changes: 6 additions & 3 deletions packages/phase2cli/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
"compilerOptions": {
"baseUrl": ".",
"target": "es2020",
"module": "ESNext",
"moduleResolution": "Node16",
"module": "nodenext",
"moduleResolution": "nodenext",
"skipLibCheck": true,
"allowSyntheticDefaultImports": true
},
"include": ["src/**/*", "rollup.config.ts"]
"include": [
"src/**/*",
"rollup.config.ts"
]
}
13 changes: 9 additions & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"strict": true,
"target": "ESNext",
"module": "ESNext",
"moduleResolution": "node",
"moduleResolution": "nodenext",
"esModuleInterop": true,
"resolveJsonModule": true,
"preserveConstEnums": true,
Expand All @@ -13,15 +13,20 @@
"declarationMap": true,
"allowSyntheticDefaultImports": true,
"declarationDir": "types",
"typeRoots": ["node_modules/@types", "types"],
"typeRoots": [
"node_modules/@types",
"types"
],
"paths": {
"@p0tion/*": ["packages/*/src"]
"@p0tion/*": [
"packages/*/src"
]
}
},
"ts-node": {
"compilerOptions": {
"target": "esnext",
"module": "commonjs"
"module": "nodenext"
}
}
}
Loading