diff --git a/.secretlintrc.json b/.secretlintrc.json index 43d3a0f21ac..de68888039a 100644 --- a/.secretlintrc.json +++ b/.secretlintrc.json @@ -43,7 +43,9 @@ ], "allows": [ "/attempt-to-change-via-edit/", - "/mynewfancypasswordwhichisnotallowed/" + "/mynewfancypasswordwhichisnotallowed/", + "/scriptTag\\.dataset\\.key/", + "/69010382388f9de5869ad6e558/" ] }, { diff --git a/apps/admin-toolbar/package.json b/apps/admin-toolbar/package.json index 985e020245d..b57db21fb78 100644 --- a/apps/admin-toolbar/package.json +++ b/apps/admin-toolbar/package.json @@ -1,7 +1,7 @@ { "name": "@tryghost/admin-toolbar", "type": "module", - "version": "0.1.9", + "version": "0.1.10", "license": "MIT", "repository": "https://github.com/TryGhost/Ghost", "author": "Ghost Foundation", diff --git a/apps/admin-toolbar/vite.config.mjs b/apps/admin-toolbar/vite.config.mjs index 7de16392368..2f8df9aa72d 100644 --- a/apps/admin-toolbar/vite.config.mjs +++ b/apps/admin-toolbar/vite.config.mjs @@ -3,29 +3,12 @@ import {resolve} from 'path'; import {defineConfig} from 'vite'; -// `vite preview` aborts when its outDir is missing — a UX nudge for the -// "did you forget to build?" case. Our dev script runs preview alongside -// `build:watch`, so the dir is missing for the first ~1s after a fresh -// clone or `build:clean`. Defining configurePreviewServer is Vite's -// documented opt-out from that guard; the underlying sirv server already -// 404s for missing files. -const tolerateMissingOutDir = () => ({ - name: 'tolerate-missing-outdir', - configurePreviewServer() {} -}); - export default defineConfig(({mode}) => ({ logLevel: process.env.CI ? 'info' : 'warn', clearScreen: false, - plugins: [tolerateMissingOutDir()], define: { 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || mode) }, - preview: { - host: '0.0.0.0', - allowedHosts: true, // allows domain-name proxies to the preview server - port: 4176 - }, build: { outDir: resolve(import.meta.dirname, 'umd'), emptyOutDir: true, diff --git a/apps/announcement-bar/package.json b/apps/announcement-bar/package.json index 0c744c5a800..590efea8820 100644 --- a/apps/announcement-bar/package.json +++ b/apps/announcement-bar/package.json @@ -1,7 +1,7 @@ { "name": "@tryghost/announcement-bar", "type": "module", - "version": "1.1.25", + "version": "1.1.26", "license": "MIT", "repository": "https://github.com/TryGhost/Ghost", "author": "Ghost Foundation", diff --git a/apps/announcement-bar/src/app.js b/apps/announcement-bar/src/app.jsx similarity index 100% rename from apps/announcement-bar/src/app.js rename to apps/announcement-bar/src/app.jsx diff --git a/apps/announcement-bar/src/components/announcement-bar.js b/apps/announcement-bar/src/components/announcement-bar.jsx similarity index 100% rename from apps/announcement-bar/src/components/announcement-bar.js rename to apps/announcement-bar/src/components/announcement-bar.jsx diff --git a/apps/announcement-bar/src/components/main.js b/apps/announcement-bar/src/components/main.jsx similarity index 100% rename from apps/announcement-bar/src/components/main.js rename to apps/announcement-bar/src/components/main.jsx diff --git a/apps/announcement-bar/src/components/preview.js b/apps/announcement-bar/src/components/preview.jsx similarity index 100% rename from apps/announcement-bar/src/components/preview.js rename to apps/announcement-bar/src/components/preview.jsx diff --git a/apps/announcement-bar/src/index.js b/apps/announcement-bar/src/index.jsx similarity index 100% rename from apps/announcement-bar/src/index.js rename to apps/announcement-bar/src/index.jsx diff --git a/apps/announcement-bar/vite.config.mjs b/apps/announcement-bar/vite.config.mjs index b23bac5a0c5..ea50f33aab5 100644 --- a/apps/announcement-bar/vite.config.mjs +++ b/apps/announcement-bar/vite.config.mjs @@ -1,6 +1,5 @@ /* eslint-env node */ import {resolve} from 'path'; -import fs from 'fs/promises'; import {defineConfig} from 'vitest/config'; import reactPlugin from '@vitejs/plugin-react'; @@ -17,35 +16,10 @@ export default defineConfig((config) => { define: { 'process.env.NODE_ENV': JSON.stringify(config.mode) }, - preview: { - host: '0.0.0.0', - allowedHosts: true, // allows domain-name proxies to the preview server - port: 4177 - }, plugins: [ reactPlugin(), svgrPlugin() ], - esbuild: { - loader: 'jsx', - include: /src\/.*\.jsx?$/, - exclude: [] - }, - optimizeDeps: { - esbuildOptions: { - plugins: [ - { - name: 'load-js-files-as-jsx', - setup(build) { - build.onLoad({filter: /(src|test)\/.*\.js$/}, async args => ({ - loader: 'jsx', - contents: await fs.readFile(args.path, 'utf8') - })); - } - } - ] - } - }, build: { outDir: resolve(__dirname, 'umd'), emptyOutDir: true, @@ -54,7 +28,7 @@ export default defineConfig((config) => { sourcemap: true, cssCodeSplit: true, lib: { - entry: resolve(__dirname, 'src/index.js'), + entry: resolve(__dirname, 'src/index.jsx'), formats: ['umd'], name: pkg.name, fileName: format => `${outputFileName}.min.js` diff --git a/apps/portal/package.json b/apps/portal/package.json index e0805ef29cf..a346cb8eaad 100644 --- a/apps/portal/package.json +++ b/apps/portal/package.json @@ -1,7 +1,7 @@ { "name": "@tryghost/portal", "type": "module", - "version": "2.69.13", + "version": "2.69.14", "license": "MIT", "repository": "https://github.com/TryGhost/Ghost", "author": "Ghost Foundation", diff --git a/apps/portal/src/app.js b/apps/portal/src/app.jsx similarity index 100% rename from apps/portal/src/app.js rename to apps/portal/src/app.jsx diff --git a/apps/portal/src/components/common/action-button.js b/apps/portal/src/components/common/action-button.jsx similarity index 100% rename from apps/portal/src/components/common/action-button.js rename to apps/portal/src/components/common/action-button.jsx diff --git a/apps/portal/src/components/common/back-button.js b/apps/portal/src/components/common/back-button.jsx similarity index 100% rename from apps/portal/src/components/common/back-button.js rename to apps/portal/src/components/common/back-button.jsx diff --git a/apps/portal/src/components/common/close-button.js b/apps/portal/src/components/common/close-button.jsx similarity index 100% rename from apps/portal/src/components/common/close-button.js rename to apps/portal/src/components/common/close-button.jsx diff --git a/apps/portal/src/components/common/gift-card.js b/apps/portal/src/components/common/gift-card.jsx similarity index 100% rename from apps/portal/src/components/common/gift-card.js rename to apps/portal/src/components/common/gift-card.jsx diff --git a/apps/portal/src/components/common/gift-details-toggle.js b/apps/portal/src/components/common/gift-details-toggle.jsx similarity index 100% rename from apps/portal/src/components/common/gift-details-toggle.js rename to apps/portal/src/components/common/gift-details-toggle.jsx diff --git a/apps/portal/src/components/common/inbox-link-button.js b/apps/portal/src/components/common/inbox-link-button.jsx similarity index 100% rename from apps/portal/src/components/common/inbox-link-button.js rename to apps/portal/src/components/common/inbox-link-button.jsx diff --git a/apps/portal/src/components/common/input-field.js b/apps/portal/src/components/common/input-field.jsx similarity index 100% rename from apps/portal/src/components/common/input-field.js rename to apps/portal/src/components/common/input-field.jsx diff --git a/apps/portal/src/components/common/input-form.js b/apps/portal/src/components/common/input-form.jsx similarity index 100% rename from apps/portal/src/components/common/input-form.js rename to apps/portal/src/components/common/input-form.jsx diff --git a/apps/portal/src/components/common/member-gravatar.js b/apps/portal/src/components/common/member-gravatar.jsx similarity index 100% rename from apps/portal/src/components/common/member-gravatar.js rename to apps/portal/src/components/common/member-gravatar.jsx diff --git a/apps/portal/src/components/common/newsletter-management.js b/apps/portal/src/components/common/newsletter-management.jsx similarity index 100% rename from apps/portal/src/components/common/newsletter-management.js rename to apps/portal/src/components/common/newsletter-management.jsx diff --git a/apps/portal/src/components/common/plans-section.js b/apps/portal/src/components/common/plans-section.jsx similarity index 100% rename from apps/portal/src/components/common/plans-section.js rename to apps/portal/src/components/common/plans-section.jsx diff --git a/apps/portal/src/components/common/popup-notification.js b/apps/portal/src/components/common/popup-notification.jsx similarity index 100% rename from apps/portal/src/components/common/popup-notification.js rename to apps/portal/src/components/common/popup-notification.jsx diff --git a/apps/portal/src/components/common/powered-by.js b/apps/portal/src/components/common/powered-by.jsx similarity index 100% rename from apps/portal/src/components/common/powered-by.js rename to apps/portal/src/components/common/powered-by.jsx diff --git a/apps/portal/src/components/common/products-section.js b/apps/portal/src/components/common/products-section.jsx similarity index 100% rename from apps/portal/src/components/common/products-section.js rename to apps/portal/src/components/common/products-section.jsx diff --git a/apps/portal/src/components/common/site-title-back-button.js b/apps/portal/src/components/common/site-title-back-button.jsx similarity index 100% rename from apps/portal/src/components/common/site-title-back-button.js rename to apps/portal/src/components/common/site-title-back-button.jsx diff --git a/apps/portal/src/components/common/switch.js b/apps/portal/src/components/common/switch.jsx similarity index 100% rename from apps/portal/src/components/common/switch.js rename to apps/portal/src/components/common/switch.jsx diff --git a/apps/portal/src/components/frame.js b/apps/portal/src/components/frame.jsx similarity index 100% rename from apps/portal/src/components/frame.js rename to apps/portal/src/components/frame.jsx diff --git a/apps/portal/src/components/notification.js b/apps/portal/src/components/notification.jsx similarity index 100% rename from apps/portal/src/components/notification.js rename to apps/portal/src/components/notification.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/account-home-page.js b/apps/portal/src/components/pages/AccountHomePage/account-home-page.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/account-home-page.js rename to apps/portal/src/components/pages/AccountHomePage/account-home-page.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/components/account-actions.js b/apps/portal/src/components/pages/AccountHomePage/components/account-actions.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/components/account-actions.js rename to apps/portal/src/components/pages/AccountHomePage/components/account-actions.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/components/account-footer.js b/apps/portal/src/components/pages/AccountHomePage/components/account-footer.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/components/account-footer.js rename to apps/portal/src/components/pages/AccountHomePage/components/account-footer.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/components/account-main.js b/apps/portal/src/components/pages/AccountHomePage/components/account-main.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/components/account-main.js rename to apps/portal/src/components/pages/AccountHomePage/components/account-main.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/components/account-welcome.js b/apps/portal/src/components/pages/AccountHomePage/components/account-welcome.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/components/account-welcome.js rename to apps/portal/src/components/pages/AccountHomePage/components/account-welcome.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/components/continue-gift-subscription-banner.js b/apps/portal/src/components/pages/AccountHomePage/components/continue-gift-subscription-banner.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/components/continue-gift-subscription-banner.js rename to apps/portal/src/components/pages/AccountHomePage/components/continue-gift-subscription-banner.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/components/continue-subscription-button.js b/apps/portal/src/components/pages/AccountHomePage/components/continue-subscription-button.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/components/continue-subscription-button.js rename to apps/portal/src/components/pages/AccountHomePage/components/continue-subscription-button.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/components/email-newsletter-action.js b/apps/portal/src/components/pages/AccountHomePage/components/email-newsletter-action.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/components/email-newsletter-action.js rename to apps/portal/src/components/pages/AccountHomePage/components/email-newsletter-action.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/components/email-preferences-action.js b/apps/portal/src/components/pages/AccountHomePage/components/email-preferences-action.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/components/email-preferences-action.js rename to apps/portal/src/components/pages/AccountHomePage/components/email-preferences-action.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/components/paid-account-actions.js b/apps/portal/src/components/pages/AccountHomePage/components/paid-account-actions.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/components/paid-account-actions.js rename to apps/portal/src/components/pages/AccountHomePage/components/paid-account-actions.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/components/subscribe-button.js b/apps/portal/src/components/pages/AccountHomePage/components/subscribe-button.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/components/subscribe-button.js rename to apps/portal/src/components/pages/AccountHomePage/components/subscribe-button.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/components/transistor-podcasts-action.js b/apps/portal/src/components/pages/AccountHomePage/components/transistor-podcasts-action.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/components/transistor-podcasts-action.js rename to apps/portal/src/components/pages/AccountHomePage/components/transistor-podcasts-action.jsx diff --git a/apps/portal/src/components/pages/AccountHomePage/components/user-header.js b/apps/portal/src/components/pages/AccountHomePage/components/user-header.jsx similarity index 100% rename from apps/portal/src/components/pages/AccountHomePage/components/user-header.js rename to apps/portal/src/components/pages/AccountHomePage/components/user-header.jsx diff --git a/apps/portal/src/components/pages/account-email-page.js b/apps/portal/src/components/pages/account-email-page.jsx similarity index 100% rename from apps/portal/src/components/pages/account-email-page.js rename to apps/portal/src/components/pages/account-email-page.jsx diff --git a/apps/portal/src/components/pages/account-plan-page.js b/apps/portal/src/components/pages/account-plan-page.jsx similarity index 100% rename from apps/portal/src/components/pages/account-plan-page.js rename to apps/portal/src/components/pages/account-plan-page.jsx diff --git a/apps/portal/src/components/pages/account-profile-page.js b/apps/portal/src/components/pages/account-profile-page.jsx similarity index 100% rename from apps/portal/src/components/pages/account-profile-page.js rename to apps/portal/src/components/pages/account-profile-page.jsx diff --git a/apps/portal/src/components/pages/email-receiving-faq.js b/apps/portal/src/components/pages/email-receiving-faq.jsx similarity index 100% rename from apps/portal/src/components/pages/email-receiving-faq.js rename to apps/portal/src/components/pages/email-receiving-faq.jsx diff --git a/apps/portal/src/components/pages/email-suppressed-page.js b/apps/portal/src/components/pages/email-suppressed-page.jsx similarity index 100% rename from apps/portal/src/components/pages/email-suppressed-page.js rename to apps/portal/src/components/pages/email-suppressed-page.jsx diff --git a/apps/portal/src/components/pages/email-suppression-faq.js b/apps/portal/src/components/pages/email-suppression-faq.jsx similarity index 100% rename from apps/portal/src/components/pages/email-suppression-faq.js rename to apps/portal/src/components/pages/email-suppression-faq.jsx diff --git a/apps/portal/src/components/pages/feedback-page.js b/apps/portal/src/components/pages/feedback-page.jsx similarity index 100% rename from apps/portal/src/components/pages/feedback-page.js rename to apps/portal/src/components/pages/feedback-page.jsx diff --git a/apps/portal/src/components/pages/gift-page.js b/apps/portal/src/components/pages/gift-page.jsx similarity index 100% rename from apps/portal/src/components/pages/gift-page.js rename to apps/portal/src/components/pages/gift-page.jsx diff --git a/apps/portal/src/components/pages/gift-redemption-page.js b/apps/portal/src/components/pages/gift-redemption-page.jsx similarity index 100% rename from apps/portal/src/components/pages/gift-redemption-page.js rename to apps/portal/src/components/pages/gift-redemption-page.jsx diff --git a/apps/portal/src/components/pages/gift-success-page.js b/apps/portal/src/components/pages/gift-success-page.jsx similarity index 100% rename from apps/portal/src/components/pages/gift-success-page.js rename to apps/portal/src/components/pages/gift-success-page.jsx diff --git a/apps/portal/src/components/pages/loading-page.js b/apps/portal/src/components/pages/loading-page.jsx similarity index 100% rename from apps/portal/src/components/pages/loading-page.js rename to apps/portal/src/components/pages/loading-page.jsx diff --git a/apps/portal/src/components/pages/magic-link-page.js b/apps/portal/src/components/pages/magic-link-page.jsx similarity index 100% rename from apps/portal/src/components/pages/magic-link-page.js rename to apps/portal/src/components/pages/magic-link-page.jsx diff --git a/apps/portal/src/components/pages/newsletter-selection-page.js b/apps/portal/src/components/pages/newsletter-selection-page.jsx similarity index 100% rename from apps/portal/src/components/pages/newsletter-selection-page.js rename to apps/portal/src/components/pages/newsletter-selection-page.jsx diff --git a/apps/portal/src/components/pages/offer-page.js b/apps/portal/src/components/pages/offer-page.jsx similarity index 100% rename from apps/portal/src/components/pages/offer-page.js rename to apps/portal/src/components/pages/offer-page.jsx diff --git a/apps/portal/src/components/pages/recommendations-page.js b/apps/portal/src/components/pages/recommendations-page.jsx similarity index 100% rename from apps/portal/src/components/pages/recommendations-page.js rename to apps/portal/src/components/pages/recommendations-page.jsx diff --git a/apps/portal/src/components/pages/share/share-modal.js b/apps/portal/src/components/pages/share/share-modal.jsx similarity index 100% rename from apps/portal/src/components/pages/share/share-modal.js rename to apps/portal/src/components/pages/share/share-modal.jsx diff --git a/apps/portal/src/components/pages/signin-page.js b/apps/portal/src/components/pages/signin-page.jsx similarity index 100% rename from apps/portal/src/components/pages/signin-page.js rename to apps/portal/src/components/pages/signin-page.jsx diff --git a/apps/portal/src/components/pages/signup-page.js b/apps/portal/src/components/pages/signup-page.jsx similarity index 100% rename from apps/portal/src/components/pages/signup-page.js rename to apps/portal/src/components/pages/signup-page.jsx diff --git a/apps/portal/src/components/pages/support-error.js b/apps/portal/src/components/pages/support-error.jsx similarity index 100% rename from apps/portal/src/components/pages/support-error.js rename to apps/portal/src/components/pages/support-error.jsx diff --git a/apps/portal/src/components/pages/support-page.js b/apps/portal/src/components/pages/support-page.jsx similarity index 100% rename from apps/portal/src/components/pages/support-page.js rename to apps/portal/src/components/pages/support-page.jsx diff --git a/apps/portal/src/components/pages/support-success.js b/apps/portal/src/components/pages/support-success.jsx similarity index 100% rename from apps/portal/src/components/pages/support-success.js rename to apps/portal/src/components/pages/support-success.jsx diff --git a/apps/portal/src/components/pages/unsubscribe-page.js b/apps/portal/src/components/pages/unsubscribe-page.jsx similarity index 100% rename from apps/portal/src/components/pages/unsubscribe-page.js rename to apps/portal/src/components/pages/unsubscribe-page.jsx diff --git a/apps/portal/src/components/popup-modal.js b/apps/portal/src/components/popup-modal.jsx similarity index 100% rename from apps/portal/src/components/popup-modal.js rename to apps/portal/src/components/popup-modal.jsx diff --git a/apps/portal/src/components/trigger-button.js b/apps/portal/src/components/trigger-button.jsx similarity index 100% rename from apps/portal/src/components/trigger-button.js rename to apps/portal/src/components/trigger-button.jsx diff --git a/apps/portal/src/index.js b/apps/portal/src/index.jsx similarity index 100% rename from apps/portal/src/index.js rename to apps/portal/src/index.jsx diff --git a/apps/portal/test/app-frames.test.js b/apps/portal/test/app-frames.test.jsx similarity index 100% rename from apps/portal/test/app-frames.test.js rename to apps/portal/test/app-frames.test.jsx diff --git a/apps/portal/test/app.test.js b/apps/portal/test/app.test.jsx similarity index 100% rename from apps/portal/test/app.test.js rename to apps/portal/test/app.test.jsx diff --git a/apps/portal/test/data-attributes.test.js b/apps/portal/test/data-attributes.test.jsx similarity index 100% rename from apps/portal/test/data-attributes.test.js rename to apps/portal/test/data-attributes.test.jsx diff --git a/apps/portal/test/email-subscriptions-flow.test.js b/apps/portal/test/email-subscriptions-flow.test.jsx similarity index 99% rename from apps/portal/test/email-subscriptions-flow.test.js rename to apps/portal/test/email-subscriptions-flow.test.jsx index 1b021f9134a..a4e5e761dcf 100644 --- a/apps/portal/test/email-subscriptions-flow.test.js +++ b/apps/portal/test/email-subscriptions-flow.test.jsx @@ -1,4 +1,4 @@ -import App from '../src/app.js'; +import App from '../src/app'; import {appRender, fireEvent, within, waitFor} from './utils/test-utils'; import {newsletters as Newsletters, site as FixtureSite, member as FixtureMember} from './utils/test-fixtures'; import setupGhostApi from '../src/utils/api.js'; diff --git a/apps/portal/test/feedback-flow.test.js b/apps/portal/test/feedback-flow.test.jsx similarity index 99% rename from apps/portal/test/feedback-flow.test.js rename to apps/portal/test/feedback-flow.test.jsx index 316aeb2904c..685983d04c1 100644 --- a/apps/portal/test/feedback-flow.test.js +++ b/apps/portal/test/feedback-flow.test.jsx @@ -1,4 +1,4 @@ -import App from '../src/app.js'; +import App from '../src/app'; import {appRender, fireEvent, waitFor, within} from './utils/test-utils'; import setupGhostApi from '../src/utils/api.js'; import {getMemberData, getPostsData, getSiteData} from '../src/utils/fixtures-generator.js'; diff --git a/apps/portal/test/portal-links.test.js b/apps/portal/test/portal-links.test.jsx similarity index 100% rename from apps/portal/test/portal-links.test.js rename to apps/portal/test/portal-links.test.jsx diff --git a/apps/portal/test/signin-flow.test.js b/apps/portal/test/signin-flow.test.jsx similarity index 99% rename from apps/portal/test/signin-flow.test.js rename to apps/portal/test/signin-flow.test.jsx index 7d02055c39e..ae1e8611ef6 100644 --- a/apps/portal/test/signin-flow.test.js +++ b/apps/portal/test/signin-flow.test.jsx @@ -1,4 +1,4 @@ -import App from '../src/app.js'; +import App from '../src/app'; import {fireEvent, appRender, within, waitFor} from './utils/test-utils'; import {site as FixtureSite} from './utils/test-fixtures'; import setupGhostApi from '../src/utils/api.js'; diff --git a/apps/portal/test/signup-flow.test.js b/apps/portal/test/signup-flow.test.jsx similarity index 99% rename from apps/portal/test/signup-flow.test.js rename to apps/portal/test/signup-flow.test.jsx index 027bba23dd0..e8e1c859cff 100644 --- a/apps/portal/test/signup-flow.test.js +++ b/apps/portal/test/signup-flow.test.jsx @@ -1,4 +1,4 @@ -import App from '../src/app.js'; +import App from '../src/app'; import {fireEvent, appRender, within, waitFor} from './utils/test-utils'; import {offer as FixtureOffer, site as FixtureSite, member as FixtureMember} from './utils/test-fixtures'; import setupGhostApi from '../src/utils/api.js'; diff --git a/apps/portal/test/unit/components/common/action-button.test.js b/apps/portal/test/unit/components/common/action-button.test.jsx similarity index 100% rename from apps/portal/test/unit/components/common/action-button.test.js rename to apps/portal/test/unit/components/common/action-button.test.jsx diff --git a/apps/portal/test/unit/components/common/input-field.test.js b/apps/portal/test/unit/components/common/input-field.test.jsx similarity index 100% rename from apps/portal/test/unit/components/common/input-field.test.js rename to apps/portal/test/unit/components/common/input-field.test.jsx diff --git a/apps/portal/test/unit/components/common/member-gravatar.test.js b/apps/portal/test/unit/components/common/member-gravatar.test.jsx similarity index 100% rename from apps/portal/test/unit/components/common/member-gravatar.test.js rename to apps/portal/test/unit/components/common/member-gravatar.test.jsx diff --git a/apps/portal/test/unit/components/common/newsletter-management.test.js b/apps/portal/test/unit/components/common/newsletter-management.test.jsx similarity index 100% rename from apps/portal/test/unit/components/common/newsletter-management.test.js rename to apps/portal/test/unit/components/common/newsletter-management.test.jsx diff --git a/apps/portal/test/unit/components/common/switch.test.js b/apps/portal/test/unit/components/common/switch.test.jsx similarity index 100% rename from apps/portal/test/unit/components/common/switch.test.js rename to apps/portal/test/unit/components/common/switch.test.jsx diff --git a/apps/portal/test/unit/components/notification.test.js b/apps/portal/test/unit/components/notification.test.jsx similarity index 100% rename from apps/portal/test/unit/components/notification.test.js rename to apps/portal/test/unit/components/notification.test.jsx diff --git a/apps/portal/test/unit/components/pages/AccountHomePage/account-actions.test.js b/apps/portal/test/unit/components/pages/AccountHomePage/account-actions.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/AccountHomePage/account-actions.test.js rename to apps/portal/test/unit/components/pages/AccountHomePage/account-actions.test.jsx diff --git a/apps/portal/test/unit/components/pages/AccountHomePage/account-home-page.test.js b/apps/portal/test/unit/components/pages/AccountHomePage/account-home-page.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/AccountHomePage/account-home-page.test.js rename to apps/portal/test/unit/components/pages/AccountHomePage/account-home-page.test.jsx diff --git a/apps/portal/test/unit/components/pages/AccountHomePage/account-welcome.test.js b/apps/portal/test/unit/components/pages/AccountHomePage/account-welcome.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/AccountHomePage/account-welcome.test.js rename to apps/portal/test/unit/components/pages/AccountHomePage/account-welcome.test.jsx diff --git a/apps/portal/test/unit/components/pages/AccountHomePage/continue-gift-subscription-banner.test.js b/apps/portal/test/unit/components/pages/AccountHomePage/continue-gift-subscription-banner.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/AccountHomePage/continue-gift-subscription-banner.test.js rename to apps/portal/test/unit/components/pages/AccountHomePage/continue-gift-subscription-banner.test.jsx diff --git a/apps/portal/test/unit/components/pages/AccountHomePage/continue-subscription-button.test.js b/apps/portal/test/unit/components/pages/AccountHomePage/continue-subscription-button.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/AccountHomePage/continue-subscription-button.test.js rename to apps/portal/test/unit/components/pages/AccountHomePage/continue-subscription-button.test.jsx diff --git a/apps/portal/test/unit/components/pages/AccountHomePage/email-newsletter-action.test.js b/apps/portal/test/unit/components/pages/AccountHomePage/email-newsletter-action.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/AccountHomePage/email-newsletter-action.test.js rename to apps/portal/test/unit/components/pages/AccountHomePage/email-newsletter-action.test.jsx diff --git a/apps/portal/test/unit/components/pages/AccountHomePage/paid-account-actions.test.js b/apps/portal/test/unit/components/pages/AccountHomePage/paid-account-actions.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/AccountHomePage/paid-account-actions.test.js rename to apps/portal/test/unit/components/pages/AccountHomePage/paid-account-actions.test.jsx diff --git a/apps/portal/test/unit/components/pages/AccountHomePage/transistor-podcasts-action.test.js b/apps/portal/test/unit/components/pages/AccountHomePage/transistor-podcasts-action.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/AccountHomePage/transistor-podcasts-action.test.js rename to apps/portal/test/unit/components/pages/AccountHomePage/transistor-podcasts-action.test.jsx diff --git a/apps/portal/test/unit/components/pages/account-email-page.test.js b/apps/portal/test/unit/components/pages/account-email-page.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/account-email-page.test.js rename to apps/portal/test/unit/components/pages/account-email-page.test.jsx diff --git a/apps/portal/test/unit/components/pages/account-plan-page.test.js b/apps/portal/test/unit/components/pages/account-plan-page.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/account-plan-page.test.js rename to apps/portal/test/unit/components/pages/account-plan-page.test.jsx diff --git a/apps/portal/test/unit/components/pages/account-profile-page.test.js b/apps/portal/test/unit/components/pages/account-profile-page.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/account-profile-page.test.js rename to apps/portal/test/unit/components/pages/account-profile-page.test.jsx diff --git a/apps/portal/test/unit/components/pages/email-suppressed-page.test.js b/apps/portal/test/unit/components/pages/email-suppressed-page.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/email-suppressed-page.test.js rename to apps/portal/test/unit/components/pages/email-suppressed-page.test.jsx diff --git a/apps/portal/test/unit/components/pages/feedback-page.test.js b/apps/portal/test/unit/components/pages/feedback-page.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/feedback-page.test.js rename to apps/portal/test/unit/components/pages/feedback-page.test.jsx diff --git a/apps/portal/test/unit/components/pages/gift-redemption-page.test.js b/apps/portal/test/unit/components/pages/gift-redemption-page.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/gift-redemption-page.test.js rename to apps/portal/test/unit/components/pages/gift-redemption-page.test.jsx diff --git a/apps/portal/test/unit/components/pages/magic-link-page.test.js b/apps/portal/test/unit/components/pages/magic-link-page.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/magic-link-page.test.js rename to apps/portal/test/unit/components/pages/magic-link-page.test.jsx diff --git a/apps/portal/test/unit/components/pages/newsletter-selection-page.test.js b/apps/portal/test/unit/components/pages/newsletter-selection-page.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/newsletter-selection-page.test.js rename to apps/portal/test/unit/components/pages/newsletter-selection-page.test.jsx diff --git a/apps/portal/test/unit/components/pages/offer-page.test.js b/apps/portal/test/unit/components/pages/offer-page.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/offer-page.test.js rename to apps/portal/test/unit/components/pages/offer-page.test.jsx diff --git a/apps/portal/test/unit/components/pages/share-modal.test.js b/apps/portal/test/unit/components/pages/share-modal.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/share-modal.test.js rename to apps/portal/test/unit/components/pages/share-modal.test.jsx diff --git a/apps/portal/test/unit/components/pages/signin-page.test.js b/apps/portal/test/unit/components/pages/signin-page.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/signin-page.test.js rename to apps/portal/test/unit/components/pages/signin-page.test.jsx diff --git a/apps/portal/test/unit/components/pages/signup-page.test.js b/apps/portal/test/unit/components/pages/signup-page.test.jsx similarity index 100% rename from apps/portal/test/unit/components/pages/signup-page.test.js rename to apps/portal/test/unit/components/pages/signup-page.test.jsx diff --git a/apps/portal/test/unit/components/trigger-button.test.js b/apps/portal/test/unit/components/trigger-button.test.jsx similarity index 100% rename from apps/portal/test/unit/components/trigger-button.test.js rename to apps/portal/test/unit/components/trigger-button.test.jsx diff --git a/apps/portal/test/upgrade-flow.test.js b/apps/portal/test/upgrade-flow.test.jsx similarity index 99% rename from apps/portal/test/upgrade-flow.test.js rename to apps/portal/test/upgrade-flow.test.jsx index 8bd66540bf3..bddd09d542c 100644 --- a/apps/portal/test/upgrade-flow.test.js +++ b/apps/portal/test/upgrade-flow.test.jsx @@ -1,4 +1,4 @@ -import App from '../src/app.js'; +import App from '../src/app'; import {fireEvent, appRender, within, waitFor} from './utils/test-utils'; import {offer as FixtureOffer, site as FixtureSite, member as FixtureMember} from './utils/test-fixtures'; import setupGhostApi from '../src/utils/api.js'; diff --git a/apps/portal/test/utils/test-utils.js b/apps/portal/test/utils/test-utils.jsx similarity index 100% rename from apps/portal/test/utils/test-utils.js rename to apps/portal/test/utils/test-utils.jsx diff --git a/apps/portal/vite.config.mjs b/apps/portal/vite.config.mjs index 619144cfac9..27a47b851a6 100644 --- a/apps/portal/vite.config.mjs +++ b/apps/portal/vite.config.mjs @@ -1,6 +1,5 @@ /* eslint-env node */ import {resolve} from 'path'; -import fs from 'fs/promises'; import {defineConfig} from 'vitest/config'; import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js'; @@ -19,40 +18,11 @@ export default defineConfig((config) => { 'process.env.NODE_ENV': JSON.stringify(config.mode), REACT_APP_VERSION: JSON.stringify(process.env.npm_package_version) }, - preview: { - host: '0.0.0.0', - allowedHosts: true, // allows domain-name proxies to the preview server - port: 4175, - cors: true - }, - server: { - port: 5368 - }, plugins: [ cssInjectedByJsPlugin(), reactPlugin(), svgrPlugin() ], - esbuild: { - loader: 'tsx', - include: [/src\/.*\.[jt]sx?$/, /__mocks__\/.*\.[jt]sx?$/, /test\/.*\.[jt]sx?$/], - exclude: [] - }, - optimizeDeps: { - esbuildOptions: { - plugins: [ - { - name: 'load-js-files-as-jsx', - setup(build) { - build.onLoad({filter: /src\/.*\.js$/}, async args => ({ - loader: 'jsx', - contents: await fs.readFile(args.path, 'utf8') - })); - } - } - ] - } - }, resolve: { dedupe: ['@tryghost/debug'] }, @@ -64,7 +34,7 @@ export default defineConfig((config) => { sourcemap: true, cssCodeSplit: false, lib: { - entry: resolve(__dirname, 'src/index.js'), + entry: resolve(__dirname, 'src/index.jsx'), formats: ['umd'], name: pkg.name, fileName: format => `${outputFileName}.min.js` diff --git a/apps/sodo-search/package.json b/apps/sodo-search/package.json index bff465ea0d4..9216ba0e448 100644 --- a/apps/sodo-search/package.json +++ b/apps/sodo-search/package.json @@ -1,7 +1,7 @@ { "name": "@tryghost/sodo-search", "type": "module", - "version": "1.8.28", + "version": "1.8.29", "license": "MIT", "repository": "https://github.com/TryGhost/Ghost", "author": "Ghost Foundation", diff --git a/apps/sodo-search/src/app.js b/apps/sodo-search/src/app.jsx similarity index 100% rename from apps/sodo-search/src/app.js rename to apps/sodo-search/src/app.jsx diff --git a/apps/sodo-search/src/components/frame.js b/apps/sodo-search/src/components/frame.jsx similarity index 100% rename from apps/sodo-search/src/components/frame.js rename to apps/sodo-search/src/components/frame.jsx diff --git a/apps/sodo-search/src/components/popup-modal.js b/apps/sodo-search/src/components/popup-modal.jsx similarity index 100% rename from apps/sodo-search/src/components/popup-modal.js rename to apps/sodo-search/src/components/popup-modal.jsx diff --git a/apps/sodo-search/src/index.js b/apps/sodo-search/src/index.jsx similarity index 100% rename from apps/sodo-search/src/index.js rename to apps/sodo-search/src/index.jsx diff --git a/apps/sodo-search/test/acceptance/app.test.js b/apps/sodo-search/test/acceptance/app.test.jsx similarity index 100% rename from apps/sodo-search/test/acceptance/app.test.js rename to apps/sodo-search/test/acceptance/app.test.jsx diff --git a/apps/sodo-search/test/unit/popup-modal.test.js b/apps/sodo-search/test/unit/popup-modal.test.jsx similarity index 100% rename from apps/sodo-search/test/unit/popup-modal.test.js rename to apps/sodo-search/test/unit/popup-modal.test.jsx diff --git a/apps/sodo-search/vite.config.mjs b/apps/sodo-search/vite.config.mjs index fd1773da843..019ccdee758 100644 --- a/apps/sodo-search/vite.config.mjs +++ b/apps/sodo-search/vite.config.mjs @@ -1,6 +1,5 @@ /* eslint-env node */ import {resolve} from 'path'; -import fs from 'fs/promises'; import {defineConfig} from 'vitest/config'; import reactPlugin from '@vitejs/plugin-react'; @@ -16,35 +15,10 @@ export default defineConfig((config) => { define: { 'process.env.NODE_ENV': JSON.stringify(config.mode) }, - preview: { - host: '0.0.0.0', - allowedHosts: true, // allows domain-name proxies to the preview server - port: 4178 - }, plugins: [ reactPlugin(), svgrPlugin() ], - esbuild: { - loader: 'jsx', - include: /(src|test)\/.*\.jsx?$/, - exclude: [] - }, - optimizeDeps: { - esbuildOptions: { - plugins: [ - { - name: 'load-js-files-as-jsx', - setup(build) { - build.onLoad({filter: /(src|test)\/.*\.js$/}, async args => ({ - loader: 'jsx', - contents: await fs.readFile(args.path, 'utf8') - })); - } - } - ] - } - }, resolve: { dedupe: ['@tryghost/debug'] }, @@ -56,7 +30,7 @@ export default defineConfig((config) => { sourcemap: true, cssCodeSplit: false, lib: { - entry: resolve(__dirname, 'src/index.js'), + entry: resolve(__dirname, 'src/index.jsx'), formats: ['umd'], name: pkg.name, fileName: format => `${outputFileName}.min.js`