aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2021-12-31 02:53:18 +0100
committerLibravatar Kristóf Marussy <kristof@marussy.com>2021-12-31 02:56:53 +0100
commit8fafe2011857a836cf1d8dd9530930d1d6205cf6 (patch)
treeaee64862cc8f61cedcc0c18a40a39948fc3ebcdc
parentchore: Add import extensions preparing for ts 4.6 nodenext (diff)
downloadsophie-8fafe2011857a836cf1d8dd9530930d1d6205cf6.tar.gz
sophie-8fafe2011857a836cf1d8dd9530930d1d6205cf6.tar.zst
sophie-8fafe2011857a836cf1d8dd9530930d1d6205cf6.zip
build: Use nodenext module resolution
The renderer package still has to use node module resolution to be able to find MUI packages.
-rw-r--r--packages/main/src/controllers/config.ts2
-rw-r--r--packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts2
-rw-r--r--packages/renderer/tsconfig.json1
-rw-r--r--tsconfig.json2
4 files changed, 4 insertions, 3 deletions
diff --git a/packages/main/src/controllers/config.ts b/packages/main/src/controllers/config.ts
index ec23e8f..971f151 100644
--- a/packages/main/src/controllers/config.ts
+++ b/packages/main/src/controllers/config.ts
@@ -18,7 +18,7 @@
18 * SPDX-License-Identifier: AGPL-3.0-only 18 * SPDX-License-Identifier: AGPL-3.0-only
19 */ 19 */
20 20
21import debounce from 'lodash-es/debounce'; 21import { debounce } from 'lodash-es';
22import ms from 'ms'; 22import ms from 'ms';
23import { applySnapshot, getSnapshot, onSnapshot } from 'mobx-state-tree'; 23import { applySnapshot, getSnapshot, onSnapshot } from 'mobx-state-tree';
24 24
diff --git a/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts b/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts
index 22b7d65..65a51ba 100644
--- a/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts
+++ b/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts
@@ -21,7 +21,7 @@
21import { watch } from 'fs'; 21import { watch } from 'fs';
22import { readFile, stat, writeFile } from 'fs/promises'; 22import { readFile, stat, writeFile } from 'fs/promises';
23import JSON5 from 'json5'; 23import JSON5 from 'json5';
24import throttle from 'lodash-es/throttle'; 24import { throttle} from 'lodash-es';
25import { join } from 'path'; 25import { join } from 'path';
26 26
27import type { ConfigPersistenceService, ReadConfigResult } from '../ConfigPersistenceService.js'; 27import type { ConfigPersistenceService, ReadConfigResult } from '../ConfigPersistenceService.js';
diff --git a/packages/renderer/tsconfig.json b/packages/renderer/tsconfig.json
index 8746462..5cd8846 100644
--- a/packages/renderer/tsconfig.json
+++ b/packages/renderer/tsconfig.json
@@ -1,6 +1,7 @@
1{ 1{
2 "extends": "../../tsconfig.json", 2 "extends": "../../tsconfig.json",
3 "compilerOptions": { 3 "compilerOptions": {
4 "moduleResolution": "node",
4 "noEmit": true, 5 "noEmit": true,
5 "jsx": "react", 6 "jsx": "react",
6 "lib": [ 7 "lib": [
diff --git a/tsconfig.json b/tsconfig.json
index 255f334..e626876 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,7 @@
2 "compilerOptions": { 2 "compilerOptions": {
3 "module": "esnext", 3 "module": "esnext",
4 "target": "esnext", 4 "target": "esnext",
5 "moduleResolution": "node", 5 "moduleResolution": "nodenext",
6 "esModuleInterop": true, 6 "esModuleInterop": true,
7 "allowSyntheticDefaultImports": true, 7 "allowSyntheticDefaultImports": true,
8 "strict": true, 8 "strict": true,