From d38568d34a8ef4d4110b9d0e3f582290fc534d7b Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Fri, 10 Nov 2023 13:02:13 +0100 Subject: [PATCH] merge vite and vitest config --- package-lock.json | 14 +++++++------- package.json | 2 +- packages/examples/package.json | 6 +++--- packages/monaco-editor-react/package.json | 6 +++--- packages/monaco-editor-wrapper/package.json | 2 +- vite.config.ts | 7 +++++++ vitest.config.ts | 11 ----------- 7 files changed, 22 insertions(+), 26 deletions(-) delete mode 100644 vitest.config.ts diff --git a/package-lock.json b/package-lock.json index b7d9670..8306528 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7479,20 +7479,20 @@ }, "packages/examples": { "name": "monaco-editor-wrapper-examples", - "version": "3.4.0-next.4", + "version": "3.4.0-next.5", "dependencies": { "@codingame/monaco-vscode-configuration-service-override": "~1.83.5", "@codingame/monaco-vscode-editor-service-override": "~1.83.5", "@codingame/monaco-vscode-json-default-extension": "~1.83.5", "@codingame/monaco-vscode-keybindings-service-override": "~1.83.5", "@codingame/monaco-vscode-python-default-extension": "~1.83.5", - "@typefox/monaco-editor-react": "~2.4.0-next.4", + "@typefox/monaco-editor-react": "~2.4.0-next.5", "http-server": "~14.1.1", "langium": "~2.1.1", "langium-statemachine-dsl": "~2.1.0", "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0", "monaco-editor-workers": "~0.44.0", - "monaco-editor-wrapper": "~3.4.0-next.4", + "monaco-editor-wrapper": "~3.4.0-next.5", "monaco-languageclient": "~7.0.1", "monaco-languageclient-examples": "~7.0.1", "react": "~18.2.0", @@ -7632,11 +7632,11 @@ }, "packages/monaco-editor-react": { "name": "@typefox/monaco-editor-react", - "version": "2.4.0-next.4", + "version": "2.4.0-next.5", "license": "MIT", "dependencies": { "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0", - "monaco-editor-wrapper": "~3.4.0-next.4", + "monaco-editor-wrapper": "~3.4.0-next.5", "react": "~18.2.0", "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0" }, @@ -7644,7 +7644,7 @@ "@types/react": "~18.2.37" }, "peerDependencies": { - "monaco-editor-wrapper": "~3.4.0-next.4" + "monaco-editor-wrapper": "~3.4.0-next.5" } }, "packages/monaco-editor-react/node_modules/@types/react": { @@ -7659,7 +7659,7 @@ } }, "packages/monaco-editor-wrapper": { - "version": "3.4.0-next.4", + "version": "3.4.0-next.5", "license": "MIT", "dependencies": { "@codingame/monaco-vscode-configuration-service-override": "~1.83.5", diff --git a/package.json b/package.json index ab7c6d1..fcf2a29 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "watch": "tsc --build tsconfig.build.json --watch --verbose", "lint": "eslint {**/src/**/*.ts,**/src/**/*.tsx,**/test/**/*.ts,**/test/**/*.tsx}", "build": "npm run build --workspaces", - "test": "vitest -c vitest.config.ts", + "test": "node --experimental-import-meta-resolve ./node_modules/vitest/vitest.mjs -c vite.config.ts", "release:prepare": "npm run reset:repo && npm ci && npm run lint && npm run build", "reset:repo": "git clean -f -X -d", "start:example:server:json": "npm run start:server:json --workspace packages/examples", diff --git a/packages/examples/package.json b/packages/examples/package.json index 404ac3a..e3586c0 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -1,7 +1,7 @@ { "name": "monaco-editor-wrapper-examples", "private": true, - "version": "3.4.0-next.4", + "version": "3.4.0-next.5", "type": "module", "dependencies": { "@codingame/monaco-vscode-configuration-service-override": "~1.83.5", @@ -9,13 +9,13 @@ "@codingame/monaco-vscode-json-default-extension": "~1.83.5", "@codingame/monaco-vscode-keybindings-service-override": "~1.83.5", "@codingame/monaco-vscode-python-default-extension": "~1.83.5", - "@typefox/monaco-editor-react": "~2.4.0-next.4", + "@typefox/monaco-editor-react": "~2.4.0-next.5", "http-server": "~14.1.1", "langium": "~2.1.1", "langium-statemachine-dsl": "~2.1.0", "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0", "monaco-editor-workers": "~0.44.0", - "monaco-editor-wrapper": "~3.4.0-next.4", + "monaco-editor-wrapper": "~3.4.0-next.5", "monaco-languageclient": "~7.0.1", "monaco-languageclient-examples": "~7.0.1", "react": "~18.2.0", diff --git a/packages/monaco-editor-react/package.json b/packages/monaco-editor-react/package.json index 7c9feb1..36429c6 100644 --- a/packages/monaco-editor-react/package.json +++ b/packages/monaco-editor-react/package.json @@ -1,6 +1,6 @@ { "name": "@typefox/monaco-editor-react", - "version": "2.4.0-next.4", + "version": "2.4.0-next.5", "license": "MIT", "description": "React component for Monaco-Editor and Monaco Languageclient", "keywords": [ @@ -51,12 +51,12 @@ }, "dependencies": { "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0", - "monaco-editor-wrapper": "~3.4.0-next.4", + "monaco-editor-wrapper": "~3.4.0-next.5", "react": "~18.2.0", "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0" }, "peerDependencies": { - "monaco-editor-wrapper": "~3.4.0-next.4" + "monaco-editor-wrapper": "~3.4.0-next.5" }, "devDependencies": { "@types/react": "~18.2.37" diff --git a/packages/monaco-editor-wrapper/package.json b/packages/monaco-editor-wrapper/package.json index 1437804..8cbd5e8 100644 --- a/packages/monaco-editor-wrapper/package.json +++ b/packages/monaco-editor-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "monaco-editor-wrapper", - "version": "3.4.0-next.4", + "version": "3.4.0-next.5", "license": "MIT", "description": "Monaco-Editor and Monaco Languageclient Wrapper", "keywords": [ diff --git a/vite.config.ts b/vite.config.ts index e3eb77e..209bd87 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -63,6 +63,13 @@ export default defineConfig(() => { }, define: { rootDirectory: JSON.stringify(__dirname) + }, + test: { + browser: { + enabled: true, + headless: true, + name: 'chrome' + } } }; return config; diff --git a/vitest.config.ts b/vitest.config.ts deleted file mode 100644 index 20914c0..0000000 --- a/vitest.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { defineConfig } from 'vite'; - -export default defineConfig({ - test: { - browser: { - enabled: true, - headless: true, - name: 'chrome' - } - } -});