Skip to content

Commit

Permalink
Merge pull request #1061 from joshunrau/small-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
joshunrau authored Dec 17, 2024
2 parents 7de0f45 + 27c91ad commit 72375fc
Show file tree
Hide file tree
Showing 11 changed files with 375 additions and 301 deletions.
1 change: 1 addition & 0 deletions apps/playground/src/components/Editor/EditorPane.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export const EditorPane = React.forwardRef<EditorPaneRef, EditorPaneProps>(funct
Object.keys(libs).forEach((filename) => {
const uri = monaco.Uri.parse(filename);
if (!monaco.editor.getModel(uri)) {
monaco.languages.typescript.javascriptDefaults.addExtraLib(libs[filename]!, filename);
monaco.languages.typescript.typescriptDefaults.addExtraLib(libs[filename]!, filename);
monaco.editor.createModel(libs[filename]!, 'typescript', uri);
}
Expand Down
5 changes: 2 additions & 3 deletions apps/playground/src/components/Editor/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,15 @@ loader.config({ monaco });
module: monaco.languages.typescript.ModuleKind.ESNext,
moduleResolution: monaco.languages.typescript.ModuleResolutionKind.NodeJs,
newLine: monaco.languages.typescript.NewLineKind.LineFeed,
strict: true,
strict: false,
target: monaco.languages.typescript.ScriptTarget.ES2020
};

monaco.languages.typescript.javascriptDefaults.setCompilerOptions(baseTypeScriptOptions);
monaco.languages.typescript.typescriptDefaults.setCompilerOptions({
...baseTypeScriptOptions,
allowImportingTsExtensions: true,
checkJs: true,
strict: false
strict: true
});

/**
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opendatacapture",
"type": "module",
"version": "1.8.1",
"version": "1.8.2",
"private": true,
"packageManager": "pnpm@9.14.2",
"license": "Apache-2.0",
Expand Down
Loading

0 comments on commit 72375fc

Please sign in to comment.