diff --git a/.changeset/spotty-numbers-occur.md b/.changeset/spotty-numbers-occur.md index dee57f8850..fff27a18d3 100644 --- a/.changeset/spotty-numbers-occur.md +++ b/.changeset/spotty-numbers-occur.md @@ -1,5 +1,5 @@ --- -'@backstage/cli': minor +'@backstage/cli': patch --- Adds support for two new CLI options on the `repo build` and `package build` commands. Both options are only available to frontend components. Backend config continues to be supplied at runtime. diff --git a/packages/cli/package.json b/packages/cli/package.json index 0fcd8cd89f..fd8b852558 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -24,9 +24,7 @@ "lint": "backstage-cli package lint", "test": "backstage-cli package test", "clean": "backstage-cli package clean", - "start": "nodemon --", - "test:e2e": "backstage-cli test --config e2e-test.config.js", - "test:e2e:ci": "backstage-cli test --config e2e-test.config.js --watchAll=false --ci" + "start": "nodemon --" }, "bin": { "backstage-cli": "bin/backstage-cli" @@ -86,7 +84,6 @@ "express": "^4.17.1", "fork-ts-checker-webpack-plugin": "^7.0.0-alpha.8", "fs-extra": "10.1.0", - "get-port": "^6.1.2", "glob": "^7.1.7", "global-agent": "^3.0.0", "handlebars": "^4.7.3", @@ -157,6 +154,7 @@ "@types/terser-webpack-plugin": "^5.0.4", "@types/yarnpkg__lockfile": "^1.1.4", "del": "^6.0.0", + "get-port": "^6.1.2", "mock-fs": "^5.1.0", "msw": "^0.49.0", "nodemon": "^2.0.2", @@ -275,4 +273,4 @@ } } } -} +} \ No newline at end of file diff --git a/packages/cli/src/__fixtures__/test-project/backstage.json b/packages/cli/src/__fixtures__/test-project/backstage.json index 3e73a3c875..688e939808 100644 --- a/packages/cli/src/__fixtures__/test-project/backstage.json +++ b/packages/cli/src/__fixtures__/test-project/backstage.json @@ -1,3 +1,3 @@ { - "version": "1.7.0-next.0" -} + "version": "1.0.0" +} \ No newline at end of file diff --git a/packages/cli/src/__fixtures__/test-project/package.json b/packages/cli/src/__fixtures__/test-project/package.json index 7ebf258618..07f754b9c9 100644 --- a/packages/cli/src/__fixtures__/test-project/package.json +++ b/packages/cli/src/__fixtures__/test-project/package.json @@ -5,50 +5,15 @@ "engines": { "node": "14 || 16" }, - "scripts": { - "dev": "concurrently \"yarn start\" \"yarn start-backend\"", - "start": "yarn workspace app start", - "start-backend": "yarn workspace backend start", - "build": "backstage-cli repo build --all", - "build-image": "yarn workspace backend build-image", - "tsc": "tsc", - "tsc:full": "tsc --skipLibCheck false --incremental false", - "clean": "backstage-cli repo clean", - "test": "backstage-cli repo test", - "test:all": "backstage-cli repo test --coverage", - "lint": "backstage-cli repo lint --since origin/master", - "lint:all": "backstage-cli repo lint", - "prettier:check": "prettier --check .", - "create-plugin": "backstage-cli create-plugin --scope internal", - "new": "backstage-cli new --scope internal" - }, "workspaces": { "packages": [ - "packages/*", - "plugins/*" + "packages/*" ] }, "devDependencies": { "@backstage/cli": "^0.20.0-next.0", - "@spotify/prettier-config": "^12.0.0", - "concurrently": "^6.0.0", "lerna": "^4.0.0", "node-gyp": "^9.0.0", - "prettier": "^2.3.2", "typescript": "~4.6.4" - }, - "resolutions": { - "@types/react": "^17", - "@types/react-dom": "^17" - }, - "prettier": "@spotify/prettier-config", - "lint-staged": { - "*.{js,jsx,ts,tsx,mjs,cjs}": [ - "eslint --fix", - "prettier --write" - ], - "*.{json,md}": [ - "prettier --write" - ] } -} +} \ No newline at end of file diff --git a/packages/cli/src/__fixtures__/test-project/packages/app/package.json b/packages/cli/src/__fixtures__/test-project/packages/app/package.json index 1157a698f5..91acce03ef 100644 --- a/packages/cli/src/__fixtures__/test-project/packages/app/package.json +++ b/packages/cli/src/__fixtures__/test-project/packages/app/package.json @@ -6,77 +6,7 @@ "backstage": { "role": "frontend" }, - "scripts": { - "start": "backstage-cli package start", - "build": "backstage-cli package build", - "clean": "backstage-cli package clean", - "test": "backstage-cli package test", - "lint": "backstage-cli package lint", - "test:e2e": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:dev", - "test:e2e:ci": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:run", - "cy:dev": "cypress open", - "cy:run": "cypress run --browser chrome" - }, - "dependencies": { - "@backstage/app-defaults": "^1.0.7-next.0", - "@backstage/catalog-model": "^1.1.2-next.0", - "@backstage/cli": "^0.20.0-next.0", - "@backstage/core-app-api": "^1.1.1-next.0", - "@backstage/core-components": "^0.11.2-next.0", - "@backstage/core-plugin-api": "^1.0.7-next.0", - "@backstage/integration-react": "^1.1.5-next.0", - "@backstage/plugin-api-docs": "^0.8.10-next.0", - "@backstage/plugin-catalog": "^1.5.2-next.0", - "@backstage/plugin-catalog-common": "^1.0.7-next.0", - "@backstage/plugin-catalog-graph": "^0.2.22-next.0", - "@backstage/plugin-catalog-import": "^0.8.13-next.0", - "@backstage/plugin-catalog-react": "^1.1.5-next.0", - "@backstage/plugin-github-actions": "^0.5.10-next.0", - "@backstage/plugin-org": "^0.5.10-next.0", - "@backstage/plugin-permission-react": "^0.4.6-next.0", - "@backstage/plugin-scaffolder": "^1.7.0-next.0", - "@backstage/plugin-search": "^1.0.3-next.0", - "@backstage/plugin-search-react": "^1.1.1-next.0", - "@backstage/plugin-tech-radar": "^0.5.17-next.0", - "@backstage/plugin-techdocs": "^1.3.3-next.0", - "@backstage/plugin-techdocs-module-addons-contrib": "^1.0.5-next.0", - "@backstage/plugin-techdocs-react": "^1.0.5-next.0", - "@backstage/plugin-user-settings": "^0.5.0-next.0", - "@backstage/theme": "^0.2.16", - "@material-ui/core": "^4.12.2", - "@material-ui/icons": "^4.9.1", - "history": "^5.0.0", - "react": "^17.0.2", - "react-dom": "^17.0.2", - "react-router": "^6.3.0", - "react-router-dom": "^6.3.0", - "react-use": "^17.2.4" - }, - "devDependencies": { - "@backstage/test-utils": "^1.2.1-next.0", - "@testing-library/jest-dom": "^5.10.1", - "@testing-library/react": "^12.1.3", - "@testing-library/user-event": "^14.0.0", - "@types/node": "^16.11.26", - "@types/react-dom": "*", - "cross-env": "^7.0.0", - "cypress": "^9.7.0", - "eslint-plugin-cypress": "^2.10.3", - "start-server-and-test": "^1.10.11" - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - }, "files": [ "dist" ] -} +} \ No newline at end of file diff --git a/packages/cli/src/__fixtures__/test-project/packages/app/public/index.html b/packages/cli/src/__fixtures__/test-project/packages/app/public/index.html index a936c73602..93da08ba81 100644 --- a/packages/cli/src/__fixtures__/test-project/packages/app/public/index.html +++ b/packages/cli/src/__fixtures__/test-project/packages/app/public/index.html @@ -4,76 +4,8 @@ - - - - - - - - - - -