Skip to content

Commit 7559d42

Browse files
boyney123boyney123
authored
Revert commit for workspaces (#1009)
* merge * update * Create purple-papayas-lay.md
1 parent fb2b5c3 commit 7559d42

File tree

11 files changed

+92
-171
lines changed

11 files changed

+92
-171
lines changed

‎.changeset/purple-papayas-lay.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@eventcatalog/core": patch
3+
---
4+
5+
chore(core): revert commit for workspaces

‎Dockerfile‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ RUN npm pack
99

1010

1111
FROM node:20.17 AS runner
12-
ENV PNPM_HOME="/pnpm"
13-
ENV PATH="$PNPM_HOME:$PATH"
14-
RUN corepack enable
1512
WORKDIR /usr/example/
1613
COPY examples/default/ .
1714
COPY --from=builder /usr/eventcatalog/*.tgz /usr/eventcatalog/
18-
RUN pnpm init && \
19-
pnpm add /usr/eventcatalog/*.tgz
20-
CMD ["pnpm", "exec", "eventcatalog", "build"]
15+
RUN npm init -y && \
16+
npm install /usr/eventcatalog/*.tgz
17+
CMD ["npx", "eventcatalog", "build"]

‎package-lock.json‎

Lines changed: 25 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,17 @@
2121
"default-files-for-collections/"
2222
],
2323
"scripts": {
24+
"dev": "astro dev",
2425
"build:bin": "tsup",
2526
"prepublishOnly": "npm run build:bin",
2627
"test": "vitest",
2728
"test:ci": "node scripts/ci/test.js",
2829
"test:e2e": "playwright test",
30+
"start": "astro dev",
31+
"build": "astro build",
2932
"build:cd": "node scripts/build-ci.js",
33+
"preview": "astro preview",
34+
"astro": "astro",
3035
"start:catalog": "node scripts/start-catalog-locally.js",
3136
"verify-build:catalog": "rimraf dist && npm run build:cd",
3237
"changeset": "changeset",
@@ -36,30 +41,68 @@
3641
"format:diff": "prettier --config .prettierrc --list-different \"**/*.{js,jsx,ts,tsx,json,astro}\""
3742
},
3843
"dependencies": {
44+
"@astrojs/markdown-remark": "^5.3.0",
45+
"@astrojs/mdx": "^3.1.8",
46+
"@astrojs/react": "^3.6.2",
47+
"@astrojs/tailwind": "^5.1.2",
48+
"@asyncapi/avro-schema-parser": "^3.0.24",
49+
"@asyncapi/react-component": "^2.4.3",
50+
"@headlessui/react": "^2.0.3",
51+
"@heroicons/react": "^2.1.3",
3952
"@parcel/watcher": "^2.4.1",
53+
"@stoplight/json-schema-viewer": "^4.7.0",
54+
"@stoplight/mosaic": "^1.53.2",
55+
"@tailwindcss/typography": "^0.5.13",
56+
"@tanstack/react-table": "^8.17.3",
57+
"astro": "^4.16.5",
58+
"astro-expressive-code": "^0.36.1",
59+
"astro-pagefind": "^1.6.0",
60+
"astro-seo": "^0.8.4",
4061
"axios": "^1.7.7",
4162
"commander": "^12.1.0",
4263
"concurrently": "^8.2.2",
4364
"cross-env": "^7.0.3",
65+
"dagre": "^0.8.5",
66+
"diff": "^7.0.0",
67+
"diff2html": "^3.4.48",
4468
"glob": "^10.4.1",
4569
"gray-matter": "^4.0.3",
70+
"html-to-image": "^1.11.11",
71+
"js-yaml": "^4.1.0",
72+
"lodash.debounce": "^4.0.8",
73+
"lodash.merge": "4.6.2",
74+
"lucide-react": "^0.453.0",
75+
"mermaid": "^10.9.1",
76+
"rapidoc": "^9.3.4",
77+
"react": "^18.3.1",
78+
"react-dom": "^18.3.1",
79+
"reactflow": "^11.11.4",
80+
"rehype-slug": "^6.0.0",
81+
"remark-gfm": "^3.0.1",
4682
"rimraf": "^5.0.7",
47-
"uuid": "^10.0.0",
48-
"which-pm-runs": "^1.1.0"
83+
"semver": "7.6.3",
84+
"tailwindcss": "^3.4.3",
85+
"typescript": "^5.4.5",
86+
"unist-util-visit": "^5.0.0",
87+
"uuid": "^10.0.0"
4988
},
5089
"devDependencies": {
5190
"@astrojs/check": "^0.9.4",
5291
"@changesets/cli": "^2.27.5",
5392
"@playwright/test": "^1.48.1",
54-
"@types/which-pm-runs": "^1.0.2",
93+
"@types/dagre": "^0.7.52",
94+
"@types/diff": "^5.2.2",
95+
"@types/js-yaml": "^4.0.9",
96+
"@types/lodash.debounce": "^4.0.9",
97+
"@types/lodash.merge": "4.6.9",
98+
"@types/node": "^20.14.2",
99+
"@types/react": "^18.3.3",
100+
"@types/react-dom": "^18.3.0",
101+
"@types/semver": "^7.5.8",
55102
"prettier": "^3.3.3",
56103
"prettier-plugin-astro": "^0.14.1",
57104
"tsup": "^8.1.0",
58-
"typescript": "^5.4.5",
59105
"vite-tsconfig-paths": "^4.3.2",
60106
"vitest": "^2.0.5"
61-
},
62-
"workspaces": [
63-
"eventcatalog"
64-
]
107+
}
65108
}

