From 0acf108a1b278fd89cc6166eda3c2b02d6bd497b Mon Sep 17 00:00:00 2001 From: Santosh Yadav Date: Wed, 20 Mar 2024 21:05:46 +0100 Subject: [PATCH] feat: Moving away from spotify/web-scripts Signed-off-by: Santosh Yadav --- .changeset/olive-radios-fly.md | 5 +++ .prettierrc.json | 5 +++ microsite/package.json | 40 ++++++++--------- microsite/yarn.lock | 10 ----- package.json | 2 - .../templates/default-app/.prettierrc.json | 5 +++ .../templates/default-app/package.json.hbs | 2 - .../techdocs-cli-embedded-app/package.json | 43 +++++++++---------- yarn.lock | 10 ----- 9 files changed, 55 insertions(+), 67 deletions(-) create mode 100644 .changeset/olive-radios-fly.md create mode 100644 .prettierrc.json create mode 100644 packages/create-app/templates/default-app/.prettierrc.json diff --git a/.changeset/olive-radios-fly.md b/.changeset/olive-radios-fly.md new file mode 100644 index 0000000000000..a9ab19cd25b40 --- /dev/null +++ b/.changeset/olive-radios-fly.md @@ -0,0 +1,5 @@ +--- +'@backstage/create-app': patch +--- + +remove @spotify/prettier-config diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 0000000000000..cd3bf3277438c --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,5 @@ +{ + "trailingComma": "all", + "arrowParens": "avoid", + "singleQuote": true +} diff --git a/microsite/package.json b/microsite/package.json index d5efa8196b247..92f208461ec13 100644 --- a/microsite/package.json +++ b/microsite/package.json @@ -1,34 +1,22 @@ { - "version": "0.0.0", "name": "backstage-microsite", - "license": "Apache-2.0", + "version": "0.0.0", "private": true, + "license": "Apache-2.0", "scripts": { - "start": "node scripts/pre-build.js && docusaurus start", "build": "node scripts/pre-build.js && docusaurus build", - "prettier:fix": "prettier --write .", + "deploy": "docusaurus deploy", + "docusaurus": "docusaurus", "prettier:check": "prettier --check .", + "prettier:fix": "prettier --write .", "publish-gh-pages": "docusaurus-publish", - "write-translations": "docusaurus-write-translations", - "version": "docusaurus-version", "rename-version": "docusaurus-rename-version", - "verify:sidebars": "node ./scripts/verify-sidebars", + "start": "node scripts/pre-build.js && docusaurus start", "swizzle": "docusaurus swizzle", - "deploy": "docusaurus deploy", - "docusaurus": "docusaurus" - }, - "devDependencies": { - "@docusaurus/module-type-aliases": "^3.1.1", - "@spotify/prettier-config": "^15.0.0", - "@tsconfig/docusaurus": "^2.0.0", - "@types/luxon": "^3.0.0", - "@types/webpack-env": "^1.18.0", - "js-yaml": "^4.1.0", - "prettier": "^2.6.2", - "typescript": "~5.1.0", - "yaml-loader": "^0.8.0" + "verify:sidebars": "node ./scripts/verify-sidebars", + "version": "docusaurus-version", + "write-translations": "docusaurus-write-translations" }, - "prettier": "@spotify/prettier-config", "dependencies": { "@docusaurus/core": "^3.1.1", "@docusaurus/plugin-client-redirects": "^3.1.1", @@ -42,5 +30,15 @@ "react-dom": "^18.0.0", "sass": "^1.57.1", "swc-loader": "^0.2.3" + }, + "devDependencies": { + "@docusaurus/module-type-aliases": "^3.1.1", + "@tsconfig/docusaurus": "^2.0.0", + "@types/luxon": "^3.0.0", + "@types/webpack-env": "^1.18.0", + "js-yaml": "^4.1.0", + "prettier": "^2.6.2", + "typescript": "~5.1.0", + "yaml-loader": "^0.8.0" } } diff --git a/microsite/yarn.lock b/microsite/yarn.lock index e7f76d67d9cb6..3ba2e761ac5df 100644 --- a/microsite/yarn.lock +++ b/microsite/yarn.lock @@ -2532,15 +2532,6 @@ __metadata: languageName: node linkType: hard -"@spotify/prettier-config@npm:^15.0.0": - version: 15.0.0 - resolution: "@spotify/prettier-config@npm:15.0.0" - peerDependencies: - prettier: 2.x - checksum: aa5ec5739427f9acdb9d62ae6c04f04a344898567239f7ee45c75c6205ebdffbc61747ea8de6e83baf0bc3785359967de4b7097a8723c4b4063ff57dc5cb6c44 - languageName: node - linkType: hard - "@svgr/babel-plugin-add-jsx-attribute@npm:^6.5.1": version: 6.5.1 resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:6.5.1" @@ -3855,7 +3846,6 @@ __metadata: "@docusaurus/module-type-aliases": ^3.1.1 "@docusaurus/plugin-client-redirects": ^3.1.1 "@docusaurus/preset-classic": ^3.1.1 - "@spotify/prettier-config": ^15.0.0 "@swc/core": ^1.3.46 "@tsconfig/docusaurus": ^2.0.0 "@types/luxon": ^3.0.0 diff --git a/package.json b/package.json index 5a5c7fd25a421..09214d14ff885 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,6 @@ "node ./scripts/verify-lockfile-duplicates --fix" ] }, - "prettier": "@spotify/prettier-config", "resolutions": { "@material-ui/pickers@^3.2.10": "patch:@material-ui/pickers@npm%3A3.3.11#./.yarn/patches/@material-ui-pickers-npm-3.3.11-1c8f68ea20.patch", "@material-ui/pickers@^3.3.10": "patch:@material-ui/pickers@npm%3A3.3.11#./.yarn/patches/@material-ui-pickers-npm-3.3.11-1c8f68ea20.patch", @@ -105,7 +104,6 @@ "@octokit/rest": "^19.0.3", "@playwright/test": "^1.32.3", "@spotify/eslint-plugin": "^15.0.0", - "@spotify/prettier-config": "^15.0.0", "@techdocs/cli": "workspace:*", "@types/node": "^18.17.8", "@types/webpack": "^5.28.0", diff --git a/packages/create-app/templates/default-app/.prettierrc.json b/packages/create-app/templates/default-app/.prettierrc.json new file mode 100644 index 0000000000000..cd3bf3277438c --- /dev/null +++ b/packages/create-app/templates/default-app/.prettierrc.json @@ -0,0 +1,5 @@ +{ + "trailingComma": "all", + "arrowParens": "avoid", + "singleQuote": true +} diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs index f2f35360cc265..346253dd2952f 100644 --- a/packages/create-app/templates/default-app/package.json.hbs +++ b/packages/create-app/templates/default-app/package.json.hbs @@ -34,7 +34,6 @@ "@backstage/cli": "^{{version '@backstage/cli'}}", "@backstage/e2e-test-utils": "^{{version '@backstage/e2e-test-utils'}}", "@playwright/test": "^1.32.3", - "@spotify/prettier-config": "^12.0.0", "concurrently": "^8.0.0", "lerna": "^7.3.0", "node-gyp": "^9.0.0", @@ -45,7 +44,6 @@ "@types/react": "^18", "@types/react-dom": "^18" }, - "prettier": "@spotify/prettier-config", "lint-staged": { "*.{js,jsx,ts,tsx,mjs,cjs}": [ "eslint --fix", diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json index 20a3c1a69366f..114ac99a75877 100644 --- a/packages/techdocs-cli-embedded-app/package.json +++ b/packages/techdocs-cli-embedded-app/package.json @@ -1,17 +1,35 @@ { "name": "techdocs-cli-embedded-app", "version": "0.2.92", - "private": true, "backstage": { "role": "frontend" }, - "bundled": true, + "private": true, "homepage": "https://backstage.io", "repository": { "type": "git", "url": "https://github.com/backstage/backstage", "directory": "packages/techdocs-cli-embedded-app" }, + "scripts": { + "build": "backstage-cli package build --config ./app-config.yaml", + "clean": "backstage-cli package clean", + "lint": "backstage-cli package lint", + "start": "backstage-cli package start --config ./app-config.yaml", + "test": "backstage-cli package test" + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + }, "dependencies": { "@backstage/app-defaults": "workspace:^", "@backstage/catalog-model": "workspace:^", @@ -44,24 +62,5 @@ "@types/react-dom": "*", "cross-env": "^7.0.0" }, - "scripts": { - "start": "backstage-cli package start --config ./app-config.yaml", - "build": "backstage-cli package build --config ./app-config.yaml", - "clean": "backstage-cli package clean", - "test": "backstage-cli package test", - "lint": "backstage-cli package lint" - }, - "prettier": "@spotify/prettier-config", - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - } + "bundled": true } diff --git a/yarn.lock b/yarn.lock index 8f6f3f18bd617..3a96ab3c11ffc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16513,15 +16513,6 @@ __metadata: languageName: node linkType: hard -"@spotify/prettier-config@npm:^15.0.0": - version: 15.0.0 - resolution: "@spotify/prettier-config@npm:15.0.0" - peerDependencies: - prettier: 2.x - checksum: aa5ec5739427f9acdb9d62ae6c04f04a344898567239f7ee45c75c6205ebdffbc61747ea8de6e83baf0bc3785359967de4b7097a8723c4b4063ff57dc5cb6c44 - languageName: node - linkType: hard - "@stoplight/better-ajv-errors@npm:1.0.3": version: 1.0.3 resolution: "@stoplight/better-ajv-errors@npm:1.0.3" @@ -40848,7 +40839,6 @@ __metadata: "@octokit/rest": ^19.0.3 "@playwright/test": ^1.32.3 "@spotify/eslint-plugin": ^15.0.0 - "@spotify/prettier-config": ^15.0.0 "@techdocs/cli": "workspace:*" "@types/node": ^18.17.8 "@types/webpack": ^5.28.0