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

Bump typescript from 4.9.5 to 5.3.3 #5452

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 5 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
4 changes: 2 additions & 2 deletions apps/frontend/src/store/data_filters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import * as _ from 'lodash';
import {LRUCache} from 'lru-cache';
import {
Action,
getModule,
Module,
Mutation,
VuexModule
VuexModule,
getModule
} from 'vuex-module-decorators';

const MAX_CACHE_ENTRIES = 20;
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/store/data_store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import {
import Store from '@/store/store';
import {
Action,
getModule,
Module,
Mutation,
VuexModule
VuexModule,
getModule
} from 'vuex-module-decorators';
import {FilteredDataModule} from './data_filters';

Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/store/evaluations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import axios from 'axios';
import * as _ from 'lodash';
import {
Action,
getModule,
Module,
Mutation,
VuexModule
VuexModule,
getModule
} from 'vuex-module-decorators';
import {InspecDataModule} from './data_store';
import {
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/store/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import axios from 'axios';
import Vue from 'vue';
import {
Action,
getModule,
Module,
Mutation,
VuexModule
VuexModule,
getModule
} from 'vuex-module-decorators';
import {GroupsModule} from './groups';

Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/store/severity_counts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import Store from '@/store/store';
import {Severity} from 'inspecjs';
import {LRUCache} from 'lru-cache';
import {getModule, Module, VuexModule} from 'vuex-module-decorators';
import {Module, VuexModule, getModule} from 'vuex-module-decorators';

// The hash that we will generally be working with herein
type SeverityHash = {[key in Severity]: number};
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/store/status_counts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import Store from '@/store/store';
import {ControlStatus} from 'inspecjs';
import {LRUCache} from 'lru-cache';
import {getModule, Module, VuexModule} from 'vuex-module-decorators';
import {Module, VuexModule, getModule} from 'vuex-module-decorators';

// The hash that we will generally be working with herein
export type ControlStatusHash = {
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/tests/unit/Results.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import ControlTable from '@/components/cards/controltable/ControlTable.vue';
import {Filter, FilteredDataModule} from '@/store/data_filters';
import Results from '@/views/Results.vue';
import {shallowMount, Wrapper} from '@vue/test-utils';
import {Wrapper, shallowMount} from '@vue/test-utils';
import {ContextualizedControl} from 'inspecjs';
import 'jest';
import Vue from 'vue';
Expand Down
6 changes: 3 additions & 3 deletions libs/hdf-converters/src/asff-mapper/case-previously-hdf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import {ExecJSON} from 'inspecjs';
import * as _ from 'lodash';
import {ILookupPath, MappedTransform} from '../base-converter';
import {
conditionallyProvideAttribute,
DEFAULT_STATIC_CODE_ANALYSIS_NIST_TAGS,
FROM_ASFF_TYPES_SLASH_REPLACEMENT
FROM_ASFF_TYPES_SLASH_REPLACEMENT,
conditionallyProvideAttribute
} from '../utils/global';
import {ASFFMapper, consolidate, SpecialCasing} from './asff-mapper';
import {ASFFMapper, SpecialCasing, consolidate} from './asff-mapper';

function replaceTypesSlashes<T>(type: T): T | string {
if (!_.isString(type)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import axios from 'axios';
import {
ContextualizedControl,
ContextualizedEvaluation,
convertFileContextual,
HDFControlSegment,
convertFileContextual,
isContextualizedEvaluation
} from 'inspecjs';
import * as _ from 'lodash';
Expand Down
6 changes: 3 additions & 3 deletions libs/hdf-converters/src/xccdf-results-mapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import {version as HeimdallToolsVersion} from '../package.json';
import {
BaseConverter,
ILookupPath,
impactMapping,
MappedTransform,
impactMapping,
parseHtml,
parseXml
} from './base-converter';
import {CciNistMapping} from './mappings/CciNistMapping';
import {
conditionallyProvideAttribute,
DEFAULT_STATIC_CODE_ANALYSIS_NIST_TAGS
DEFAULT_STATIC_CODE_ANALYSIS_NIST_TAGS,
conditionallyProvideAttribute
} from './utils/global';

const IMPACT_MAPPING: Map<string, number> = new Map([
Expand Down
2 changes: 1 addition & 1 deletion libs/hdf-converters/types/splunk-control-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export type SplunkControl = {
descriptions: Record<string, string>[] | ILookupPathFH;
id: string;
impact: number;
refs: any[] | ILookupPathFH;
refs: unknown[];
results?: HDFControlSegment[] | ILookupPathFH;
source_location?: any;
tags: Tags;
Expand Down
2 changes: 1 addition & 1 deletion libs/inspecjs/src/compat_impl/compat_inspec_1_0.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import {
import {ProfileJSONControl as ProfileControl_1_0} from '../generated_parsers/v_1_0/profile-json';
import {
CanonizationConfig,
is_control,
NistControl,
NistRevision,
is_control,
parse_nist
} from '../nist';

Expand Down
4 changes: 2 additions & 2 deletions libs/inspecjs/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export {
ControlStatus,
HDFControl,
HDFControlSegment,
hdfWrapControl,
SegmentStatus,
Severity
Severity,
hdfWrapControl
} from './compat_wrappers';
// Export Conversion functions
export * from './context';
Expand Down
10 changes: 5 additions & 5 deletions libs/inspecjs/src/versions/v_1_0/exec_json.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
export {
ExecJSONControl as Control,
ControlDescription,
ControlGroup,
ControlResult,
ControlResultStatus,
WaiverData as ControlWaiverData,
Convert,
Dependency as ProfileDependency,
ExecJSON as Execution,
ExecJSONControl as Control,
ExecJSONProfile as Profile,
Platform,
ExecJSONProfile as Profile,
Dependency as ProfileDependency,
Reference,
SourceLocation,
StatisticBlock,
StatisticHash,
Statistics,
SupportedPlatform,
WaiverData as ControlWaiverData
SupportedPlatform
} from '../../generated_parsers/v_1_0/exec-json';
2 changes: 1 addition & 1 deletion libs/inspecjs/src/versions/v_1_0/exec_jsonmin.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export {
ExecJSONMINControl as Control,
Convert,
ExecJsonmin as Execution,
ExecJSONMINControl as Control,
StatisticBlock,
StatisticHash,
Statistics
Expand Down
2 changes: 1 addition & 1 deletion libs/inspecjs/src/versions/v_1_0/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as ExecJSON from './exec_json';
import * as ExecJSONMin from './exec_jsonmin';
import * as ProfileJSON from './profile_json';
export {ExecJSON, ProfileJSON, ExecJSONMin};
export {ExecJSON, ExecJSONMin, ProfileJSON};
4 changes: 2 additions & 2 deletions libs/inspecjs/src/versions/v_1_0/profile_json.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export {
ProfileJSONControl as Control,
ControlGroup,
Convert,
Dependency as ProfileDependency,
ProfileJSON as Profile,
ProfileJSONControl as Control,
Dependency as ProfileDependency,
Reference,
SourceLocation,
SupportedPlatform
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"lerna": "^5.0.0",
"prettier": "^2.1.2",
"prettier-plugin-organize-imports": "^3.0.0",
"typescript": "^4.9.3"
"typescript": "^5.3.3"
},
"devDependencies": {
"dotenv-cli": "^7.0.0"
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20414,12 +20414,12 @@ typedoc@^0.25.0:
minimatch "^9.0.3"
shiki "^0.14.7"

[email protected]:
[email protected], typescript@^5.3.3:
version "5.3.3"
resolved "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==

"typescript@^3 || ^4", typescript@^4.9.3:
"typescript@^3 || ^4":
version "4.9.5"
resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
Expand Down
Loading