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.

Sign up for GitHub

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

generator-langium: Transform generated project to npm workspace #1520

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
+1,431 −909
Open

generator-langium: Transform generated project to npm workspace #1520

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
42554d4
Transform generated project to npm workspace
kaisalmen May 29, 2024
eb78d1f
Integrating langauge tests again in generator and enhancing tests
kaisalmen Jun 14, 2024
66d1e21
Move test output to packages/generator-langium/test/genetator-tests
kaisalmen Jun 14, 2024
96bd3ab
fix: web languageId and fileExt replacement / configuration, remove n…
kaisalmen Jun 14, 2024
a57d24f
Implemented a first set of review comments
kaisalmen Jun 15, 2024
35721eb
Implement further review comments
kaisalmen Jun 16, 2024
ea179bc
Update generator documentation in repo. At build:clean to generated p…
kaisalmen Jun 19, 2024
23b3283
Updated READMEs once more
kaisalmen Jun 21, 2024
dbb7a40
Updated monaco-editor-wrapper to the latest version
kaisalmen Jul 2, 2024
da5562d
Implement review comments: tmLanguage location and package names use …
kaisalmen Jul 5, 2024
351915c
Fix documentation and fix tests
kaisalmen Jul 5, 2024
176e78a
fix: monarch is only generated and included if web project us selected
kaisalmen Jul 8, 2024
782a12e
fix: correction to cli
kaisalmen Jul 8, 2024
cff11ba
Rebased branch once more and contained smaller changes due to further…
kaisalmen Aug 8, 2024
6f10baa
Do not use "run --prefix" and align eslint+plugin version with typesc…
kaisalmen Aug 12, 2024
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
1 change: 1 addition & 0 deletions packages/generator-langium/templates/gitignore.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ out/
**/src/generated
syntaxes/
*.tsbuildinfo
*.vsix
2 changes: 1 addition & 1 deletion packages/generator-langium/templates/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"watch": "tsc -b tsconfig.build.json --watch",
"build": "tsc -b tsconfig.build.json && npm run build --workspaces",
"build:clean": "npm run clean && npm run build",
"lint": "eslint src --ext ts",
"lint": "eslint {**/src/**/*.ts,**/src/**/*.tsx,**/test/**/*.ts,**/test/**/*.tsx}",
"langium:generate": "npm run --workspace packages/language langium:generate",
"langium:watch": "npm run --workspace packages/language langium:watch"
},
Expand Down
5 changes: 4 additions & 1 deletion packages/generator-langium/templates/packages/extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"main": "./out/extension/main.cjs",
"scripts": {
"clean": "shx rm -fr *.tsbuildinfo out syntaxes",
"vscode:prepublish": "npm run build && npm run lint",
"vscode:prepublish": "npm run build && npm run --prefix ../.. lint",
kaisalmen marked this conversation as resolved.
Show resolved Hide resolved
"build:prepare": "shx mkdir -p ./syntaxes/ && shx cp -f ../language/syntaxes/<%= language-id %>.tmLanguage.json ./syntaxes/<%= language-id %>.tmLanguage.json",
"build": "npm run build:prepare && tsc -b tsconfig.json && node esbuild.mjs",
"build:clean": "npm run clean && npm run build",
Expand All @@ -43,5 +43,8 @@
"@types/vscode": "~1.67.0",
"concurrently": "~8.2.2",
"esbuild": "~0.23.0"
},
"vsce": {
"dependencies": false
}
}
4 changes: 2 additions & 2 deletions packages/generator-langium/test/yeoman-generator.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ const PACKAGE_JSON_EXPECTATION: Record<string, any> = {
'watch': 'tsc -b tsconfig.build.json --watch',
'build': 'tsc -b tsconfig.build.json && npm run build --workspaces',
'build:clean': 'npm run clean && npm run build',
'lint': 'eslint src --ext ts',
'lint': 'eslint {**/src/**/*.ts,**/src/**/*.tsx,**/test/**/*.ts,**/test/**/*.tsx}',
'langium:generate': 'npm run --workspace packages/language langium:generate',
'langium:watch': 'npm run --workspace packages/language langium:watch'
},
Expand Down Expand Up @@ -366,7 +366,7 @@ const PACKAGE_JSON_EXPECTATION_EXTENSION: Record<string, any> = {
main: './out/extension/main.cjs',
scripts: {
'clean': 'shx rm -fr *.tsbuildinfo out syntaxes',
'vscode:prepublish': 'npm run build && npm run lint',
'vscode:prepublish': 'npm run build && npm run --prefix ../.. lint',
'build:prepare': 'shx mkdir -p ./syntaxes/ && shx cp -f ../language/syntaxes/hello-world.tmLanguage.json ./syntaxes/hello-world.tmLanguage.json',
'build': 'npm run build:prepare && tsc -b tsconfig.json && node esbuild.mjs',
'build:clean': 'npm run clean && npm run build',
Expand Down
Loading