diff --git a/__tests__/disabled-env.test.ts b/__tests__/disabled-env.test.ts index b94fcb7..f375578 100644 --- a/__tests__/disabled-env.test.ts +++ b/__tests__/disabled-env.test.ts @@ -6,7 +6,7 @@ test('disabled-env.prisma', async () => { const folderName = '__tests__'; child_process.execSync(`rm -f ${folderName}/${fileName}`); child_process.execSync( - `npx cross-env DISABLE_ERD=true prisma generate --schema ./prisma/disabled-env.prisma` + `cross-env DISABLE_ERD=true prisma generate --schema ./prisma/disabled-env.prisma` ); const exists = fs.existsSync(`${folderName}/${fileName}`); expect(exists).toBe(false); diff --git a/package-lock.json b/package-lock.json index 0d03963..ed04f59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,6 +28,7 @@ "all-contributors-cli": "^6.26.1", "babel-jest": "^29.6.2", "concurrently": "^8.2.0", + "cross-env": "^7.0.3", "jest": "^29.6.2", "mermaid": "^10.3.0", "prettier": "3.0.1", @@ -5574,6 +5575,24 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.1" + }, + "bin": { + "cross-env": "src/bin/cross-env.js", + "cross-env-shell": "src/bin/cross-env-shell.js" + }, + "engines": { + "node": ">=10.14", + "npm": ">=6", + "yarn": ">=1" + } + }, "node_modules/cross-fetch": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", diff --git a/package.json b/package.json index c40fb83..f6672a0 100644 --- a/package.json +++ b/package.json @@ -108,6 +108,7 @@ "all-contributors-cli": "^6.26.1", "babel-jest": "^29.6.2", "concurrently": "^8.2.0", + "cross-env": "^7.0.3", "jest": "^29.6.2", "mermaid": "^10.3.0", "prettier": "3.0.1", diff --git a/src/generate.ts b/src/generate.ts index 9348f59..ec7867e 100644 --- a/src/generate.ts +++ b/src/generate.ts @@ -442,7 +442,7 @@ export default async (options: GeneratorOptions) => { const tempPuppeteerConfigFile = path.resolve( path.join(tmpDir, 'puppeteerConfig.json') ); - const executablePath = '/usr/bin/chromium-browser'; + let executablePath: string | undefined; let puppeteerConfigJson: PuppeteerConfiguration & { args: string[]; } = { @@ -468,6 +468,7 @@ export default async (options: GeneratorOptions) => { console.log( `\nPrisma ERD Generator: Unable to find chromium path for you MacOS arm64 machine. Attempting to use the default at ${executablePath}. To learn more visit https://github.com/keonik/prisma-erd-generator#-arm64-users-\n` ); + executablePath = '/usr/bin/chromium-browser'; } } fs.writeFileSync(