Skip to content

Commit

Permalink
Disabled minifying for cjs, as it seems that's breaking the build
Browse files Browse the repository at this point in the history
  • Loading branch information
oskardudycz committed Oct 25, 2024
1 parent a2c8145 commit 206ad6a
Show file tree
Hide file tree
Showing 21 changed files with 320 additions and 180 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ jobs:
echo "No errors found, proceeding..."
fi
- name: Use Emmett shims in the browser compatibility test project
working-directory: ./src/e2e/browser
run: npm install ../esmCompatibility/${{ env.PACKAGE_FILENAME_SHIMS }}
# - name: Use Emmett shims in the browser compatibility test project
# working-directory: ./src/e2e/browser
# run: npm install ../esmCompatibility/${{ env.PACKAGE_FILENAME_SHIMS }}

- name: Use Emmett in the browser compatibility test project
working-directory: ./src/e2e/browser
Expand Down
4 changes: 0 additions & 4 deletions src/e2e/browser/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
</script>
</head>
<body>
<!-- Load the bundled file -->
<!-- <script src="./node_modules/@event-driven-io/emmett/dist/index.js"></script> -->

<!-- Test script -->
<script type="module">
import { getInMemoryEventStore } from '@event-driven-io/emmett';

Expand Down
44 changes: 22 additions & 22 deletions src/package-lock.json

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

2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@event-driven-io/core",
"type": "module",
"version": "0.20.1",
"version": "0.20.2-alpha.4",
"description": "Emmett - Event Sourcing development made simple",
"engines": {
"node": ">=20.11.1"
Expand Down
6 changes: 3 additions & 3 deletions src/packages/emmett-esdb/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@event-driven-io/emmett-esdb",
"type": "module",
"version": "0.20.1",
"version": "0.20.2-alpha.4",
"description": "Emmett - EventStoreDB - Event Sourcing development made simple",
"scripts": {
"build": "tsup",
Expand Down Expand Up @@ -48,10 +48,10 @@
],
"dependencies": {},
"devDependencies": {
"@event-driven-io/emmett-testcontainers": "0.20.1"
"@event-driven-io/emmett-testcontainers": "0.20.2-alpha.4"
},
"peerDependencies": {
"@event-driven-io/emmett": "0.20.1",
"@event-driven-io/emmett": "0.20.2-alpha.4",
"@eventstore/db-client": "^6.2.1"
}
}
48 changes: 33 additions & 15 deletions src/packages/emmett-esdb/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,36 @@ import { defineConfig } from 'tsup';

const env = process.env.NODE_ENV;

