From 09e950fdc5aac2931d14e5ebd1189bb09bc24e20 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 21 Feb 2021 03:57:10 +0200 Subject: [PATCH] feat: rename pnpmfile.js to .pnpmfile.cjs (#3149) close #3145 close #1339 --- .changeset/long-dancers-allow.md | 6 +++ packages/default-reporter/test/index.ts | 4 +- .../src/install.ts | 2 +- .../plugin-commands-installation/test/add.ts | 2 +- .../test/peerDependencies.ts | 2 +- .../test/prune.ts | 2 +- .../test/update/interactive.ts | 2 +- .../test/utils.ts | 2 +- .../plugin-commands-listing/test/utils.ts | 2 +- .../plugin-commands-outdated/test/utils.ts | 2 +- .../plugin-commands-publishing/test/utils.ts | 2 +- .../plugin-commands-rebuild/test/utils.ts | 2 +- .../test/utils.ts | 2 +- packages/pnpm/test/hooks.ts | 4 +- packages/pnpm/test/install/hooks.ts | 50 +++++++++---------- packages/pnpm/test/monorepo/index.ts | 2 +- packages/pnpm/test/recursive/misc.ts | 16 +++--- packages/pnpmfile/README.md | 2 +- packages/pnpmfile/package.json | 2 +- packages/pnpmfile/src/requireHooks.ts | 2 +- packages/pnpmfile/src/requirePnpmfile.ts | 6 +-- 21 files changed, 61 insertions(+), 55 deletions(-) create mode 100644 .changeset/long-dancers-allow.md diff --git a/.changeset/long-dancers-allow.md b/.changeset/long-dancers-allow.md new file mode 100644 index 0000000000..592c81557a --- /dev/null +++ b/.changeset/long-dancers-allow.md @@ -0,0 +1,6 @@ +--- +"@pnpm/plugin-commands-installation": major +"@pnpm/pnpmfile": major +--- + +`pnpmfile.js` renamed to `.pnpmfile.cjs`. diff --git a/packages/default-reporter/test/index.ts b/packages/default-reporter/test/index.ts index 19ecc398cd..309a475b83 100644 --- a/packages/default-reporter/test/index.ts +++ b/packages/default-reporter/test/index.ts @@ -858,7 +858,7 @@ test('install: print hook message', (done) => { }) hookLogger.debug({ - from: '/home/jane/repo/pnpmfile.js', + from: '/home/jane/repo/.pnpmfile.cjs', hook: 'readPackage', message: 'foo', prefix: '/home/jane/repo', @@ -885,7 +885,7 @@ test('recursive: print hook message', (done) => { }) hookLogger.debug({ - from: '/home/jane/repo/pnpmfile.js', + from: '/home/jane/repo/.pnpmfile.cjs', hook: 'readPackage', message: 'foo', prefix: '/home/jane/repo/pkg-1', diff --git a/packages/plugin-commands-installation/src/install.ts b/packages/plugin-commands-installation/src/install.ts index 241e87db17..b7febbc7fa 100644 --- a/packages/plugin-commands-installation/src/install.ts +++ b/packages/plugin-commands-installation/src/install.ts @@ -160,7 +160,7 @@ by any dependencies, so it is an emulation of a flat node_modules', name: '--child-concurrency ', }, { - description: 'Disable pnpm hooks defined in pnpmfile.js', + description: 'Disable pnpm hooks defined in .pnpmfile.cjs', name: '--ignore-pnpmfile', }, { diff --git a/packages/plugin-commands-installation/test/add.ts b/packages/plugin-commands-installation/test/add.ts index e74f8a733e..c0506ba8e5 100644 --- a/packages/plugin-commands-installation/test/add.ts +++ b/packages/plugin-commands-installation/test/add.ts @@ -20,7 +20,7 @@ const DEFAULT_OPTIONS = { optionalDependencies: true, }, lock: true, - pnpmfile: 'pnpmfile.js', + pnpmfile: '.pnpmfile.cjs', rawConfig: { registry: REGISTRY_URL }, rawLocalConfig: { registry: REGISTRY_URL }, registries: { diff --git a/packages/plugin-commands-installation/test/peerDependencies.ts b/packages/plugin-commands-installation/test/peerDependencies.ts index 16ef3ad3f3..949090ec2d 100644 --- a/packages/plugin-commands-installation/test/peerDependencies.ts +++ b/packages/plugin-commands-installation/test/peerDependencies.ts @@ -17,7 +17,7 @@ const DEFAULT_OPTIONS = { optionalDependencies: true, }, lock: true, - pnpmfile: 'pnpmfile.js', + pnpmfile: '.pnpmfile.cjs', rawConfig: { registry: REGISTRY_URL }, rawLocalConfig: { registry: REGISTRY_URL }, registries: { diff --git a/packages/plugin-commands-installation/test/prune.ts b/packages/plugin-commands-installation/test/prune.ts index 7f18612a46..682ebe77d8 100644 --- a/packages/plugin-commands-installation/test/prune.ts +++ b/packages/plugin-commands-installation/test/prune.ts @@ -18,7 +18,7 @@ const DEFAULT_OPTIONS = { optionalDependencies: true, }, lock: true, - pnpmfile: 'pnpmfile.js', + pnpmfile: '.pnpmfile.cjs', rawConfig: { registry: REGISTRY_URL }, rawLocalConfig: { registry: REGISTRY_URL }, registries: { diff --git a/packages/plugin-commands-installation/test/update/interactive.ts b/packages/plugin-commands-installation/test/update/interactive.ts index 9fad045695..b6c2abecee 100644 --- a/packages/plugin-commands-installation/test/update/interactive.ts +++ b/packages/plugin-commands-installation/test/update/interactive.ts @@ -31,7 +31,7 @@ const DEFAULT_OPTIONS = { optionalDependencies: true, }, lock: true, - pnpmfile: 'pnpmfile.js', + pnpmfile: '.pnpmfile.cjs', rawConfig: { registry: REGISTRY_URL }, rawLocalConfig: { registry: REGISTRY_URL }, registries: { diff --git a/packages/plugin-commands-installation/test/utils.ts b/packages/plugin-commands-installation/test/utils.ts index edd26d6ae9..77e3eaddce 100644 --- a/packages/plugin-commands-installation/test/utils.ts +++ b/packages/plugin-commands-installation/test/utils.ts @@ -30,7 +30,7 @@ export const DEFAULT_OPTS = { networkConcurrency: 16, offline: false, pending: false, - pnpmfile: './pnpmfile.js', + pnpmfile: './.pnpmfile.cjs', proxy: undefined, rawConfig: { registry: REGISTRY }, rawLocalConfig: {}, diff --git a/packages/plugin-commands-listing/test/utils.ts b/packages/plugin-commands-listing/test/utils.ts index 7ac7ac7329..b7ea385d37 100644 --- a/packages/plugin-commands-listing/test/utils.ts +++ b/packages/plugin-commands-listing/test/utils.ts @@ -30,7 +30,7 @@ export const DEFAULT_OPTS = { networkConcurrency: 16, offline: false, pending: false, - pnpmfile: './pnpmfile.js', + pnpmfile: './.pnpmfile.cjs', proxy: undefined, rawConfig: { registry: REGISTRY }, rawLocalConfig: {}, diff --git a/packages/plugin-commands-outdated/test/utils.ts b/packages/plugin-commands-outdated/test/utils.ts index e9346d3955..5d021433d1 100644 --- a/packages/plugin-commands-outdated/test/utils.ts +++ b/packages/plugin-commands-outdated/test/utils.ts @@ -31,7 +31,7 @@ export const DEFAULT_OPTS = { networkConcurrency: 16, offline: false, pending: false, - pnpmfile: './pnpmfile.js', + pnpmfile: './.pnpmfile.cjs', proxy: undefined, rawConfig: { registry: REGISTRY }, rawLocalConfig: {}, diff --git a/packages/plugin-commands-publishing/test/utils.ts b/packages/plugin-commands-publishing/test/utils.ts index 7ac7ac7329..b7ea385d37 100644 --- a/packages/plugin-commands-publishing/test/utils.ts +++ b/packages/plugin-commands-publishing/test/utils.ts @@ -30,7 +30,7 @@ export const DEFAULT_OPTS = { networkConcurrency: 16, offline: false, pending: false, - pnpmfile: './pnpmfile.js', + pnpmfile: './.pnpmfile.cjs', proxy: undefined, rawConfig: { registry: REGISTRY }, rawLocalConfig: {}, diff --git a/packages/plugin-commands-rebuild/test/utils.ts b/packages/plugin-commands-rebuild/test/utils.ts index 29e13be18f..23f71162ed 100644 --- a/packages/plugin-commands-rebuild/test/utils.ts +++ b/packages/plugin-commands-rebuild/test/utils.ts @@ -30,7 +30,7 @@ export const DEFAULT_OPTS = { networkConcurrency: 16, offline: false, pending: false, - pnpmfile: './pnpmfile.js', + pnpmfile: './.pnpmfile.cjs', proxy: undefined, rawConfig: { registry: REGISTRY }, rawLocalConfig: {}, diff --git a/packages/plugin-commands-script-runners/test/utils.ts b/packages/plugin-commands-script-runners/test/utils.ts index 31b8e5fe86..b13f8ae036 100644 --- a/packages/plugin-commands-script-runners/test/utils.ts +++ b/packages/plugin-commands-script-runners/test/utils.ts @@ -28,7 +28,7 @@ export const DEFAULT_OPTS = { networkConcurrency: 16, offline: false, pending: false, - pnpmfile: './pnpmfile.js', + pnpmfile: './.pnpmfile.cjs', proxy: undefined, rawConfig: { registry: REGISTRY }, rawLocalConfig: {}, diff --git a/packages/pnpm/test/hooks.ts b/packages/pnpm/test/hooks.ts index eb31cd58b1..6d1b5287eb 100644 --- a/packages/pnpm/test/hooks.ts +++ b/packages/pnpm/test/hooks.ts @@ -18,7 +18,7 @@ test('readPackage hook in single project doesn\'t modify manifest', async () => return pkg } ` - await fs.writeFile('pnpmfile.js', pnpmfile, 'utf8') + await fs.writeFile('.pnpmfile.cjs', pnpmfile, 'utf8') await execPnpm(['add', 'is-positive@1.0.0']) let pkg: PackageManifest = await loadJsonFile(path.resolve('package.json')) expect(pkg?.dependencies).toStrictEqual({ 'is-positive': '1.0.0' }) // add dependency & readPackage hook work @@ -59,7 +59,7 @@ test('readPackage hook in monorepo doesn\'t modify manifest', async () => { return pkg } ` - await fs.writeFile('pnpmfile.js', pnpmfile, 'utf8') + await fs.writeFile('.pnpmfile.cjs', pnpmfile, 'utf8') await writeYamlFile('pnpm-workspace.yaml', { packages: ['**', '!store/**'] }) await execPnpm(['add', 'is-positive@1.0.0', '--filter', 'project-a']) diff --git a/packages/pnpm/test/install/hooks.ts b/packages/pnpm/test/install/hooks.ts index 3436b441e4..54d1906cce 100644 --- a/packages/pnpm/test/install/hooks.ts +++ b/packages/pnpm/test/install/hooks.ts @@ -13,7 +13,7 @@ import { test('readPackage hook', async () => { const project = prepare() - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -38,7 +38,7 @@ test('readPackage hook', async () => { test('readPackage hook makes installation fail if it does not return the modified package manifests', async () => { prepare() - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -80,7 +80,7 @@ test('readPackage hook from custom location', async () => { test('readPackage hook from global pnpmfile', async () => { const project = prepare() - await fs.writeFile('../pnpmfile.js', ` + await fs.writeFile('../.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -97,7 +97,7 @@ test('readPackage hook from global pnpmfile', async () => { // w/o the hook, 100.1.0 would be installed await addDistTag('dep-of-pkg-with-1-dep', '100.1.0', 'latest') - await execPnpm(['install', 'pkg-with-1-dep', '--global-pnpmfile', path.resolve('..', 'pnpmfile.js')]) + await execPnpm(['install', 'pkg-with-1-dep', '--global-pnpmfile', path.resolve('..', '.pnpmfile.cjs')]) await project.storeHas('dep-of-pkg-with-1-dep', '100.0.0') }) @@ -105,7 +105,7 @@ test('readPackage hook from global pnpmfile', async () => { test('readPackage hook from global pnpmfile and local pnpmfile', async () => { const project = prepare() - await fs.writeFile('../pnpmfile.js', ` + await fs.writeFile('../.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -120,7 +120,7 @@ test('readPackage hook from global pnpmfile and local pnpmfile', async () => { } `, 'utf8') - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -137,7 +137,7 @@ test('readPackage hook from global pnpmfile and local pnpmfile', async () => { // w/o the hook, 100.1.0 would be installed await addDistTag('dep-of-pkg-with-1-dep', '100.1.0', 'latest') - await execPnpm(['install', 'pkg-with-1-dep', '--global-pnpmfile', path.resolve('..', 'pnpmfile.js')]) + await execPnpm(['install', 'pkg-with-1-dep', '--global-pnpmfile', path.resolve('..', '.pnpmfile.cjs')]) await project.storeHas('dep-of-pkg-with-1-dep', '100.0.0') await project.storeHas('is-positive', '1.0.0') @@ -163,7 +163,7 @@ test('readPackage hook from pnpmfile at root of workspace', async () => { return pkg } ` - await fs.writeFile('pnpmfile.js', pnpmfile, 'utf8') + await fs.writeFile('.pnpmfile.cjs', pnpmfile, 'utf8') await writeYamlFile('pnpm-workspace.yaml', { packages: ['project-1'] }) @@ -198,7 +198,7 @@ test('readPackage hook during update', async () => { }, }) - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -220,10 +220,10 @@ test('readPackage hook during update', async () => { await project.storeHas('dep-of-pkg-with-1-dep', '100.0.0') }) -test('prints meaningful error when there is syntax error in pnpmfile.js', async () => { +test('prints meaningful error when there is syntax error in .pnpmfile.cjs', async () => { prepare() - await fs.writeFile('pnpmfile.js', '/boom', 'utf8') + await fs.writeFile('.pnpmfile.cjs', '/boom', 'utf8') const proc = execPnpmSync(['install', 'pkg-with-1-dep']) @@ -231,10 +231,10 @@ test('prints meaningful error when there is syntax error in pnpmfile.js', async expect(proc.status).toBe(1) }) -test('fails when pnpmfile.js requires a non-existend module', async () => { +test('fails when .pnpmfile.cjs requires a non-existend module', async () => { prepare() - await fs.writeFile('pnpmfile.js', 'module.exports = require("./this-does-node-exist")', 'utf8') + await fs.writeFile('.pnpmfile.cjs', 'module.exports = require("./this-does-node-exist")', 'utf8') const proc = execPnpmSync(['install', 'pkg-with-1-dep']) @@ -242,10 +242,10 @@ test('fails when pnpmfile.js requires a non-existend module', async () => { expect(proc.status).toBe(1) }) -test('ignore pnpmfile.js when --ignore-pnpmfile is used', async () => { +test('ignore .pnpmfile.cjs when --ignore-pnpmfile is used', async () => { const project = prepare() - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -266,14 +266,14 @@ test('ignore pnpmfile.js when --ignore-pnpmfile is used', async () => { await project.storeHas('dep-of-pkg-with-1-dep', '100.1.0') }) -test('ignore pnpmfile.js during update when --ignore-pnpmfile is used', async () => { +test('ignore .pnpmfile.cjs during update when --ignore-pnpmfile is used', async () => { const project = prepare({ dependencies: { 'pkg-with-1-dep': '*', }, }) - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -297,7 +297,7 @@ test('ignore pnpmfile.js during update when --ignore-pnpmfile is used', async () test('pnpmfile: pass log function to readPackage hook', async () => { const project = prepare() - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -335,7 +335,7 @@ test('pnpmfile: pass log function to readPackage hook', async () => { test('pnpmfile: pass log function to readPackage hook of global and local pnpmfile', async () => { const project = prepare() - await fs.writeFile('../pnpmfile.js', ` + await fs.writeFile('../.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -351,7 +351,7 @@ test('pnpmfile: pass log function to readPackage hook of global and local pnpmfi } `, 'utf8') - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -369,7 +369,7 @@ test('pnpmfile: pass log function to readPackage hook of global and local pnpmfi // w/o the hook, 100.1.0 would be installed await addDistTag('dep-of-pkg-with-1-dep', '100.1.0', 'latest') - const proc = execPnpmSync(['install', 'pkg-with-1-dep', '--global-pnpmfile', path.resolve('..', 'pnpmfile.js'), '--reporter', 'ndjson']) + const proc = execPnpmSync(['install', 'pkg-with-1-dep', '--global-pnpmfile', path.resolve('..', '.pnpmfile.cjs'), '--reporter', 'ndjson']) await project.storeHas('dep-of-pkg-with-1-dep', '100.0.0') await project.storeHas('is-positive', '1.0.0') @@ -399,7 +399,7 @@ test('pnpmfile: pass log function to readPackage hook of global and local pnpmfi test('pnpmfile: run afterAllResolved hook', async () => { prepare() - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -429,7 +429,7 @@ test('pnpmfile: run afterAllResolved hook', async () => { test('readPackage hook normalizes the package manifest', async () => { prepare() - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -454,7 +454,7 @@ test('readPackage hook overrides project package', async () => { name: 'test-read-package-hook', }) - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { @@ -494,7 +494,7 @@ test('readPackage hook is used during removal inside a workspace', async () => { ]) await writeYamlFile('pnpm-workspace.yaml', { packages: ['project-1'] }) - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` 'use strict' module.exports = { hooks: { diff --git a/packages/pnpm/test/monorepo/index.ts b/packages/pnpm/test/monorepo/index.ts index d0cf5d8862..6664de7848 100644 --- a/packages/pnpm/test/monorepo/index.ts +++ b/packages/pnpm/test/monorepo/index.ts @@ -716,7 +716,7 @@ test('recursive installation with shared-workspace-lockfile and a readPackage ho return pkg } ` - await fs.writeFile('pnpmfile.js', pnpmfile, 'utf8') + await fs.writeFile('.pnpmfile.cjs', pnpmfile, 'utf8') await writeYamlFile('pnpm-workspace.yaml', { packages: ['**', '!store/**'] }) await execPnpm(['recursive', 'install', '--shared-workspace-lockfile', '--store-dir', 'store']) diff --git a/packages/pnpm/test/recursive/misc.ts b/packages/pnpm/test/recursive/misc.ts index 8794d72fbf..2060451d0f 100644 --- a/packages/pnpm/test/recursive/misc.ts +++ b/packages/pnpm/test/recursive/misc.ts @@ -166,10 +166,10 @@ test('recursive installation of packages with hooks', async () => { return pkg } ` - await fs.writeFile('pnpmfile.js', pnpmfile, 'utf8') + await fs.writeFile('.pnpmfile.cjs', pnpmfile, 'utf8') process.chdir('../project-2') - await fs.writeFile('pnpmfile.js', pnpmfile, 'utf8') + await fs.writeFile('.pnpmfile.cjs', pnpmfile, 'utf8') process.chdir('..') @@ -213,13 +213,13 @@ test('recursive installation of packages in workspace ignores hooks in packages' return pkg } ` - await fs.writeFile('pnpmfile.js', pnpmfile, 'utf8') + await fs.writeFile('.pnpmfile.cjs', pnpmfile, 'utf8') process.chdir('../project-2') - await fs.writeFile('pnpmfile.js', pnpmfile, 'utf8') + await fs.writeFile('.pnpmfile.cjs', pnpmfile, 'utf8') process.chdir('..') - await fs.writeFile('pnpmfile.js', ` + await fs.writeFile('.pnpmfile.cjs', ` module.exports = { hooks: { readPackage } } function readPackage (pkg) { pkg.dependencies = pkg.dependencies || {} @@ -239,7 +239,7 @@ test('recursive installation of packages in workspace ignores hooks in packages' /* eslint-enable @typescript-eslint/no-unnecessary-type-assertion */ }) -test('ignores pnpmfile.js during recursive installation when --ignore-pnpmfile is used', async () => { +test('ignores .pnpmfile.cjs during recursive installation when --ignore-pnpmfile is used', async () => { // This test hangs on Appveyor for some reason if (isCI && isWindows()) return const projects = preparePackages([ @@ -270,10 +270,10 @@ test('ignores pnpmfile.js during recursive installation when --ignore-pnpmfile i return pkg } ` - await fs.writeFile('pnpmfile.js', pnpmfile, 'utf8') + await fs.writeFile('.pnpmfile.cjs', pnpmfile, 'utf8') process.chdir('../project-2') - await fs.writeFile('pnpmfile.js', pnpmfile, 'utf8') + await fs.writeFile('.pnpmfile.cjs', pnpmfile, 'utf8') process.chdir('..') diff --git a/packages/pnpmfile/README.md b/packages/pnpmfile/README.md index bc8d1ad7ad..f1040d07bc 100644 --- a/packages/pnpmfile/README.md +++ b/packages/pnpmfile/README.md @@ -1,6 +1,6 @@ # @pnpm/pnpmfile -> Reading a pnpmfile.js +> Reading a .pnpmfile.cjs [![npm version](https://img.shields.io/npm/v/@pnpm/pnpmfile.svg)](https://www.npmjs.com/package/@pnpm/pnpmfile) diff --git a/packages/pnpmfile/package.json b/packages/pnpmfile/package.json index 2f17518c2b..e9571425e0 100644 --- a/packages/pnpmfile/package.json +++ b/packages/pnpmfile/package.json @@ -1,7 +1,7 @@ { "name": "@pnpm/pnpmfile", "version": "0.1.21", - "description": "Reading a pnpmfile.js", + "description": "Reading a .pnpmfile.cjs", "main": "lib/index.js", "typings": "lib/index.d.ts", "files": [ diff --git a/packages/pnpmfile/src/requireHooks.ts b/packages/pnpmfile/src/requireHooks.ts index da4f8c4c86..9a19f738e8 100644 --- a/packages/pnpmfile/src/requireHooks.ts +++ b/packages/pnpmfile/src/requireHooks.ts @@ -16,7 +16,7 @@ export default function requireHooks ( let globalHooks = globalPnpmfile?.hooks const pnpmFile = opts.pnpmfile && requirePnpmfile(pathAbsolute(opts.pnpmfile, prefix), prefix) || - requirePnpmfile(path.join(prefix, 'pnpmfile.js'), prefix) + requirePnpmfile(path.join(prefix, '.pnpmfile.cjs'), prefix) let hooks = pnpmFile?.hooks if (!globalHooks && !hooks) return {} diff --git a/packages/pnpmfile/src/requirePnpmfile.ts b/packages/pnpmfile/src/requirePnpmfile.ts index 4cb808294d..9d0c2151fb 100644 --- a/packages/pnpmfile/src/requirePnpmfile.ts +++ b/packages/pnpmfile/src/requirePnpmfile.ts @@ -65,7 +65,7 @@ export default (pnpmFilePath: string, prefix: string) => { return pnpmfile } catch (err) { if (err instanceof SyntaxError) { - console.error(chalk.red('A syntax error in the pnpmfile.js\n')) + console.error(chalk.red('A syntax error in the .pnpmfile.cjs\n')) console.error(err) process.exit(1) } @@ -77,8 +77,8 @@ export default (pnpmFilePath: string, prefix: string) => { } function pnpmFileExistsSync (pnpmFilePath: string) { - const pnpmFileRealName = pnpmFilePath.endsWith('.js') + const pnpmFileRealName = pnpmFilePath.endsWith('.cjs') ? pnpmFilePath - : `${pnpmFilePath}.js` + : `${pnpmFilePath}.cjs` return fs.existsSync(pnpmFileRealName) }