Merge pull request #284 from vivid-planet/rename-scope

refactor: renamed all packages, scope changed from @vivid-planet/come…

README.md

@@ -1,4 +1,4 @@
-# comet-admin
+# @comet/admin
 
 ## Developoment
 
@@ -14,7 +14,7 @@
 ### use yarn
 
     docker-compose exec comet-admin bash -c "yarn --help"
-    docker-compose exec comet-admin bash -c "cd packages/comet-admin && yarn --help"
+    docker-compose exec comet-admin bash -c "cd packages/admin && yarn --help"
 
 ### Develop in an project
 
@@ -28,7 +28,6 @@
     ./wml-add.sh ../example
     wml start
 
-
 ### Notes
 
 Please note that this project is released with a [Contributor Code of Conduct](CODE-OF-CONDUCT.md). By participating in this project you agree to abide by its terms.

codemods/1.0.0/component-renames.ts

@@ -25,9 +25,9 @@ const transform: Transform = (file, api, options) => {
     for (const candidateElement of Object.keys(renameMap)) {
         const touched = {};
         root.findJSXElements(candidateElement).forEach((element, i) => {
-            // Check if we can find an import from comet-admin and rename that as well
+            // Check if we can find an import from admin and rename that as well
             root.find(j.ImportDeclaration).forEach((imp) => {
-                if (imp.value.source.value === "@vivid-planet/comet-admin") {
+                if (imp.value.source.value === "@comet/admin") {
                     imp.value.specifiers.forEach((specifier) => {
                         if (specifier.local.name === candidateElement) {
                             specifier.local.name = renameMap[candidateElement];

codemods/1.0.0/package-renames.ts

@@ -1,16 +1,16 @@
 import { Transform } from "jscodeshift";
 
 const renameMap: { [key: string]: string } = {
-    "@vivid-planet/react-admin-core": "@vivid-planet/comet-admin",
-    "@vivid-planet/fetch-provider": "@vivid-planet/comet-admin",
-    "@vivid-planet/file-icons": "@vivid-planet/comet-admin",
-    "@vivid-planet/react-admin-final-form-material-ui": "@vivid-planet/comet-admin",
-    "@vivid-planet/react-admin-form": "@vivid-planet/comet-admin",
-    "@vivid-planet/react-admin-layout": "@vivid-planet/comet-admin",
-    "@vivid-planet/react-select": "@vivid-planet/comet-admin-react-select",
-    "@vivid-planet/react-admin-date-picker": "@vivid-planet/comet-admin-date-picker",
-    "@vivid-planet/react-admin-color-picker": "@vivid-planet/comet-admin-color-picker",
-    "@vivid-planet/react-admin-rte": "@vivid-planet/comet-admin-rte",
+    "@vivid-planet/react-admin-core": "@comet/admin",
+    "@vivid-planet/fetch-provider": "@comet/admin",
+    "@vivid-planet/file-icons": "@comet/admin",
+    "@vivid-planet/react-admin-final-form-material-ui": "@comet/admin",
+    "@vivid-planet/react-admin-form": "@comet/admin",
+    "@vivid-planet/react-admin-layout": "@comet/admin",
+    "@vivid-planet/react-select": "@comet/admin-react-select",
+    "@vivid-planet/react-admin-date-picker": "@comet/admin-date-picker",
+    "@vivid-planet/react-admin-color-picker": "@comet/admin-color-picker",
+    "@vivid-planet/react-admin-rte": "@comet/admin-rte",
 };
 
 const transform: Transform = (file, api, options) => {

docker-compose.yml

@@ -13,7 +13,7 @@ services:
             - ./:/opt/app-root/src
         ports:
             - 8080:8080
-        command: bash -c "./wait-while-starting.sh && cd packages/comet-admin-stories && yarn start-storybook --port=8080"
+        command: bash -c "./wait-while-starting.sh && cd packages/admin-stories && yarn start-storybook --port=8080"
         depends_on:
             - comet-admin
     githook:

package.json

@@ -9,14 +9,14 @@
         "build": "lerna run build --stream",
         "bootstrap": "lerna bootstrap",
         "start": "lerna run --stream --no-sort --concurrency 999 start",
-        "storybook": "yarn --cwd packages/comet-admin-stories storybook",
+        "storybook": "yarn --cwd packages/admin-stories storybook",
         "lint": "npm run lint:eslint && npm run lint:tsc",
         "lint:eslint": "eslint --ext .ts,.tsx,.js,.jsx,.json,.md packages/**/src/",
         "prelint:tsc": "yarn build",
         "lint:tsc": "lerna run lint:tsc --stream",
         "prebuild:storybook": "yarn build",
-        "build:storybook": "yarn workspace @vivid-planet/comet-admin-stories build-storybook",
-        "intl:extract": "formatjs extract ./packages/**/*.ts* --out-file lang/en.json --ignore ./**.d.ts --ignore ./packages/comet-admin-stories/**/* --format simple"
+        "build:storybook": "yarn workspace @comet/admin-stories build-storybook",
+        "intl:extract": "formatjs extract ./packages/**/*.ts* --out-file lang/en.json --ignore ./**.d.ts --ignore ./packages/admin-stories/**/* --format simple"
     },
     "devDependencies": {
         "@apollo/client": "^3.2.5",

packages/comet-admin-color-picker/package.json → packages/admin-color-picker/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "@vivid-planet/comet-admin-color-picker",
+    "name": "@comet/admin-color-picker",
     "version": "1.0.1",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -13,13 +13,13 @@
     "devDependencies": {
         "@types/react-color": "^2.17.4",
         "@types/tinycolor2": "^1.4.2",
-        "@vivid-planet/comet-admin": "^1.1.0"
+        "@comet/admin": "^1.1.0"
     },
     "peerDependencies": {
         "@material-ui/core": "^4.1.3",
         "@material-ui/icons": "^4.2.1",
         "@material-ui/styles": "^4.1.2",
-        "@vivid-planet/comet-admin": "^1.0.0",
+        "@comet/admin": "^1.0.0",
         "react": "^16.8",
         "react-final-form": "^6.3.1"
     },

packages/comet-admin-color-picker/src/core/ColorPicker.styles.ts → packages/admin-color-picker/src/core/ColorPicker.styles.ts

@@ -1,6 +1,6 @@
+import { getDefaultVPAdminInputStyles } from "@comet/admin";
 import { Theme } from "@material-ui/core";
 import { createStyles } from "@material-ui/styles";
-import { getDefaultVPAdminInputStyles } from "@vivid-planet/comet-admin";
 
 export type VPAdminColorPickerClassKeys =
     | "input"

packages/comet-admin-date-picker/package.json → packages/admin-date-picker/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "@vivid-planet/comet-admin-date-picker",
+    "name": "@comet/admin-date-picker",
     "version": "1.0.1",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -13,11 +13,11 @@
     },
     "devDependencies": {
         "@types/react-dates": "^17.1.5",
-        "@vivid-planet/comet-admin": "^1.1.0"
+        "@comet/admin": "^1.1.0"
     },
     "peerDependencies": {
         "@material-ui/core": "^4.1.3",
-        "@vivid-planet/comet-admin": "^1.0.0",
+        "@comet/admin": "^1.0.0",
         "react": "^16.8",
         "react-final-form": "^6.3.0",
         "react-intl": "^5.10.0"

packages/comet-admin-react-select/package.json → packages/admin-react-select/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "@vivid-planet/comet-admin-react-select",
+    "name": "@comet/admin-react-select",
     "version": "1.0.1",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -10,12 +10,12 @@
         "classnames": "^2.2.6"
     },
     "devDependencies": {
-        "@vivid-planet/comet-admin": "^1.1.0"
+        "@comet/admin": "^1.1.0"
     },
     "peerDependencies": {
         "@material-ui/core": "^4.1.3",
         "@material-ui/icons": "^4.2.1",
-        "@vivid-planet/comet-admin": "^1.0.0",
+        "@comet/admin": "^1.0.0",
         "final-form": "^4.16.1",
         "react": "^16.8",
         "react-final-form": "^6.3.1",

packages/comet-admin-react-select/src/ReactSelect.styles.ts → packages/admin-react-select/src/ReactSelect.styles.ts

@@ -3,7 +3,7 @@ import { emphasize } from "@material-ui/core/styles/colorManipulator";
 import zIndex from "@material-ui/core/styles/zIndex";
 import { createStyles } from "@material-ui/styles";
 
-// TODO: import from "@vivid-planet/comet-admin" after publish.
+// TODO: import from "@comet/admin" after publish.
 const getDefaultVPAdminInputStyles = (theme: Theme) => {
     return {
         border: `1px solid ${theme.palette.grey[300]}`,

packages/comet-admin-rte/package.json → packages/admin-rte/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "@vivid-planet/comet-admin-rte",
+    "name": "@comet/admin-rte",
     "version": "1.1.1",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -9,12 +9,12 @@
     "devDependencies": {
         "@types/draft-js": "^0.10.38",
         "@types/immutable": "^3.8.7",
-        "@vivid-planet/comet-admin": "^1.1.0"
+        "@comet/admin": "^1.1.0"
     },
     "peerDependencies": {
         "@material-ui/core": "^4.1.3",
         "@material-ui/icons": "^4.2.1",
-        "@vivid-planet/comet-admin": "^1.0.0",
+        "@comet/admin": "^1.0.0",
         "draft-js": "^0.11.4",
         "final-form": "^4.16.1",
         "immutable": "~3.7.4",

packages/comet-admin-stories/.storybook/config.tsx → packages/admin-stories/.storybook/config.tsx

@@ -1,9 +1,9 @@
 import { select, withKnobs } from "@storybook/addon-knobs";
 import { addDecorator, configure } from "@storybook/react";
-import "@vivid-planet/comet-admin-color-picker/src/themeAugmentation";
+import "@comet/admin-color-picker/src/themeAugmentation";
 import * as React from "react";
 import { IntlProvider } from "react-intl";
-import { createMuiTheme, MuiThemeProvider as ThemeProvider } from "@vivid-planet/comet-admin";
+import { createMuiTheme, MuiThemeProvider as ThemeProvider } from "@comet/admin";
 
 const req = require.context("../src", true, /\.tsx$/);
 

packages/comet-admin-stories/.storybook/manager-head.html → packages/admin-stories/.storybook/manager-head.html

@@ -2,7 +2,7 @@
     document.addEventListener("DOMContentLoaded", function() {
         var badge = document.createElement("div");
         badge.style.position = "fixed";
-        badge.style.left = "5px";
+        badge.style.right = "5px";
         badge.style.bottom = "5px";
         badge.style.zIndex = "10";
         badge.innerHTML =

packages/comet-admin-stories/package.json → packages/admin-stories/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "@vivid-planet/comet-admin-stories",
+    "name": "@comet/admin-stories",
     "version": "1.2.0",
     "files": [
         "src"
@@ -9,10 +9,10 @@
         "@material-ui/core": "^4.1.3",
         "@material-ui/icons": "^4.2.1",
         "@material-ui/styles": "^4.1.2",
-        "@vivid-planet/comet-admin": "*",
-        "@vivid-planet/comet-admin-color-picker": "*",
-        "@vivid-planet/comet-admin-react-select": "*",
-        "@vivid-planet/comet-admin-rte": "*",
+        "@comet/admin": "*",
+        "@comet/admin-color-picker": "*",
+        "@comet/admin-react-select": "*",
+        "@comet/admin-rte": "*",
         "final-form": "^4.16.1",
         "graphql": "^15.4.0",
         "react": "^16.8",

packages/comet-admin-stories/src/react-admin-color-picker/ColorPicker.tsx → packages/admin-stories/src/admin-color-picker/ColorPicker.tsx

@@ -1,7 +1,7 @@
+import { Field } from "@comet/admin";
+import { FinalFormColorPicker } from "@comet/admin-color-picker";
 import { Button } from "@material-ui/core";
 import { storiesOf } from "@storybook/react";
-import { Field } from "@vivid-planet/comet-admin";
-import { FinalFormColorPicker } from "@vivid-planet/comet-admin-color-picker";
 import * as React from "react";
 import { Form } from "react-final-form";
 
@@ -48,4 +48,4 @@ const Story = () => (
     </div>
 );
 
-storiesOf("comet-admin-color-picker", module).add("Color Picker", () => <Story />);
+storiesOf("@comet/admin-color-picker", module).add("Color Picker", () => <Story />);

packages/comet-admin-stories/src/react-admin-date-picker/DatePicker.tsx → packages/admin-stories/src/admin-date-picker/DatePicker.tsx

@@ -1,5 +1,5 @@
+import { FinalFormDatePicker } from "@comet/admin-date-picker";
 import { storiesOf } from "@storybook/react";
-import { FinalFormDatePicker } from "@vivid-planet/comet-admin-date-picker";
 import * as React from "react";
 import { Field, Form } from "react-final-form";
 import { IntlProvider } from "react-intl";
@@ -21,4 +21,4 @@ const Story = () => {
     );
 };
 
-storiesOf("comet-admin-date-picker", module).add("Date Picker", () => <Story />);
+storiesOf("@comet/admin-date-picker", module).add("Date Picker", () => <Story />);

packages/comet-admin-stories/src/react-admin-date-picker/DateRangePicker.tsx → packages/admin-stories/src/admin-date-picker/DateRangePicker.tsx

@@ -1,5 +1,5 @@
+import { FinalFormDateRangePicker } from "@comet/admin-date-picker";
 import { storiesOf } from "@storybook/react";
-import { FinalFormDateRangePicker } from "@vivid-planet/comet-admin-date-picker";
 import * as React from "react";
 import { Field, Form } from "react-final-form";
 import { IntlProvider } from "react-intl";
@@ -23,4 +23,4 @@ const Story = () => {
     );
 };
 
-storiesOf("comet-admin-date-picker", module).add("Date Range Picker", () => <Story />);
+storiesOf("@comet/admin-date-picker", module).add("Date Range Picker", () => <Story />);

packages/comet-admin-stories/src/react-admin-form/ReactSelect.tsx → packages/admin-stories/src/admin-react-select/FinalFormReactSelect.tsx

@@ -1,7 +1,7 @@
+import { Field, FieldContainerLabelAbove, FinalFormInput } from "@comet/admin";
+import { FinalFormReactSelectStaticOptions } from "@comet/admin-react-select";
 import { Button, ListItem, Typography } from "@material-ui/core";
 import { storiesOf } from "@storybook/react";
-import { Field, FieldContainerLabelAbove, FinalFormInput } from "@vivid-planet/comet-admin";
-import { FinalFormReactSelectStaticOptions } from "@vivid-planet/comet-admin-react-select";
 import * as React from "react";
 import { Form } from "react-final-form";
 
@@ -49,4 +49,4 @@ function Story() {
     );
 }
 
-storiesOf("comet-admin-form", module).add("React Select", () => <Story />);
+storiesOf("@comet/admin-react-select", module).add("Final Form React Select", () => <Story />);

packages/comet-admin-stories/src/react-admin-form/ReactSelectDialog.tsx → packages/admin-stories/src/admin-react-select/FinalFormReactSelectDialog.tsx

@@ -1,7 +1,7 @@
+import { Field, FieldContainerLabelAbove } from "@comet/admin";
+import { FinalFormReactSelectStaticOptions } from "@comet/admin-react-select";
 import { Button, Dialog, DialogActions, DialogContent, DialogTitle } from "@material-ui/core";
 import { storiesOf } from "@storybook/react";
-import { Field, FieldContainerLabelAbove } from "@vivid-planet/comet-admin";
-import { FinalFormReactSelectStaticOptions } from "@vivid-planet/comet-admin-react-select";
 import * as React from "react";
 import { Form } from "react-final-form";
 
@@ -44,4 +44,4 @@ function Story() {
     );
 }
 
-storiesOf("comet-admin-form", module).add("React Select Dialog", () => <Story />);
+storiesOf("@comet/admin-react-select", module).add("Final Form React Select Dialog", () => <Story />);

packages/comet-admin-stories/src/react-admin-form/ReactSelectDisabledOption.tsx → packages/admin-stories/src/admin-react-select/FinalFormReactSelectDisabledOption.tsx

@@ -1,6 +1,6 @@
+import { Field, FieldContainerLabelAbove } from "@comet/admin";
+import { FinalFormReactSelectStaticOptions } from "@comet/admin-react-select";
 import { storiesOf } from "@storybook/react";
-import { Field, FieldContainerLabelAbove } from "@vivid-planet/comet-admin";
-import { FinalFormReactSelectStaticOptions } from "@vivid-planet/comet-admin-react-select";
 import * as React from "react";
 import { Form } from "react-final-form";
 
@@ -36,4 +36,4 @@ function Story() {
     );
 }
 
-storiesOf("comet-admin-form", module).add("React Select Disabled Option", () => <Story />);
+storiesOf("@comet/admin-react-select", module).add("Final Form React Select Disabled Option", () => <Story />);

packages/comet-admin-stories/src/material-ui-react-select/ReactSelectDisabledOption.tsx → packages/admin-stories/src/admin-react-select/ReactSelectDisabledOption.tsx

@@ -1,6 +1,6 @@
+import { ReactSelect } from "@comet/admin-react-select";
 import { Button, ListItem, Typography } from "@material-ui/core";
 import { storiesOf } from "@storybook/react";
-import { ReactSelect } from "@vivid-planet/comet-admin-react-select";
 import * as React from "react";
 
 function Story() {
@@ -22,4 +22,4 @@ function Story() {
     );
 }
 
-storiesOf("material-ui-react-select", module).add("React Select Disabled Option", () => <Story />);
+storiesOf("@comet/admin-react-select", module).add("React Select Disabled Option", () => <Story />);

packages/comet-admin-stories/src/react-admin-rte/Field.tsx → packages/admin-stories/src/admin-rte/Field.tsx

@@ -1,7 +1,7 @@
+import { Field } from "@comet/admin";
+import { createFinalFormRte } from "@comet/admin-rte";
 import { Button, Typography } from "@material-ui/core";
 import { storiesOf } from "@storybook/react";
-import { Field } from "@vivid-planet/comet-admin";
-import { createFinalFormRte } from "@vivid-planet/comet-admin-rte";
 import * as React from "react";
 import { Form } from "react-final-form";
 
@@ -36,4 +36,4 @@ function Story() {
     );
 }
 
-storiesOf("comet-admin-rte/field", module).add("Field", () => <Story />);
+storiesOf("@comet/admin-rte/field", module).add("Field", () => <Story />);

packages/comet-admin-stories/src/react-admin-rte/FieldAllOptions.tsx → packages/admin-stories/src/admin-rte/FieldAllOptions.tsx

@@ -1,7 +1,7 @@
+import { Field } from "@comet/admin";
+import { createFinalFormRte } from "@comet/admin-rte";
 import { Button, Typography } from "@material-ui/core";
 import { storiesOf } from "@storybook/react";
-import { Field } from "@vivid-planet/comet-admin";
-import { createFinalFormRte } from "@vivid-planet/comet-admin-rte";
 import * as React from "react";
 import { Form } from "react-final-form";
 
@@ -44,4 +44,4 @@ function Story() {
     );
 }
 
-storiesOf("comet-admin-rte/field", module).add("Field, all options", () => <Story />);
+storiesOf("@comet/admin-rte/field", module).add("Field, all options", () => <Story />);

packages/comet-admin-stories/src/react-admin-rte/Rte.tsx → packages/admin-stories/src/admin-rte/Rte.tsx

@@ -1,5 +1,5 @@
+import { IRteRef, makeRteApi, Rte } from "@comet/admin-rte";
 import { storiesOf } from "@storybook/react";
-import { IRteRef, makeRteApi, Rte } from "@vivid-planet/comet-admin-rte";
 import * as React from "react";
 
 import { exampleContent, PrintEditorState, RteLayout, useAutoFocus } from "./helper";
@@ -23,4 +23,4 @@ function Story() {
     );
 }
 
-storiesOf("comet-admin-rte", module).add("Rte, minimal configuration", () => <Story />);
+storiesOf("@comet/admin-rte", module).add("Rte, minimal configuration", () => <Story />);

packages/comet-admin-stories/src/react-admin-rte/RteAllOptions.tsx → packages/admin-stories/src/admin-rte/RteAllOptions.tsx

@@ -1,5 +1,5 @@
+import { IMakeRteApiProps, IRteApiProps, IRteOptions, IRteRef, LinkDecorator, makeRteApi, Rte } from "@comet/admin-rte";
 import { storiesOf } from "@storybook/react";
-import { IMakeRteApiProps, IRteApiProps, IRteOptions, IRteRef, LinkDecorator, makeRteApi, Rte } from "@vivid-planet/comet-admin-rte";
 import { convertFromRaw, convertToRaw } from "draft-js";
 import * as React from "react";
 
@@ -91,4 +91,4 @@ function Story() {
     );
 }
 
-storiesOf("comet-admin-rte", module).add("Rte, all options", () => <Story />);
+storiesOf("@comet/admin-rte", module).add("Rte, all options", () => <Story />);