cli,create-app: bump esbuild + remove resolutions override in create-app

.changeset/light-nails-crash.md

@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Bump versions of `esbuild` and `rollup-plugin-esbuild`

.changeset/perfect-dryers-sell.md

@@ -0,0 +1,13 @@
+---
+'@backstage/create-app': patch
+---
+
+Removed `"resolutions"` entry for `esbuild` in the root `package.json` in order to use the version specified by `@backstage/cli`.
+
+To apply this change to an existing app, remove the following from your root `package.json`:
+
+```json
+"resolutions": {
+  "esbuild": "0.6.3"
+},
+```

packages/cli/package.json

@@ -59,7 +59,7 @@
     "css-loader": "^3.5.3",
     "dashify": "^2.0.0",
     "diff": "^4.0.2",
-    "esbuild": "^0.7.7",
+    "esbuild": "^0.8.16",
     "eslint": "^7.1.0",
     "eslint-config-prettier": "^6.0.0",
     "eslint-formatter-friendly": "^7.0.0",
@@ -88,7 +88,7 @@
     "replace-in-file": "^6.0.0",
     "rollup": "2.33.x",
     "rollup-plugin-dts": "1.4.13",
-    "rollup-plugin-esbuild": "2.3.x",
+    "rollup-plugin-esbuild": "2.6.x",
     "rollup-plugin-peer-deps-external": "^2.2.2",
     "rollup-plugin-postcss": "^3.1.1",
     "rollup-plugin-typescript2": "^0.27.3",

packages/cli/src/lib/builder/packager.ts

@@ -83,6 +83,23 @@ async function build(config: RollupOptions) {
 }
 
 export const buildPackage = async (options: BuildOptions) => {
+  try {
+    const { resolutions } = await fs.readJson(
+      paths.resolveTargetRoot('package.json'),
+    );
+    if (resolutions?.esbuild) {
+      console.warn(
+        chalk.red(
+          'Your root package.json contains a "resolutions" entry for "esbuild". This was ' +
+            'included in older @backstage/create-app templates in order to work around build ' +
+            'issues that have since been fixed. Please remove the entry and run `yarn install`',
+        ),
+      );
+    }
+  } catch {
+    /* Errors ignored, this is just a warning */
+  }
+
   const configs = await makeConfigs(options);
   await fs.remove(paths.resolveTarget('dist'));
   await Promise.all(configs.map(build));

packages/create-app/templates/default-app/package.json.hbs

@@ -32,9 +32,6 @@
     "lerna": "^3.20.2",
     "prettier": "^1.19.1"
   },
-  "resolutions": {
-    "esbuild": "0.6.3"
-  },
   "prettier": "@spotify/prettier-config",
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [

yarn.lock

@@ -3836,6 +3836,14 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
+"@rollup/pluginutils@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.1.0.tgz#0dcc61c780e39257554feb7f77207dceca13c838"
+  integrity sha512-TrBhfJkFxA+ER+ew2U2/fHbebhLT/l/2pRk0hfj9KusXUuRXd2v0R58AfaZK9VXDQ4TogOSEmICVrQAA3zFnHQ==
+  dependencies:
+    estree-walker "^2.0.1"
+    picomatch "^2.2.2"
+
 "@samverschueren/stream-to-observable@^0.3.0":
   version "0.3.0"
   resolved "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
@@ -11153,10 +11161,10 @@ es6-weak-map@^2.0.2:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
-esbuild@^0.7.7:
-  version "0.7.7"
-  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.7.7.tgz#fd86332d1c0a047231bd6da930666028c40c14bf"
-  integrity sha512-1Ub4BBsWwPdxkwjyuXdKrgMIZROZ82ULIRFclOzXXVrqKOv9rMDoShRf23WEbPfeEA94z/BScKyUOyooyQ3XnQ==
+esbuild@^0.8.16:
+  version "0.8.16"
+  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.8.16.tgz#8ae34b15d938e8b8b5ac2459414fe3e7fd7dd6b2"
+  integrity sha512-HMvPNxDIhEGO/YUh8oO8oxQ1g+ttWz2anUF7NJmQglj2XfJS8zd8mP0Sb2y+jE1SVk3UjD/rYhdsEOFULN9/xw==
 
 escalade@^3.0.1:
   version "3.0.2"
@@ -15106,6 +15114,11 @@ jose@^2.0.2:
   dependencies:
     "@panva/asn1.js" "^1.0.0"
 
+joycon@^2.2.5:
+  version "2.2.5"
+  resolved "https://registry.npmjs.org/joycon/-/joycon-2.2.5.tgz#8d4cf4cbb2544d7b7583c216fcdfec19f6be1615"
+  integrity sha512-YqvUxoOcVPnCp0VU1/56f+iKSdvIRJYPznH22BdXV3xMk75SFXhWeJkZ8C9XxUWt1b5x2X1SxuFygW1U0FmkEQ==
+
 js-cookie@^2.2.1:
   version "2.2.1"
   resolved "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
@@ -21172,12 +21185,14 @@ rollup-plugin-dts@1.4.13:
   optionalDependencies:
     "@babel/code-frame" "^7.10.4"
 
-rollup-plugin-esbuild@2.3.x:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/rollup-plugin-esbuild/-/rollup-plugin-esbuild-2.3.0.tgz#7c107d4508af80d30966a148b306cb7d5b36b258"
-  integrity sha512-lNbWDRaClwXauaIybuaiOBRWgxcp3GkZu0UUix9yH/OHFgVohKmzlU0NtNbvfbxAcfEooyuBRAv6YCaJl1Mbpw==
+rollup-plugin-esbuild@2.6.x:
+  version "2.6.0"
+  resolved "https://registry.npmjs.org/rollup-plugin-esbuild/-/rollup-plugin-esbuild-2.6.0.tgz#80336399b113a179ccb2af5bdf7c03f061f37146"
+  integrity sha512-wtyDAX8kNABrBfwkrrG2xLRKRGSWUyMBURS067IRvRMpgJlLRo14WcFl95uGc4iYWfdAx436/z1LMzYqdlY4ig==
   dependencies:
-    "@rollup/pluginutils" "^3.1.0"
+    "@rollup/pluginutils" "^4.1.0"
+    joycon "^2.2.5"
+    strip-json-comments "^3.1.1"
 
 rollup-plugin-peer-deps-external@^2.2.2:
   version "2.2.3"