Skip to content

ci: merge staging to master #387

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.

Sign up for GitHub

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

Merged
maxwell-aiden merged 2 commits into from
Apr 17, 2025
Merged

ci: merge staging to master #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f3cae9
fix: renamed esbuild output to use `.mjs` file extension
tegefaulkes Apr 17, 2025
11ce719
0.18.3
tegefaulkes Apr 17, 2025
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 npmDepsHash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sha256-b41SjcnhID/H62BKsam9NPExCnyU1b1gjMZCoCqbtjY=
sha256-seF0UmaonXcbXIQQMq1ZrtoYm1GmIwfK2+lUZB12jYU=
202 changes: 4 additions & 198 deletions package-lock.json
View file
Open in desktop

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

14 changes: 6 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "polykey-cli",
"version": "0.18.2",
"version": "0.18.3",
"homepage": "https://polykey.com",
"author": "Roger Qiu",
"contributors": [
Expand Down Expand Up @@ -75,8 +75,8 @@
"#*": "./build/*"
},
"bin": {
"polykey": "dist/polykey.js",
"pk": "dist/polykey.js"
"polykey": "dist/polykey.mjs",
"pk": "dist/polykey.mjs"
},
"pkg": {
"assets": [
Expand Down Expand Up @@ -105,7 +105,7 @@
"node_modules/sodium-native/prebuilds/win32-x64/node.napi.node"
],
"scripts": [
"dist/polykeyWorkerManifest.js"
"dist/polykeyWorkerManifest.mjs"
]
},
"scripts": {
Expand All @@ -121,9 +121,8 @@
"lint-shell": "find ./src ./tests ./scripts -type f -regextype posix-extended -regex '.*\\.(sh)' -exec shellcheck {} +",
"docs": "shx rm -rf ./docs && typedoc --gitRevision master --tsconfig ./tsconfig.build.json --out ./docs src",
"pkg": "node ./scripts/pkg.mjs",
"polykey": "ts-node src/polykey.ts",
"start": "ts-node src/polykey.ts -- agent start --verbose",
"dev": "nodemon src/polykey.ts -- agent start --verbose"
"polykey": "node dist/polykey.mjs",
"start": "node dist/polykey.mjs -- agent start --verbose"
},
"optionalDependencies": {
"@matrixai/db": "*",
Expand Down Expand Up @@ -165,7 +164,6 @@
"mocked-env": "^1.3.5",
"nexpect": "^0.6.0",
"node-gyp-build": "^4.8.4",
"nodemon": "^3.0.1",
"polykey": "^2.0.4",
"prettier": "^3.0.0",
"shelljs": "^0.8.5",
Expand Down
1 change: 1 addition & 0 deletions scripts/build.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ async function main(argv = process.argv) {
// Supporting ESM
format: 'esm',
inject: [path.join(projectPath, './shims/require-shim.mjs')],
outExtension: { '.js': '.mjs' },
};
console.error('Running esbuild:');
console.error(esbuildOptions);
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/exec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const tsConfigPath = path.resolve(
);

const polykeyPath = path.resolve(
path.join(globalThis.projectDir ?? '', 'dist/polykey.js'),
path.join(globalThis.projectDir ?? '', 'dist/polykey.mjs'),
);

const generateDockerArgs = (mountPath: string) => [
Expand Down
Loading