Show files added since the last release and not part of the package (#…

…456)

Co-authored-by: Sindre Sorhus <sindresorhus@gmail.com>

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "integration-test"]
+	path = integration-test
+	url = https://github.com/bunysae/np_integration_test

package.json

@@ -42,6 +42,7 @@
 		"github-url-from-git": "^1.5.0",
 		"has-yarn": "^2.1.0",
 		"hosted-git-info": "^3.0.0",
+		"ignore-walk": "^3.0.3",
 		"import-local": "^3.0.2",
 		"inquirer": "^7.0.0",
 		"is-installed-globally": "^0.3.1",
@@ -51,6 +52,7 @@
 		"listr-input": "^0.2.1",
 		"log-symbols": "^3.0.0",
 		"meow": "^6.0.0",
+		"minimatch": "^3.0.4",
 		"new-github-release-url": "^1.0.0",
 		"npm-name": "^6.0.0",
 		"onetime": "^5.1.0",
@@ -77,7 +79,8 @@
 	},
 	"ava": {
 		"files": [
-			"!test/fixtures"
+			"!test/fixtures",
+			"!integration-test"
 		]
 	}
 }

readme.md

@@ -280,6 +280,10 @@ Host *
 
 If you're running into other issues when using SSH, please consult [GitHub's support article](https://help.github.com/articles/connecting-to-github-with-ssh/).
 
+### Ignore strategy
+
+The [ignore strategy](https://docs.npmjs.com/files/package.json#files), either maintained in the `files`-property in `package.json` or in `.npmignore`, is meant to help reduce the package size. To avoid broken packages caused by essential files being accidentally ignored, `np` prints out all the new and unpublished files added to Git. Test files and other [common files](https://docs.npmjs.com/files/package.json#files) that are never published are not considered. `np` assumes either a standard directory layout or a customized layout represented in the `directories` property in `package.json`.
+
 ## FAQ
 
 ### I get an error when publishing my package through Yarn

source/git-util.js

@@ -1,13 +1,29 @@
 'use strict';
 const execa = require('execa');
 const escapeStringRegexp = require('escape-string-regexp');
+const ignoreWalker = require('ignore-walk');
+const pkgDir = require('pkg-dir');
 const {verifyRequirementSatisfied} = require('./version');
 
 exports.latestTag = async () => {
 	const {stdout} = await execa('git', ['describe', '--abbrev=0', '--tags']);
 	return stdout;
 };
 
+exports.newFilesSinceLastRelease = async () => {
+	try {
+		const {stdout} = await execa('git', ['diff', '--stat', '--diff-filter=A', await this.latestTag(), 'HEAD']);
+		const result = stdout.trim().split('\n').slice(0, -1).map(row => row.slice(0, row.indexOf('|')).trim());
+		return result;
+	} catch (_) {
+		// Get all files under version control
+		return ignoreWalker({
+			path: pkgDir.sync(),
+			ignoreFiles: ['.gitignore']
+		});
+	}
+};
+
 const firstCommit = async () => {
 	const {stdout} = await execa('git', ['rev-list', '--max-parents=0', 'HEAD']);
 	return stdout;

source/npm/util.js

@@ -7,6 +7,8 @@ const ow = require('ow');
 const npmName = require('npm-name');
 const chalk = require('chalk');
 const pkgDir = require('pkg-dir');
+const ignoreWalker = require('ignore-walk');
+const minimatch = require('minimatch');
 const {verifyRequirementSatisfied} = require('../version');
 
 exports.checkConnection = () => pTimeout(
@@ -117,16 +119,110 @@ exports.verifyRecentNpmVersion = async () => {
 };
 
 exports.checkIgnoreStrategy = ({files}) => {
-	const rootDir = pkgDir.sync();
-	const npmignoreExists = fs.existsSync(path.resolve(rootDir, '.npmignore'));
-
-	if (!files && !npmignoreExists) {
+	if (!files && !npmignoreExistsInPackageRootDir()) {
 		console.log(`
 		\n${chalk.bold.yellow('Warning:')} No ${chalk.bold.cyan('files')} field specified in ${chalk.bold.magenta('package.json')} nor is a ${chalk.bold.magenta('.npmignore')} file present. Having one of those will prevent you from accidentally publishing development-specific files along with your package's source code to npm.
 		`);
 	}
 };
 
+function npmignoreExistsInPackageRootDir() {
+	const rootDir = pkgDir.sync();
+	return fs.existsSync(path.resolve(rootDir, '.npmignore'));
+}
+
+async function getFilesIgnoredByDotnpmignore(pkg, fileList) {
+	const whiteList = await ignoreWalker({
+		path: pkgDir.sync(),
+		ignoreFiles: ['.npmignore']
+	});
+	return fileList.filter(minimatch.filter(getIgnoredFilesGlob(whiteList, pkg.directories), {matchBase: true, dot: true}));
+}
+
+function getFilesNotIncludedInFilesProperty(pkg, fileList) {
+	const globArrayForFilesAndDirectories = [...pkg.files];
+	const rootDir = pkgDir.sync();
+	for (const glob of pkg.files) {
+		try {
+			if (fs.statSync(path.resolve(rootDir, glob)).isDirectory()) {
+				globArrayForFilesAndDirectories.push(`${glob}/**/*`);
+			}
+		} catch (_) {}
+	}
+
+	const result = fileList.filter(minimatch.filter(getIgnoredFilesGlob(globArrayForFilesAndDirectories, pkg.directories), {matchBase: true, dot: true}));
+	return result.filter(minimatch.filter(getDefaultIncludedFilesGlob(pkg.main), {nocase: true, matchBase: true}));
+}
+
+function getDefaultIncludedFilesGlob(mainFile) {
+	// According to https://docs.npmjs.com/files/package.json#files
+	// npm's default behavior is to always include these files.
+	const filesAlwaysIncluded = [
+		'package.json',
+		'README*',
+		'CHANGES*',
+		'CHANGELOG*',
+		'HISTORY*',
+		'LICENSE*',
+		'LICENCE*',
+		'NOTICE*'
+	];
+	if (mainFile) {
+		filesAlwaysIncluded.push(mainFile);
+	}
+
+	return `!{${filesAlwaysIncluded}}`;
+}
+
+function getIgnoredFilesGlob(globArrayFromFilesProperty, packageDirectories) {
+	// According to https://docs.npmjs.com/files/package.json#files
+	// npm's default behavior is to ignore these files.
+	const filesIgnoredByDefault = [
+		'.*.swp',
+		'.npmignore',
+		'.gitignore',
+		'._*',
+		'.DS_Store',
+		'.hg',
+		'.npmrc',
+		'.lock-wscript',
+		'.svn',
+		'.wafpickle-N',
+		'*.orig',
+		'config.gypi',
+		'CVS',
+		'node_modules/**/*',
+		'npm-debug.log',
+		'package-lock.json',
+		'.git/**/*',
+		'.git'
+	];
+
+	// Test files are assumed not to be part of the package
+	let testDirectoriesGlob = '';
+	if (packageDirectories && Array.isArray(packageDirectories.test)) {
+		testDirectoriesGlob = packageDirectories.test.join(',');
+	} else if (packageDirectories && typeof packageDirectories.test === 'string') {
+		testDirectoriesGlob = packageDirectories.test;
+	} else {
+		// Fallback to `test` directory
+		testDirectoriesGlob = 'test/**/*';
+	}
+
+	return `!{${globArrayFromFilesProperty.join(',')},${filesIgnoredByDefault.join(',')},${testDirectoriesGlob}}`;
+}
+
+// Get all files which will be ignored by either `.npmignore` or the `files` property in `package.json` (if defined).
+exports.getNewAndUnpublishedFiles = async (pkg, newFiles = []) => {
+	if (pkg.files) {
+		return getFilesNotIncludedInFilesProperty(pkg, newFiles);
+	}
+
+	if (npmignoreExistsInPackageRootDir()) {
+		return getFilesIgnoredByDotnpmignore(pkg, newFiles);
+	}
+};
+
 exports.getRegistryUrl = async (pkgManager, pkg) => {
 	const args = ['config', 'get', 'registry'];
 	if (exports.isExternalRegistry(pkg)) {

source/ui.js

@@ -50,6 +50,22 @@ const printCommitLog = async (repoUrl, registryUrl) => {
 	};
 };
 
+const checkIgnoredFiles = async pkg => {
+	const ignoredFiles = await util.getNewAndUnpublishedFiles(pkg);
+	if (!ignoredFiles || ignoredFiles.length === 0) {
+		return true;
+	}
+
+	const answers = await inquirer.prompt([{
+		type: 'confirm',
+		name: 'confirm',
+		message: `The following new files are not already part of your published package:\n${chalk.reset(ignoredFiles.map(path => `- ${path}`).join('\n'))}\nContinue?`,
+		default: false
+	}]);
+
+	return answers.confirm;
+};
+
 module.exports = async (options, pkg) => {
 	const oldVersion = pkg.version;
 	const extraBaseUrls = ['gitlab.com'];
@@ -59,6 +75,14 @@ module.exports = async (options, pkg) => {
 
 	if (options.runPublish) {
 		checkIgnoreStrategy(pkg);
+
+		const answerIgnoredFiles = await checkIgnoredFiles(pkg);
+		if (!answerIgnoredFiles) {
+			return {
+				...options,
+				confirm: answerIgnoredFiles
+			};
+		}
 	}
 
 	console.log(`\nPublish a new version of ${chalk.bold.magenta(pkg.name)} ${chalk.dim(`(current: ${oldVersion})`)}\n`);

source/util.js

@@ -6,6 +6,8 @@ const execa = require('execa');
 const pMemoize = require('p-memoize');
 const ow = require('ow');
 const pkgDir = require('pkg-dir');
+const gitUtil = require('./git-util');
+const npmUtil = require('./npm/util');
 
 exports.readPkg = packagePath => {
 	packagePath = packagePath ? pkgDir.sync(packagePath) : pkgDir.sync();
@@ -69,6 +71,11 @@ exports.getTagVersionPrefix = pMemoize(async options => {
 	}
 });
 
+exports.getNewAndUnpublishedFiles = async pkg => {
+	const listNewFiles = await gitUtil.newFilesSinceLastRelease();
+	return npmUtil.getNewAndUnpublishedFiles(pkg, listNewFiles);
+};
+
 exports.getPreReleasePrefix = pMemoize(async options => {
 	ow(options, ow.object.hasKeys('yarn'));
 

test/fixtures/npmignore/.hg

@@ -0,0 +1 @@
+should be ignored by default

test/fixtures/npmignore/.npmignore

@@ -0,0 +1,2 @@
+ignore.txt
+test

test/fixtures/npmignore/README.txt

@@ -0,0 +1 @@
+File is always included in package.

test/fixtures/npmignore/readme.md

@@ -0,0 +1 @@
+File is always included in package.

test/fixtures/npmignore/source/ignore.txt

@@ -0,0 +1 @@
+Ignore this file

test/fixtures/npmignore/source/pay_attention.txt

@@ -0,0 +1 @@
+File is excluded from .npmignore

test/fixtures/npmignore/test/file.txt

@@ -0,0 +1 @@
+ignore this file

test/fixtures/package/.hg

@@ -0,0 +1 @@
+should be ignored by default

test/fixtures/package/package.json

@@ -0,0 +1,3 @@
+{
+	"files": ["pay_attention.txt"]
+}

test/fixtures/package/source/ignore.txt

@@ -0,0 +1 @@
+File is excluded from package.json

test/fixtures/package/source/pay_attention.txt

@@ -0,0 +1 @@
+File in included in package.json

test/fixtures/readme.md

@@ -0,0 +1,2 @@
+The directory is for the resources
+in the script npmignore.js

test/integration.js

@@ -0,0 +1,11 @@
+const test = require('ava');
+const execa = require('execa');
+
+test.after.always(async () => {
+	await execa('git', ['submodule', 'update', '--remote']);
+});
+
+test('Integration tests', async t => {
+	await execa('ava', {cwd: 'integration-test'});
+	t.pass();
+});

test/npmignore.js

@@ -0,0 +1,94 @@
+import path from 'path';
+import test from 'ava';
+import proxyquire from 'proxyquire';
+
+const newFiles = [
+	'source/ignore.txt',
+	'source/pay_attention.txt',
+	'.hg',
+	'test/file.txt',
+	'readme.md',
+	'README.txt'
+];
+
+test('ignored files using file-attribute in package.json with one file', async t => {
+	const testedModule = proxyquire('../source/npm/util', {
+		'pkg-dir':
+			{
+				sync: () => path.resolve('test', 'fixtures', 'package')
+			}
+	});
+	t.deepEqual(await testedModule.getNewAndUnpublishedFiles({files: ['pay_attention.txt']}, newFiles), ['source/ignore.txt']);
+});
+
+test('ignored file using file-attribute in package.json with directory', async t => {
+	const testedModule = proxyquire('../source/npm/util', {
+		'pkg-dir':
+			{
+				sync: () => path.resolve('test', 'fixtures', 'package')
+			}
+	});
+	t.deepEqual(await testedModule.getNewAndUnpublishedFiles({files: ['source']}, newFiles), []);
+});
+
+test('ignored test files using files attribute and directory structure in package.json', async t => {
+	const testedModule = proxyquire('../source/npm/util', {
+		'pkg-dir':
+			{
+				sync: () => path.resolve('test', 'fixtures', 'package')
+			}
+	});
+	t.deepEqual(await testedModule.getNewAndUnpublishedFiles({files: ['source'], directories: {test: 'test-tap'}}, newFiles), ['test/file.txt']);
+	t.deepEqual(await testedModule.getNewAndUnpublishedFiles({files: ['source'], directories: {test: ['test-tap']}}, newFiles), ['test/file.txt']);
+});
+
+test('ignored files using .npmignore', async t => {
+	const testedModule = proxyquire('../source/npm/util', {
+		'pkg-dir':
+			{
+				sync: () => path.resolve('test', 'fixtures', 'npmignore')
+			}
+	});
+	t.deepEqual(await testedModule.getNewAndUnpublishedFiles({name: 'npmignore'}, newFiles), ['source/ignore.txt']);
+});
+
+test('ignored test files using files attribute and .npmignore', async t => {
+	const testedModule = proxyquire('../source/npm/util', {
+		'pkg-dir':
+			{
+				sync: () => path.resolve('test', 'fixtures', 'npmignore')
+			}
+	});
+	t.deepEqual(await testedModule.getNewAndUnpublishedFiles({directories: {test: 'test-tap'}}, newFiles), ['source/ignore.txt', 'test/file.txt']);
+	t.deepEqual(await testedModule.getNewAndUnpublishedFiles({directories: {test: ['test-tap']}}, newFiles), ['source/ignore.txt', 'test/file.txt']);
+});
+
+test('dot files using files attribute', async t => {
+	const testedModule = proxyquire('../source/npm/util', {
+		'pkg-dir':
+			{
+				sync: () => path.resolve('test', 'fixtures', 'package')
+			}
+	});
+	t.deepEqual(await testedModule.getNewAndUnpublishedFiles({files: ['source']}, ['test/.dotfile']), []);
+});
+
+test('dot files using .npmignore', async t => {
+	const testedModule = proxyquire('../source/npm/util', {
+		'pkg-dir':
+			{
+				sync: () => path.resolve('test', 'fixtures', 'npmignore')
+			}
+	});
+	t.deepEqual(await testedModule.getNewAndUnpublishedFiles({}, ['test/.dot']), []);
+});
+
+test('ignore strategy is not used', async t => {
+	const testedModule = proxyquire('../source/npm/util', {
+		'pkg-dir':
+			{
+				sync: () => path.resolve('test', 'fixtures')
+			}
+	});
+	t.is(await testedModule.getNewAndUnpublishedFiles({name: 'no ignore strategy'}, newFiles), undefined);
+});