export default defineConfig({
splitting: true,
clean: true, // clean up the dist folder
dts: true, // generate dts files
format: ['cjs', 'esm'], // generate cjs and esm files
minify: true, //env === 'production',
bundle: true, //env === 'production',
skipNodeModulesBundle: true,
watch: env === 'development',
target: 'esnext',
outDir: 'dist', //env === 'production' ? 'dist' : 'lib',
entry: ['src/index.ts'],
sourcemap: true,
tsconfig: 'tsconfig.build.json', // workaround for https://github.com/egoist/tsup/issues/571#issuecomment-1760052931
});
export default defineConfig([
{
format: ['cjs'],
splitting: true,
clean: true,
dts: true,
// TODO: For some reason minified code doesn't work for cjs
minify: false, //env === 'production',
bundle: true, //env === 'production',
skipNodeModulesBundle: true,
watch: env === 'development',
target: 'esnext',
outDir: 'dist', //env === 'production' ? 'dist' : 'lib',
entry: ['src/index.ts'],
sourcemap: true,
tsconfig: 'tsconfig.build.json', // workaround for https://github.com/egoist/tsup/issues/571#issuecomment-1760052931
},
{
format: ['esm'],
splitting: true,
clean: true,
dts: true,
minify: true, //env === 'production',
bundle: true, //env === 'production',
skipNodeModulesBundle: true,
watch: env === 'development',
target: 'esnext',
outDir: 'dist', //env === 'production' ? 'dist' : 'lib',
entry: ['src/index.ts'],
sourcemap: true,
tsconfig: 'tsconfig.build.json', // workaround for https://github.com/egoist/tsup/issues/571#issuecomment-1760052931
},
]);
4 changes: 2 additions & 2 deletions src/packages/emmett-expressjs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@event-driven-io/emmett-expressjs",
"version": "0.20.1",
"version": "0.20.2-alpha.4",
"type": "module",
"description": "Emmett - Event Sourcing development made simple",
"scripts": {
Expand Down Expand Up @@ -49,7 +49,7 @@
"dependencies": {},
"devDependencies": {},
"peerDependencies": {
"@event-driven-io/emmett": "0.20.1",
"@event-driven-io/emmett": "0.20.2-alpha.4",
"@types/express": "^4.17.21",
"@types/supertest": "^6.0.2",
"express": "^4.19.2",
Expand Down
48 changes: 33 additions & 15 deletions src/packages/emmett-expressjs/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,36 @@ import { defineConfig } from 'tsup';

const env = process.env.NODE_ENV;

export default defineConfig({
splitting: true,
clean: true, // clean up the dist folder
dts: true, // generate dts files
format: ['cjs', 'esm'], // generate cjs and esm files
minify: true, //env === 'production',
bundle: true, //env === 'production',
skipNodeModulesBundle: true,
watch: env === 'development',
target: 'esnext',
outDir: 'dist', //env === 'production' ? 'dist' : 'lib',
entry: ['src/index.ts'],
sourcemap: true,
tsconfig: 'tsconfig.build.json', // workaround for https://github.com/egoist/tsup/issues/571#issuecomment-1760052931
});
export default defineConfig([
{
format: ['cjs'],
splitting: true,
clean: true,
dts: true,
// TODO: For some reason minified code doesn't work for cjs
minify: false, //env === 'production',
bundle: true, //env === 'production',
skipNodeModulesBundle: true,
watch: env === 'development',
target: 'esnext',
outDir: 'dist', //env === 'production' ? 'dist' : 'lib',
entry: ['src/index.ts'],
sourcemap: true,
tsconfig: 'tsconfig.build.json', // workaround for https://github.com/egoist/tsup/issues/571#issuecomment-1760052931
},
{
format: ['esm'],
splitting: true,
clean: true,
dts: true,
minify: true, //env === 'production',
bundle: true, //env === 'production',
skipNodeModulesBundle: true,
watch: env === 'development',
target: 'esnext',
outDir: 'dist', //env === 'production' ? 'dist' : 'lib',
entry: ['src/index.ts'],
sourcemap: true,
tsconfig: 'tsconfig.build.json', // workaround for https://github.com/egoist/tsup/issues/571#issuecomment-1760052931
},
]);
4 changes: 2 additions & 2 deletions src/packages/emmett-fastify/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@event-driven-io/emmett-fastify",
"version": "0.20.1",
"version": "0.20.2-alpha.4",
"type": "module",
"description": "Emmett - Event Sourcing development made simple",
"scripts": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"dependencies": {},
"devDependencies": {},
"peerDependencies": {
"@event-driven-io/emmett": "0.20.1",
"@event-driven-io/emmett": "0.20.2-alpha.4",
"fastify": "^4.28.1",
"@fastify/compress": "^7.0.3",
"@fastify/etag": "^5.2.0",
Expand Down
48 changes: 33 additions & 15 deletions src/packages/emmett-fastify/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,36 @@ import { defineConfig } from 'tsup';

const env = process.env.NODE_ENV;

export default defineConfig({
splitting: true,
clean: true, // clean up the dist folder
dts: true, // generate dts files
format: ['cjs', 'esm'], // generate cjs and esm files
minify: true, //env === 'production',
bundle: true, //env === 'production',
skipNodeModulesBundle: true,
watch: env === 'development',
target: 'esnext',
outDir: 'dist', //env === 'production' ? 'dist' : 'lib',
entry: ['src/index.ts'],
sourcemap: true,
tsconfig: 'tsconfig.build.json', // workaround for https://github.com/egoist/tsup/issues/571#issuecomment-1760052931
});
export default defineConfig([
{
format: ['cjs'],
splitting: true,
clean: true,
dts: true,
// TODO: For some reason minified code doesn't work for cjs
minify: false, //env === 'production',
bundle: true, //env === 'production',
skipNodeModulesBundle: true,
watch: env === 'development',
target: 'esnext',
outDir: 'dist', //env === 'production' ? 'dist' : 'lib',
entry: ['src/index.ts'],
sourcemap: true,
tsconfig: 'tsconfig.build.json', // workaround for https://github.com/egoist/tsup/issues/571#issuecomment-1760052931
},
{
format: ['esm'],
splitting: true,
clean: true,
dts: true,
minify: true, //env === 'production',
bundle: true, //env === 'production',
skipNodeModulesBundle: true,
watch: env === 'development',
target: 'esnext',
outDir: 'dist', //env === 'production' ? 'dist' : 'lib',
entry: ['src/index.ts'],
sourcemap: true,
tsconfig: 'tsconfig.build.json', // workaround for https://github.com/egoist/tsup/issues/571#issuecomment-1760052931
},
]);
6 changes: 3 additions & 3 deletions src/packages/emmett-postgresql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@event-driven-io/emmett-postgresql",
"version": "0.20.1",
"version": "0.20.2-alpha.4",
"type": "module",
"description": "Emmett - PostgreSQL - Event Sourcing development made simple",
"scripts": {
Expand Down Expand Up @@ -70,10 +70,10 @@
],
"devDependencies": {
"@testcontainers/postgresql": "^10.12.0",
"@event-driven-io/emmett-testcontainers": "0.20.1"
"@event-driven-io/emmett-testcontainers": "0.20.2-alpha.4"
},
"peerDependencies": {
"@event-driven-io/emmett": "0.20.1",
"@event-driven-io/emmett": "0.20.2-alpha.4",
"@event-driven-io/pongo": "0.16.1"
}
}
Loading

0 comments on commit 206ad6a

Please sign in to comment.