‎playwright.config.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ export default defineConfig({
3232
trace: 'on-first-retry',
3333
},
3434
webServer: {
35-
// TODO: get the absolute path to outDir from eventcatalog.config.js
36-
// The root path below is relative to `eventcatalog/` dir
37-
command: 'npm run preview -w=eventcatalog -- --root ../examples/default/ --port 3000',
35+
command: 'npm run preview -- --root examples/default --port 3000',
3836
url: 'http://localhost:3000',
3937
reuseExistingServer: !process.env.CI,
4038
},

‎pnpm-workspace.yaml‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎scripts/build-ci.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,8 @@ const projectDIR = join(__dirname, `../examples/${catalog}`);
1515
execSync('npm run build:bin', { stdio: 'inherit' });
1616

1717
// Build catalog
18-
execSync(`npx . build`, {
18+
execSync(`cross-env NODE_ENV=CI PROJECT_DIR=${projectDIR} CATALOG_DIR=${catalogDir} npx . build`, {
1919
stdio: 'inherit',
20-
env: {
21-
...process.env,
22-
NODE_EVN: 'CI',
23-
PROJECT_DIR: projectDIR,
24-
CATALOG_DIR: catalogDir,
25-
},
2620
});
2721

2822
// Type check

‎scripts/ci/test.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ const projectDIR = join(process.cwd(), `/examples/${catalog}`);
1818
fs.copyFileSync(join(projectDIR, 'eventcatalog.config.js'), join(catalogDir, 'eventcatalog.config.js'));
1919
fs.copyFileSync(join(projectDIR, 'eventcatalog.styles.css'), join(catalogDir, 'eventcatalog.styles.css'));
2020

21-
execSync(`npm run test run`, {
21+
execSync(`cross-env NODE_ENV=test PROJECT_DIR=${projectDIR} CATALOG_DIR=${catalogDir} npm run test run`, {
2222
stdio: 'inherit',
23-
env: {
24-
...process.env,
25-
NODE_ENV: 'test',
26-
PROJECT_DIR: projectDIR,
27-
CATALOG_DIR: catalogDir,
28-
},
2923
});

‎scripts/start-catalog-locally.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,8 @@ async function main() {
1313

1414
execSync('npm run build:bin', { stdio: 'inherit' });
1515

16-
execSync(`npx . dev`, {
16+
execSync(`cross-env NODE_ENV=development PROJECT_DIR=${projectDIR} CATALOG_DIR=${catalogDir} npx . dev`, {
1717
stdio: 'inherit',
18-
env: {
19-
...process.env,
20-
NODE_ENV: 'development',
21-
PROJECT_DIR: projectDIR,
22-
CATALOG_DIR: catalogDir,
23-
},
2418
});
2519
}
2620

0 commit comments

Comments
 (0)