diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index cb24501..455ccd6 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -8,9 +8,6 @@ on: jobs: build: runs-on: ubuntu-latest - defaults: - run: - working-directory: safe-chain steps: - name: Checkout code @@ -30,12 +27,6 @@ jobs: version="${{ github.ref_name }}" echo "tag=$version" >> $GITHUB_OUTPUT - - name: Add docs - run: | - cp ../README.md ./README.md - cp ../LICENSE ./LICENSE - cp -r ../docs ./docs - - name: Set the version run: npm --no-git-tag-version version ${{ steps.get_version.outputs.tag }} diff --git a/.npmignore b/.npmignore new file mode 100644 index 0000000..72f297f --- /dev/null +++ b/.npmignore @@ -0,0 +1,5 @@ + +.github +.claude +test/e2e + diff --git a/safe-chain/bin/aikido-npm.js b/bin/aikido-npm.js similarity index 100% rename from safe-chain/bin/aikido-npm.js rename to bin/aikido-npm.js diff --git a/safe-chain/bin/aikido-npx.js b/bin/aikido-npx.js similarity index 100% rename from safe-chain/bin/aikido-npx.js rename to bin/aikido-npx.js diff --git a/safe-chain/bin/aikido-pnpm.js b/bin/aikido-pnpm.js similarity index 100% rename from safe-chain/bin/aikido-pnpm.js rename to bin/aikido-pnpm.js diff --git a/safe-chain/bin/aikido-pnpx.js b/bin/aikido-pnpx.js similarity index 100% rename from safe-chain/bin/aikido-pnpx.js rename to bin/aikido-pnpx.js diff --git a/safe-chain/bin/aikido-yarn.js b/bin/aikido-yarn.js similarity index 100% rename from safe-chain/bin/aikido-yarn.js rename to bin/aikido-yarn.js diff --git a/safe-chain/bin/safe-chain.js b/bin/safe-chain.js similarity index 100% rename from safe-chain/bin/safe-chain.js rename to bin/safe-chain.js diff --git a/safe-chain/eslint.config.js b/eslint.config.js similarity index 100% rename from safe-chain/eslint.config.js rename to eslint.config.js diff --git a/safe-chain/package-lock.json b/package-lock.json similarity index 100% rename from safe-chain/package-lock.json rename to package-lock.json diff --git a/safe-chain/package.json b/package.json similarity index 100% rename from safe-chain/package.json rename to package.json diff --git a/safe-chain/src/api/aikido.js b/src/api/aikido.js similarity index 100% rename from safe-chain/src/api/aikido.js rename to src/api/aikido.js diff --git a/safe-chain/src/api/npmApi.js b/src/api/npmApi.js similarity index 100% rename from safe-chain/src/api/npmApi.js rename to src/api/npmApi.js diff --git a/safe-chain/src/config/configFile.js b/src/config/configFile.js similarity index 100% rename from safe-chain/src/config/configFile.js rename to src/config/configFile.js diff --git a/safe-chain/src/environment/environment.js b/src/environment/environment.js similarity index 100% rename from safe-chain/src/environment/environment.js rename to src/environment/environment.js diff --git a/safe-chain/src/environment/userInteraction.js b/src/environment/userInteraction.js similarity index 100% rename from safe-chain/src/environment/userInteraction.js rename to src/environment/userInteraction.js diff --git a/safe-chain/src/main.js b/src/main.js similarity index 100% rename from safe-chain/src/main.js rename to src/main.js diff --git a/safe-chain/src/packagemanager/_shared/matchesCommand.js b/src/packagemanager/_shared/matchesCommand.js similarity index 100% rename from safe-chain/src/packagemanager/_shared/matchesCommand.js rename to src/packagemanager/_shared/matchesCommand.js diff --git a/safe-chain/src/packagemanager/currentPackageManager.js b/src/packagemanager/currentPackageManager.js similarity index 100% rename from safe-chain/src/packagemanager/currentPackageManager.js rename to src/packagemanager/currentPackageManager.js diff --git a/safe-chain/src/packagemanager/npm/createPackageManager.js b/src/packagemanager/npm/createPackageManager.js similarity index 100% rename from safe-chain/src/packagemanager/npm/createPackageManager.js rename to src/packagemanager/npm/createPackageManager.js diff --git a/safe-chain/src/packagemanager/npm/dependencyScanner/commandArgumentScanner.js b/src/packagemanager/npm/dependencyScanner/commandArgumentScanner.js similarity index 100% rename from safe-chain/src/packagemanager/npm/dependencyScanner/commandArgumentScanner.js rename to src/packagemanager/npm/dependencyScanner/commandArgumentScanner.js diff --git a/safe-chain/src/packagemanager/npm/dependencyScanner/dryRunScanner.js b/src/packagemanager/npm/dependencyScanner/dryRunScanner.js similarity index 100% rename from safe-chain/src/packagemanager/npm/dependencyScanner/dryRunScanner.js rename to src/packagemanager/npm/dependencyScanner/dryRunScanner.js diff --git a/safe-chain/src/packagemanager/npm/dependencyScanner/nullScanner.js b/src/packagemanager/npm/dependencyScanner/nullScanner.js similarity index 100% rename from safe-chain/src/packagemanager/npm/dependencyScanner/nullScanner.js rename to src/packagemanager/npm/dependencyScanner/nullScanner.js diff --git a/safe-chain/src/packagemanager/npm/parsing/parseNpmInstallDryRunOutput.js b/src/packagemanager/npm/parsing/parseNpmInstallDryRunOutput.js similarity index 100% rename from safe-chain/src/packagemanager/npm/parsing/parseNpmInstallDryRunOutput.js rename to src/packagemanager/npm/parsing/parseNpmInstallDryRunOutput.js diff --git a/safe-chain/src/packagemanager/npm/parsing/parseNpmInstallDryRunOutput.spec.js b/src/packagemanager/npm/parsing/parseNpmInstallDryRunOutput.spec.js similarity index 100% rename from safe-chain/src/packagemanager/npm/parsing/parseNpmInstallDryRunOutput.spec.js rename to src/packagemanager/npm/parsing/parseNpmInstallDryRunOutput.spec.js diff --git a/safe-chain/src/packagemanager/npm/parsing/parsePackagesFromInstallArgs.js b/src/packagemanager/npm/parsing/parsePackagesFromInstallArgs.js similarity index 100% rename from safe-chain/src/packagemanager/npm/parsing/parsePackagesFromInstallArgs.js rename to src/packagemanager/npm/parsing/parsePackagesFromInstallArgs.js diff --git a/safe-chain/src/packagemanager/npm/parsing/parsePackagesFromInstallArgs.spec.js b/src/packagemanager/npm/parsing/parsePackagesFromInstallArgs.spec.js similarity index 100% rename from safe-chain/src/packagemanager/npm/parsing/parsePackagesFromInstallArgs.spec.js rename to src/packagemanager/npm/parsing/parsePackagesFromInstallArgs.spec.js diff --git a/safe-chain/src/packagemanager/npm/runNpmCommand.js b/src/packagemanager/npm/runNpmCommand.js similarity index 100% rename from safe-chain/src/packagemanager/npm/runNpmCommand.js rename to src/packagemanager/npm/runNpmCommand.js diff --git a/safe-chain/src/packagemanager/npm/utils/cmd-list.js b/src/packagemanager/npm/utils/cmd-list.js similarity index 100% rename from safe-chain/src/packagemanager/npm/utils/cmd-list.js rename to src/packagemanager/npm/utils/cmd-list.js diff --git a/safe-chain/src/packagemanager/npm/utils/npmCommands.js b/src/packagemanager/npm/utils/npmCommands.js similarity index 100% rename from safe-chain/src/packagemanager/npm/utils/npmCommands.js rename to src/packagemanager/npm/utils/npmCommands.js diff --git a/safe-chain/src/packagemanager/npx/createPackageManager.js b/src/packagemanager/npx/createPackageManager.js similarity index 100% rename from safe-chain/src/packagemanager/npx/createPackageManager.js rename to src/packagemanager/npx/createPackageManager.js diff --git a/safe-chain/src/packagemanager/npx/dependencyScanner/commandArgumentScanner.js b/src/packagemanager/npx/dependencyScanner/commandArgumentScanner.js similarity index 100% rename from safe-chain/src/packagemanager/npx/dependencyScanner/commandArgumentScanner.js rename to src/packagemanager/npx/dependencyScanner/commandArgumentScanner.js diff --git a/safe-chain/src/packagemanager/npx/parsing/parsePackagesFromArguments.js b/src/packagemanager/npx/parsing/parsePackagesFromArguments.js similarity index 100% rename from safe-chain/src/packagemanager/npx/parsing/parsePackagesFromArguments.js rename to src/packagemanager/npx/parsing/parsePackagesFromArguments.js diff --git a/safe-chain/src/packagemanager/npx/parsing/parsePackagesFromArguments.spec.js b/src/packagemanager/npx/parsing/parsePackagesFromArguments.spec.js similarity index 100% rename from safe-chain/src/packagemanager/npx/parsing/parsePackagesFromArguments.spec.js rename to src/packagemanager/npx/parsing/parsePackagesFromArguments.spec.js diff --git a/safe-chain/src/packagemanager/npx/runNpxCommand.js b/src/packagemanager/npx/runNpxCommand.js similarity index 100% rename from safe-chain/src/packagemanager/npx/runNpxCommand.js rename to src/packagemanager/npx/runNpxCommand.js diff --git a/safe-chain/src/packagemanager/pnpm/createPackageManager.js b/src/packagemanager/pnpm/createPackageManager.js similarity index 100% rename from safe-chain/src/packagemanager/pnpm/createPackageManager.js rename to src/packagemanager/pnpm/createPackageManager.js diff --git a/safe-chain/src/packagemanager/pnpm/dependencyScanner/commandArgumentScanner.js b/src/packagemanager/pnpm/dependencyScanner/commandArgumentScanner.js similarity index 100% rename from safe-chain/src/packagemanager/pnpm/dependencyScanner/commandArgumentScanner.js rename to src/packagemanager/pnpm/dependencyScanner/commandArgumentScanner.js diff --git a/safe-chain/src/packagemanager/pnpm/parsing/parsePackagesFromArguments.js b/src/packagemanager/pnpm/parsing/parsePackagesFromArguments.js similarity index 100% rename from safe-chain/src/packagemanager/pnpm/parsing/parsePackagesFromArguments.js rename to src/packagemanager/pnpm/parsing/parsePackagesFromArguments.js diff --git a/safe-chain/src/packagemanager/pnpm/parsing/parsePackagesFromArguments.spec.js b/src/packagemanager/pnpm/parsing/parsePackagesFromArguments.spec.js similarity index 100% rename from safe-chain/src/packagemanager/pnpm/parsing/parsePackagesFromArguments.spec.js rename to src/packagemanager/pnpm/parsing/parsePackagesFromArguments.spec.js diff --git a/safe-chain/src/packagemanager/pnpm/runPnpmCommand.js b/src/packagemanager/pnpm/runPnpmCommand.js similarity index 100% rename from safe-chain/src/packagemanager/pnpm/runPnpmCommand.js rename to src/packagemanager/pnpm/runPnpmCommand.js diff --git a/safe-chain/src/packagemanager/yarn/createPackageManager.js b/src/packagemanager/yarn/createPackageManager.js similarity index 100% rename from safe-chain/src/packagemanager/yarn/createPackageManager.js rename to src/packagemanager/yarn/createPackageManager.js diff --git a/safe-chain/src/packagemanager/yarn/dependencyScanner/commandArgumentScanner.js b/src/packagemanager/yarn/dependencyScanner/commandArgumentScanner.js similarity index 100% rename from safe-chain/src/packagemanager/yarn/dependencyScanner/commandArgumentScanner.js rename to src/packagemanager/yarn/dependencyScanner/commandArgumentScanner.js diff --git a/safe-chain/src/packagemanager/yarn/parsing/parsePackagesFromArguments.js b/src/packagemanager/yarn/parsing/parsePackagesFromArguments.js similarity index 100% rename from safe-chain/src/packagemanager/yarn/parsing/parsePackagesFromArguments.js rename to src/packagemanager/yarn/parsing/parsePackagesFromArguments.js diff --git a/safe-chain/src/packagemanager/yarn/parsing/parsePackagesFromArguments.spec.js b/src/packagemanager/yarn/parsing/parsePackagesFromArguments.spec.js similarity index 100% rename from safe-chain/src/packagemanager/yarn/parsing/parsePackagesFromArguments.spec.js rename to src/packagemanager/yarn/parsing/parsePackagesFromArguments.spec.js diff --git a/safe-chain/src/packagemanager/yarn/runYarnCommand.js b/src/packagemanager/yarn/runYarnCommand.js similarity index 100% rename from safe-chain/src/packagemanager/yarn/runYarnCommand.js rename to src/packagemanager/yarn/runYarnCommand.js diff --git a/safe-chain/src/scanning/audit/index.js b/src/scanning/audit/index.js similarity index 100% rename from safe-chain/src/scanning/audit/index.js rename to src/scanning/audit/index.js diff --git a/safe-chain/src/scanning/index.js b/src/scanning/index.js similarity index 100% rename from safe-chain/src/scanning/index.js rename to src/scanning/index.js diff --git a/safe-chain/src/scanning/index.scanCommand.spec.js b/src/scanning/index.scanCommand.spec.js similarity index 100% rename from safe-chain/src/scanning/index.scanCommand.spec.js rename to src/scanning/index.scanCommand.spec.js diff --git a/safe-chain/src/scanning/index.shouldScanCommand.spec.js b/src/scanning/index.shouldScanCommand.spec.js similarity index 100% rename from safe-chain/src/scanning/index.shouldScanCommand.spec.js rename to src/scanning/index.shouldScanCommand.spec.js diff --git a/safe-chain/src/scanning/malwareDatabase.js b/src/scanning/malwareDatabase.js similarity index 100% rename from safe-chain/src/scanning/malwareDatabase.js rename to src/scanning/malwareDatabase.js diff --git a/safe-chain/src/shell-integration/helpers.js b/src/shell-integration/helpers.js similarity index 100% rename from safe-chain/src/shell-integration/helpers.js rename to src/shell-integration/helpers.js diff --git a/safe-chain/src/shell-integration/setup.js b/src/shell-integration/setup.js similarity index 100% rename from safe-chain/src/shell-integration/setup.js rename to src/shell-integration/setup.js diff --git a/safe-chain/src/shell-integration/shellDetection.js b/src/shell-integration/shellDetection.js similarity index 100% rename from safe-chain/src/shell-integration/shellDetection.js rename to src/shell-integration/shellDetection.js diff --git a/safe-chain/src/shell-integration/startup-scripts/init-fish.fish b/src/shell-integration/startup-scripts/init-fish.fish similarity index 100% rename from safe-chain/src/shell-integration/startup-scripts/init-fish.fish rename to src/shell-integration/startup-scripts/init-fish.fish diff --git a/safe-chain/src/shell-integration/startup-scripts/init-posix.sh b/src/shell-integration/startup-scripts/init-posix.sh similarity index 100% rename from safe-chain/src/shell-integration/startup-scripts/init-posix.sh rename to src/shell-integration/startup-scripts/init-posix.sh diff --git a/safe-chain/src/shell-integration/startup-scripts/init-pwsh.ps1 b/src/shell-integration/startup-scripts/init-pwsh.ps1 similarity index 100% rename from safe-chain/src/shell-integration/startup-scripts/init-pwsh.ps1 rename to src/shell-integration/startup-scripts/init-pwsh.ps1 diff --git a/safe-chain/src/shell-integration/supported-shells/bash.js b/src/shell-integration/supported-shells/bash.js similarity index 100% rename from safe-chain/src/shell-integration/supported-shells/bash.js rename to src/shell-integration/supported-shells/bash.js diff --git a/safe-chain/src/shell-integration/supported-shells/bash.spec.js b/src/shell-integration/supported-shells/bash.spec.js similarity index 100% rename from safe-chain/src/shell-integration/supported-shells/bash.spec.js rename to src/shell-integration/supported-shells/bash.spec.js diff --git a/safe-chain/src/shell-integration/supported-shells/fish.js b/src/shell-integration/supported-shells/fish.js similarity index 100% rename from safe-chain/src/shell-integration/supported-shells/fish.js rename to src/shell-integration/supported-shells/fish.js diff --git a/safe-chain/src/shell-integration/supported-shells/fish.spec.js b/src/shell-integration/supported-shells/fish.spec.js similarity index 100% rename from safe-chain/src/shell-integration/supported-shells/fish.spec.js rename to src/shell-integration/supported-shells/fish.spec.js diff --git a/safe-chain/src/shell-integration/supported-shells/powershell.js b/src/shell-integration/supported-shells/powershell.js similarity index 100% rename from safe-chain/src/shell-integration/supported-shells/powershell.js rename to src/shell-integration/supported-shells/powershell.js diff --git a/safe-chain/src/shell-integration/supported-shells/powershell.spec.js b/src/shell-integration/supported-shells/powershell.spec.js similarity index 100% rename from safe-chain/src/shell-integration/supported-shells/powershell.spec.js rename to src/shell-integration/supported-shells/powershell.spec.js diff --git a/safe-chain/src/shell-integration/supported-shells/windowsPowershell.js b/src/shell-integration/supported-shells/windowsPowershell.js similarity index 100% rename from safe-chain/src/shell-integration/supported-shells/windowsPowershell.js rename to src/shell-integration/supported-shells/windowsPowershell.js diff --git a/safe-chain/src/shell-integration/supported-shells/windowsPowershell.spec.js b/src/shell-integration/supported-shells/windowsPowershell.spec.js similarity index 100% rename from safe-chain/src/shell-integration/supported-shells/windowsPowershell.spec.js rename to src/shell-integration/supported-shells/windowsPowershell.spec.js diff --git a/safe-chain/src/shell-integration/supported-shells/zsh.js b/src/shell-integration/supported-shells/zsh.js similarity index 100% rename from safe-chain/src/shell-integration/supported-shells/zsh.js rename to src/shell-integration/supported-shells/zsh.js diff --git a/safe-chain/src/shell-integration/supported-shells/zsh.spec.js b/src/shell-integration/supported-shells/zsh.spec.js similarity index 100% rename from safe-chain/src/shell-integration/supported-shells/zsh.spec.js rename to src/shell-integration/supported-shells/zsh.spec.js diff --git a/safe-chain/src/shell-integration/teardown.js b/src/shell-integration/teardown.js similarity index 100% rename from safe-chain/src/shell-integration/teardown.js rename to src/shell-integration/teardown.js diff --git a/test/e2e/setup.teardown.e2e.spec.js b/test/e2e/setup.teardown.e2e.spec.js index ad3f264..804bf29 100644 --- a/test/e2e/setup.teardown.e2e.spec.js +++ b/test/e2e/setup.teardown.e2e.spec.js @@ -16,7 +16,8 @@ describe("E2E: safe-chain setup command", () => { before(async () => { // Build the Docker image for the test environment try { - execSync(`docker build -t ${imageName} -f Dockerfile ../../safe-chain`, { + const sourceDir = path.join(__dirname, "../.."); + execSync(`docker build -t ${imageName} -f Dockerfile ${sourceDir}`, { cwd: __dirname, stdio: "ignore", });