fix(cli): make sure generated package.json is well formatted

loopbackio · Mar 30, 2020 · 38be23f · 38be23f
1 parent c30dce3
commit 38be23f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/packages/cli/generators/project/templates/package.json.ejs b/packages/cli/generators/project/templates/package.json.ejs
@@ -13,7 +13,6 @@
   "scripts": {
     "build": "lb-tsc",
     "build:watch": "lb-tsc --watch",
-    "clean": "lb-clean dist *.tsbuildinfo",
 <% if (project.prettier && project.eslint) { -%>
     "lint": "npm run prettier:check && npm run eslint",
     "lint:fix": "npm run eslint:fix && npm run prettier:fix",
@@ -46,15 +45,15 @@
     "test:dev": "lb-mocha --allow-console-logs dist/__tests__/**/*.js",
 <% } -%>
 <% if (project.projectType === 'application') { -%>
-  <% if (project.docker) { -%>
+  <%_ if (project.docker) { -%>
     "docker:build": "docker build -t <%= project.name -%> .",
     "docker:run": "docker run -p 3000:3000 -d <%= project.name -%>",
-  <% } -%>
+  <%_ } -%>
     "migrate": "node ./dist/migrate",
     "prestart": "npm run build",
     "start": "node -r source-map-support/register .",
 <% } -%>
-    "prepublishOnly": "npm run test"
+    "clean": "lb-clean dist *.tsbuildinfo .eslintcache"
   },
   "repository": {
     "type": "git"
@@ -91,22 +90,22 @@
 <% } else { /* NOT AN APPLICATION */-%>
     "@loopback/core": "<%= project.dependencies['@loopback/core'] -%>",
 <% } -%>
-  "tslib": "<%= project.dependencies['tslib'] -%>"
+    "tslib": "<%= project.dependencies['tslib'] -%>"
   },
   "devDependencies": {
     "@loopback/build": "<%= project.dependencies['@loopback/build'] -%>",
     "source-map-support": "<%= project.dependencies['source-map-support'] -%>",
     "@loopback/testlab": "<%= project.dependencies['@loopback/testlab'] -%>",
     "@types/node": "<%= project.dependencies['@types/node'] -%>",
-    <% if (project.eslint) { -%>
+<% if (project.eslint) { -%>
     "@typescript-eslint/parser": "<%= project.dependencies['@typescript-eslint/parser'] -%>",
     "@typescript-eslint/eslint-plugin": "<%= project.dependencies['@typescript-eslint/eslint-plugin'] -%>",
     "@loopback/eslint-config": "<%= project.dependencies['@loopback/eslint-config'] -%>",
     "eslint": "<%= project.dependencies['eslint'] -%>",
     "eslint-config-prettier": "<%= project.dependencies['eslint-config-prettier'] -%>",
     "eslint-plugin-eslint-plugin": "<%= project.dependencies['eslint-plugin-eslint-plugin'] -%>",
     "eslint-plugin-mocha": "<%= project.dependencies['eslint-plugin-mocha'] -%>",
-    <% } -%>
+<% } -%>
     "typescript": "<%= project.dependencies['typescript'] -%>"
   }
 }
diff --git a/packages/cli/generators/project/templates/package.plain.json.ejs b/packages/cli/generators/project/templates/package.plain.json.ejs
@@ -13,7 +13,7 @@
   "scripts": {
     "build": "tsc",
     "build:watch": "tsc --watch",
-    "clean": "rimraf dist *.tsbuildinfo",
+    "clean": "rimraf dist *.tsbuildinfo .eslintcache",
 <% if (project.prettier && project.eslint) { -%>
     "lint": "npm run prettier:check && npm run eslint",
     "lint:fix": "npm run eslint:fix && npm run prettier:fix",
@@ -46,10 +46,10 @@
     "test:dev": "mocha dist/__tests__/**/*.js",
 <% } -%>
 <% if (project.projectType === 'application') { -%>
-  <% if (project.docker) { -%>
+  <%_ if (project.docker) { -%>
     "docker:build": "docker build -t <%= project.name -%> .",
     "docker:run": "docker run -p 3000:3000 -d <%= project.name -%>",
-  <% } -%>
+  <%_ } -%>
     "migrate": "node ./dist/migrate",
     "start": "npm run build && node -r source-map-support/register .",
 <% } -%>
@@ -83,7 +83,7 @@
 <% } else { -%>
     "@loopback/core": "<%= project.dependencies['@loopback/core'] -%>",
 <% } -%>
-  "tslib": "<%= project.dependencies['tslib'] -%>"
+    "tslib": "<%= project.dependencies['tslib'] -%>"
   },
   "devDependencies": {
     "rimraf": "<%= project.dependencies['rimraf'] -%>",
@@ -110,7 +110,7 @@
     "eslint-config-prettier": "<%= project.dependencies['eslint-config-prettier'] -%>",
     "eslint-plugin-eslint-plugin": "<%= project.dependencies['eslint-plugin-eslint-plugin'] -%>",
     "eslint-plugin-mocha": "<%= project.dependencies['eslint-plugin-mocha'] -%>",
-  <% } -%>
+<% } -%>
     "typescript": "<%= project.dependencies['typescript'] -%>"
   }
 }
diff --git a/packages/cli/test/integration/generators/app.integration.js b/packages/cli/test/integration/generators/app.integration.js
@@ -125,7 +125,7 @@ describe('app-generator specific files', () => {
   it('creates npm script "clean"', () => {
     assert.fileContent(
       'package.json',
-      '"clean": "lb-clean dist *.tsbuildinfo"',
+      '"clean": "lb-clean dist *.tsbuildinfo .eslintcache"',
     );
   });
 

diff --git a/packages/cli/test/integration/lib/project-generator.js b/packages/cli/test/integration/lib/project-generator.js
@@ -342,8 +342,9 @@ module.exports = function (projGenerator, props, projectType) {
           ['tsconfig.json', '@loopback/build'],
         ]);
         assert.fileContent([
-          ['package.json', '"clean": "rimraf dist *.tsbuildinfo"'],
-          ['package.json', '"typescript"'],
+          ['package.json', '"clean": "rimraf dist *.tsbuildinfo .eslintcache"'],
+          ['package.json', /^ {4}"typescript"/m],
+          ['package.json', /^ {4}"tslib"/m],
           ['package.json', '"eslint"'],
           ['package.json', 'eslint-config-prettier'],
           ['package.json', 'eslint-plugin-eslint-plugin'],