diff --git a/packages/app/package.json b/packages/app/package.json index fd9aa88323..2c8b10ffb3 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -2,6 +2,21 @@ "name": "example-app", "version": "0.1.1-alpha.4", "private": true, + "devDependencies": { + "@testing-library/cypress": "^6.0.0", + "@types/jquery": "^3.3.34", + "@testing-library/jest-dom": "^4.2.4", + "@testing-library/react": "^9.3.2", + "@testing-library/user-event": "^7.1.2", + "@types/jest": "^24.0.0", + "@types/node": "^12.0.0", + "@types/react-router-dom": "^5.1.3", + "@types/zen-observable": "^0.8.0", + "cross-env": "^7.0.0", + "cypress": "^4.2.0", + "eslint-plugin-cypress": "^2.10.3", + "start-server-and-test": "^1.10.11" + }, "dependencies": { "@backstage/cli": "^0.1.1-alpha.4", "@backstage/core": "^0.1.1-alpha.4", @@ -12,14 +27,6 @@ "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", - "@testing-library/jest-dom": "^4.2.4", - "@testing-library/react": "^9.3.2", - "@testing-library/user-event": "^7.1.2", - "@types/jest": "^24.0.0", - "@types/node": "^12.0.0", - "@types/react-router-dom": "^5.1.3", - "@types/zen-observable": "^0.8.0", - "cross-env": "^7.0.0", "prop-types": "^15.7.2", "react": "^16.12.0", "react-dom": "^16.12.0", @@ -50,12 +57,5 @@ "last 1 safari version" ] }, - "license": "Apache-2.0", - "devDependencies": { - "@testing-library/cypress": "^6.0.0", - "@types/jquery": "^3.3.34", - "cypress": "^4.2.0", - "eslint-plugin-cypress": "^2.10.3", - "start-server-and-test": "^1.10.11" - } + "license": "Apache-2.0" } diff --git a/packages/cli/package.json b/packages/cli/package.json index faf8710d14..3607a17e8f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -26,6 +26,9 @@ "clean": "backstage-cli clean", "start": "nodemon ." }, + "bin": { + "backstage-cli": "bin/backstage-cli" + }, "devDependencies": { "@types/fs-extra": "^8.1.0", "@types/html-webpack-plugin": "^3.2.2", @@ -45,9 +48,6 @@ "tsconfig-paths": "^3.9.0", "zombie": "^6.1.4" }, - "bin": { - "backstage-cli": "bin/backstage-cli" - }, "dependencies": { "@lerna/package-graph": "^3.18.5", "@lerna/project": "^3.18.0", @@ -67,6 +67,7 @@ "html-webpack-plugin": "^3.2.0", "inquirer": "^7.0.4", "ora": "^4.0.3", + "react": "^16.0.0", "react-dev-utils": "^10.2.0", "react-scripts": "^3.4.1", "recursive-readdir": "^2.2.2", @@ -81,9 +82,6 @@ "webpack": "^4.41.6", "webpack-dev-server": "^3.10.3" }, - "peerDependencies": { - "react": "^16.0.0" - }, "files": [ "templates", "config", diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs index 32479b879b..9f7f0d69ca 100644 --- a/packages/cli/templates/default-plugin/package.json.hbs +++ b/packages/cli/templates/default-plugin/package.json.hbs @@ -8,7 +8,7 @@ "scripts": { "build": "backstage-cli plugin:build", "lint": "backstage-cli lint", - "test": "backstage-cli test", + "test": "backstage-cli test", "clean": "backstage-cli clean" }, "devDependencies": { @@ -21,7 +21,7 @@ "@types/testing-library__jest-dom": "5.0.2", "jest-fetch-mock": "^3.0.3" }, - "peerDependencies": { + "dependencies": { "@backstage/core": "^{{version}}", "@backstage/theme": "^{{version}}", "@material-ui/core": "^4.9.1", diff --git a/packages/core/package.json b/packages/core/package.json index 651ac1006c..6aea91be7d 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -21,15 +21,25 @@ "scripts": { "build": "backstage-cli plugin:build", "lint": "backstage-cli lint", - "test": "backstage-cli test", + "test": "backstage-cli test", "clean": "backstage-cli clean" }, - "dependencies": { - "@material-ui/core": "^4.9.1", - "@material-ui/icons": "^4.9.1", + "devDependencies": { + "@backstage/cli": "^0.1.1-alpha.4", + "@backstage/test-utils": "0.1.1-alpha.4", + "@backstage/test-utils-core": "^0.1.1-alpha.4", + "@testing-library/jest-dom": "^4.2.4", + "@testing-library/react": "^9.3.2", + "@testing-library/user-event": "^7.1.2", "@types/google-protobuf": "^3.7.2", "@types/jest": "^24.0.0", "@types/node": "^12.0.0", + "@types/react-sparklines": "^1.7.0" + }, + "dependencies": { + "@backstage/theme": "^0.1.1-alpha.4", + "@material-ui/core": "^4.9.1", + "@material-ui/icons": "^4.9.1", "classnames": "^2.2.6", "clsx": "^1.1.0", "prop-types": "^15.7.2", @@ -38,22 +48,9 @@ "react-addons-text-content": "0.0.4", "react-dom": "^16.12.0", "react-helmet": "5.2.1", + "react-router": "^5.1.2", "react-router-dom": "^5.1.2", "react-sparklines": "^1.7.0", "recompose": "0.30.0" - }, - "devDependencies": { - "@backstage/cli": "^0.1.1-alpha.4", - "@backstage/test-utils": "0.1.1-alpha.4", - "@backstage/test-utils-core": "^0.1.1-alpha.4", - "@backstage/theme": "^0.1.1-alpha.4", - "@testing-library/jest-dom": "^4.2.4", - "@testing-library/react": "^9.3.2", - "@testing-library/user-event": "^7.1.2", - "@types/react-sparklines": "^1.7.0", - "react-router": "^5.1.2" - }, - "peerDependencies": { - "@backstage/theme": "^0.1.1-alpha.3" } } diff --git a/packages/storybook/package.json b/packages/storybook/package.json index 56ac5c6264..435c0d397e 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -13,14 +13,14 @@ "@storybook/addons/**" ] }, - "dependencies": { - "@backstage/theme": "0.1.1-alpha.4" - }, "devDependencies": { "@storybook/addon-actions": "^5.3.17", "@storybook/addon-links": "^5.3.17", "@storybook/addon-storysource": "^5.3.18", "@storybook/addons": "^5.3.17", "@storybook/react": "^5.3.17" + }, + "dependencies": { + "@backstage/theme": "0.1.1-alpha.4" } } diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 9eca38eeb5..e3d12b0e6d 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -21,26 +21,17 @@ "scripts": { "build": "backstage-cli plugin:build", "lint": "backstage-cli lint", - "test": "backstage-cli test", + "test": "backstage-cli test", "clean": "backstage-cli clean" }, "devDependencies": { "@backstage/cli": "^0.1.1-alpha.4", - "@backstage/theme": "^0.1.1-alpha.4", - "@material-ui/core": "^4.9.1", - "@testing-library/jest-dom": "^4.2.4", - "@testing-library/react": "^9.3.2", - "@testing-library/user-event": "^7.1.2", + "@backstage/test-utils-core": "^0.1.1-alpha.4", "@types/jest": "^24.0.0", - "@types/node": "^12.0.0", - "react": "^16.12.0", - "react-dom": "^16.12.0", - "react-router": "^5.1.2", - "react-router-dom": "^5.1.2" + "@types/node": "^12.0.0" }, - "peerDependencies": { - "@backstage/test-utils-core": "^0.1.1-alpha.3", - "@backstage/theme": "^0.1.1-alpha.3", + "dependencies": { + "@backstage/theme": "^0.1.1-alpha.4", "@material-ui/core": "^4.9.1", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", diff --git a/packages/theme/package.json b/packages/theme/package.json index 6504d7dea5..6bab9371d2 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -20,14 +20,13 @@ "types": "dist/index.d.ts", "scripts": { "build": "backstage-cli plugin:build", - "lint": "backstage-cli lint", + "lint": "backstage-cli lint", "clean": "backstage-cli clean" }, "devDependencies": { - "@backstage/cli": "^0.1.1-alpha.4", - "@material-ui/core": "^4.9.1" + "@backstage/cli": "^0.1.1-alpha.4" }, - "peerDependencies": { + "dependencies": { "@material-ui/core": "^4.9.1" } } diff --git a/plugins/home-page/package.json b/plugins/home-page/package.json index 65fb3cf9da..4cc553b994 100644 --- a/plugins/home-page/package.json +++ b/plugins/home-page/package.json @@ -8,27 +8,21 @@ "scripts": { "build": "backstage-cli plugin:build", "lint": "backstage-cli lint", - "test": "backstage-cli test", + "test": "backstage-cli test", "clean": "backstage-cli clean" }, "devDependencies": { "@backstage/cli": "^0.1.1-alpha.4", - "@backstage/core": "^0.1.1-alpha.4", - "@backstage/theme": "^0.1.1-alpha.4", - "@material-ui/core": "^4.9.1", - "@material-ui/icons": "^4.9.1", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", "@types/jest": "^24.0.0", "@types/node": "^12.0.0", - "@types/testing-library__jest-dom": "5.0.2", - "react": "^16.12.0", - "react-dom": "^16.12.0" + "@types/testing-library__jest-dom": "5.0.2" }, - "peerDependencies": { - "@backstage/core": "^0.1.1-alpha.3", - "@backstage/theme": "^0.1.1-alpha.3", + "dependencies": { + "@backstage/core": "^0.1.1-alpha.4", + "@backstage/theme": "^0.1.1-alpha.4", "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json index d082b0be0f..52ba968bfd 100644 --- a/plugins/lighthouse/package.json +++ b/plugins/lighthouse/package.json @@ -12,38 +12,27 @@ "test": "backstage-cli test", "clean": "backstage-cli clean" }, - "dependencies": { - "react-markdown": "^4.3.1" - }, "devDependencies": { "@backstage/cli": "^0.1.1-alpha.4", - "@backstage/core": "^0.1.1-alpha.4", "@backstage/test-utils": "^0.1.1-alpha.4", - "@backstage/theme": "^0.1.1-alpha.4", - "@material-ui/core": "^4.9.1", - "@material-ui/icons": "^4.9.1", - "@material-ui/lab": "4.0.0-alpha.45", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", "@types/jest": "^24.0.0", "@types/node": "^12.0.0", "@types/testing-library__jest-dom": "5.0.2", - "jest-fetch-mock": "^3.0.3", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "react-router-dom": "^5.1.2", - "react-use": "^13.24.0" + "jest-fetch-mock": "^3.0.3" }, - "peerDependencies": { - "@backstage/core": "^0.1.1-alpha.3", - "@backstage/theme": "^0.1.1-alpha.3", + "dependencies": { + "@backstage/core": "^0.1.1-alpha.4", + "@backstage/theme": "^0.1.1-alpha.4", "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", "react-dom": "^16.13.1", "react-router-dom": "^5.1.2", + "react-markdown": "^4.3.1", "react-use": "^13.24.0" } } diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json index 86cb0e3f45..97a2071066 100644 --- a/plugins/welcome/package.json +++ b/plugins/welcome/package.json @@ -13,8 +13,6 @@ }, "devDependencies": { "@backstage/cli": "^0.1.1-alpha.4", - "@backstage/core": "^0.1.1-alpha.4", - "@backstage/theme": "^0.1.1-alpha.4", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", @@ -22,9 +20,9 @@ "@types/node": "^12.0.0", "@types/testing-library__jest-dom": "5.0.2" }, - "peerDependencies": { - "@backstage/core": "^0.1.1-alpha.3", - "@backstage/theme": "^0.1.1-alpha.3", + "dependencies": { + "@backstage/core": "^0.1.1-alpha.4", + "@backstage/theme": "^0.1.1-alpha.4", "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", diff --git a/yarn.lock b/yarn.lock index 22ba268f8d..97018734a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7226,7 +7226,7 @@ cyclist@^1.0.1: resolved "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= -cypress@*, cypress@^4.2.0: +cypress@*, cypress@4.2.0, cypress@^4.2.0: version "4.2.0" resolved "https://registry.npmjs.org/cypress/-/cypress-4.2.0.tgz#45673fb648b1a77b9a78d73e58b89ed05212d243" integrity sha512-8LdreL91S/QiTCLYLNbIjLL8Ht4fJmu/4HGLxUI20Tc7JSfqEfCmXELrRfuPT0kjosJwJJZacdSji9XSRkPKUw== @@ -16428,7 +16428,7 @@ react-docgen@^5.0.0: node-dir "^0.1.10" strip-indent "^3.0.0" -react-dom@^16.12.0, react-dom@^16.13.1, react-dom@^16.8.3: +react-dom@16.13.1, react-dom@^16.12.0, react-dom@^16.13.1, react-dom@^16.8.3: version "16.13.1" resolved "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f" integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag== @@ -16550,7 +16550,7 @@ react-popper@^1.3.6: typed-styles "^0.0.7" warning "^4.0.2" -react-router-dom@^5.1.2: +react-router-dom@5.1.2, react-router-dom@^5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.1.2.tgz#06701b834352f44d37fbb6311f870f84c76b9c18" integrity sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew== @@ -16711,7 +16711,7 @@ react-use@^13.24.0: ts-easing "^0.2.0" tslib "^1.10.0" -react@^16.12.0, react@^16.13.1, react@^16.8.3: +react@16.13.1, react@^16.0.0, react@^16.12.0, react@^16.13.1, react@^16.8.3: version "16.13.1" resolved "https://registry.npmjs.org/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e" integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==