make obt install always create a package-lock.json file (#966)

Financial-Times · Feb 11, 2021 · 5073fb7 · 5073fb7
1 parent 15fd16e
commit 5073fb7
Show file tree

Hide file tree

Showing 24 changed files with 11,483 additions and 373 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,5 @@ node_modules
 npm-debug.log*
 .DS_Store
 .editorconfig
-/test/integration/*/fixtures/*/package-lock.json
 test/integration/demo/fixtures/no-demos/o-component-boilerplate/
 ws-*
diff --git a/lib/tasks/run-npm-install.js b/lib/tasks/run-npm-install.js
@@ -1,14 +1,7 @@
 'use strict';
 
 const commandLine = require('../helpers/command-line');
-const files = require('../helpers/files');
 
 module.exports = function runNpmInstall(options = {}) {
-	return files.packageLockJsonExists(options.cwd).then(packageLockJsonExists => {
-		const command = packageLockJsonExists
-			? ['i']
-			: ['install', '--no-shrinkwrap'];
-
-		return commandLine.run('npm', command, options);
-	});
+	return commandLine.run('npm', ['install'], options);
 };
diff --git a/test/integration/install/fixtures/no-npm-dependencies/package-lock.json b/test/integration/install/fixtures/no-npm-dependencies/package-lock.json
diff --git a/test/integration/install/fixtures/with-npm-dependencies/package-lock.json b/test/integration/install/fixtures/with-npm-dependencies/package-lock.json
diff --git a/test/integration/test/fixtures/with-npm-dependency-installed/package-lock.json b/test/integration/test/fixtures/with-npm-dependency-installed/package-lock.json
diff --git a/test/integration/verify/fixtures/js-custom-eslint/package.json b/test/integration/verify/fixtures/js-custom-eslint/package.json
@@ -10,7 +10,6 @@
   "author": "",
   "license": "ISC",
   "type": "module",
-  "dependencies": {},
   "devDependencies": {
     "eslint-config-origami-component": "^1.1.1"
   }

diff --git a/test/integration/verify/fixtures/js-es5/package.json b/test/integration/verify/fixtures/js-es5/package.json
@@ -3,6 +3,5 @@
 	"main": [
 		"main.js"
 	],
-	"type": "module",
-	"dependencies": {}
+	"type": "module"
 }
diff --git a/test/integration/verify/fixtures/js-es6/package.json b/test/integration/verify/fixtures/js-es6/package.json
@@ -3,6 +3,5 @@
 	"main": [
 		"main.js"
 	],
-	"type": "module",
-	"dependencies": {}
+	"type": "module"
 }
diff --git a/test/integration/verify/fixtures/js-es7/package.json b/test/integration/verify/fixtures/js-es7/package.json
@@ -3,6 +3,5 @@
 	"main": [
 		"main.js"
 	],
-	"type": "module",
-	"dependencies": {}
+	"type": "module"
 }
diff --git a/test/integration/verify/fixtures/js-invalid/package.json b/test/integration/verify/fixtures/js-invalid/package.json
@@ -10,7 +10,6 @@
   "author": "",
   "license": "ISC",
   "type": "module",
-  "dependencies": {},
   "devDependencies": {
     "eslint-config-origami-component": "^1.1.1"
   }

diff --git a/test/integration/verify/fixtures/no-js-or-sass/package.json b/test/integration/verify/fixtures/no-js-or-sass/package.json
@@ -10,7 +10,6 @@
   "author": "",
   "license": "ISC",
   "type": "module",
-  "dependencies": {},
   "devDependencies": {
     "remark-preset-lint-origami-component": "2.0.0-beta.1",
     "stylelint": "^13.7.0",

diff --git a/test/integration/verify/fixtures/no-readme/package.json b/test/integration/verify/fixtures/no-readme/package.json
@@ -10,7 +10,6 @@
   "author": "",
   "license": "ISC",
   "type": "module",
-  "dependencies": {},
   "devDependencies": {
     "remark-preset-lint-origami-component": "2.0.0-beta.1"
   }

diff --git a/test/integration/verify/fixtures/readme-custom-remarkrc/package.json b/test/integration/verify/fixtures/readme-custom-remarkrc/package.json
@@ -1,6 +1,5 @@
 {
 	"name": "test-component",
 	"main": [],
-	"type": "module",
-	"dependencies": {}
+	"type": "module"
 }
diff --git a/test/integration/verify/fixtures/readme-invalid-name/package.json b/test/integration/verify/fixtures/readme-invalid-name/package.json
@@ -10,7 +10,6 @@
   "author": "",
   "license": "ISC",
   "type": "module",
-  "dependencies": {},
   "devDependencies": {
     "remark-preset-lint-origami-component": "2.0.0-beta.1"
   }

diff --git a/test/integration/verify/fixtures/readme-invalid/package.json b/test/integration/verify/fixtures/readme-invalid/package.json
@@ -10,7 +10,6 @@
   "author": "",
   "license": "ISC",
   "type": "module",
-  "dependencies": {},
   "devDependencies": {
     "eslint-config-origami-component": "^1.1.1",
     "remark-preset-lint-origami-component": "2.0.0-beta.1",

diff --git a/test/integration/verify/fixtures/readme-valid-lowercase/package.json b/test/integration/verify/fixtures/readme-valid-lowercase/package.json
@@ -10,7 +10,6 @@
   "author": "",
   "license": "ISC",
   "type": "module",
-  "dependencies": {},
   "devDependencies": {
     "remark-preset-lint-origami-component": "2.0.0-beta.1"
   }

diff --git a/test/integration/verify/fixtures/readme-valid-uppercase/package.json b/test/integration/verify/fixtures/readme-valid-uppercase/package.json
@@ -10,7 +10,6 @@
   "author": "",
   "license": "ISC",
   "type": "module",
-  "dependencies": {},
   "devDependencies": {
     "remark-preset-lint-origami-component": "2.0.0-beta.1"
   }

diff --git a/test/integration/verify/fixtures/sass-custom-config/package.json b/test/integration/verify/fixtures/sass-custom-config/package.json
@@ -10,7 +10,6 @@
   "author": "",
   "license": "ISC",
   "type": "module",
-  "dependencies": {},
   "devDependencies": {
     "remark-preset-lint-origami-component": "2.0.0-beta.1",
     "stylelint": "^13.7.0",

diff --git a/test/integration/verify/fixtures/sass/package.json b/test/integration/verify/fixtures/sass/package.json
@@ -1,5 +1,4 @@
 {
 	"name": "test-component",
-	"type": "module",
-	"dependencies": {}
+	"type": "module"
 }