Skip to content

Commit

Permalink
Merge branch 'master' into electronTests
Browse files Browse the repository at this point in the history
# Conflicts:
#	pnpm-lock.yaml
  • Loading branch information
Bartel-C8 committed Dec 6, 2022
2 parents 7a5e488 + 1e17ee3 commit cb40129
Show file tree
Hide file tree
Showing 3 changed files with 125 additions and 0 deletions.
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"type": "git",
"url": "https://github.com/zeromq/zeromq.js.git"
},
"homepage": "http://zeromq.github.io/zeromq.js/",
"dependencies": {
"@aminya/node-gyp-build": "4.5.0-aminya.4",
"cross-env": "^7.0.3",
Expand All @@ -41,6 +42,7 @@
"eslint-config-atomic": "^1.18.1",
"eslint-plugin-prettier": "^4.2.1",
"fs-extra": "^10.1.0",
"gh-pages": "^4.0.0",
"minify-all-cli": "^1.0.13",
"mocha": "^10.1.0",
"node-gyp": "^9.3.0",
Expand Down Expand Up @@ -84,6 +86,7 @@
"build.script": "tsc -p ./script/tsconfig.json",
"build.js": "run-p build.script build.library",
"build.doc": "typedoc --options ./typedoc.json --tsconfig ./tsconfig.docs.json && minify-all -s docs-raw -d docs --jsCompressor terser",
"deploy.doc": "run-s build.doc && gh-pages --dist \"./docs\"",
"prebuild": "run-s build.js && node ./script/prebuild.js",
"build.native": "node-gyp configure --release && node-gyp build --release",
"build.native.debug": "cross-env CMAKE_BUILD_TYPE=Debug node-gyp configure --debug && cross-env CMAKE_BUILD_TYPE=Debug node-gyp build --debug",
Expand Down
121 changes: 121 additions & 0 deletions pnpm-lock.yaml

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

1 change: 1 addition & 0 deletions typedoc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"src/errors.ts",
"src/util.ts"
],
"cleanOutputDir": true,
"pretty": false,
"githubPages": true
}

0 comments on commit cb40129

Please sign in to comment.