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

Jump to bottom

feat: add pnpm #690

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+12,247 −10,889
Draft

feat: add pnpm #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
* text=auto eol=lf
pnpm-lock.yaml eol=lf merge=ours
2 changes: 1 addition & 1 deletion esbuild.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ async function builder(options) {
};

if (process.argv.slice(2).includes("--watch")) {
console.log("Applyin watch config");
console.log("Applying watch config");
buildConfig.watch = true;
buildConfig.minify = false;
}
Expand Down
15 changes: 0 additions & 15 deletions lerna.json
View file
Open in desktop

This file was deleted.

21 changes: 8 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
{
"name": "root",
"name": "@ui5-language-assistant/root",
"private": true,
"workspaces": {
"packages": [
"packages/*",
"test-packages/*"
],
"nohoist": [
"vscode-ui5-language-assistant/prettier",
"vscode-ui5-language-assistant/@prettier/plugin-xml",
"vscode-ui5-language-assistant/@ui5-language-assistant/language-server",
"vscode-ui5-language-assistant/@ui5-language-assistant/language-server/**"
]
},
"scripts": {
"build:quick": "lerna run compile && lerna run bundle && lerna run package",
"release:version": "lerna version --force-publish",
Expand Down Expand Up @@ -91,6 +79,13 @@
"typescript": "4.9.4",
"esbuild": "0.17.12"
},
"engines": {
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
"pnpm": "8.14.0",
"node": ">=18.x"
},
"packageManager": "[email protected]",
"lint-staged": {
"*.{js,ts,md,json}": [
"prettier --write"
Expand Down
2 changes: 1 addition & 1 deletion packages/binding-parser/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "lib",
Expand Down
20 changes: 10 additions & 10 deletions packages/binding/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
"repository": "https://github.com/sap/ui5-language-assistant/",
"license": "Apache-2.0",
"dependencies": {
"@ui5-language-assistant/binding-parser": "1.0.7",
"@ui5-language-assistant/logger": "0.0.1",
"@ui5-language-assistant/context": "4.0.23",
"@ui5-language-assistant/logic-utils": "4.0.17",
"@ui5-language-assistant/xml-views-completion": "4.0.23",
"@ui5-language-assistant/xml-views-validation": "4.0.18",
"@ui5-language-assistant/settings": "4.0.9",
"@ui5-language-assistant/binding-parser": "workspace:*",
"@ui5-language-assistant/logger": "workspace:*",
"@ui5-language-assistant/context": "workspace:*",
"@ui5-language-assistant/logic-utils": "workspace:*",
"@ui5-language-assistant/xml-views-completion": "workspace:*",
"@ui5-language-assistant/xml-views-validation": "workspace:*",
"@ui5-language-assistant/settings": "workspace:*",
"deep-freeze-strict": "1.1.1",
"lodash": "4.17.21"
},
"devDependencies": {
"@sap-ux/vocabularies-types": "0.7.4",
"@types/lodash": "4.14.168",
"@ui5-language-assistant/semantic-model-types": "4.0.9",
"@ui5-language-assistant/test-framework": "4.0.12",
"@ui5-language-assistant/test-utils": "4.0.12",
"@ui5-language-assistant/semantic-model-types": "workspace:*",
"@ui5-language-assistant/test-framework": "workspace:*",
"@ui5-language-assistant/test-utils": "workspace:*",
"@xml-tools/ast": "5.0.0",
"@xml-tools/parser": "1.0.7",
"vscode-languageserver-protocol": "3.17.2",
Expand Down
36 changes: 34 additions & 2 deletions packages/binding/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,41 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "lib",
"baseUrl": "."
},
"include": ["src/**/*", "test/**/*", "api.d.ts", "src/**/*.json"]
"include": ["src/**/*", "test/**/*", "api.d.ts", "src/**/*.json"],
"references": [
{
"path": "../binding-parser"
},
{
"path": "../logger"
},
{
"path": "../context"
},
{
"path": "../logic-utils"
},
{
"path": "../xml-views-completion"
},
{
"path": "../xml-views-validation"
},
{
"path": "../settings"
},
{
"path": "../semantic-model-types"
},
{
"path": "../../test-packages/framework"
},
{
"path": "../../test-packages/test-utils"
}
]
}
12 changes: 6 additions & 6 deletions packages/context/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"@sap-ux/annotation-converter": "0.5.20",
"@sap-ux/edmx-parser": "0.5.13",
"@sap-ux/project-access": "1.9.1",
"@ui5-language-assistant/logger": "0.0.1",
"@ui5-language-assistant/logic-utils": "4.0.17",
"@ui5-language-assistant/settings": "4.0.9",
"@ui5-language-assistant/logger": "workspace:*",
"@ui5-language-assistant/logic-utils": "workspace:*",
"@ui5-language-assistant/settings": "workspace:*",
"fs-extra": "10.1.0",
"globby": "11.1.0",
"js-yaml": "4.1.0",
Expand All @@ -36,9 +36,9 @@
"@types/lodash": "4.14.168",
"@types/node-fetch": "2.5.10",
"@types/semver": "7.3.12",
"@ui5-language-assistant/semantic-model-types": "4.0.9",
"@ui5-language-assistant/test-framework": "4.0.12",
"@ui5-language-assistant/test-utils": "4.0.12",
"@ui5-language-assistant/semantic-model-types": "workspace:*",
"@ui5-language-assistant/test-framework": "workspace:*",
"@ui5-language-assistant/test-utils": "workspace:*",
"rimraf": "3.0.2",
"tmp-promise": "3.0.2",
"proxyquire": "2.1.3"
Expand Down
15 changes: 13 additions & 2 deletions packages/context/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "lib",
"baseUrl": "."
},
"include": ["src/**/*", "test/**/*", "api.d.ts"]
"include": ["src/**/*", "test/**/*", "api.d.ts"],
"references": [
{
"path": "../logic-utils"
},
{
"path": "../semantic-model-types"
},
{
"path": "../../test-packages/framework"
}
]
}
14 changes: 7 additions & 7 deletions packages/fe/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
"license": "Apache-2.0",
"typings": "./api.d.ts",
"dependencies": {
"@ui5-language-assistant/context": "4.0.23",
"@ui5-language-assistant/logic-utils": "4.0.17",
"@ui5-language-assistant/xml-views-completion": "4.0.23",
"@ui5-language-assistant/xml-views-validation": "4.0.18",
"@ui5-language-assistant/context": "workspace:*",
"@ui5-language-assistant/logic-utils": "workspace:*",
"@ui5-language-assistant/xml-views-completion": "workspace:*",
"@ui5-language-assistant/xml-views-validation": "workspace:*",
"deep-freeze-strict": "1.1.1",
"lodash": "4.17.21"
},
"devDependencies": {
"@sap-ux/vocabularies-types": "0.6.8",
"@types/lodash": "4.14.168",
"@ui5-language-assistant/semantic-model-types": "4.0.9",
"@ui5-language-assistant/test-framework": "4.0.12",
"@ui5-language-assistant/test-utils": "4.0.12",
"@ui5-language-assistant/semantic-model-types": "workspace:*",
"@ui5-language-assistant/test-framework": "workspace:*",
"@ui5-language-assistant/test-utils": "workspace:*",
"@xml-tools/ast": "5.0.0",
"@xml-tools/parser": "1.0.7",
"vscode-languageserver-protocol": "3.17.2",
Expand Down
27 changes: 25 additions & 2 deletions packages/fe/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,32 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "lib",
"baseUrl": "."
},
"include": ["src/**/*", "test/**/*", "api.d.ts", "src/**/*.json"]
"include": ["src/**/*", "test/**/*", "api.d.ts", "src/**/*.json"],
"references": [
{
"path": "../context"
},
{
"path": "../logic-utils"
},
{
"path": "../xml-views-completion"
},
{
"path": "../xml-views-validation"
},
{
"path": "../semantic-model-types"
},
{
"path": "../../test-packages/framework"
},
{
"path": "../../test-packages/test-utils"
}
]
}
28 changes: 14 additions & 14 deletions packages/language-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@
"node": ">=10.0.0"
},
"dependencies": {
"@ui5-language-assistant/binding": "1.0.26",
"@ui5-language-assistant/binding": "workspace:*",
"@sap/swa-for-sapbas-vsx": "1.1.9",
"@ui5-language-assistant/logger": "0.0.1",
"@ui5-language-assistant/context": "4.0.23",
"@ui5-language-assistant/logic-utils": "4.0.17",
"@ui5-language-assistant/fe": "4.0.24",
"@ui5-language-assistant/semantic-model": "4.0.16",
"@ui5-language-assistant/settings": "4.0.9",
"@ui5-language-assistant/user-facing-text": "4.0.8",
"@ui5-language-assistant/xml-views-completion": "4.0.23",
"@ui5-language-assistant/xml-views-quick-fix": "4.0.17",
"@ui5-language-assistant/xml-views-tooltip": "4.0.23",
"@ui5-language-assistant/xml-views-validation": "4.0.18",
"@ui5-language-assistant/logger": "workspace:*",
"@ui5-language-assistant/context": "workspace:*",
"@ui5-language-assistant/logic-utils": "workspace:*",
"@ui5-language-assistant/fe": "workspace:*",
"@ui5-language-assistant/semantic-model": "workspace:*",
"@ui5-language-assistant/settings": "workspace:*",
"@ui5-language-assistant/user-facing-text": "workspace:*",
"@ui5-language-assistant/xml-views-completion": "workspace:*",
"@ui5-language-assistant/xml-views-quick-fix": "workspace:*",
"@ui5-language-assistant/xml-views-tooltip": "workspace:*",
"@ui5-language-assistant/xml-views-validation": "workspace:*",
"@xml-tools/ast": "5.0.0",
"@xml-tools/ast-position": "2.0.2",
"@xml-tools/parser": "1.0.7",
Expand All @@ -53,8 +53,8 @@
"@types/node-fetch": "2.5.10",
"@types/semver": "7.3.12",
"@types/tmp": "0.2.0",
"@ui5-language-assistant/semantic-model-types": "4.0.9",
"@ui5-language-assistant/test-utils": "4.0.12",
"@ui5-language-assistant/semantic-model-types": "workspace:*",
"@ui5-language-assistant/test-utils": "workspace:*",
"string-replace-loader": "3.1.0",
"vscode-languageserver-types": "3.17.2"
},
Expand Down
48 changes: 46 additions & 2 deletions packages/language-server/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,53 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "lib",
"baseUrl": "."
},
"include": ["src/**/*", "test/**/*", "api.d.ts", "src/**/*.json"]
"include": ["src/**/*", "test/**/*", "api.d.ts", "src/**/*.json"],
"references": [
{
"path": "../binding"
},
{
"path": "../logger"
},
{
"path": "../context"
},
{
"path": "../logic-utils"
},
{
"path": "../fe"
},
{
"path": "../semantic-model"
},
{
"path": "../xml-views-completion"
},
{
"path": "../xml-views-validation"
},
{
"path": "../settings"
},
{
"path": "../user-facing-text"
},
{
"path": "../xml-views-quick-fix"
},
{
"path": "../xml-views-tooltip"
},
{
"path": "../semantic-model-types"
},
{
"path": "../../test-packages/test-utils"
}
]
}
2 changes: 1 addition & 1 deletion packages/logger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"typings": "./api.d.ts",
"dependencies": {
"@vscode-logging/logger": "1.2.2",
"@ui5-language-assistant/settings": "4.0.9"
"@ui5-language-assistant/settings": "workspace:*"
},
"devDependencies": {
"@vscode-logging/types": "0.1.4"
Expand Down
7 changes: 6 additions & 1 deletion packages/logger/tsconfig-test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"extends": "./tsconfig.json",
"include": ["src/**/*.ts", "test/**/*.ts"]
"include": ["src/**/*.ts", "test/**/*.ts"],
"references": [
{
"path": "../settings"
}
]
}
2 changes: 1 addition & 1 deletion packages/logger/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "lib",
Expand Down
Loading
Loading