Skip to content

ci: merge staging to master #398

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 3 commits into from
Apr 29, 2025
Merged

ci: merge staging to master #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d7a0f5
fix: fixed `wait-for-deploy.mjs` script
tegefaulkes Apr 29, 2025
770754c
fix: fixed build script supporting windows paths
tegefaulkes Apr 29, 2025
d28a82e
0.18.10
tegefaulkes Apr 29, 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-xRnHEVwU598REmAsVcghe44lzfJLQPkoXlTeHbt9WLM=
sha256-vWlgkQ7nOIkDrOYoWnRTietD9ofWGZahLBeD3dzhiZg=
4 changes: 2 additions & 2 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.

2 changes: 1 addition & 1 deletion 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.9",
"version": "0.18.10",
"homepage": "https://polykey.com",
"author": "Roger Qiu",
"contributors": [
Expand Down
16 changes: 8 additions & 8 deletions scripts/build.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const nativeNodeModulesPlugin = {
loader: 'js',
};
}
if (args.path.endsWith('fd-lock/index.js')) {
if (args.path.endsWith(path.join('fd-lock', 'index.js'))) {
return {
contents: `
const path = require('path');
Expand All @@ -59,7 +59,7 @@ const nativeNodeModulesPlugin = {
loader: 'js',
};
}
if (args.path.endsWith('sodium-native/index.js')) {
if (args.path.endsWith(path.join('sodium-native', 'index.js'))) {
return {
contents: `
const path = require('path');
Expand Down Expand Up @@ -132,7 +132,7 @@ async function main(argv = process.argv) {
? {
external: [],
format: 'cjs',
inject: [path.join(projectPath, './shims/import-meta-url-shim.mjs')],
inject: [path.join(projectPath, 'shims', 'import-meta-url-shim.mjs')],
// Fix import.meta.url in CJS output
define: {
'import.meta.url': '__import_meta_url',
Expand All @@ -142,7 +142,7 @@ async function main(argv = process.argv) {
: {
// External: externalDependencies,
format: 'esm',
inject: [path.join(projectPath, './shims/require-shim.mjs')],
inject: [path.join(projectPath, 'shims', 'require-shim.mjs')],
outExtension: { '.js': '.mjs' },
};

Expand Down Expand Up @@ -174,8 +174,8 @@ async function main(argv = process.argv) {
childProcess.execFileSync(
'mv',
[
`dist/polykeyWorkerManifest.${isPkg ? 'cjs' : 'mjs'}`,
'dist/polykeyWorkerManifest.js',
path.join('dist', `polykeyWorkerManifest.${isPkg ? 'cjs' : 'mjs'}`),
path.join('dist', 'polykeyWorkerManifest.js'),
],
{
stdio: ['inherit', 'inherit', 'inherit'],
Expand All @@ -187,8 +187,8 @@ async function main(argv = process.argv) {
childProcess.execFileSync(
'mv',
[
`dist/polykeyWorkerManifest.${isPkg ? 'cjs' : 'mjs'}.map`,
'dist/polykeyWorkerManifest.js.map',
path.join('dist', `polykeyWorkerManifest.${isPkg ? 'cjs' : 'mjs'}.map`),
path.join('dist', 'polykeyWorkerManifest.js.map'),
],
{
stdio: ['inherit', 'inherit', 'inherit'],
Expand Down
2 changes: 1 addition & 1 deletion scripts/wait-for-deploy.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env node
import process from 'node:process';
import childProcess from 'node:child_process';
import config from 'polykey/dist/config.js';
import config from 'polykey/config.js';

const versionTarget = config.version;
async function main(argv = process.argv) {
Expand Down