Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement custom entry #325

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .changeset/strong-suits-end.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
'playroom': minor
---

Add custom entry file support

You can provide a custom entry file via the `entry` option, which is a path to a file that runs some code before everything else. For example, if you wanted to apply a CSS reset or other global styles, polyfills etc.:

```js
import '../path/to/your/theming-system/reset';
import '../path/to/your/theming-system/global-styles.css';
```
Comment on lines +9 to +12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
```js
import '../path/to/your/theming-system/reset';
import '../path/to/your/theming-system/global-styles.css';
```
```js
// playroom.config.js
entry: './src/entry.js',
```
```js
// ./src/entry.js
import '../path/to/your/theming-system/reset';
import '../path/to/your/theming-system/global-styles.css';
```

10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ module.exports = {

// Optional:
title: 'My Awesome Library',
entry: './src/entry',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
entry: './src/entry',
entry: './src/entry.js',

themes: './src/themes',
snippets: './playroom/snippets.js',
frameComponent: './playroom/FrameComponent.js',
Expand Down Expand Up @@ -158,6 +159,15 @@ export default function useScope() {
};
```

## Custom Entry

You can provide a custom entry file via the `entry` option, which is a path to a file that runs some code before everything else. For example, if you wanted to apply a CSS reset or other global styles, polyfills etc.:

```js
import '../path/to/your/theming-system/reset';
import '../path/to/your/theming-system/global-styles.css';
```
Comment on lines +166 to +169
Copy link
Contributor

@askoufis askoufis May 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
```js
import '../path/to/your/theming-system/reset';
import '../path/to/your/theming-system/global-styles.css';
```
```js
// playroom.config.js
entry: './src/entry.js',
```
```js
// ./src/entry.js
import '../path/to/your/theming-system/reset';
import '../path/to/your/theming-system/global-styles.css';
```


## Theme Support

If your component library has multiple themes, you can customise Playroom to render every theme simultaneously via the `themes` configuration option.
Expand Down
71 changes: 71 additions & 0 deletions cypress/e2e/entry.cy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import {
assertPreviewContains,
cleanUp,
getFirstFrame,
typeCode,
visit,
} from '../support/utils';

const assertGlobalCounter = () => cy.window().its('counter').should('equal', 1);
const assertGlobalCounterInIframe = ($iframe) =>
cy.wrap($iframe[0].contentWindow).its('counter').should('equal', 1);

describe('Entry', () => {
afterEach(() => {
cleanUp();
});

describe('single entry', () => {
describe('loads the entry only once', () => {
it('for main app', () => {
cy.visit('http://localhost:9002');
// introduce some delay to make sure everything loads
typeCode('-');

assertGlobalCounter();
});

it('for frames', () => {
visit('http://localhost:9002');
// introduce some delay to make sure everything loads
typeCode('-');

getFirstFrame().then(($frame) => {
assertGlobalCounterInIframe($frame);
});
});

it('for preview', () => {
cy.visit(
'http://localhost:9002/preview#code=N4Igxg9gJgpiBcIC0IC%2BQ'
).then(() => {
cy.get('[data-testid="splashscreen"]').should('not.be.visible');
});
// wait for rendering to finish to make sure everything loads
assertPreviewContains('-');

assertGlobalCounter();
});
});
});

describe('multiple entries', () => {
it('loads the entry for frames', () => {
visit('http://localhost:9001/index.html');
// introduce some delay to make sure everything loads
typeCode('-');

getFirstFrame().then(($frame) => {
assertGlobalCounterInIframe($frame);
});
});

it('does not load the entry for main app', () => {
visit('http://localhost:9001/index.html');
// introduce some delay to make sure everything loads
typeCode('-');

cy.window().its('counter').should('not.exist');
});
});
});
1 change: 1 addition & 0 deletions cypress/projects/themed/entry.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
window.counter = 1;
3 changes: 3 additions & 0 deletions cypress/projects/themed/playroom.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
module.exports = {
entry: {
frame: './entry',
},
components: './components',
snippets: './snippets',
themes: './themes',
Expand Down
5 changes: 5 additions & 0 deletions cypress/projects/typescript/entry.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { counter, increment } from './state.mjs';

export default counter;

increment();
1 change: 1 addition & 0 deletions cypress/projects/typescript/playroom.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
entry: './entry.mjs',
components: './components.ts',
snippets: './snippets.ts',
outputPath: './dist',
Expand Down
9 changes: 9 additions & 0 deletions cypress/projects/typescript/state.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* eslint-disable no-console */

export let counter = 0;

export function increment() {
window.counter = ++counter;

console.log('incremented', window.counter);
}
44 changes: 20 additions & 24 deletions cypress/support/utils.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// eslint-disable-next-line spaced-comment
/// <reference types="cypress" />
// eslint-disable-next-line spaced-comment
/// <reference types="cypress-iframe" />
import 'cypress-iframe';
import dedent from 'dedent';

import { createUrl } from '../../utils';
Expand All @@ -9,22 +12,16 @@ const WAIT_FOR_FRAME_TO_RENDER = 1000;

const getCodeEditor = () => cy.get('.CodeMirror-code');

export const getPreviewFrames = () => cy.get('[data-testid="previewFrame"]');

export const getPreviewFrameNames = () => cy.get('[data-testid="frameName"]');
const getPreviewFrameNames = () => cy.get('[data-testid="frameName"]');

export const getFirstFrame = () => getPreviewFrames().first();
export const getFirstFrame = () =>
cy.frameLoaded('[data-testid="previewFrame"]:first');
mrm007 marked this conversation as resolved.
Show resolved Hide resolved

export const visit = (url) =>
cy
.visit(url)
.reload()
.then(() => {
getFirstFrame().then(
($iframe) =>
new Cypress.Promise((resolve) => $iframe.on('load', resolve))
);
});
.then(() => getFirstFrame());

export const typeCode = (code, { delay = 200 } = {}) =>
getCodeEditor()
Expand Down Expand Up @@ -153,24 +150,23 @@ export const assertPreviewContains = (text) =>
expect(el.get(0).innerText).to.eq(text);
});

export const cleanUp = () =>
cy
.window()
.then((win) => {
const { storageKey } = win.__playroomConfig__;
indexedDB.deleteDatabase(storageKey);
})
.reload();

export const loadPlayroom = (initialCode) => {
const baseUrl = 'http://localhost:9000';
const visitUrl = initialCode
? createUrl({ baseUrl, code: dedent(initialCode) })
: baseUrl;

return cy
.visit(visitUrl)
.window()
.then((win) => {
const { storageKey } = win.__playroomConfig__;
indexedDB.deleteDatabase(storageKey);
})
.reload()
.then(() =>
getFirstFrame().then(
($iframe) =>
new Cypress.Promise((resolve) => $iframe.on('load', resolve))
)
);
cy.visit(visitUrl);
cleanUp();

return getFirstFrame();
};
1 change: 1 addition & 0 deletions lib/defaultModules/entry.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// this doesn't do anything by default
21 changes: 18 additions & 3 deletions lib/makeWebpackConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,27 @@ module.exports = async (playroomConfig, options) => {

const staticTypes = await getStaticTypes(playroomConfig);

const customEntries = Object.fromEntries(
['index', 'frame', 'preview'].map((entryName) => {
const customEntry =
typeof playroomConfig.entry === 'object'
? playroomConfig.entry[entryName]
: playroomConfig.entry;
return [
entryName,
customEntry
? relativeResolve(customEntry)
: require.resolve('./defaultModules/entry'),
];
})
);

const ourConfig = {
mode: options.production ? 'production' : 'development',
entry: {
index: [require.resolve('../src/index.js')],
frame: [require.resolve('../src/frame.js')],
preview: [require.resolve('../src/preview.js')],
index: [customEntries.index, require.resolve('../src/index.js')],
frame: [customEntries.frame, require.resolve('../src/frame.js')],
preview: [customEntries.preview, require.resolve('../src/preview.js')],
},
output: {
filename: '[name].[contenthash].js',
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
"@types/react-helmet": "^6.1.6",
"concurrently": "^7.6.0",
"cypress": "^12.0.2",
"cypress-iframe": "^1.0.1",
"eslint": "^8.44.0",
"eslint-config-seek": "^11.3.1",
"husky": "^8.0.2",
Expand Down
18 changes: 18 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ interface PlayroomConfig {
components: string;
outputPath: string;
title?: string;
entry?:
| string
| {
index?: string;
frame?: string;
preview?: string;
};
themes?: string;
widths?: number[];
snippets?: Snippet[];
Expand Down
Loading