From c6cc559b5a0dc9737c354b6a92967fd3560e44ea Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Wed, 6 Mar 2024 10:35:11 +0100 Subject: [PATCH] chore(packages): remove prepare packagejson script --- .github/CODEOWNERS | 1 - packages/grafana-data/package.json | 4 +--- packages/grafana-e2e-selectors/package.json | 4 +--- packages/grafana-flamegraph/package.json | 4 +--- packages/grafana-prometheus/package.json | 4 +--- packages/grafana-runtime/package.json | 4 +--- packages/grafana-schema/package.json | 4 +--- packages/grafana-ui/package.json | 4 +--- scripts/prepare-packagejson.js | 21 --------------------- 9 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 scripts/prepare-packagejson.js diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 01178d298f3..378b6f47d67 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -622,7 +622,6 @@ playwright.config.ts @grafana/plugins-platform-frontend /scripts/import_many_dashboards.sh @torkelo /scripts/mixin-check.sh @bergquist /scripts/openapi3/ @grafana/grafana-operator-experience-squad -/scripts/prepare-packagejson.js @grafana/frontend-ops /scripts/protobuf-check.sh @grafana/plugins-platform-backend /scripts/stripnulls.sh @grafana/grafana-as-code /scripts/tag_release.sh @grafana/grafana-developer-enablement-squad diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 61124640e72..15f2e516273 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -30,9 +30,7 @@ "scripts": { "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts --configPlugin esbuild", "clean": "rimraf ./dist ./compiled ./package.tgz", - "typecheck": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js", - "postpack": "mv package.json.bak package.json" + "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "dependencies": { "@braintree/sanitize-url": "7.0.1", diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index 739e36cfec8..41e563356e7 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -34,9 +34,7 @@ "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts --configPlugin esbuild", "bundle": "rollup -c rollup.config.ts --configPlugin esbuild", "clean": "rimraf ./dist ./compiled ./package.tgz", - "typecheck": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js", - "postpack": "mv package.json.bak package.json" + "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "devDependencies": { "@rollup/plugin-node-resolve": "16.0.0", diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json index f47339c0aa0..ac24af7e952 100644 --- a/packages/grafana-flamegraph/package.json +++ b/packages/grafana-flamegraph/package.json @@ -34,9 +34,7 @@ "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts --configPlugin esbuild", "bundle": "rollup -c rollup.config.ts --configPlugin esbuild", "clean": "rimraf ./dist ./compiled ./package.tgz", - "typecheck": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js", - "postpack": "mv package.json.bak package.json" + "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "browserslist": [ "defaults", diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json index 9cf1a0c1100..18ce808713c 100644 --- a/packages/grafana-prometheus/package.json +++ b/packages/grafana-prometheus/package.json @@ -31,9 +31,7 @@ "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts --configPlugin esbuild", "bundle": "rollup -c rollup.config.ts --configPlugin esbuild", "clean": "rimraf ./dist ./compiled ./package.tgz", - "typecheck": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js", - "postpack": "mv package.json.bak package.json" + "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "dependencies": { "@emotion/css": "11.13.5", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 90ca6774646..4c797a0fb07 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -32,9 +32,7 @@ "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts --configPlugin esbuild", "bundle": "rollup -c rollup.config.ts --configPlugin esbuild", "clean": "rimraf ./dist ./compiled ./package.tgz", - "typecheck": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js", - "postpack": "mv package.json.bak package.json" + "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "dependencies": { "@grafana/data": "11.6.0-pre", diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json index a4939ade8a1..b4abf69a885 100644 --- a/packages/grafana-schema/package.json +++ b/packages/grafana-schema/package.json @@ -31,9 +31,7 @@ "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts --configPlugin esbuild", "bundle": "rollup -c rollup.config.ts --configPlugin esbuild", "clean": "rimraf ./dist ./compiled ./package.tgz", - "typecheck": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js", - "postpack": "mv package.json.bak package.json" + "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "devDependencies": { "@grafana/tsconfig": "^2.0.0", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 1116e1b2980..394999a8365 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -37,9 +37,7 @@ "clean": "rimraf ./dist ./compiled ./package.tgz", "storybook": "storybook dev -p 9001 -c .storybook --no-open", "storybook:build": "storybook build -o ./dist/storybook -c .storybook", - "typecheck": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js", - "postpack": "mv package.json.bak package.json" + "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "browserslist": [ "defaults", diff --git a/scripts/prepare-packagejson.js b/scripts/prepare-packagejson.js deleted file mode 100644 index cab9eed4c98..00000000000 --- a/scripts/prepare-packagejson.js +++ /dev/null @@ -1,21 +0,0 @@ -const fs = require('fs'); - -const cwd = process.cwd(); -const packageJson = require(`${cwd}/package.json`); - -const newPackageJson = { - ...packageJson, - main: packageJson.publishConfig?.main ?? packageJson.main, -}; - -if (packageJson.publishConfig?.types) { - newPackageJson.types = packageJson.publishConfig.types; -} - -if (packageJson.publishConfig?.module) { - newPackageJson.module = packageJson.publishConfig.module; -} - -try { - fs.writeFileSync(`${cwd}/package.json`, JSON.stringify(newPackageJson, null, 2)); -} catch (e) {}