Merge pull request #144 from spotify/raghub/consistent-package-names

Consistent package names
2020-03-03 15:08:30 +01:00
parent 4a396b1735 00101ef44e
commit f08fcbec30
17 changed files with 34 additions and 97 deletions
@@ -2,8 +2,8 @@
  "name": "root",
  "private": true,
  "scripts": {
-    "start": "yarn workspace @backstage/app start",
-    "build": "yarn workspace @backstage/app build",
+    "start": "yarn workspace @spotify-backstage/app start",
+    "build": "yarn workspace @spotify-backstage/app build",
    "test": "cross-env CI=true lerna run test --stream --parallel -- --coverage",
    "create-plugin": "yarn workspace @spotify-backstage/cli build && backstage-cli create-plugin",
    "lint": "lerna run lint --stream"
@@ -1,16 +1,15 @@
 {
-  "name": "@backstage/app",
+  "name": "@spotify-backstage/app",
  "version": "0.1.0",
  "private": true,
  "dependencies": {
    "@material-ui/core": "^4.9.1",
    "@material-ui/icons": "^4.9.1",
    "@spotify-backstage/core": "1.0.0",
-    "@backstage/plugin-github-actions": "0.0.0",
-    "@backstage/plugin-hello-world": "0.0.0",
-    "@backstage/plugin-home-page": "0.0.0",
-    "@backstage/plugin-login": "0.0.0",
-    "@backstage/plugin-create-entity": "0.0.0",
+    "@spotify-backstage/plugin-github-actions": "0.0.0",
+    "@spotify-backstage/plugin-home-page": "0.0.0",
+    "@spotify-backstage/plugin-login": "0.0.0",
+    "@spotify-backstage/plugin-create-entity": "0.0.0",
    "@react-workspaces/react-scripts": "^3.3.0-alpha-08",
    "@testing-library/jest-dom": "^4.2.4",
    "@testing-library/react": "^9.3.2",
@@ -1,6 +1,6 @@
 import { BackstageTheme, createApp, InfoCard } from '@spotify-backstage/core';
 //import PageHeader from './components/PageHeader';
-import { LoginComponent } from '@backstage/plugin-login';
+import { LoginComponent } from '@spotify-backstage/plugin-login';
 import { CssBaseline, makeStyles, ThemeProvider } from '@material-ui/core';
 import React, { FC } from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
@@ -13,7 +13,7 @@ import VpnKeyIcon from '@material-ui/icons/VpnKey';
 import DnsIcon from '@material-ui/icons/Dns';
 import MockEntityPage from './MockEntityPage';
 import MockEntityCard from './MockEntityCard';
-import GithubActionsPlugin from '@backstage/plugin-github-actions';
+import GithubActionsPlugin from '@spotify-backstage/plugin-github-actions';

 /* SERVICE */
 const serviceOverviewPage = createWidgetView()
@@ -1,2 +1,2 @@
-export { default as HomePagePlugin } from '@backstage/plugin-home-page';
-export { default as CreateEntityPlugin } from '@backstage/plugin-create-entity';
+export { default as HomePagePlugin } from '@spotify-backstage/plugin-home-page';
+export { default as CreateEntityPlugin } from '@spotify-backstage/plugin-create-entity';
@@ -1,11 +1,11 @@
 {
-  "name": "@backstage/plugin-create-entity",
+  "name": "@spotify-backstage/plugin-create-entity",
  "version": "0.0.0",
  "main": "src/index.ts",
  "main:src": "src/index.ts",
  "devDependencies": {
    "@spotify-backstage/core": "1.0.0",
-    "@backstage/protobuf-definitions": "0.0.0",
+    "@spotify-backstage/protobuf-definitions": "0.0.0",
    "@spotify/web-scripts": "^6.0.0",
    "@testing-library/jest-dom": "^4.2.4",
    "@testing-library/react": "^9.3.2",
@@ -3,7 +3,7 @@ import { useRouteMatch } from 'react-router-dom';
 import { useFormik } from 'formik';
 import { Button, TextField, makeStyles } from '@material-ui/core';
 import { InfoCard, Progress } from '@spotify-backstage/core';
-import { scaffolderV1 } from '@backstage/protobuf-definitions';
+import { scaffolderV1 } from '@spotify-backstage/protobuf-definitions';
 const google_protobuf_struct_pb = require('google-protobuf/google/protobuf/struct_pb.js');
 // import * as google_protobuf_struct_pb from 'google-protobuf/google/protobuf/struct_pb.js';

@@ -1,6 +1,6 @@
 import React, { FC, Fragment, useEffect, useState } from 'react';
 import { InfoCard, TemplateList } from '@spotify-backstage/core';
-import { scaffolderV1 } from '@backstage/protobuf-definitions';
+import { scaffolderV1 } from '@spotify-backstage/protobuf-definitions';

 const CreateEntityPage: FC<{}> = () => {
  const [templates, setTemplates] = useState<
@@ -1,11 +1,11 @@
 {
-  "name": "@backstage/plugin-github-actions",
+  "name": "@spotify-backstage/plugin-github-actions",
  "version": "0.0.0",
  "main": "src/index.ts",
  "main:src": "src/index.ts",
  "devDependencies": {
    "@spotify-backstage/core": "1.0.0",
-    "@backstage/protobuf-definitions": "0.0.0",
+    "@spotify-backstage/protobuf-definitions": "0.0.0",
    "@spotify/web-scripts": "^6.0.0",
    "@testing-library/jest-dom": "^4.2.4",
    "@testing-library/react": "^9.3.2",
@@ -1,4 +1,4 @@
-import { buildsV1 } from '@backstage/protobuf-definitions';
+import { buildsV1 } from '@spotify-backstage/protobuf-definitions';
 import { BuildStatus, Build, BuildDetails } from './types';

 const statusTable = {
@@ -1,5 +1,5 @@
 {
-  "name": "@backstage/plugin-hello-world",
+  "name": "@spotify-backstage/plugin-hello-world",
  "version": "0.0.0",
  "main": "src/index.ts",
  "main:src": "src/index.ts",
@@ -1,5 +1,5 @@
 {
-  "name": "@backstage/plugin-home-page",
+  "name": "@spotify-backstage/plugin-home-page",
  "version": "0.0.0",
  "main": "src/index.ts",
  "main:src": "src/index.ts",
@@ -14,7 +14,7 @@ import {
 import SquadTechHealth from './SquadTechHealth';
 import { useAsync } from 'react-use';

-import { inventoryV1 } from '@backstage/protobuf-definitions';
+import { inventoryV1 } from '@spotify-backstage/protobuf-definitions';

 const client = new inventoryV1.Client('http://localhost:8080');

@@ -1,5 +1,5 @@
 {
-  "name": "@backstage/plugin-login",
+  "name": "@spotify-backstage/plugin-login",
  "version": "0.0.0",
  "main": "src/index.ts",
  "main:src": "src/index.ts",
@@ -1,6 +1,6 @@
 {
  "private": true,
-  "name": "@backstage/protobuf-definitions",
+  "name": "@spotify-backstage/protobuf-definitions",
  "main": "src/index.ts",
  "main:src": "src/index.ts",
  "version": "0.0.0",
@@ -6032,7 +6032,7 @@ debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
  dependencies:
    ms "^2.1.1"

-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
  version "1.0.1"
  resolved "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
@@ -6206,11 +6206,6 @@ detect-indent@^5.0.0, detect-indent@~5.0.0:
  resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
  integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=

-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-newline@^2.1.0:
  version "2.1.0"
  resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -8472,7 +8467,7 @@ hyphenate-style-name@^1.0.2, hyphenate-style-name@^1.0.3:
  resolved "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz#097bb7fa0b8f1a9cf0bd5c734cf95899981a9b48"
  integrity sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ==

-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
  version "0.4.24"
  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -8598,7 +8593,7 @@ import-local@^3.0.2:
    pkg-dir "^4.2.0"
    resolve-cwd "^3.0.0"

-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
  version "0.1.4"
  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
@@ -10834,11 +10829,6 @@ lodash-es@^4.17.14:
  resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
  integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==

-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
-
 lodash._baseuniq@~4.6.0:
  version "4.6.0"
  resolved "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -10847,33 +10837,11 @@ lodash._baseuniq@~4.6.0:
    lodash._createset "~4.0.0"
    lodash._root "~3.0.0"

-lodash._bindcallback@*:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
-
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
-
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
  version "4.0.3"
  resolved "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
  integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=

-lodash._getnative@*, lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
 lodash._reinterpolate@^3.0.0:
  version "3.0.0"
  resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -10929,11 +10897,6 @@ lodash.memoize@4.x, lodash.memoize@^4.1.2:
  resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=

-lodash.restparam@*:
-  version "3.6.1"
-  resolved "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
 lodash.set@^4.3.2:
  version "4.3.2"
  resolved "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
@@ -11667,15 +11630,6 @@ natural-compare@^1.4.0:
  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=

-needle@^2.2.1:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528"
-  integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 negotiator@0.6.2:
  version "0.6.2"
  resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -11820,22 +11774,6 @@ node-notifier@^6.0.0:
    shellwords "^0.1.1"
    which "^1.3.1"

-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.47, node-releases@^1.1.50:
  version "1.1.50"
  resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz#803c40d2c45db172d0410e4efec83aa8c6ad0592"
@@ -11982,7 +11920,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
    semver "^5.6.0"
    validate-npm-package-name "^3.0.0"

-npm-packlist@^1.1.12, npm-packlist@^1.1.6, npm-packlist@^1.4.4, npm-packlist@^1.4.8:
+npm-packlist@^1.1.12, npm-packlist@^1.4.4, npm-packlist@^1.4.8:
  version "1.4.8"
  resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
@@ -12162,7 +12100,7 @@ npm@^6.10.3:
    worker-farm "^1.7.0"
    write-file-atomic "^2.4.3"

-npmlog@^4.0.2, npmlog@^4.1.2, npmlog@~4.1.2:
+npmlog@^4.1.2, npmlog@~4.1.2:
  version "4.1.2"
  resolved "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -13969,7 +13907,7 @@ rc-progress@^2.5.2:
    babel-runtime "6.x"
    prop-types "^15.5.8"

-rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8:
+rc@^1.0.1, rc@^1.1.6, rc@^1.2.8:
  version "1.2.8"
  resolved "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -14774,7 +14712,7 @@ rimraf@2.6.3:
  dependencies:
    glob "^7.1.3"

-rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
+rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
  version "2.7.1"
  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -15007,7 +14945,7 @@ semver-regex@^2.0.0:
  resolved "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
  integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==

-"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
  version "5.7.1"
  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -15969,7 +15907,7 @@ tapable@^1.0.0, tapable@^1.1.0, tapable@^1.1.3:
  resolved "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==

-tar@^4.4.10, tar@^4.4.12, tar@^4.4.13, tar@^4.4.2, tar@^4.4.8:
+tar@^4.4.10, tar@^4.4.12, tar@^4.4.13, tar@^4.4.8:
  version "4.4.13"
  resolved "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
@@ -67,7 +67,7 @@ Firstly, ensure this line is in your `package.json` within the `frontend/` folde

 ```js
 "dependencies": {
-  "@backstage/protobuf-definitions": "0.0.0",
+  "@spotify-backstage/protobuf-definitions": "0.0.0",
  ...
 }
 ```
@@ -75,7 +75,7 @@ Firstly, ensure this line is in your `package.json` within the `frontend/` folde
 Next, you can use them in your [Yarn Workspaces](https://yarnpkg.com/en/docs/workspaces/) package using the following:

 ```ts
-import { IdentityClient } from '@backstage/protocol-definitions/generated/identity/v1/identity_pb_service';
+import { IdentityClient } from '@spotify-backstage/protocol-definitions/generated/identity/v1/identity_pb_service';

 const client = new IdentityClient('http://localhost:8080');
 // const req = new GetUserRequest();