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

Fixed commonjs build #122

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
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
12 changes: 6 additions & 6 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ jobs:
- name: Test
run: npm run test

- name: Pack Emmett Shims locally to tar file
shell: bash
run: echo "PACKAGE_FILENAME_SHIMS=$(npm pack --json --pack-destination './e2e/esmCompatibility' -w @event-driven-io/emmett-shims | jq -r '.[] | .filename')" >> $GITHUB_ENV
# - name: Pack Emmett Shims locally to tar file
# shell: bash
# run: echo "PACKAGE_FILENAME_SHIMS=$(npm pack --json --pack-destination './e2e/esmCompatibility' -w @event-driven-io/emmett-shims | jq -r '.[] | .filename')" >> $GITHUB_ENV

- name: Pack Emmett locally to tar file
shell: bash
run: echo "PACKAGE_FILENAME=$(npm pack --json --pack-destination './e2e/esmCompatibility' -w @event-driven-io/emmett | jq -r '.[] | .filename')" >> $GITHUB_ENV

- name: Use Emmett shims in the compatibility test project
working-directory: ./src/e2e/esmCompatibility
run: npm install ${{ env.PACKAGE_FILENAME_SHIMS }}
# - name: Use Emmett shims in the compatibility test project
# working-directory: ./src/e2e/esmCompatibility
# run: npm install ${{ env.PACKAGE_FILENAME_SHIMS }}

- name: Use Emmett in the compatibility test project
working-directory: ./src/e2e/esmCompatibility
Expand Down
3 changes: 1 addition & 2 deletions samples/webApi/expressjs-with-esdb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ WORKDIR /app

# Copy published in previous stage binaries
# from the `builder` image
COPY --from=builder /app/package.json ./package.json
COPY --from=builder /app/dist ./dist
COPY --from=builder /app/node_modules ./node_modules

Expand All @@ -51,4 +50,4 @@ EXPOSE 3000

# sets entry point command to automatically
# run application on `docker run`
ENTRYPOINT ["node", "./dist/index.js"]
ENTRYPOINT ["node", "./dist/index.cjs"]
44 changes: 22 additions & 22 deletions samples/webApi/expressjs-with-esdb/package-lock.json

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

6 changes: 3 additions & 3 deletions samples/webApi/expressjs-with-esdb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
},
"homepage": "https://github.com/event-driven-io/emmett#readme",
"dependencies": {
"@event-driven-io/emmett-esdb": "0.20.0",
"@event-driven-io/emmett-expressjs": "0.20.0",
"@event-driven-io/emmett-testcontainers": "0.20.0"
"@event-driven-io/emmett-esdb": "0.20.1-alpha.1",
"@event-driven-io/emmett-expressjs": "0.20.1-alpha.1",
"@event-driven-io/emmett-testcontainers": "0.20.1-alpha.1"
},
"devDependencies": {
"@types/node": "20.11.30",
Expand Down
2 changes: 1 addition & 1 deletion src/e2e/esmCompatibility/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"postinstall": "nuxt prepare"
},
"dependencies": {
"@event-driven-io/emmett": "0.20.0-alpha.1",
"@event-driven-io/emmett": "0.20.0-alpha.2",
"nuxt": "^3.10.3",
"ts-pattern": "^5.0.8"
}
Expand Down
46 changes: 23 additions & 23 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.0",
"version": "0.20.1-alpha.10",
"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.0",
"version": "0.20.1-alpha.10",
"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.0"
"@event-driven-io/emmett-testcontainers": "0.20.1-alpha.10"
},
"peerDependencies": {
"@event-driven-io/emmett": "0.20.0",
"@event-driven-io/emmett": "0.20.1-alpha.10",
"@eventstore/db-client": "^6.2.1"
}
}
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.0",
"version": "0.20.1-alpha.10",
"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.0",
"@event-driven-io/emmett": "0.20.1-alpha.10",
"@types/express": "^4.17.21",
"@types/supertest": "^6.0.2",
"express": "^4.19.2",
Expand Down
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.0",
"version": "0.20.1-alpha.10",
"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.0",
"@event-driven-io/emmett": "0.20.1-alpha.10",
"fastify": "^4.28.1",
"@fastify/compress": "^7.0.3",
"@fastify/etag": "^5.2.0",
Expand Down
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.0",
"version": "0.20.1-alpha.10",
"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.0"
"@event-driven-io/emmett-testcontainers": "0.20.1-alpha.10"
},
"peerDependencies": {
"@event-driven-io/emmett": "0.20.0",
"@event-driven-io/emmett": "0.20.1-alpha.10",
"@event-driven-io/pongo": "0.16.1"
}
}
2 changes: 1 addition & 1 deletion src/packages/emmett-shims/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@event-driven-io/emmett-shims",
"version": "0.20.0",
"version": "0.20.1-alpha.10",
"type": "module",
"description": "Emmett - Event Sourcing development made simple",
"scripts": {
Expand Down
7 changes: 1 addition & 6 deletions src/packages/emmett-shims/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,7 @@ if (
) {
streams = globalThis as typeof streamsPolyfill;
} else {
try {
streams = (await import('node:stream/web')) as typeof streamsPolyfill;
} catch {
// Just falling back to the default polyfill
streams = streamsPolyfill;
}
streams = streamsPolyfill;
}

export default streams;
Expand Down
Loading
Loading