Merge remote-tracking branch 'origin/feat/themes-example-app' into beta

SoftwareBrothers · Apr 4, 2023 · 12d8453 · 12d8453
2 parents 6855835 + 9534200
commit 12d8453
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 5 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,5 +1,5 @@
 {
-  "plugins": [["babel-plugin-styled-components", { "diplayName": true }]],
+  "plugins": [],
   "presets": [
     "@babel/preset-react",
     [

diff --git a/example/package.json b/example/package.json
@@ -14,7 +14,7 @@
     "@adminjs/design-system": "^4.0.0-beta-v4.7",
     "@adminjs/express": "^6.0.0-beta.3",
     "@adminjs/passwords": "^4.0.0-beta.1",
-    "@adminjs/themes": "*",
+    "@adminjs/themes": "^1.0.0-beta.1",
     "@adminjs/typeorm": "^5.0.0-beta.1",
     "adminjs": "^7.0.0-beta-v7.4",
     "argon2": "^0.30.3",

diff --git a/example/src/admin/index.ts b/example/src/admin/index.ts
@@ -1,4 +1,4 @@
-import { dark, wide } from '@adminjs/themes';
+import { dark, noSidebar } from '@adminjs/themes';
 import { Database, Resource } from '@adminjs/typeorm';
 import AdminJS, { ThemeConfig } from 'adminjs';
 import { Express } from 'express';
@@ -31,7 +31,7 @@ const setupAdmin = async (app: Express): Promise<void> => {
     },
     defaultTheme: themeConfig.id,
     availableThemes: [
-      wide,
+      noSidebar,
       dark,
       {
         ...themeConfig,

diff --git a/example/yarn.lock b/example/yarn.lock
@@ -41,6 +41,46 @@
     styled-system "^5.1.5"
     text-mask-addons "^3.8.0"
 
+"@adminjs/design-system@^4.0.0-beta-v4.8":
+  version "4.0.0-beta-v4.8"
+  resolved "https://registry.yarnpkg.com/@adminjs/design-system/-/design-system-4.0.0-beta-v4.8.tgz#8314e7e3275953c8b2fdebec7cf45b9663e2a9e3"
+  integrity sha512-CE0/hvvdJ21cwExE1jJ4k4OXtHzP62CMMKl5RLEHNhkW3bhPt42hJlYbjq2tELnSCjZN1RWzhiJYPuLh8ViPrw==
+  dependencies:
+    "@hypnosphi/create-react-context" "^0.3.1"
+    "@tiptap/core" "2.0.1"
+    "@tiptap/extension-bubble-menu" "2.0.1"
+    "@tiptap/extension-character-count" "2.0.1"
+    "@tiptap/extension-code" "2.0.1"
+    "@tiptap/extension-document" "2.0.1"
+    "@tiptap/extension-floating-menu" "2.0.1"
+    "@tiptap/extension-heading" "2.0.1"
+    "@tiptap/extension-image" "2.0.1"
+    "@tiptap/extension-link" "2.0.1"
+    "@tiptap/extension-table" "2.0.1"
+    "@tiptap/extension-table-cell" "2.0.1"
+    "@tiptap/extension-table-header" "2.0.1"
+    "@tiptap/extension-table-row" "2.0.1"
+    "@tiptap/extension-text" "2.0.1"
+    "@tiptap/extension-text-align" "2.0.1"
+    "@tiptap/extension-typography" "2.0.1"
+    "@tiptap/pm" "2.0.1"
+    "@tiptap/react" "2.0.1"
+    "@tiptap/starter-kit" "2.0.1"
+    date-fns "^2.29.3"
+    flat "^5.0.2"
+    jw-paginate "^1.0.4"
+    lodash "^4.17.21"
+    polished "^4.2.2"
+    react-currency-input-field "^3.6.10"
+    react-datepicker "^4.10.0"
+    react-feather "^2.0.10"
+    react-phone-input-2 "^2.15.1"
+    react-select "^5.7.2"
+    react-text-mask "^5.5.0"
+    styled-components "5.3.9"
+    styled-system "^5.1.5"
+    text-mask-addons "^3.8.0"
+
 "@adminjs/express@^6.0.0-beta.3":
   version "6.0.0-beta.3"
   resolved "https://registry.yarnpkg.com/@adminjs/express/-/express-6.0.0-beta.3.tgz#d113ee76c897e54b7fb748d08a9a6026577d3358"
@@ -51,6 +91,13 @@
   resolved "https://registry.yarnpkg.com/@adminjs/passwords/-/passwords-4.0.0-beta.1.tgz#9d5ee5616b26c3b1b0144056ab45733316f3c70f"
   integrity sha512-Bbc/9lIwJ0SQD7Q5N+g8NIk/As2aeGFr5v1mpBWprYigt1u/KIJWy7LQKc28hd63Mwk7fK8Y35OMcXpVUEFFpA==
 
+"@adminjs/themes@^1.0.0-beta.1":
+  version "1.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@adminjs/themes/-/themes-1.0.0-beta.1.tgz#5c55309455b15bc33d66ebca89529a38282fc191"
+  integrity sha512-EYWcn2T1qNanYjwi0v+1LvDi7To/2I5yDOpV2p4ARGmR3C/eiXY3t/yykjf9nlhYZc0Q5tbDZFtASH3u4eqYgQ==
+  dependencies:
+    "@adminjs/design-system" "^4.0.0-beta-v4.8"
+
 "@adminjs/typeorm@^5.0.0-beta.1":
   version "5.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/@adminjs/typeorm/-/typeorm-5.0.0-beta.1.tgz#81970528299a21489615a4d38b7da6318d203271"

diff --git a/src/cli/actions/bundleTheme.js b/src/cli/actions/bundleTheme.js
@@ -50,7 +50,7 @@ export const bundleTheme = async (
 const bundleComponents = async (input, id) => {
   const themeDir = path.resolve(input, id);
 
-  if (fs.existsSync(themeDir)) {
+  if (!fs.existsSync(themeDir)) {
     console.error(`⚠️ Theme ${id} doesn't exists`);
     process.exit(1);
   }