From fa43a0236b550be2d6d4f119a2affc7c3cc921e0 Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Tue, 13 Jun 2023 14:14:53 +0200 Subject: [PATCH] Moved Sodo-Search into `apps/` refs https://github.com/TryGhost/Toolbox/issues/594 - this is the first of a set of commits to move our "apps" into the `apps/` folder, so we don't mix Ghost core and standalone apps --- .github/dev.js | 2 +- .gitignore | 7 ++++--- {ghost => apps}/sodo-search/.yarnrc | 0 {ghost => apps}/sodo-search/LICENSE | 0 {ghost => apps}/sodo-search/README.md | 0 {ghost => apps}/sodo-search/package.json | 0 {ghost => apps}/sodo-search/postcss.config.js | 0 {ghost => apps}/sodo-search/public/favicon.ico | Bin {ghost => apps}/sodo-search/public/index.html | 0 {ghost => apps}/sodo-search/public/logo192.png | Bin {ghost => apps}/sodo-search/public/logo512.png | Bin {ghost => apps}/sodo-search/public/manifest.json | 0 {ghost => apps}/sodo-search/public/robots.txt | 0 .../sodo-search/scripts/build-combined.js | 0 {ghost => apps}/sodo-search/scripts/dev-mode.js | 0 {ghost => apps}/sodo-search/scripts/load-portal.js | 0 .../sodo-search/scripts/start-combined.js | 0 {ghost => apps}/sodo-search/scripts/start-mode.js | 0 {ghost => apps}/sodo-search/src/App.css | 0 {ghost => apps}/sodo-search/src/App.js | 0 {ghost => apps}/sodo-search/src/App.test.js | 0 {ghost => apps}/sodo-search/src/AppContext.js | 0 {ghost => apps}/sodo-search/src/components/Frame.js | 0 .../sodo-search/src/components/PopupModal.js | 0 .../sodo-search/src/icons/circle-anim.svg | 0 {ghost => apps}/sodo-search/src/icons/clear.svg | 0 {ghost => apps}/sodo-search/src/icons/search.svg | 0 {ghost => apps}/sodo-search/src/index.css | 0 {ghost => apps}/sodo-search/src/index.js | 0 {ghost => apps}/sodo-search/src/logo.svg | 0 {ghost => apps}/sodo-search/src/search-index.js | 0 .../sodo-search/src/search-index.test.js | 0 {ghost => apps}/sodo-search/src/setupTests.js | 0 {ghost => apps}/sodo-search/src/utils/helpers.js | 0 {ghost => apps}/sodo-search/tailwind.config.js | 0 {ghost => apps}/sodo-search/webpack.config.js | 0 36 files changed, 5 insertions(+), 4 deletions(-) rename {ghost => apps}/sodo-search/.yarnrc (100%) rename {ghost => apps}/sodo-search/LICENSE (100%) rename {ghost => apps}/sodo-search/README.md (100%) rename {ghost => apps}/sodo-search/package.json (100%) rename {ghost => apps}/sodo-search/postcss.config.js (100%) rename {ghost => apps}/sodo-search/public/favicon.ico (100%) rename {ghost => apps}/sodo-search/public/index.html (100%) rename {ghost => apps}/sodo-search/public/logo192.png (100%) rename {ghost => apps}/sodo-search/public/logo512.png (100%) rename {ghost => apps}/sodo-search/public/manifest.json (100%) rename {ghost => apps}/sodo-search/public/robots.txt (100%) rename {ghost => apps}/sodo-search/scripts/build-combined.js (100%) rename {ghost => apps}/sodo-search/scripts/dev-mode.js (100%) rename {ghost => apps}/sodo-search/scripts/load-portal.js (100%) rename {ghost => apps}/sodo-search/scripts/start-combined.js (100%) rename {ghost => apps}/sodo-search/scripts/start-mode.js (100%) rename {ghost => apps}/sodo-search/src/App.css (100%) rename {ghost => apps}/sodo-search/src/App.js (100%) rename {ghost => apps}/sodo-search/src/App.test.js (100%) rename {ghost => apps}/sodo-search/src/AppContext.js (100%) rename {ghost => apps}/sodo-search/src/components/Frame.js (100%) rename {ghost => apps}/sodo-search/src/components/PopupModal.js (100%) rename {ghost => apps}/sodo-search/src/icons/circle-anim.svg (100%) rename {ghost => apps}/sodo-search/src/icons/clear.svg (100%) rename {ghost => apps}/sodo-search/src/icons/search.svg (100%) rename {ghost => apps}/sodo-search/src/index.css (100%) rename {ghost => apps}/sodo-search/src/index.js (100%) rename {ghost => apps}/sodo-search/src/logo.svg (100%) rename {ghost => apps}/sodo-search/src/search-index.js (100%) rename {ghost => apps}/sodo-search/src/search-index.test.js (100%) rename {ghost => apps}/sodo-search/src/setupTests.js (100%) rename {ghost => apps}/sodo-search/src/utils/helpers.js (100%) rename {ghost => apps}/sodo-search/tailwind.config.js (100%) rename {ghost => apps}/sodo-search/webpack.config.js (100%) diff --git a/.github/dev.js b/.github/dev.js index 6040ba8e5e..2d1f14d91e 100644 --- a/.github/dev.js +++ b/.github/dev.js @@ -115,7 +115,7 @@ if (DASH_DASH_ARGS.includes('search') || DASH_DASH_ARGS.includes('all')) { commands.push({ name: 'search', command: 'yarn dev', - cwd: path.resolve(__dirname, '../ghost/sodo-search'), + cwd: path.resolve(__dirname, '../apps/sodo-search'), prefixColor: '#23de43', env: {} }); diff --git a/.gitignore b/.gitignore index cd3d0a442b..300ac409e3 100644 --- a/.gitignore +++ b/.gitignore @@ -130,8 +130,8 @@ Caddyfile /ghost/portal/umd # Sodo-Search -/ghost/sodo-search/public/main.css -/ghost/sodo-search/umd +/apps/sodo-search/public/main.css +/apps/sodo-search/umd # Signup Form and local environments /ghost/signup-form/umd @@ -144,10 +144,11 @@ Caddyfile /ghost/announcement-bar/umd # Build files +/apps/*/build /ghost/*/build # Typescript build artifacts -/ghost/*/tsconfig.tsbuildinfo +tsconfig.tsbuildinfo # Admin X /ghost/admin-x-settings/dist diff --git a/ghost/sodo-search/.yarnrc b/apps/sodo-search/.yarnrc similarity index 100% rename from ghost/sodo-search/.yarnrc rename to apps/sodo-search/.yarnrc diff --git a/ghost/sodo-search/LICENSE b/apps/sodo-search/LICENSE similarity index 100% rename from ghost/sodo-search/LICENSE rename to apps/sodo-search/LICENSE diff --git a/ghost/sodo-search/README.md b/apps/sodo-search/README.md similarity index 100% rename from ghost/sodo-search/README.md rename to apps/sodo-search/README.md diff --git a/ghost/sodo-search/package.json b/apps/sodo-search/package.json similarity index 100% rename from ghost/sodo-search/package.json rename to apps/sodo-search/package.json diff --git a/ghost/sodo-search/postcss.config.js b/apps/sodo-search/postcss.config.js similarity index 100% rename from ghost/sodo-search/postcss.config.js rename to apps/sodo-search/postcss.config.js diff --git a/ghost/sodo-search/public/favicon.ico b/apps/sodo-search/public/favicon.ico similarity index 100% rename from ghost/sodo-search/public/favicon.ico rename to apps/sodo-search/public/favicon.ico diff --git a/ghost/sodo-search/public/index.html b/apps/sodo-search/public/index.html similarity index 100% rename from ghost/sodo-search/public/index.html rename to apps/sodo-search/public/index.html diff --git a/ghost/sodo-search/public/logo192.png b/apps/sodo-search/public/logo192.png similarity index 100% rename from ghost/sodo-search/public/logo192.png rename to apps/sodo-search/public/logo192.png diff --git a/ghost/sodo-search/public/logo512.png b/apps/sodo-search/public/logo512.png similarity index 100% rename from ghost/sodo-search/public/logo512.png rename to apps/sodo-search/public/logo512.png diff --git a/ghost/sodo-search/public/manifest.json b/apps/sodo-search/public/manifest.json similarity index 100% rename from ghost/sodo-search/public/manifest.json rename to apps/sodo-search/public/manifest.json diff --git a/ghost/sodo-search/public/robots.txt b/apps/sodo-search/public/robots.txt similarity index 100% rename from ghost/sodo-search/public/robots.txt rename to apps/sodo-search/public/robots.txt diff --git a/ghost/sodo-search/scripts/build-combined.js b/apps/sodo-search/scripts/build-combined.js similarity index 100% rename from ghost/sodo-search/scripts/build-combined.js rename to apps/sodo-search/scripts/build-combined.js diff --git a/ghost/sodo-search/scripts/dev-mode.js b/apps/sodo-search/scripts/dev-mode.js similarity index 100% rename from ghost/sodo-search/scripts/dev-mode.js rename to apps/sodo-search/scripts/dev-mode.js diff --git a/ghost/sodo-search/scripts/load-portal.js b/apps/sodo-search/scripts/load-portal.js similarity index 100% rename from ghost/sodo-search/scripts/load-portal.js rename to apps/sodo-search/scripts/load-portal.js diff --git a/ghost/sodo-search/scripts/start-combined.js b/apps/sodo-search/scripts/start-combined.js similarity index 100% rename from ghost/sodo-search/scripts/start-combined.js rename to apps/sodo-search/scripts/start-combined.js diff --git a/ghost/sodo-search/scripts/start-mode.js b/apps/sodo-search/scripts/start-mode.js similarity index 100% rename from ghost/sodo-search/scripts/start-mode.js rename to apps/sodo-search/scripts/start-mode.js diff --git a/ghost/sodo-search/src/App.css b/apps/sodo-search/src/App.css similarity index 100% rename from ghost/sodo-search/src/App.css rename to apps/sodo-search/src/App.css diff --git a/ghost/sodo-search/src/App.js b/apps/sodo-search/src/App.js similarity index 100% rename from ghost/sodo-search/src/App.js rename to apps/sodo-search/src/App.js diff --git a/ghost/sodo-search/src/App.test.js b/apps/sodo-search/src/App.test.js similarity index 100% rename from ghost/sodo-search/src/App.test.js rename to apps/sodo-search/src/App.test.js diff --git a/ghost/sodo-search/src/AppContext.js b/apps/sodo-search/src/AppContext.js similarity index 100% rename from ghost/sodo-search/src/AppContext.js rename to apps/sodo-search/src/AppContext.js diff --git a/ghost/sodo-search/src/components/Frame.js b/apps/sodo-search/src/components/Frame.js similarity index 100% rename from ghost/sodo-search/src/components/Frame.js rename to apps/sodo-search/src/components/Frame.js diff --git a/ghost/sodo-search/src/components/PopupModal.js b/apps/sodo-search/src/components/PopupModal.js similarity index 100% rename from ghost/sodo-search/src/components/PopupModal.js rename to apps/sodo-search/src/components/PopupModal.js diff --git a/ghost/sodo-search/src/icons/circle-anim.svg b/apps/sodo-search/src/icons/circle-anim.svg similarity index 100% rename from ghost/sodo-search/src/icons/circle-anim.svg rename to apps/sodo-search/src/icons/circle-anim.svg diff --git a/ghost/sodo-search/src/icons/clear.svg b/apps/sodo-search/src/icons/clear.svg similarity index 100% rename from ghost/sodo-search/src/icons/clear.svg rename to apps/sodo-search/src/icons/clear.svg diff --git a/ghost/sodo-search/src/icons/search.svg b/apps/sodo-search/src/icons/search.svg similarity index 100% rename from ghost/sodo-search/src/icons/search.svg rename to apps/sodo-search/src/icons/search.svg diff --git a/ghost/sodo-search/src/index.css b/apps/sodo-search/src/index.css similarity index 100% rename from ghost/sodo-search/src/index.css rename to apps/sodo-search/src/index.css diff --git a/ghost/sodo-search/src/index.js b/apps/sodo-search/src/index.js similarity index 100% rename from ghost/sodo-search/src/index.js rename to apps/sodo-search/src/index.js diff --git a/ghost/sodo-search/src/logo.svg b/apps/sodo-search/src/logo.svg similarity index 100% rename from ghost/sodo-search/src/logo.svg rename to apps/sodo-search/src/logo.svg diff --git a/ghost/sodo-search/src/search-index.js b/apps/sodo-search/src/search-index.js similarity index 100% rename from ghost/sodo-search/src/search-index.js rename to apps/sodo-search/src/search-index.js diff --git a/ghost/sodo-search/src/search-index.test.js b/apps/sodo-search/src/search-index.test.js similarity index 100% rename from ghost/sodo-search/src/search-index.test.js rename to apps/sodo-search/src/search-index.test.js diff --git a/ghost/sodo-search/src/setupTests.js b/apps/sodo-search/src/setupTests.js similarity index 100% rename from ghost/sodo-search/src/setupTests.js rename to apps/sodo-search/src/setupTests.js diff --git a/ghost/sodo-search/src/utils/helpers.js b/apps/sodo-search/src/utils/helpers.js similarity index 100% rename from ghost/sodo-search/src/utils/helpers.js rename to apps/sodo-search/src/utils/helpers.js diff --git a/ghost/sodo-search/tailwind.config.js b/apps/sodo-search/tailwind.config.js similarity index 100% rename from ghost/sodo-search/tailwind.config.js rename to apps/sodo-search/tailwind.config.js diff --git a/ghost/sodo-search/webpack.config.js b/apps/sodo-search/webpack.config.js similarity index 100% rename from ghost/sodo-search/webpack.config.js rename to apps/sodo-search/webpack.config.js