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

Fix UMD build & transform cookie CJS build into ESM for ESM build #460

Merged
merged 6 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
File renamed without changes.
47 changes: 47 additions & 0 deletions e2e/universal-cookie-umd.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { test, expect } from '@playwright/test';

declare global {
const UniversalCookie: any; // should import the right type but was not able to make it work
}

test('UMD build works properly', async ({ page }) => {
await page.goto('/');
await page.addScriptTag({
path: './packages/universal-cookie/umd/universalCookie.js',
});

const result = await page.evaluate(() => {
const cookies = new UniversalCookie();
cookies.set('testCookie', 'helloWorld');
const retrievedValue = cookies.get('testCookie');
return retrievedValue;
});

expect(result).toBe('helloWorld');

const cookieValue = await page.evaluate(() =>
new UniversalCookie().get('testCookie'),
);
expect(cookieValue).toBe('helloWorld');
});

test('UMD minified build works properly', async ({ page }) => {
await page.goto('/');
await page.addScriptTag({
path: './packages/universal-cookie/umd/universalCookie.min.js',
});

const result = await page.evaluate(() => {
const cookies = new UniversalCookie();
cookies.set('testCookie', 'helloWorld');
const retrievedValue = cookies.get('testCookie');
return retrievedValue;
});

expect(result).toBe('helloWorld');

const cookieValue = await page.evaluate(() =>
new UniversalCookie().get('testCookie'),
);
expect(cookieValue).toBe('helloWorld');
});
1 change: 1 addition & 0 deletions packages/react-cookie-demo/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const app = express();

app
.use('/assets', express.static('dist'))
.use('/umd', express.static('../universal-cookie/umd'))
.use(cookiesMiddleware())
.use(serverMiddleware);

Expand Down
8 changes: 4 additions & 4 deletions packages/react-cookie/rollup.config.mjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import resolve from '@rollup/plugin-node-resolve';
import replace from '@rollup/plugin-replace';
import terser from '@rollup/plugin-terser';
import commonjs from '@rollup/plugin-commonjs';
import resolve from '@rollup/plugin-node-resolve';
import typescript from '@rollup/plugin-typescript';
import babel from '@rollup/plugin-babel';

Expand All @@ -19,7 +19,7 @@ export default [
format: 'esm',
entryFileNames: '[name].mjs',
},
plugins: [typescript({ outDir: './esm' })],
plugins: [resolve(), commonjs(), typescript({ outDir: './esm' })],
external,
},
{
Expand All @@ -43,8 +43,8 @@ export default [
globals,
},
plugins: [
commonjs(),
resolve(),
commonjs(),
typescript({ outDir: 'umd' }),
replace({
preventAssignment: true,
Expand All @@ -62,8 +62,8 @@ export default [
globals,
},
plugins: [
commonjs(),
resolve(),
commonjs(),
typescript({ outDir: 'umd' }),
replace({
preventAssignment: true,
Expand Down
22 changes: 8 additions & 14 deletions packages/universal-cookie/rollup.config.mjs
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import resolve from '@rollup/plugin-node-resolve';
import terser from '@rollup/plugin-terser';
import commonjs from '@rollup/plugin-commonjs';
import typescript from '@rollup/plugin-typescript';
import babel from '@rollup/plugin-babel';

const mainFields = ['module', 'jsnext:main', 'main', 'browser'];
const external = ['cookie'];

export default [
{
input: 'src/index.ts',
Expand All @@ -14,8 +12,8 @@ export default [
format: 'esm',
entryFileNames: '[name].mjs',
},
plugins: [typescript({ outDir: './esm' })],
external,
plugins: [resolve(), commonjs(), typescript({ outDir: './esm' })],
external: [], // cookie library is not ESM compatible so we transform it
},
{
input: 'src/index.ts',
Expand All @@ -27,7 +25,7 @@ export default [
typescript({ outDir: './cjs' }),
babel({ babelHelpers: 'bundled' }),
],
external,
external: ['cookie'],
},
{
input: 'src/index.ts',
Expand All @@ -36,8 +34,8 @@ export default [
format: 'umd',
name: 'UniversalCookie',
},
plugins: [resolve({ mainFields }), typescript({ outDir: './umd' })],
external,
plugins: [resolve(), commonjs(), typescript({ outDir: './umd' })],
external: [], // cookie library is not UMD compatible so we transform it
},
{
input: 'src/index.ts',
Expand All @@ -46,11 +44,7 @@ export default [
format: 'umd',
name: 'UniversalCookie',
},
plugins: [
resolve({ mainFields }),
typescript({ outDir: './umd' }),
terser(),
],
external,
plugins: [resolve(), commonjs(), typescript({ outDir: './umd' }), terser()],
external: [], // cookie library is not UMD compatible so we transform it
},
];
20 changes: 20 additions & 0 deletions packages/universal-cookie/umd-sandbox.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!doctype html>
<html>
<head>
<script crossorigin src="umd/universalCookie.js"></script>
<script>
function load() {
var data = '{{data}}';

var cookies = new UniversalCookie(null, { path: '/' });
cookies.set('data_cookie', data, {
expires: data.expires_at,
});

document.body.innerHTML = cookies.get('data_cookie');
}
window.onload = load;
</script>
</head>
<body></body>
</html>
Loading