Skip to content

Commit

Permalink
chore: revert back to @pact-foundation scope
Browse files Browse the repository at this point in the history
  • Loading branch information
YOU54F committed Jul 14, 2024
1 parent 0347f6a commit 80b66a8
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 14 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# platform-arch specific packages
@you54f/*
@pact-foundation/*

# Logs
Expand Down
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Standalone Binaries - Published as seperate packages
@you54f/
@pact-foundation/

# Cross packaging files
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SHELL:=/bin/bash
export bin=@you54f/pact-core
export pkg_version=0.0.1
export bin=@pact-foundation/pact-core
export pkg_version=$(shell cat package.json | jq -r .version)
supported_platforms = "linux-x64" "linux-arm64" "darwin-x64" "darwin-arm64" "windows-x64"

# https://github.com/npm/npm/issues/17722
Expand All @@ -9,10 +9,10 @@ supported_platforms = "linux-x64" "linux-arm64" "darwin-x64" "darwin-arm64" "win
# https://blog.orhun.dev/packaging-rust-for-npm/

clean:
rm -rf @you54f
rm -rf @pact-foundation
npm run clean-libs
libs:
FETCH_ASSETS=true ./script/ci/check-release-libs.sh --fetch-assets -t v15.1.0
FETCH_ASSETS=true ./script/ci/check-release-libs.sh --fetch-assets -t v$(pkg_version)

all:
for supported_platform in $(supported_platforms); do \
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@you54f/pact-core",
"name": "@pact-foundation/pact-core",
"version": "15.1.0",
"description": "TEST - Core of @pact-foundation/pact. You almost certainly don't want to depend on this directly.",
"main": "src/index.js",
Expand Down Expand Up @@ -42,11 +42,11 @@
"access": "public"
},
"optionalDependencies": {
"@you54f/pact-core-darwin-arm64": "0.0.1",
"@you54f/pact-core-darwin-x64": "0.0.1",
"@you54f/pact-core-windows-x64": "0.0.1",
"@you54f/pact-core-linux-x64": "0.0.1",
"@you54f/pact-core-linux-arm64": "0.0.1"
"@pact-foundation/pact-core-darwin-arm64": "0.0.1",
"@pact-foundation/pact-core-darwin-x64": "0.0.1",
"@pact-foundation/pact-core-windows-x64": "0.0.1",
"@pact-foundation/pact-core-linux-x64": "0.0.1",
"@pact-foundation/pact-core-linux-arm64": "0.0.1"
},
"dependencies": {
"check-types": "7.3.0",
Expand Down
3 changes: 1 addition & 2 deletions src/ffi/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ function getPlatformArchSpecificPackage() {
if (['win32', 'cygwin'].includes(process.platform)) {
os = 'windows';
}
const platformArchSpecificPackage = `@you54f/pact-core-${os}-${arch}`;
// const platformArchSpecificPackage = `@pact-foundation/pact-core-${os}-${arch}`;
const platformArchSpecificPackage = `@pact-foundation/pact-core-${os}-${arch}`;
try {
require.resolve(`${platformArchSpecificPackage}/package.json`);
return platformArchSpecificPackage;
Expand Down

0 comments on commit 80b66a8

Please sign in to comment.