From 2d61521a41dcc78fd330e861f09d9719a2dd7354 Mon Sep 17 00:00:00 2001 From: Simon Brunel Date: Tue, 20 Apr 2021 22:44:24 +0200 Subject: [PATCH] fix(cli): invalid package.plain.json.ejs template Generating a project (`lb4 app`) without enabling the `loopbackBuild` feature produces an invalid `package.json` with the following errors: - duplicated `main` field (should be `types` for the second one) - incorrect `types` path (should be `dist/index.d.ts`) - `services` feature not handled (missing dependency) - `repositories` flag not handled (always enabled) - duplicated `source-map-support` dependency Fixes for these issues are consistent with `package.json.ejs`. Signed-off-by: Simon Brunel --- .../project/templates/package.plain.json.ejs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/cli/generators/project/templates/package.plain.json.ejs b/packages/cli/generators/project/templates/package.plain.json.ejs index 763efb90c577..c66c4f0919b8 100644 --- a/packages/cli/generators/project/templates/package.plain.json.ejs +++ b/packages/cli/generators/project/templates/package.plain.json.ejs @@ -10,7 +10,7 @@ "private": true, <% } -%> "main": "dist/index.js", - "main": "types/index.d.ts", + "types": "dist/index.d.ts", "engines": { "node": ">=10.16" }, @@ -134,12 +134,17 @@ <% if (project.projectType === 'application') { -%> "@loopback/boot": "<%= project.dependencies['@loopback/boot'] -%>", "@loopback/core": "<%= project.dependencies['@loopback/core'] -%>", +<% if (project.repositories) { -%> "@loopback/repository": "<%= project.dependencies['@loopback/repository'] -%>", +<% } -%> <% if (project.apiconnect) { -%> "@loopback/apiconnect": "<%= project.dependencies['@loopback/apiconnect'] -%>", <% } -%> "@loopback/rest": "<%= project.dependencies['@loopback/rest'] -%>", "@loopback/rest-explorer": "<%= project.dependencies['@loopback/rest-explorer'] -%>", +<% } -%> +<% if (project.services) { -%> + "@loopback/service-proxy": "<%= project.dependencies['@loopback/service-proxy'] -%>", <% } -%> "tslib": "<%= project.dependencies['tslib'] -%>" }, @@ -160,9 +165,6 @@ <% if (project.prettier) { -%> "prettier": "<%= project.dependencies['prettier'] -%>", <% } -%> -<% if (project.mocha) { -%> - "source-map-support": "<%= project.dependencies['source-map-support'] -%>", -<% } -%> <% if (project.eslint) { -%> "@loopback/eslint-config": "<%= project.dependencies['@loopback/eslint-config'] -%>", "eslint": "<%= project.dependencies['eslint'] -%>",