chore: move 'packages/themes' into 'src' (no longer an injected package) (#2080)

33 files changed, 44 insertions, 128 deletions

diff --git a/.eslintignore b/.eslintignore
index 0dfa46e43..820648215 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -27,6 +27,4 @@ npm-debug.log.*
 
 /build/
 /out/
-/packages/*/lib
-/packages/**/*.test.*
 /recipes/
diff --git a/electron-builder.yml b/electron-builder.yml
index 0159e701f..d4d30ed85 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -70,4 +70,3 @@ protocols:
 asarUnpack:
   - ./recipes
   - ./assets/images/taskbar
-  - ./node_modules/@meetfranz
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index d5fb607d9..ae461ba87 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -75,7 +75,6 @@ const paths = {
     dest: 'build/',
     watch: [
       'src/**/*.js',
-      // 'packages/**/*.js',
     ],
   },
   typescripts: {
@@ -83,17 +82,8 @@ const paths = {
     dest: 'build/',
     watch: [
       'src/**/*.ts',
-      // 'packages/**/*.ts',
     ],
   },
-  packages: {
-    watch: 'packages/**/*',
-    // dest: 'build/',
-    // watch: [
-    //   'src/**/*.js',
-    //   // 'packages/**/*.js',
-    // ],
-  },
 };
 
 // eslint-disable-next-line no-unused-vars
@@ -145,10 +135,6 @@ export function mvPackageJson() {
   return gulp.src(['./package.json']).pipe(gulp.dest(paths.dest));
 }
 
-export function mvLernaPackages() {
-  return gulp.src(['packages/**']).pipe(gulp.dest(`${paths.dest}/packages`));
-}
-
 export function mvPostinstallScript() {
   return gulp
     .src(['./scripts/postinstall.ts'])
@@ -240,7 +226,6 @@ export function processTypescripts() {
 }
 
 export function watch() {
-  gulp.watch(paths.packages.watch, mvLernaPackages);
   gulp.watch(paths.styles.watch, styles);
 
   gulp.watch([paths.src], mvSrc);
@@ -273,7 +258,6 @@ const build = gulp.series(
   gulp.parallel(
     mvSrc,
     mvPackageJson,
-    mvLernaPackages,
     mvPostinstallScript,
     exportBuildInfo,
   ),
diff --git a/lerna.json b/lerna.json
index 95aa62baa..2fec49441 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,9 +1,4 @@
 {
-  "packages": [
-    "packages/theme",
-    "packages/forms",
-    "packages/ui"
-  ],
   "npmClient": "npm",
   "version": "independent",
   "ignoreChanges": [
diff --git a/package-lock.json b/package-lock.json
index f6742cca4..e6f308bdf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5276,12 +5276,6 @@
       "resolved": "https://registry.npmjs.org/@mdi/react/-/react-1.5.0.tgz",
       "integrity": "sha512-NztRgUxSYD+ImaKN94Tg66VVVqXj4SmlDGzZoz48H9riJ+Awha56sfXH2fegw819NWo7KI3oeS1Es0lNQqwr0w=="
     },
-    "@meetfranz/theme": {
-      "version": "file:packages/theme",
-      "requires": {
-        "color": "4.0.1"
-      }
-    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
diff --git a/package.json b/package.json
index 248a96ef9..c453bf705 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "dev": "cross-env NODE_ENV=development gulp dev",
     "test": "jest",
     "test:watch": "jest --watch",
-    "lint": "eslint \"{src,scripts,packages}/**/*.{js,jsx,ts,tsx}\" --quiet",
+    "lint": "eslint \"{src,test,scripts}/**/*.{js,jsx,ts,tsx}\" --quiet",
     "lint:fix": "npm run lint -- --fix",
     "extract": "formatjs extract 'src/**/*.{js,ts,tsx}' --out-file temp.json --flatten --id-interpolation-pattern '[sha512:contenthash:base64:6]' --preserve-whitespace",
     "compile": "formatjs compile 'temp.json' --out-file src/i18n/locales/en-US.json",
@@ -35,7 +35,6 @@
     "commit": "git-cz",
     "contributors": "all-contributors",
     "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"",
-    "packages": "npx lerna publish --no-git-tag-version",
     "postinstall": "ts-node scripts/postinstall.ts",
     "apply-branding": "ts-node ./src/i18n/apply-branding.ts",
     "update-submodules": "git submodule update --remote --force",
@@ -65,7 +64,6 @@
     "@mdi/font": "6.2.95",
     "@mdi/js": "6.2.95",
     "@mdi/react": "1.5.0",
-    "@meetfranz/theme": "file:packages/theme",
     "@sentry/electron": "2.5.3",
     "auto-launch": "5.0.5",
     "btoa": "1.2.1",
diff --git a/packages/theme/.gitignore b/packages/theme/.gitignore
deleted file mode 100644
index d01826a6b..000000000
--- a/packages/theme/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/
-lib
diff --git a/packages/theme/README.md b/packages/theme/README.md
deleted file mode 100644
index 6f9cc406b..000000000
--- a/packages/theme/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# `theme`
-
-> TODO: description
-
-## Usage
-
-```
-const theme = require('theme');
-
-// TODO: DEMONSTRATE API
-```
diff --git a/packages/theme/package.json b/packages/theme/package.json
deleted file mode 100644
index 7f3226bd8..000000000
--- a/packages/theme/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "@meetfranz/theme",
-  "version": "1.0.14",
-  "description": "Theme configuration for Ferdi",
-  "author": "Stefan Malzner <stefan@adlk.io>",
-  "homepage": "https://github.com/meetfranz/franz",
-  "license": "Apache-2.0",
-  "main": "lib/index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/meetfranz/franz.git"
-  },
-  "scripts": {
-    "dev": "tsc -w",
-    "build": "tsc",
-    "preprepare": "npm run test",
-    "test": "ts-mocha 'test/**/*.test.ts'"
-  },
-  "bugs": {
-    "url": "https://github.com/meetfranz/franz/issues"
-  },
-  "dependencies": {
-    "color": "4.0.1"
-  },
-  "gitHead": "9f2ab40b7602bc3df26ebb093b484b9917768f69"
-}
diff --git a/packages/theme/src/index.ts b/packages/theme/src/index.ts
deleted file mode 100644
index 5ba225e51..000000000
--- a/packages/theme/src/index.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import makeDarkThemeConfig from './themes/dark';
-import makeDefaultThemeConfig from './themes/default';
-import { themeBrandPrimary } from './themes/legacy';
-
-export enum ThemeType {
-  default = 'default',
-  dark = 'dark',
-}
-
-export const DEFAULT_ACCENT_COLOR = themeBrandPrimary;
-
-export function theme(
-  themeId: ThemeType,
-  brandColor: string = DEFAULT_ACCENT_COLOR,
-) {
-  return themeId === ThemeType.dark
-    ? makeDarkThemeConfig(brandColor)
-    : makeDefaultThemeConfig(brandColor);
-}
-
-const defaultThemeConfigWithDefaultAccentColor =
-  makeDefaultThemeConfig(DEFAULT_ACCENT_COLOR);
-
-export type Theme = typeof defaultThemeConfigWithDefaultAccentColor;
diff --git a/packages/theme/tsconfig.json b/packages/theme/tsconfig.json
deleted file mode 100644
index 8b4163e7f..000000000
--- a/packages/theme/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "lib",
-    "rootDir": "src"
-  },
-  "exclude": ["node_modules", "lib", "test"]
-}
diff --git a/src/components/ui/badge/ProBadge.tsx b/src/components/ui/badge/ProBadge.tsx
index cb6bc4c98..dc1e76f7f 100644
--- a/src/components/ui/badge/ProBadge.tsx
+++ b/src/components/ui/badge/ProBadge.tsx
@@ -3,7 +3,7 @@ import classnames from 'classnames';
 import { Component } from 'react';
 import injectStyle from 'react-jss';
 
-import { Theme } from '@meetfranz/theme';
+import { Theme } from '../../../themes';
 import { Icon } from '../icon';
 import { Badge } from './index';
 import { IWithStyle } from '../typings/generic';
diff --git a/src/components/ui/badge/index.tsx b/src/components/ui/badge/index.tsx
index 6495036ff..61bede937 100644
--- a/src/components/ui/badge/index.tsx
+++ b/src/components/ui/badge/index.tsx
@@ -2,7 +2,7 @@ import classnames from 'classnames';
 import { Component, ReactNode } from 'react';
 import injectStyle from 'react-jss';
 
-import { Theme } from '@meetfranz/theme';
+import { Theme } from '../../../themes';
 import { IWithStyle } from '../typings/generic';
 
 interface IProps extends IWithStyle {
diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx
index 5b8927b51..12e5e4449 100644
--- a/src/components/ui/button/index.tsx
+++ b/src/components/ui/button/index.tsx
@@ -4,8 +4,8 @@ import { Property } from 'csstype';
 import { Component, MouseEvent } from 'react';
 import injectStyle, { withTheme } from 'react-jss';
 import Loader from 'react-loader';
-import { Theme } from '@meetfranz/theme';
 
+import { Theme } from '../../../themes';
 import { IFormField, IWithStyle } from '../typings/generic';
 
 type ButtonType =
diff --git a/src/components/ui/error/styles.ts b/src/components/ui/error/styles.ts
index ed993ddd5..9da95705a 100644
--- a/src/components/ui/error/styles.ts
+++ b/src/components/ui/error/styles.ts
@@ -1,4 +1,4 @@
-import { Theme } from '@meetfranz/theme';
+import { Theme } from '../../../themes';
 
 export default (theme: Theme) => ({
   message: {
diff --git a/src/components/ui/headline/index.tsx b/src/components/ui/headline/index.tsx
index 3a3654f02..ea2949102 100644
--- a/src/components/ui/headline/index.tsx
+++ b/src/components/ui/headline/index.tsx
@@ -2,7 +2,7 @@ import classnames from 'classnames';
 import { Component, createElement, ReactNode } from 'react';
 import injectStyle from 'react-jss';
 
-import { Theme } from '@meetfranz/theme';
+import { Theme } from '../../../themes';
 import { IWithStyle, Omit } from '../typings/generic';
 
 interface IProps extends IWithStyle {
diff --git a/src/components/ui/icon/index.tsx b/src/components/ui/icon/index.tsx
index fdc48d14a..85bb61d13 100644
--- a/src/components/ui/icon/index.tsx
+++ b/src/components/ui/icon/index.tsx
@@ -3,7 +3,7 @@ import classnames from 'classnames';
 import { Component } from 'react';
 import injectStyle from 'react-jss';
 
-import { Theme } from '@meetfranz/theme';
+import { Theme } from '../../../themes';
 import { IWithStyle } from '../typings/generic';
 
 interface IProps extends IWithStyle {
diff --git a/src/components/ui/infobox/index.tsx b/src/components/ui/infobox/index.tsx
index e6be83556..87940c4d4 100644
--- a/src/components/ui/infobox/index.tsx
+++ b/src/components/ui/infobox/index.tsx
@@ -3,7 +3,7 @@ import classnames from 'classnames';
 import { Component, ReactNode } from 'react';
 import injectStyle from 'react-jss';
 
-import { Theme } from '@meetfranz/theme';
+import { Theme } from '../../../themes';
 import { Icon } from '../icon';
 import { IWithStyle } from '../typings/generic';
 
diff --git a/src/components/ui/input/styles.ts b/src/components/ui/input/styles.ts
index 27426152e..04c1b3991 100644
--- a/src/components/ui/input/styles.ts
+++ b/src/components/ui/input/styles.ts
@@ -1,6 +1,6 @@
 import { Property } from 'csstype';
 
-import { Theme } from '@meetfranz/theme';
+import { Theme } from '../../../themes';
 
 const prefixStyles = (theme: Theme) => ({
   background: theme.inputPrefixBackground,
diff --git a/src/components/ui/label/styles.ts b/src/components/ui/label/styles.ts
index 0c9cef8bf..faa44ae5b 100644
--- a/src/components/ui/label/styles.ts
+++ b/src/components/ui/label/styles.ts
@@ -1,4 +1,4 @@
-import { Theme } from '@meetfranz/theme';
+import { Theme } from '../../../themes';
 
 export default (theme: Theme) => ({
   content: {},
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx
index 41cab7818..2605503a3 100644
--- a/src/components/ui/select/index.tsx
+++ b/src/components/ui/select/index.tsx
@@ -8,8 +8,7 @@ import classnames from 'classnames';
 import { ChangeEvent, Component, createRef } from 'react';
 import injectStyle from 'react-jss';
 
-import { Theme } from '@meetfranz/theme';
-
+import { Theme } from '../../../themes';
 import { IFormField, IWithStyle } from '../typings/generic';
 
 import { Error } from '../error';
diff --git a/src/components/ui/textarea/styles.ts b/src/components/ui/textarea/styles.ts
index f2267e000..36fc2a82e 100644
--- a/src/components/ui/textarea/styles.ts
+++ b/src/components/ui/textarea/styles.ts
@@ -1,6 +1,6 @@
 import { Property } from 'csstype';
 
-import { Theme } from '@meetfranz/theme';
+import { Theme } from '../../../themes';
 
 export default (theme: Theme) => ({
   label: {
diff --git a/src/components/ui/toggle/index.tsx b/src/components/ui/toggle/index.tsx
index 67b6c3835..7b6ba147f 100644
--- a/src/components/ui/toggle/index.tsx
+++ b/src/components/ui/toggle/index.tsx
@@ -2,8 +2,8 @@ import classnames from 'classnames';
 import { Property } from 'csstype';
 import { Component, InputHTMLAttributes } from 'react';
 import injectStyle from 'react-jss';
-import { Theme } from '@meetfranz/theme';
 
+import { Theme } from '../../../themes';
 import { IFormField, IWithStyle } from '../typings/generic';
 
 import { Error } from '../error';
diff --git a/src/components/ui/typings/generic.ts b/src/components/ui/typings/generic.ts
index 084e0e0a5..65b996d59 100644
--- a/src/components/ui/typings/generic.ts
+++ b/src/components/ui/typings/generic.ts
@@ -1,6 +1,6 @@
 import { Classes } from 'jss';
 
-import { Theme } from '@meetfranz/theme';
+import { Theme } from '../../../themes';
 
 export interface IFormField {
   showLabel?: boolean;
diff --git a/src/config.ts b/src/config.ts
index e1e8230c2..5f95a59f4 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -2,7 +2,7 @@
 
 import ms from 'ms';
 
-import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme';
+export const DEFAULT_ACCENT_COLOR = '#7266F0';
 
 export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks
 
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index ec06c279d..010a029ff 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -1,7 +1,7 @@
-import { ThemeType } from '@meetfranz/theme';
 import { computed, action, observable } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
+import { ThemeType } from '../../themes';
 import { todoActions } from './actions';
 import {
   CUSTOM_TODO_SERVICE,
diff --git a/src/stores/UIStore.ts b/src/stores/UIStore.ts
index 6ab63c2ee..6a9597006 100644
--- a/src/stores/UIStore.ts
+++ b/src/stores/UIStore.ts
@@ -1,7 +1,7 @@
 import { action, observable, computed, reaction } from 'mobx';
-import { theme, ThemeType } from '@meetfranz/theme';
 import { nativeTheme, systemPreferences } from '@electron/remote';
 
+import { theme, ThemeType } from '../themes';
 import Store from './lib/Store';
 import { isMac, isWindows } from '../environment';
 
diff --git a/packages/theme/src/themes/IStyleTypes.ts b/src/themes/IStyleTypes.ts
index 48f52daf2..48f52daf2 100644
--- a/packages/theme/src/themes/IStyleTypes.ts
+++ b/src/themes/IStyleTypes.ts
diff --git a/packages/theme/src/themes/dark/index.ts b/src/themes/dark/index.ts
index aa132c743..aa132c743 100644
--- a/packages/theme/src/themes/dark/index.ts
+++ b/src/themes/dark/index.ts
diff --git a/packages/theme/src/themes/default/index.ts b/src/themes/default/index.ts
index 80bcba766..80bcba766 100644
--- a/packages/theme/src/themes/default/index.ts
+++ b/src/themes/default/index.ts
diff --git a/src/themes/index.ts b/src/themes/index.ts
new file mode 100644
index 000000000..27be4d04b
--- /dev/null
+++ b/src/themes/index.ts
@@ -0,0 +1,21 @@
+import makeDarkThemeConfig from './dark';
+import makeDefaultThemeConfig from './default';
+import { themeBrandPrimary } from './legacy';
+
+export enum ThemeType {
+  default = 'default',
+  dark = 'dark',
+}
+
+export function theme(
+  themeId: ThemeType,
+  brandColor: string = themeBrandPrimary,
+) {
+  return themeId === ThemeType.dark
+    ? makeDarkThemeConfig(brandColor)
+    : makeDefaultThemeConfig(brandColor);
+}
+
+const defaultThemeConfigWithDefaultAccentColor = makeDefaultThemeConfig(themeBrandPrimary);
+
+export type Theme = typeof defaultThemeConfigWithDefaultAccentColor;
diff --git a/packages/theme/src/themes/legacy/index.ts b/src/themes/legacy/index.ts
index 3f4bec5d5..c6105a4e2 100644
--- a/packages/theme/src/themes/legacy/index.ts
+++ b/src/themes/legacy/index.ts
@@ -1,5 +1,7 @@
+import { DEFAULT_ACCENT_COLOR } from '../../config';
+
 /* legacy config, injected into sass */
-export const themeBrandPrimary = '#7266F0';
+export const themeBrandPrimary = DEFAULT_ACCENT_COLOR;
 export const themeBrandSuccess = '#5cb85c';
 export const themeBrandInfo = '#5bc0de';
 export const themeBrandWarning = '#FF9F00';
diff --git a/packages/theme/test/index.test.ts b/test/themes/index.test.ts
index 7eda4e359..042b70009 100644
--- a/packages/theme/test/index.test.ts
+++ b/test/themes/index.test.ts
@@ -1,8 +1,8 @@
 import expect from 'expect.js';
 
-import makeDefaultThemeConfig from '../src/themes/default';
-import makeDarkThemeConfig from '../src/themes/dark';
-import { theme, ThemeType } from '../src';
+import makeDefaultThemeConfig from '../../src/themes/default';
+import makeDarkThemeConfig from '../../src/themes/dark';
+import { theme, ThemeType } from '../../src/themes';
 
 describe('Load theme', () => {
   it('Should load default theme', () => {