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.

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

fix(developer): move osk.ts from developer-utils to kmc-kmn #10903

Merged
merged 2 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion developer/src/common/web/utils/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ containing helper functions such as:
* Sentry integration
* MIT license text validation

It is not intended for separate use.
It is not intended for separate use.

**Note:** developer/server depends on this module; adding extra dependencies may
impact the bundling for that module too (#10872).
1 change: 0 additions & 1 deletion developer/src/common/web/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export { validateMITLicense } from './src/validate-mit-license.js';
export { KeymanSentry } from './src/KeymanSentry.js';
export { getOption, loadOptions, clearOptions } from './src/options.js';
export * as Osk from './src/osk.js';
export { escapeMarkdownChar } from './src/markdown.js';
3 changes: 0 additions & 3 deletions developer/src/common/web/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
"scripts": {
"build": "tsc -b"
},
"dependencies": {
"@keymanapp/common-types": "*"
},
"mocha": {
"spec": "build/test/**/test-*.js",
"require": [
Expand Down
6 changes: 0 additions & 6 deletions developer/src/common/web/utils/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,9 @@
"rootDir": ".",
"outDir": "./build/",
"baseUrl": ".",
"paths": {
"@keymanapp/common-types": ["../../../../../common/web/types/src/main"],
},
},
"include": [
"index.ts",
"src/**/*.ts",
],
"references": [
{ "path": "../../../../../common/web/types/" },
]
}
4 changes: 2 additions & 2 deletions developer/src/kmc-analyze/src/osk-character-use/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CompilerCallbacks, KeymanFileTypes, KvksFile, KvksFileReader, TouchLayout, TouchLayoutFileReader } from "@keymanapp/common-types";
import { CompilerMessages } from '@keymanapp/kmc-kmn';
import { escapeMarkdownChar, Osk } from '@keymanapp/developer-utils';
import { CompilerMessages, Osk } from '@keymanapp/kmc-kmn';
import { escapeMarkdownChar } from '@keymanapp/developer-utils';
import { getOskFromKmnFile } from "../util/get-osk-from-kmn-file.js";
import { AnalyzerMessages } from "../messages.js";

Expand Down
3 changes: 1 addition & 2 deletions developer/src/kmc-analyze/src/osk-rewrite-pua/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { CompilerCallbacks, KeymanFileTypes, KvksFile, KvksFileReader, KvksFileWriter, TouchLayoutFileReader, TouchLayoutFileWriter } from "@keymanapp/common-types";
import { Osk } from '@keymanapp/developer-utils';
import { CompilerMessages } from '@keymanapp/kmc-kmn';
import { CompilerMessages, Osk } from '@keymanapp/kmc-kmn';
import { getOskFromKmnFile } from "../util/get-osk-from-kmn-file.js";
import { AnalyzerMessages } from "../messages.js";

Expand Down
2 changes: 1 addition & 1 deletion developer/src/kmc-kmn/src/compiler/compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ TODO: implement additional interfaces:
// TODO: rename wasm-host?
import { UnicodeSetParser, UnicodeSet, VisualKeyboard, KvkFileReader, KeymanCompiler, KeymanCompilerArtifacts, KeymanCompilerArtifactOptional, KeymanCompilerResult, KeymanCompilerArtifact } from '@keymanapp/common-types';
import { CompilerCallbacks, CompilerEvent, CompilerOptions, KeymanFileTypes, KvkFileWriter, KvksFileReader } from '@keymanapp/common-types';
import { Osk } from '@keymanapp/developer-utils';
import * as Osk from './osk.js';
import loadWasmHost from '../import/kmcmplib/wasm-host.js';
import { CompilerMessages, mapErrorFromKmcmplib } from './kmn-compiler-messages.js';
import { WriteCompiledKeyboard } from '../kmw-compiler/kmw-compiler.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { JavaScript_Key } from "./javascript-strings.js";
import { TRequiredKey, CRequiredKeys, CSpecialText, CSpecialText14Map, CSpecialText17Map, CSpecialTextMinVer, CSpecialTextMaxVer } from "./constants.js";
import { KeymanWebTouchStandardKeyNames, KMWAdditionalKeyNames, VKeyNames } from "./keymanweb-key-codes.js";
import { KmwCompilerMessages } from "./kmw-compiler-messages.js";
import { Osk } from '@keymanapp/developer-utils';
import * as Osk from '../compiler/osk.js';

interface VLFOutput {
output: string;
Expand Down
3 changes: 3 additions & 0 deletions developer/src/kmc-kmn/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@
export { KmnCompiler, KmnCompilerOptions, KmnCompilerResult, KmnCompilerArtifacts, KmnCompilerResultExtra, CompilerResultExtraStore, CompilerResultExtraGroup } from './compiler/compiler.js';
export { KmnCompilerMessages, CompilerMessages } from './compiler/kmn-compiler-messages.js';
export { KmwCompilerMessages } from './kmw-compiler/kmw-compiler-messages.js';

import * as Osk from './compiler/osk.js';
export { Osk };
3 changes: 0 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading