From 8966e493f5c17a19260ecb125795f127593e4fdb Mon Sep 17 00:00:00 2001 From: Webber Date: Tue, 7 Jun 2022 23:59:34 +0200 Subject: [PATCH] chore: rewrite imports to deno style --- deno.ts | 3 ++ src/index.ts | 12 ++++---- src/integrity.test.ts | 2 +- src/model/__mocks__/input.ts | 2 +- src/model/action.test.ts | 6 ++-- src/model/action.ts | 4 +-- src/model/android-versioning.test.ts | 2 +- src/model/android-versioning.ts | 4 +-- src/model/build-parameters.test.ts | 12 ++++---- src/model/build-parameters.ts | 22 +++++++------- src/model/cache.test.ts | 2 +- src/model/cache.ts | 8 ++--- src/model/cli/cli.ts | 22 +++++++------- .../cloud-runner/cloud-runner-step-state.ts | 4 +-- src/model/cloud-runner/cloud-runner.test.ts | 16 +++++----- src/model/cloud-runner/cloud-runner.ts | 30 +++++++++---------- .../cloud-runner/error/cloud-runner-error.ts | 6 ++-- .../providers/aws/aws-base-stack.ts | 6 ++-- .../aws/aws-cloud-formation-templates.ts | 2 +- .../cloud-runner/providers/aws/aws-error.ts | 6 ++-- .../providers/aws/aws-job-stack.ts | 12 ++++---- .../providers/aws/aws-task-runner.ts | 18 +++++------ .../aws/commands/aws-cli-commands.ts | 8 ++--- src/model/cloud-runner/providers/aws/index.ts | 20 ++++++------- src/model/cloud-runner/providers/k8s/index.ts | 30 +++++++++---------- .../k8s/kubernetes-job-spec-factory.ts | 4 +-- .../providers/k8s/kubernetes-secret.ts | 2 +- .../providers/k8s/kubernetes-storage.ts | 10 +++---- .../providers/k8s/kubernetes-task-runner.ts | 10 +++---- .../providers/local-docker/index.ts | 12 ++++---- .../cloud-runner/providers/local/index.ts | 12 ++++---- .../providers/provider-interface.ts | 6 ++-- .../cloud-runner/providers/test/index.ts | 10 +++---- .../remote-client/caching.test.ts | 16 +++++----- .../cloud-runner/remote-client/caching.ts | 22 +++++++------- src/model/cloud-runner/remote-client/index.ts | 22 +++++++------- .../remote-client/remote-client-logger.ts | 2 +- .../cloud-runner-build-command-process.ts | 8 ++--- .../services/cloud-runner-folders.ts | 4 +-- .../services/cloud-runner-guid.ts | 4 +-- .../services/cloud-runner-logger.ts | 2 +- .../services/cloud-runner-query-override.ts | 4 +-- .../services/cloud-runner-system.ts | 4 +-- .../services/depdency-override-service.ts | 4 +-- .../services/follow-log-stream-service.ts | 8 ++--- .../cloud-runner/services/lfs-hashing.ts | 14 ++++----- .../services/task-parameter-serializer.ts | 12 ++++---- .../workflows/build-automation-workflow.ts | 18 +++++------ .../cloud-runner/workflows/custom-workflow.ts | 10 +++---- .../workflows/workflow-composition-root.ts | 10 +++---- .../workflows/workflow-interface.ts | 2 +- src/model/docker.test.ts | 4 +-- src/model/docker.ts | 8 ++--- .../error/command-execution-error.test.ts | 2 +- .../error/not-implemented-exception.test.ts | 2 +- src/model/error/validation-error.test.ts | 2 +- src/model/image-environment-factory.ts | 4 +-- src/model/image-tag.test.ts | 2 +- src/model/image-tag.ts | 4 +-- src/model/index.ts | 24 +++++++-------- src/model/input-readers/action-yaml.ts | 6 ++-- .../input-readers/generic-input-reader.ts | 4 +-- src/model/input-readers/git-repo.test.ts | 2 +- src/model/input-readers/git-repo.ts | 17 ++++++----- src/model/input-readers/github-cli.test.ts | 4 +-- src/model/input-readers/github-cli.ts | 6 ++-- .../input-readers/test-license-reader.ts | 8 ++--- src/model/input.test.ts | 6 ++-- src/model/input.ts | 10 +++---- src/model/mac-builder.ts | 4 +-- src/model/output.test.ts | 2 +- src/model/platform-setup.ts | 6 ++-- src/model/platform-setup/index.ts | 4 +-- src/model/platform-setup/setup-mac.ts | 8 ++--- src/model/platform-setup/setup-windows.ts | 4 +-- .../platform-validation/validate-windows.ts | 4 +-- src/model/platform.test.ts | 2 +- src/model/project.test.ts | 2 +- src/model/project.ts | 6 ++-- src/model/system.integration.test.ts | 4 +-- src/model/system.test.ts | 6 ++-- src/model/system.ts | 4 +-- src/model/unity-versioning.test.ts | 2 +- src/model/unity-versioning.ts | 5 ++-- src/model/unity.test.ts | 2 +- src/model/versioning.test.ts | 10 +++---- src/model/versioning.ts | 10 +++---- 87 files changed, 349 insertions(+), 342 deletions(-) create mode 100644 deno.ts diff --git a/deno.ts b/deno.ts new file mode 100644 index 00000000..bfef6f64 --- /dev/null +++ b/deno.ts @@ -0,0 +1,3 @@ +// These are the packages from Deno that replace the ones from Node. +import * as fs from 'https://deno.land/std@0.142.0/node/fs/promises.ts'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; diff --git a/src/index.ts b/src/index.ts index 1582d7c0..6f947ccc 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,8 +1,9 @@ -import * as core from '@actions/core'; -import { Action, BuildParameters, Cache, CloudRunner, Docker, ImageTag, Output } from './model'; -import { Cli } from './model/cli/cli'; -import MacBuilder from './model/mac-builder'; -import PlatformSetup from './model/platform-setup'; +import * as core from '../node_modules/@actions/core'; +import { Action, BuildParameters, Cache, CloudRunner, Docker, ImageTag, Output } from './model.ts'; +import { Cli } from './model/cli/cli.ts'; +import MacBuilder from './model/mac-builder.ts'; +import PlatformSetup from './model/platform-setup.ts'; + async function runMain() { try { if (Cli.InitCliMode()) { @@ -36,4 +37,5 @@ async function runMain() { core.setFailed((error as Error).message); } } + runMain(); diff --git a/src/integrity.test.ts b/src/integrity.test.ts index 7763709c..b93f5627 100644 --- a/src/integrity.test.ts +++ b/src/integrity.test.ts @@ -1,4 +1,4 @@ -import { stat } from 'fs/promises'; +import { stat } from 'https://deno.land/std@0.142.0/node/fs/promises/mod.ts'; describe('Integrity tests', () => { describe('package-lock.json', () => { diff --git a/src/model/__mocks__/input.ts b/src/model/__mocks__/input.ts index 72645c0f..0e93a989 100644 --- a/src/model/__mocks__/input.ts +++ b/src/model/__mocks__/input.ts @@ -1,5 +1,5 @@ // Import this named export into your test file: -import Platform from '../platform'; +import Platform from '../platform.ts'; export const mockGetFromUser = jest.fn().mockResolvedValue({ editorVersion: '', diff --git a/src/model/action.test.ts b/src/model/action.test.ts index 76fef312..a7760329 100644 --- a/src/model/action.test.ts +++ b/src/model/action.test.ts @@ -1,6 +1,6 @@ -import path from 'path'; -import fs from 'fs'; -import Action from './action'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; +import fs from '../../../node_modules/fs'; +import Action from './action.ts'; describe('Action', () => { describe('compatibility check', () => { diff --git a/src/model/action.ts b/src/model/action.ts index 28d07963..fa7b91b1 100644 --- a/src/model/action.ts +++ b/src/model/action.ts @@ -1,4 +1,4 @@ -import path from 'path'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; class Action { static get supportedPlatforms() { @@ -10,7 +10,7 @@ class Action { } static get isRunningFromSource() { - return path.basename(__dirname) === 'model'; + return path.basename(__dirname) === "model"; } static get canonicalName() { diff --git a/src/model/android-versioning.test.ts b/src/model/android-versioning.test.ts index 59d3b64a..ec146943 100644 --- a/src/model/android-versioning.test.ts +++ b/src/model/android-versioning.test.ts @@ -1,4 +1,4 @@ -import AndroidVersioning from './android-versioning'; +import AndroidVersioning from './android-versioning.ts'; describe('Android Versioning', () => { describe('versionToVersionCode', () => { diff --git a/src/model/android-versioning.ts b/src/model/android-versioning.ts index 3fb5a5a3..0c8d5210 100644 --- a/src/model/android-versioning.ts +++ b/src/model/android-versioning.ts @@ -1,5 +1,5 @@ -import * as core from '@actions/core'; -import * as semver from 'semver'; +import * as core from '../../../node_modules/@actions/core'; +import * as semver from '../../../node_modules/semver'; export default class AndroidVersioning { static determineVersionCode(version, inputVersionCode) { diff --git a/src/model/build-parameters.test.ts b/src/model/build-parameters.test.ts index 1cb37ae5..4295ef76 100644 --- a/src/model/build-parameters.test.ts +++ b/src/model/build-parameters.test.ts @@ -1,9 +1,9 @@ -import Versioning from './versioning'; -import UnityVersioning from './unity-versioning'; -import AndroidVersioning from './android-versioning'; -import BuildParameters from './build-parameters'; -import Input from './input'; -import Platform from './platform'; +import Versioning from './versioning.ts'; +import UnityVersioning from './unity-versioning.ts'; +import AndroidVersioning from './android-versioning.ts'; +import BuildParameters from './build-parameters.ts'; +import Input from './input.ts'; +import Platform from './platform.ts'; // Todo - Don't use process.env directly, that's what the input model class is for. const testLicense = diff --git a/src/model/build-parameters.ts b/src/model/build-parameters.ts index 4dcb3854..5ee12d8f 100644 --- a/src/model/build-parameters.ts +++ b/src/model/build-parameters.ts @@ -1,14 +1,14 @@ -import { customAlphabet } from 'nanoid'; -import AndroidVersioning from './android-versioning'; -import CloudRunnerConstants from './cloud-runner/services/cloud-runner-constants'; -import CloudRunnerBuildGuid from './cloud-runner/services/cloud-runner-guid'; -import Input from './input'; -import Platform from './platform'; -import UnityVersioning from './unity-versioning'; -import Versioning from './versioning'; -import { GitRepoReader } from './input-readers/git-repo'; -import { GithubCliReader } from './input-readers/github-cli'; -import { Cli } from './cli/cli'; +import { customAlphabet } from '../../../node_modules/nanoid'; +import AndroidVersioning from './android-versioning.ts'; +import CloudRunnerConstants from './cloud-runner/services/cloud-runner-constants.ts'; +import CloudRunnerBuildGuid from './cloud-runner/services/cloud-runner-guid.ts'; +import Input from './input.ts'; +import Platform from './platform.ts'; +import UnityVersioning from './unity-versioning.ts'; +import Versioning from './versioning.ts'; +import { GitRepoReader } from './input-readers/git-repo.ts'; +import { GithubCliReader } from './input-readers/github-cli.ts'; +import { Cli } from './cli/cli.ts'; class BuildParameters { public editorVersion!: string; diff --git a/src/model/cache.test.ts b/src/model/cache.test.ts index 29afe8fa..4b85b72f 100644 --- a/src/model/cache.test.ts +++ b/src/model/cache.test.ts @@ -1,4 +1,4 @@ -import Cache from './cache'; +import Cache from './cache.ts'; jest.mock('./input'); diff --git a/src/model/cache.ts b/src/model/cache.ts index de963bc8..59f6860b 100644 --- a/src/model/cache.ts +++ b/src/model/cache.ts @@ -1,7 +1,7 @@ -import * as core from '@actions/core'; -import fs from 'fs'; -import Action from './action'; -import Project from './project'; +import * as core from '../../../node_modules/@actions/core'; +import fs from '../../../node_modules/fs'; +import Action from './action.ts'; +import Project from './project.ts'; class Cache { static verify() { diff --git a/src/model/cli/cli.ts b/src/model/cli/cli.ts index de7854e7..f21e1713 100644 --- a/src/model/cli/cli.ts +++ b/src/model/cli/cli.ts @@ -1,14 +1,14 @@ -import { Command } from 'commander-ts'; -import { BuildParameters, CloudRunner, ImageTag, Input } from '..'; -import * as core from '@actions/core'; -import { ActionYamlReader } from '../input-readers/action-yaml'; -import CloudRunnerLogger from '../cloud-runner/services/cloud-runner-logger'; -import CloudRunnerQueryOverride from '../cloud-runner/services/cloud-runner-query-override'; -import { CliFunction, CliFunctionsRepository } from './cli-functions-repository'; -import { AwsCliCommands } from '../cloud-runner/providers/aws/commands/aws-cli-commands'; -import { Caching } from '../cloud-runner/remote-client/caching'; -import { LfsHashing } from '../cloud-runner/services/lfs-hashing'; -import { RemoteClient } from '../cloud-runner/remote-client'; +import { Command } from '../../../node_modules/commander-ts'; +import { BuildParameters, CloudRunner, ImageTag, Input } from '../index.ts'; +import * as core from '../../../node_modules/@actions/core'; +import { ActionYamlReader } from '../input-readers/action-yaml.ts'; +import CloudRunnerLogger from '../cloud-runner/services/cloud-runner-logger.ts'; +import CloudRunnerQueryOverride from '../cloud-runner/services/cloud-runner-query-override.ts'; +import { CliFunction, CliFunctionsRepository } from './cli-functions-repository.ts'; +import { AwsCliCommands } from '../cloud-runner/providers/aws/commands/aws-cli-commands.ts'; +import { Caching } from '../cloud-runner/remote-client/caching.ts'; +import { LfsHashing } from '../cloud-runner/services/lfs-hashing.ts'; +import { RemoteClient } from '../cloud-runner/remote-client/index.ts'; export class Cli { public static options; diff --git a/src/model/cloud-runner/cloud-runner-step-state.ts b/src/model/cloud-runner/cloud-runner-step-state.ts index 94f744bb..60288216 100644 --- a/src/model/cloud-runner/cloud-runner-step-state.ts +++ b/src/model/cloud-runner/cloud-runner-step-state.ts @@ -1,5 +1,5 @@ -import CloudRunnerEnvironmentVariable from './services/cloud-runner-environment-variable'; -import CloudRunnerSecret from './services/cloud-runner-secret'; +import CloudRunnerEnvironmentVariable from './services/cloud-runner-environment-variable.ts'; +import CloudRunnerSecret from './services/cloud-runner-secret.ts'; export class CloudRunnerStepState { public image: string; diff --git a/src/model/cloud-runner/cloud-runner.test.ts b/src/model/cloud-runner/cloud-runner.test.ts index b8e51ed3..d5181c6c 100644 --- a/src/model/cloud-runner/cloud-runner.test.ts +++ b/src/model/cloud-runner/cloud-runner.test.ts @@ -1,12 +1,12 @@ import { BuildParameters, ImageTag } from '..'; -import CloudRunner from './cloud-runner'; -import Input from '../input'; -import { CloudRunnerStatics } from './cloud-runner-statics'; -import { TaskParameterSerializer } from './services/task-parameter-serializer'; -import UnityVersioning from '../unity-versioning'; -import { Cli } from '../cli/cli'; -import CloudRunnerLogger from './services/cloud-runner-logger'; -import { v4 as uuidv4 } from 'uuid'; +import CloudRunner from './cloud-runner.ts'; +import Input from '../input.ts'; +import { CloudRunnerStatics } from './cloud-runner-statics.ts'; +import { TaskParameterSerializer } from './services/task-parameter-serializer.ts'; +import UnityVersioning from '../unity-versioning.ts'; +import { Cli } from '../cli/cli.ts'; +import CloudRunnerLogger from './services/cloud-runner-logger.ts'; +import { v4 as uuidv4 } from '../../../node_modules/uuid'; describe('Cloud Runner', () => { it('responds', () => {}); diff --git a/src/model/cloud-runner/cloud-runner.ts b/src/model/cloud-runner/cloud-runner.ts index 9234f427..e3e4c6fc 100644 --- a/src/model/cloud-runner/cloud-runner.ts +++ b/src/model/cloud-runner/cloud-runner.ts @@ -1,18 +1,18 @@ -import AwsBuildPlatform from './providers/aws'; -import { BuildParameters, Input } from '..'; -import Kubernetes from './providers/k8s'; -import CloudRunnerLogger from './services/cloud-runner-logger'; -import { CloudRunnerStepState } from './cloud-runner-step-state'; -import { WorkflowCompositionRoot } from './workflows/workflow-composition-root'; -import { CloudRunnerError } from './error/cloud-runner-error'; -import { TaskParameterSerializer } from './services/task-parameter-serializer'; -import * as core from '@actions/core'; -import CloudRunnerSecret from './services/cloud-runner-secret'; -import { ProviderInterface } from './providers/provider-interface'; -import CloudRunnerEnvironmentVariable from './services/cloud-runner-environment-variable'; -import TestCloudRunner from './providers/test'; -import LocalCloudRunner from './providers/local'; -import LocalDockerCloudRunner from './providers/local-docker'; +import AwsBuildPlatform from './providers/aws/index.ts'; +import { BuildParameters, Input } from '../index.ts'; +import Kubernetes from './providers/k8s/index.ts'; +import CloudRunnerLogger from './services/cloud-runner-logger.ts'; +import { CloudRunnerStepState } from './cloud-runner-step-state.ts'; +import { WorkflowCompositionRoot } from './workflows/workflow-composition-root.ts'; +import { CloudRunnerError } from './error/cloud-runner-error.ts'; +import { TaskParameterSerializer } from './services/task-parameter-serializer.ts'; +import * as core from '../../../node_modules/@actions/core'; +import CloudRunnerSecret from './services/cloud-runner-secret.ts'; +import { ProviderInterface } from './providers/provider-interface.ts'; +import CloudRunnerEnvironmentVariable from './services/cloud-runner-environment-variable.ts'; +import TestCloudRunner from './providers/test/index.ts'; +import LocalCloudRunner from './providers/local/index.ts'; +import LocalDockerCloudRunner from './providers/local-docker/index.ts'; class CloudRunner { public static Provider: ProviderInterface; diff --git a/src/model/cloud-runner/error/cloud-runner-error.ts b/src/model/cloud-runner/error/cloud-runner-error.ts index c290dcce..4756a143 100644 --- a/src/model/cloud-runner/error/cloud-runner-error.ts +++ b/src/model/cloud-runner/error/cloud-runner-error.ts @@ -1,6 +1,6 @@ -import CloudRunnerLogger from '../services/cloud-runner-logger'; -import * as core from '@actions/core'; -import CloudRunner from '../cloud-runner'; +import CloudRunnerLogger from '../services/cloud-runner-logger.ts'; +import * as core from '../../../../node_modules/@actions/core'; +import CloudRunner from '../cloud-runner.ts'; export class CloudRunnerError { public static async handleException(error: unknown) { diff --git a/src/model/cloud-runner/providers/aws/aws-base-stack.ts b/src/model/cloud-runner/providers/aws/aws-base-stack.ts index a60cc43a..c3f0e571 100644 --- a/src/model/cloud-runner/providers/aws/aws-base-stack.ts +++ b/src/model/cloud-runner/providers/aws/aws-base-stack.ts @@ -1,7 +1,7 @@ -import CloudRunnerLogger from '../../services/cloud-runner-logger'; -import * as core from '@actions/core'; +import CloudRunnerLogger from '../../services/cloud-runner-logger.ts'; +import * as core from '../../../node_modules/@actions/core'; import * as SDK from 'aws-sdk'; -import { BaseStackFormation } from './cloud-formations/base-stack-formation'; +import { BaseStackFormation } from './cloud-formations/base-stack-formation.ts'; const crypto = require('crypto'); export class AWSBaseStack { diff --git a/src/model/cloud-runner/providers/aws/aws-cloud-formation-templates.ts b/src/model/cloud-runner/providers/aws/aws-cloud-formation-templates.ts index 0d0f83a4..fd3ea232 100644 --- a/src/model/cloud-runner/providers/aws/aws-cloud-formation-templates.ts +++ b/src/model/cloud-runner/providers/aws/aws-cloud-formation-templates.ts @@ -1,4 +1,4 @@ -import { TaskDefinitionFormation } from './cloud-formations/task-definition-formation'; +import { TaskDefinitionFormation } from './cloud-formations/task-definition-formation.ts'; export class AWSCloudFormationTemplates { public static getParameterTemplate(p1) { diff --git a/src/model/cloud-runner/providers/aws/aws-error.ts b/src/model/cloud-runner/providers/aws/aws-error.ts index 7acbe3c5..9481fbbb 100644 --- a/src/model/cloud-runner/providers/aws/aws-error.ts +++ b/src/model/cloud-runner/providers/aws/aws-error.ts @@ -1,7 +1,7 @@ -import CloudRunnerLogger from '../../services/cloud-runner-logger'; +import CloudRunnerLogger from '../../services/cloud-runner-logger.ts'; import * as SDK from 'aws-sdk'; -import * as core from '@actions/core'; -import CloudRunner from '../../cloud-runner'; +import * as core from '../../../node_modules/@actions/core'; +import CloudRunner from '../../cloud-runner.ts'; export class AWSError { static async handleStackCreationFailure(error: any, CF: SDK.CloudFormation, taskDefStackName: string) { diff --git a/src/model/cloud-runner/providers/aws/aws-job-stack.ts b/src/model/cloud-runner/providers/aws/aws-job-stack.ts index c970faa9..b19f75ef 100644 --- a/src/model/cloud-runner/providers/aws/aws-job-stack.ts +++ b/src/model/cloud-runner/providers/aws/aws-job-stack.ts @@ -1,10 +1,10 @@ import * as SDK from 'aws-sdk'; -import CloudRunnerAWSTaskDef from './cloud-runner-aws-task-def'; -import CloudRunnerSecret from '../../services/cloud-runner-secret'; -import { AWSCloudFormationTemplates } from './aws-cloud-formation-templates'; -import CloudRunnerLogger from '../../services/cloud-runner-logger'; -import { AWSError } from './aws-error'; -import CloudRunner from '../../cloud-runner'; +import CloudRunnerAWSTaskDef from './cloud-runner-aws-task-def.ts'; +import CloudRunnerSecret from '../../services/cloud-runner-secret.ts'; +import { AWSCloudFormationTemplates } from './aws-cloud-formation-templates.ts'; +import CloudRunnerLogger from '../../services/cloud-runner-logger.ts'; +import { AWSError } from './aws-error.ts'; +import CloudRunner from '../../cloud-runner.ts'; export class AWSJobStack { private baseStackName: string; diff --git a/src/model/cloud-runner/providers/aws/aws-task-runner.ts b/src/model/cloud-runner/providers/aws/aws-task-runner.ts index 1efb2294..0a1e2ecd 100644 --- a/src/model/cloud-runner/providers/aws/aws-task-runner.ts +++ b/src/model/cloud-runner/providers/aws/aws-task-runner.ts @@ -1,13 +1,13 @@ import * as AWS from 'aws-sdk'; -import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable'; -import * as core from '@actions/core'; -import CloudRunnerAWSTaskDef from './cloud-runner-aws-task-def'; -import * as zlib from 'zlib'; -import CloudRunnerLogger from '../../services/cloud-runner-logger'; -import { Input } from '../../..'; -import CloudRunner from '../../cloud-runner'; -import { CloudRunnerBuildCommandProcessor } from '../../services/cloud-runner-build-command-process'; -import { FollowLogStreamService } from '../../services/follow-log-stream-service'; +import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable.ts'; +import * as core from '../../../node_modules/@actions/core'; +import CloudRunnerAWSTaskDef from './cloud-runner-aws-task-def.ts'; +import * as zlib from '../../../node_modules/zlib'; +import CloudRunnerLogger from '../../services/cloud-runner-logger.ts'; +import { Input } from '../../...ts'; +import CloudRunner from '../../cloud-runner.ts'; +import { CloudRunnerBuildCommandProcessor } from '../../services/cloud-runner-build-command-process.ts'; +import { FollowLogStreamService } from '../../services/follow-log-stream-service.ts'; class AWSTaskRunner { static async runTask( diff --git a/src/model/cloud-runner/providers/aws/commands/aws-cli-commands.ts b/src/model/cloud-runner/providers/aws/commands/aws-cli-commands.ts index 7563606a..56a4e4f6 100644 --- a/src/model/cloud-runner/providers/aws/commands/aws-cli-commands.ts +++ b/src/model/cloud-runner/providers/aws/commands/aws-cli-commands.ts @@ -1,8 +1,8 @@ import AWS from 'aws-sdk'; -import { CliFunction } from '../../../../cli/cli-functions-repository'; -import Input from '../../../../input'; -import CloudRunnerLogger from '../../../services/cloud-runner-logger'; -import { BaseStackFormation } from '../cloud-formations/base-stack-formation'; +import { CliFunction } from '../../../../cli/cli-functions-repository.ts'; +import Input from '../../../../input.ts'; +import CloudRunnerLogger from '../../../services/cloud-runner-logger.ts'; +import { BaseStackFormation } from '../cloud-formations/base-stack-formation.ts'; export class AwsCliCommands { @CliFunction(`aws-list-all`, `List all resources`) diff --git a/src/model/cloud-runner/providers/aws/index.ts b/src/model/cloud-runner/providers/aws/index.ts index 4be2f66f..64995bf7 100644 --- a/src/model/cloud-runner/providers/aws/index.ts +++ b/src/model/cloud-runner/providers/aws/index.ts @@ -1,14 +1,14 @@ import * as SDK from 'aws-sdk'; -import CloudRunnerSecret from '../../services/cloud-runner-secret'; -import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable'; -import CloudRunnerAWSTaskDef from './cloud-runner-aws-task-def'; -import AWSTaskRunner from './aws-task-runner'; -import { ProviderInterface } from '../provider-interface'; -import BuildParameters from '../../../build-parameters'; -import CloudRunnerLogger from '../../services/cloud-runner-logger'; -import { AWSJobStack } from './aws-job-stack'; -import { AWSBaseStack } from './aws-base-stack'; -import { Input } from '../../..'; +import CloudRunnerSecret from '../../services/cloud-runner-secret.ts'; +import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable.ts'; +import CloudRunnerAWSTaskDef from './cloud-runner-aws-task-def.ts'; +import AWSTaskRunner from './aws-task-runner.ts'; +import { ProviderInterface } from '../provider-interface.ts'; +import BuildParameters from '../../../build-parameters.ts'; +import CloudRunnerLogger from '../../services/cloud-runner-logger.ts'; +import { AWSJobStack } from './aws-job-stack.ts'; +import { AWSBaseStack } from './aws-base-stack.ts'; +import { Input } from '../../...ts'; class AWSBuildEnvironment implements ProviderInterface { private baseStackName: string; diff --git a/src/model/cloud-runner/providers/k8s/index.ts b/src/model/cloud-runner/providers/k8s/index.ts index 65cb4ed2..f1754e2c 100644 --- a/src/model/cloud-runner/providers/k8s/index.ts +++ b/src/model/cloud-runner/providers/k8s/index.ts @@ -1,18 +1,18 @@ -import * as k8s from '@kubernetes/client-node'; -import { BuildParameters, Output } from '../../..'; -import * as core from '@actions/core'; -import { ProviderInterface } from '../provider-interface'; -import CloudRunnerSecret from '../../services/cloud-runner-secret'; -import KubernetesStorage from './kubernetes-storage'; -import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable'; -import KubernetesTaskRunner from './kubernetes-task-runner'; -import KubernetesSecret from './kubernetes-secret'; -import waitUntil from 'async-wait-until'; -import KubernetesJobSpecFactory from './kubernetes-job-spec-factory'; -import KubernetesServiceAccount from './kubernetes-service-account'; -import CloudRunnerLogger from '../../services/cloud-runner-logger'; -import { CoreV1Api } from '@kubernetes/client-node'; -import DependencyOverrideService from '../../services/depdency-override-service'; +import * as k8s from '../../../node_modules/@kubernetes/client-node'; +import { BuildParameters, Output } from '../../../index.ts'; +import * as core from '../../../node_modules/@actions/core'; +import { ProviderInterface } from '../provider-interface.ts'; +import CloudRunnerSecret from '../../services/cloud-runner-secret.ts'; +import KubernetesStorage from './kubernetes-storage.ts'; +import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable.ts'; +import KubernetesTaskRunner from './kubernetes-task-runner.ts'; +import KubernetesSecret from './kubernetes-secret.ts'; +import waitUntil from '../../../node_modules/async-wait-until'; +import KubernetesJobSpecFactory from './kubernetes-job-spec-factory.ts'; +import KubernetesServiceAccount from './kubernetes-service-account.ts'; +import CloudRunnerLogger from '../../services/cloud-runner-logger.ts'; +import { CoreV1Api } from '../../../node_modules/@kubernetes/client-node'; +import DependencyOverrideService from '../../services/depdency-override-service.ts'; class Kubernetes implements ProviderInterface { private kubeConfig: k8s.KubeConfig; diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-job-spec-factory.ts b/src/model/cloud-runner/providers/k8s/kubernetes-job-spec-factory.ts index 0bb9294a..12d3a744 100644 --- a/src/model/cloud-runner/providers/k8s/kubernetes-job-spec-factory.ts +++ b/src/model/cloud-runner/providers/k8s/kubernetes-job-spec-factory.ts @@ -1,6 +1,6 @@ import { V1EnvVar, V1EnvVarSource, V1SecretKeySelector } from '@kubernetes/client-node'; -import BuildParameters from '../../../build-parameters'; -import { CloudRunnerBuildCommandProcessor } from '../../services/cloud-runner-build-command-process'; +import BuildParameters from '../../../build-parameters.ts'; +import { CloudRunnerBuildCommandProcessor } from '../../services/cloud-runner-build-command-process.ts'; import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable'; import CloudRunnerSecret from '../../services/cloud-runner-secret'; import CloudRunner from '../../cloud-runner'; diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-secret.ts b/src/model/cloud-runner/providers/k8s/kubernetes-secret.ts index 76e3935b..65e010f8 100644 --- a/src/model/cloud-runner/providers/k8s/kubernetes-secret.ts +++ b/src/model/cloud-runner/providers/k8s/kubernetes-secret.ts @@ -1,5 +1,5 @@ import { CoreV1Api } from '@kubernetes/client-node'; -import CloudRunnerSecret from '../../services/cloud-runner-secret'; +import CloudRunnerSecret from '../../services/cloud-runner-secret.ts'; import * as k8s from '@kubernetes/client-node'; const base64 = require('base-64'); diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-storage.ts b/src/model/cloud-runner/providers/k8s/kubernetes-storage.ts index 21594882..a2817fc5 100644 --- a/src/model/cloud-runner/providers/k8s/kubernetes-storage.ts +++ b/src/model/cloud-runner/providers/k8s/kubernetes-storage.ts @@ -1,10 +1,10 @@ import waitUntil from 'async-wait-until'; -import * as core from '@actions/core'; +import * as core from '../../../node_modules/@actions/core'; import * as k8s from '@kubernetes/client-node'; -import BuildParameters from '../../../build-parameters'; -import CloudRunnerLogger from '../../services/cloud-runner-logger'; -import YAML from 'yaml'; -import { IncomingMessage } from 'http'; +import BuildParameters from '../../../build-parameters.ts'; +import CloudRunnerLogger from '../../services/cloud-runner-logger.ts'; +import YAML from '../../../node_modules/yaml'; +import { IncomingMessage } from '../../../node_modules/http'; class KubernetesStorage { public static async createPersistentVolumeClaim( diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts b/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts index da70be19..f99769d4 100644 --- a/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts +++ b/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts @@ -1,10 +1,10 @@ import { CoreV1Api, KubeConfig, Log } from '@kubernetes/client-node'; -import { Writable } from 'stream'; -import CloudRunnerLogger from '../../services/cloud-runner-logger'; -import * as core from '@actions/core'; -import { CloudRunnerStatics } from '../../cloud-runner-statics'; +import { Writable } from '../../../node_modules/stream'; +import CloudRunnerLogger from '../../services/cloud-runner-logger.ts'; +import * as core from '../../../node_modules/@actions/core'; +import { CloudRunnerStatics } from '../../cloud-runner-statics.ts'; import waitUntil from 'async-wait-until'; -import { FollowLogStreamService } from '../../services/follow-log-stream-service'; +import { FollowLogStreamService } from '../../services/follow-log-stream-service.ts'; class KubernetesTaskRunner { static async runTask( diff --git a/src/model/cloud-runner/providers/local-docker/index.ts b/src/model/cloud-runner/providers/local-docker/index.ts index 39758282..592ba0d2 100644 --- a/src/model/cloud-runner/providers/local-docker/index.ts +++ b/src/model/cloud-runner/providers/local-docker/index.ts @@ -1,9 +1,9 @@ -import BuildParameters from '../../../build-parameters'; -import { CloudRunnerSystem } from '../../services/cloud-runner-system'; -import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable'; -import CloudRunnerLogger from '../../services/cloud-runner-logger'; -import { ProviderInterface } from '../provider-interface'; -import CloudRunnerSecret from '../../services/cloud-runner-secret'; +import BuildParameters from '../../../build-parameters.ts'; +import { CloudRunnerSystem } from '../../services/cloud-runner-system.ts'; +import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable.ts'; +import CloudRunnerLogger from '../../services/cloud-runner-logger.ts'; +import { ProviderInterface } from '../provider-interface.ts'; +import CloudRunnerSecret from '../../services/cloud-runner-secret.ts'; class LocalDockerCloudRunner implements ProviderInterface { cleanup( diff --git a/src/model/cloud-runner/providers/local/index.ts b/src/model/cloud-runner/providers/local/index.ts index 0980d6c7..b713dd75 100644 --- a/src/model/cloud-runner/providers/local/index.ts +++ b/src/model/cloud-runner/providers/local/index.ts @@ -1,9 +1,9 @@ -import BuildParameters from '../../../build-parameters'; -import { CloudRunnerSystem } from '../../services/cloud-runner-system'; -import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable'; -import CloudRunnerLogger from '../../services/cloud-runner-logger'; -import { ProviderInterface } from '../provider-interface'; -import CloudRunnerSecret from '../../services/cloud-runner-secret'; +import BuildParameters from '../../../build-parameters.ts'; +import { CloudRunnerSystem } from '../../services/cloud-runner-system.ts'; +import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable.ts'; +import CloudRunnerLogger from '../../services/cloud-runner-logger.ts'; +import { ProviderInterface } from '../provider-interface.ts'; +import CloudRunnerSecret from '../../services/cloud-runner-secret.ts'; class LocalCloudRunner implements ProviderInterface { cleanup( diff --git a/src/model/cloud-runner/providers/provider-interface.ts b/src/model/cloud-runner/providers/provider-interface.ts index f6e9d171..80664a31 100644 --- a/src/model/cloud-runner/providers/provider-interface.ts +++ b/src/model/cloud-runner/providers/provider-interface.ts @@ -1,6 +1,6 @@ -import BuildParameters from '../../build-parameters'; -import CloudRunnerEnvironmentVariable from '../services/cloud-runner-environment-variable'; -import CloudRunnerSecret from '../services/cloud-runner-secret'; +import BuildParameters from '../../build-parameters.ts'; +import CloudRunnerEnvironmentVariable from '../services/cloud-runner-environment-variable.ts'; +import CloudRunnerSecret from '../services/cloud-runner-secret.ts'; export interface ProviderInterface { cleanup( diff --git a/src/model/cloud-runner/providers/test/index.ts b/src/model/cloud-runner/providers/test/index.ts index f7cb9630..1262c198 100644 --- a/src/model/cloud-runner/providers/test/index.ts +++ b/src/model/cloud-runner/providers/test/index.ts @@ -1,8 +1,8 @@ -import BuildParameters from '../../../build-parameters'; -import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable'; -import CloudRunnerLogger from '../../services/cloud-runner-logger'; -import { ProviderInterface } from '../provider-interface'; -import CloudRunnerSecret from '../../services/cloud-runner-secret'; +import BuildParameters from '../../../build-parameters.ts'; +import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable.ts'; +import CloudRunnerLogger from '../../services/cloud-runner-logger.ts'; +import { ProviderInterface } from '../provider-interface.ts'; +import CloudRunnerSecret from '../../services/cloud-runner-secret.ts'; class TestCloudRunner implements ProviderInterface { cleanup( diff --git a/src/model/cloud-runner/remote-client/caching.test.ts b/src/model/cloud-runner/remote-client/caching.test.ts index 1da3eb1d..873c93d4 100644 --- a/src/model/cloud-runner/remote-client/caching.test.ts +++ b/src/model/cloud-runner/remote-client/caching.test.ts @@ -1,13 +1,13 @@ -import fs from 'fs'; -import path from 'path'; -import BuildParameters from '../../build-parameters'; -import { Cli } from '../../cli/cli'; -import Input from '../../input'; -import UnityVersioning from '../../unity-versioning'; +import fs from '../../../node_modules/fs'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; +import BuildParameters from '../../build-parameters.ts'; +import { Cli } from '../../cli/cli.ts'; +import Input from '../../input.ts'; +import UnityVersioning from '../../unity-versioning.ts'; import CloudRunner from '../cloud-runner'; import { CloudRunnerSystem } from '../services/cloud-runner-system'; -import { Caching } from './caching'; -import { v4 as uuidv4 } from 'uuid'; +import { Caching } from './caching.ts'; +import { v4 as uuidv4 } from '../../../node_modules/uuid'; describe('Cloud Runner Caching', () => { it('responds', () => {}); diff --git a/src/model/cloud-runner/remote-client/caching.ts b/src/model/cloud-runner/remote-client/caching.ts index 19cdbf03..50e063d3 100644 --- a/src/model/cloud-runner/remote-client/caching.ts +++ b/src/model/cloud-runner/remote-client/caching.ts @@ -1,14 +1,14 @@ -import { assert } from 'console'; -import fs from 'fs'; -import path from 'path'; -import CloudRunner from '../cloud-runner'; -import CloudRunnerLogger from '../services/cloud-runner-logger'; -import { CloudRunnerFolders } from '../services/cloud-runner-folders'; -import { CloudRunnerSystem } from '../services/cloud-runner-system'; -import { LfsHashing } from '../services/lfs-hashing'; -import { RemoteClientLogger } from './remote-client-logger'; -import { Cli } from '../../cli/cli'; -import { CliFunction } from '../../cli/cli-functions-repository'; +import { assert } from '../../../node_modules/console'; +import fs from '../../../node_modules/fs'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; +import CloudRunner from '../cloud-runner.ts'; +import CloudRunnerLogger from '../services/cloud-runner-logger.ts'; +import { CloudRunnerFolders } from '../services/cloud-runner-folders.ts'; +import { CloudRunnerSystem } from '../services/cloud-runner-system.ts'; +import { LfsHashing } from '../services/lfs-hashing.ts'; +import { RemoteClientLogger } from './remote-client-logger.ts'; +import { Cli } from '../../cli/cli.ts'; +import { CliFunction } from '../../cli/cli-functions-repository.ts'; // eslint-disable-next-line github/no-then const fileExists = async (fpath) => !!(await fs.promises.stat(fpath).catch(() => false)); diff --git a/src/model/cloud-runner/remote-client/index.ts b/src/model/cloud-runner/remote-client/index.ts index 39cfcf70..24b01763 100644 --- a/src/model/cloud-runner/remote-client/index.ts +++ b/src/model/cloud-runner/remote-client/index.ts @@ -1,14 +1,14 @@ -import fs from 'fs'; -import CloudRunner from '../cloud-runner'; -import { CloudRunnerFolders } from '../services/cloud-runner-folders'; -import { Caching } from './caching'; -import { LfsHashing } from '../services/lfs-hashing'; -import { RemoteClientLogger } from './remote-client-logger'; -import path from 'path'; -import { assert } from 'console'; -import CloudRunnerLogger from '../services/cloud-runner-logger'; -import { CliFunction } from '../../cli/cli-functions-repository'; -import { CloudRunnerSystem } from '../services/cloud-runner-system'; +import fs from '../../../node_modules/fs'; +import CloudRunner from '../cloud-runner.ts'; +import { CloudRunnerFolders } from '../services/cloud-runner-folders.ts'; +import { Caching } from './caching.ts'; +import { LfsHashing } from '../services/lfs-hashing.ts'; +import { RemoteClientLogger } from './remote-client-logger.ts'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; +import { assert } from '../../../node_modules/console'; +import CloudRunnerLogger from '../services/cloud-runner-logger.ts'; +import { CliFunction } from '../../cli/cli-functions-repository.ts'; +import { CloudRunnerSystem } from '../services/cloud-runner-system.ts'; export class RemoteClient { public static async bootstrapRepository() { diff --git a/src/model/cloud-runner/remote-client/remote-client-logger.ts b/src/model/cloud-runner/remote-client/remote-client-logger.ts index 5581b8bc..2c29d7e0 100644 --- a/src/model/cloud-runner/remote-client/remote-client-logger.ts +++ b/src/model/cloud-runner/remote-client/remote-client-logger.ts @@ -1,4 +1,4 @@ -import CloudRunnerLogger from '../services/cloud-runner-logger'; +import CloudRunnerLogger from '../services/cloud-runner-logger.ts'; export class RemoteClientLogger { public static log(message: string) { diff --git a/src/model/cloud-runner/services/cloud-runner-build-command-process.ts b/src/model/cloud-runner/services/cloud-runner-build-command-process.ts index 4428d37a..3db2c12a 100644 --- a/src/model/cloud-runner/services/cloud-runner-build-command-process.ts +++ b/src/model/cloud-runner/services/cloud-runner-build-command-process.ts @@ -1,7 +1,7 @@ -import { BuildParameters } from '../..'; -import YAML from 'yaml'; -import CloudRunnerSecret from './cloud-runner-secret'; -import CloudRunner from '../cloud-runner'; +import { BuildParameters } from '../../index.ts'; +import YAML from '../../../../node_modules/yaml'; +import CloudRunnerSecret from './cloud-runner-secret.ts'; +import CloudRunner from '../cloud-runner.ts'; export class CloudRunnerBuildCommandProcessor { public static ProcessCommands(commands: string, buildParameters: BuildParameters): string { diff --git a/src/model/cloud-runner/services/cloud-runner-folders.ts b/src/model/cloud-runner/services/cloud-runner-folders.ts index 30cb4a6d..38a2075c 100644 --- a/src/model/cloud-runner/services/cloud-runner-folders.ts +++ b/src/model/cloud-runner/services/cloud-runner-folders.ts @@ -1,5 +1,5 @@ -import path from 'path'; -import { CloudRunner } from '../..'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; +import { CloudRunner } from '../...ts'; export class CloudRunnerFolders { public static readonly repositoryFolder = 'repo'; diff --git a/src/model/cloud-runner/services/cloud-runner-guid.ts b/src/model/cloud-runner/services/cloud-runner-guid.ts index 1ee76013..9e82312d 100644 --- a/src/model/cloud-runner/services/cloud-runner-guid.ts +++ b/src/model/cloud-runner/services/cloud-runner-guid.ts @@ -1,5 +1,5 @@ -import { customAlphabet } from 'nanoid'; -import CloudRunnerConstants from './cloud-runner-constants'; +import { customAlphabet } from '../../../node_modules/nanoid'; +import CloudRunnerConstants from './cloud-runner-constants.ts'; class CloudRunnerNamespace { static generateGuid(runNumber: string | number, platform: string) { diff --git a/src/model/cloud-runner/services/cloud-runner-logger.ts b/src/model/cloud-runner/services/cloud-runner-logger.ts index 53158843..a47e4d74 100644 --- a/src/model/cloud-runner/services/cloud-runner-logger.ts +++ b/src/model/cloud-runner/services/cloud-runner-logger.ts @@ -1,4 +1,4 @@ -import * as core from '@actions/core'; +import * as core from '../../../node_modules/@actions/core'; class CloudRunnerLogger { private static timestamp: number; diff --git a/src/model/cloud-runner/services/cloud-runner-query-override.ts b/src/model/cloud-runner/services/cloud-runner-query-override.ts index 750f2bd5..4ceb2bbe 100644 --- a/src/model/cloud-runner/services/cloud-runner-query-override.ts +++ b/src/model/cloud-runner/services/cloud-runner-query-override.ts @@ -1,5 +1,5 @@ -import Input from '../../input'; -import { GenericInputReader } from '../../input-readers/generic-input-reader'; +import Input from '../../input.ts'; +import { GenericInputReader } from '../../input-readers/generic-input-reader.ts'; const formatFunction = (value, arguments_) => { for (const element of arguments_) { diff --git a/src/model/cloud-runner/services/cloud-runner-system.ts b/src/model/cloud-runner/services/cloud-runner-system.ts index 0545e607..92ee7cc2 100644 --- a/src/model/cloud-runner/services/cloud-runner-system.ts +++ b/src/model/cloud-runner/services/cloud-runner-system.ts @@ -1,5 +1,5 @@ -import { exec } from 'child_process'; -import { RemoteClientLogger } from '../remote-client/remote-client-logger'; +import { exec } from '../../../../node_modules/child_process'; +import { RemoteClientLogger } from '../remote-client/remote-client-logger.ts'; export class CloudRunnerSystem { public static async Run(command: string, suppressError = false, suppressLogs = false) { diff --git a/src/model/cloud-runner/services/depdency-override-service.ts b/src/model/cloud-runner/services/depdency-override-service.ts index 83d06277..35fbfc06 100644 --- a/src/model/cloud-runner/services/depdency-override-service.ts +++ b/src/model/cloud-runner/services/depdency-override-service.ts @@ -1,5 +1,5 @@ -import Input from '../../input'; -import { CloudRunnerSystem } from './cloud-runner-system'; +import Input from '../../input.ts'; +import { CloudRunnerSystem } from './cloud-runner-system.ts'; class DependencyOverrideService { public static async CheckHealth() { diff --git a/src/model/cloud-runner/services/follow-log-stream-service.ts b/src/model/cloud-runner/services/follow-log-stream-service.ts index 59efc9b8..41362876 100644 --- a/src/model/cloud-runner/services/follow-log-stream-service.ts +++ b/src/model/cloud-runner/services/follow-log-stream-service.ts @@ -1,7 +1,7 @@ -import CloudRunnerLogger from './cloud-runner-logger'; -import * as core from '@actions/core'; -import CloudRunner from '../cloud-runner'; -import { CloudRunnerStatics } from '../cloud-runner-statics'; +import CloudRunnerLogger from './cloud-runner-logger.ts'; +import * as core from '../../../node_modules/@actions/core'; +import CloudRunner from '../cloud-runner.ts'; +import { CloudRunnerStatics } from '../cloud-runner-statics.ts'; export class FollowLogStreamService { public static handleIteration(message, shouldReadLogs, shouldCleanup, output) { diff --git a/src/model/cloud-runner/services/lfs-hashing.ts b/src/model/cloud-runner/services/lfs-hashing.ts index 9d43130a..132f62aa 100644 --- a/src/model/cloud-runner/services/lfs-hashing.ts +++ b/src/model/cloud-runner/services/lfs-hashing.ts @@ -1,10 +1,10 @@ -import path from 'path'; -import { CloudRunnerFolders } from './cloud-runner-folders'; -import { CloudRunnerSystem } from './cloud-runner-system'; -import fs from 'fs'; -import { assert } from 'console'; -import { Cli } from '../../cli/cli'; -import { CliFunction } from '../../cli/cli-functions-repository'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; +import { CloudRunnerFolders } from './cloud-runner-folders.ts'; +import { CloudRunnerSystem } from './cloud-runner-system.ts'; +import fs from '../../../node_modules/fs'; +import { assert } from '../../../node_modules/console'; +import { Cli } from '../../cli/cli.ts'; +import { CliFunction } from '../../cli/cli-functions-repository.ts'; export class LfsHashing { public static async createLFSHashFiles() { diff --git a/src/model/cloud-runner/services/task-parameter-serializer.ts b/src/model/cloud-runner/services/task-parameter-serializer.ts index 9bdf4170..7ca08088 100644 --- a/src/model/cloud-runner/services/task-parameter-serializer.ts +++ b/src/model/cloud-runner/services/task-parameter-serializer.ts @@ -1,9 +1,9 @@ -import { CloudRunner, Input } from '../..'; -import ImageEnvironmentFactory from '../../image-environment-factory'; -import CloudRunnerEnvironmentVariable from './cloud-runner-environment-variable'; -import { CloudRunnerBuildCommandProcessor } from './cloud-runner-build-command-process'; -import CloudRunnerSecret from './cloud-runner-secret'; -import CloudRunnerQueryOverride from './cloud-runner-query-override'; +import { CloudRunner, Input } from '../../index.ts'; +import ImageEnvironmentFactory from '../../image-environment-factory.ts'; +import CloudRunnerEnvironmentVariable from './cloud-runner-environment-variable.ts'; +import { CloudRunnerBuildCommandProcessor } from './cloud-runner-build-command-process.ts'; +import CloudRunnerSecret from './cloud-runner-secret.ts'; +import CloudRunnerQueryOverride from './cloud-runner-query-override.ts'; export class TaskParameterSerializer { public static readBuildEnvironmentVariables(): CloudRunnerEnvironmentVariable[] { diff --git a/src/model/cloud-runner/workflows/build-automation-workflow.ts b/src/model/cloud-runner/workflows/build-automation-workflow.ts index ac02ef9a..7e986500 100644 --- a/src/model/cloud-runner/workflows/build-automation-workflow.ts +++ b/src/model/cloud-runner/workflows/build-automation-workflow.ts @@ -1,12 +1,12 @@ -import CloudRunnerLogger from '../services/cloud-runner-logger'; -import { CloudRunnerFolders } from '../services/cloud-runner-folders'; -import { CloudRunnerStepState } from '../cloud-runner-step-state'; -import { CustomWorkflow } from './custom-workflow'; -import { WorkflowInterface } from './workflow-interface'; -import * as core from '@actions/core'; -import { CloudRunnerBuildCommandProcessor } from '../services/cloud-runner-build-command-process'; -import path from 'path'; -import CloudRunner from '../cloud-runner'; +import CloudRunnerLogger from '../services/cloud-runner-logger.ts'; +import { CloudRunnerFolders } from '../services/cloud-runner-folders.ts'; +import { CloudRunnerStepState } from '../cloud-runner-step-state.ts'; +import { CustomWorkflow } from './custom-workflow.ts'; +import { WorkflowInterface } from './workflow-interface.ts'; +import * as core from '../../../../node_modules/@actions/core'; +import { CloudRunnerBuildCommandProcessor } from '../services/cloud-runner-build-command-process.ts'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; +import CloudRunner from '../cloud-runner.ts'; export class BuildAutomationWorkflow implements WorkflowInterface { async run(cloudRunnerStepState: CloudRunnerStepState) { diff --git a/src/model/cloud-runner/workflows/custom-workflow.ts b/src/model/cloud-runner/workflows/custom-workflow.ts index 52bbf44d..a2d66c27 100644 --- a/src/model/cloud-runner/workflows/custom-workflow.ts +++ b/src/model/cloud-runner/workflows/custom-workflow.ts @@ -1,8 +1,8 @@ -import CloudRunnerLogger from '../services/cloud-runner-logger'; -import CloudRunnerSecret from '../services/cloud-runner-secret'; -import { CloudRunnerFolders } from '../services/cloud-runner-folders'; -import YAML from 'yaml'; -import { CloudRunner, Input } from '../..'; +import CloudRunnerLogger from '../services/cloud-runner-logger.ts'; +import CloudRunnerSecret from '../services/cloud-runner-secret.ts'; +import { CloudRunnerFolders } from '../services/cloud-runner-folders.ts'; +import YAML from '../../../../node_modules/yaml'; +import { CloudRunner, Input } from '../../index.ts'; export class CustomWorkflow { public static async runCustomJob(buildSteps) { diff --git a/src/model/cloud-runner/workflows/workflow-composition-root.ts b/src/model/cloud-runner/workflows/workflow-composition-root.ts index cb052200..47fcbe8e 100644 --- a/src/model/cloud-runner/workflows/workflow-composition-root.ts +++ b/src/model/cloud-runner/workflows/workflow-composition-root.ts @@ -1,8 +1,8 @@ -import { CloudRunnerStepState } from '../cloud-runner-step-state'; -import { CustomWorkflow } from './custom-workflow'; -import { WorkflowInterface } from './workflow-interface'; -import { BuildAutomationWorkflow } from './build-automation-workflow'; -import CloudRunner from '../cloud-runner'; +import { CloudRunnerStepState } from '../cloud-runner-step-state.ts'; +import { CustomWorkflow } from './custom-workflow.ts'; +import { WorkflowInterface } from './workflow-interface.ts'; +import { BuildAutomationWorkflow } from './build-automation-workflow.ts'; +import CloudRunner from '../cloud-runner.ts'; export class WorkflowCompositionRoot implements WorkflowInterface { async run(cloudRunnerStepState: CloudRunnerStepState) { diff --git a/src/model/cloud-runner/workflows/workflow-interface.ts b/src/model/cloud-runner/workflows/workflow-interface.ts index 3e8763ed..6ad6f230 100644 --- a/src/model/cloud-runner/workflows/workflow-interface.ts +++ b/src/model/cloud-runner/workflows/workflow-interface.ts @@ -1,4 +1,4 @@ -import { CloudRunnerStepState } from '../cloud-runner-step-state'; +import { CloudRunnerStepState } from '../cloud-runner-step-state.ts'; export interface WorkflowInterface { run( diff --git a/src/model/docker.test.ts b/src/model/docker.test.ts index 290d19bf..f9ed66f2 100644 --- a/src/model/docker.test.ts +++ b/src/model/docker.test.ts @@ -1,5 +1,5 @@ -import Action from './action'; -import Docker from './docker'; +import Action from './action.ts'; +import Docker from './docker.ts'; describe('Docker', () => { it.skip('runs', async () => { diff --git a/src/model/docker.ts b/src/model/docker.ts index 497b3f05..4a0fc006 100644 --- a/src/model/docker.ts +++ b/src/model/docker.ts @@ -1,7 +1,7 @@ -import { exec } from '@actions/exec'; -import ImageEnvironmentFactory from './image-environment-factory'; -import { existsSync, mkdirSync } from 'fs'; -import path from 'path'; +import { exec } from '../../../node_modules/@actions/exec'; +import ImageEnvironmentFactory from './image-environment-factory.ts'; +import { existsSync, mkdirSync } from '../../../node_modules/fs'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; class Docker { static async run(image, parameters, silent = false) { diff --git a/src/model/error/command-execution-error.test.ts b/src/model/error/command-execution-error.test.ts index 6e8ac9f0..bb420dae 100644 --- a/src/model/error/command-execution-error.test.ts +++ b/src/model/error/command-execution-error.test.ts @@ -1,4 +1,4 @@ -import CommandExecutionError from './command-execution-error'; +import CommandExecutionError from './command-execution-error.ts'; describe('CommandExecutionError', () => { it('instantiates', () => { diff --git a/src/model/error/not-implemented-exception.test.ts b/src/model/error/not-implemented-exception.test.ts index 7c9c053d..64e64b47 100644 --- a/src/model/error/not-implemented-exception.test.ts +++ b/src/model/error/not-implemented-exception.test.ts @@ -1,4 +1,4 @@ -import NotImplementedException from './not-implemented-exception'; +import NotImplementedException from './not-implemented-exception.ts'; describe('NotImplementedException', () => { it('instantiates', () => { diff --git a/src/model/error/validation-error.test.ts b/src/model/error/validation-error.test.ts index 365f0fcf..a51bef9b 100644 --- a/src/model/error/validation-error.test.ts +++ b/src/model/error/validation-error.test.ts @@ -1,4 +1,4 @@ -import ValidationError from './validation-error'; +import ValidationError from './validation-error.ts'; describe('ValidationError', () => { it('instantiates', () => { diff --git a/src/model/image-environment-factory.ts b/src/model/image-environment-factory.ts index 15513fda..b595125f 100644 --- a/src/model/image-environment-factory.ts +++ b/src/model/image-environment-factory.ts @@ -1,5 +1,5 @@ -import BuildParameters from './build-parameters'; -import { ReadLicense } from './input-readers/test-license-reader'; +import BuildParameters from './build-parameters.ts'; +import { ReadLicense } from './input-readers/test-license-reader.ts'; class Parameter { public name; diff --git a/src/model/image-tag.test.ts b/src/model/image-tag.test.ts index f7ac2e2b..f0d1e270 100644 --- a/src/model/image-tag.test.ts +++ b/src/model/image-tag.test.ts @@ -1,4 +1,4 @@ -import ImageTag from './image-tag'; +import ImageTag from './image-tag.ts'; describe('ImageTag', () => { const some = { diff --git a/src/model/image-tag.ts b/src/model/image-tag.ts index 576e8d6e..4e2ed451 100644 --- a/src/model/image-tag.ts +++ b/src/model/image-tag.ts @@ -1,6 +1,6 @@ -import Platform from './platform'; +import Platform from './platform.ts'; -import BuildParameters from './build-parameters'; +import BuildParameters from './build-parameters.ts'; class ImageTag { public repository: string; diff --git a/src/model/index.ts b/src/model/index.ts index dfd5b2f1..9e35789e 100644 --- a/src/model/index.ts +++ b/src/model/index.ts @@ -1,15 +1,15 @@ -import Action from './action'; -import BuildParameters from './build-parameters'; -import Cache from './cache'; -import Docker from './docker'; -import Input from './input'; -import ImageTag from './image-tag'; -import Output from './output'; -import Platform from './platform'; -import Project from './project'; -import Unity from './unity'; -import Versioning from './versioning'; -import CloudRunner from './cloud-runner/cloud-runner'; +import Action from './action.ts'; +import BuildParameters from './build-parameters.ts'; +import Cache from './cache.ts'; +import Docker from './docker.ts'; +import Input from './input.ts'; +import ImageTag from './image-tag.ts'; +import Output from './output.ts'; +import Platform from './platform.ts'; +import Project from './project.ts'; +import Unity from './unity.ts'; +import Versioning from './versioning.ts'; +import CloudRunner from './cloud-runner/cloud-runner.ts'; export { Action, diff --git a/src/model/input-readers/action-yaml.ts b/src/model/input-readers/action-yaml.ts index 8c46bb66..41ece117 100644 --- a/src/model/input-readers/action-yaml.ts +++ b/src/model/input-readers/action-yaml.ts @@ -1,6 +1,6 @@ -import fs from 'fs'; -import path from 'path'; -import YAML from 'yaml'; +import fs from '../../../node_modules/fs'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; +import YAML from '../../../node_modules/yaml'; export class ActionYamlReader { private actionYamlParsed: any; diff --git a/src/model/input-readers/generic-input-reader.ts b/src/model/input-readers/generic-input-reader.ts index 85a42fea..4428fde9 100644 --- a/src/model/input-readers/generic-input-reader.ts +++ b/src/model/input-readers/generic-input-reader.ts @@ -1,5 +1,5 @@ -import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system'; -import Input from '../input'; +import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system.ts'; +import Input from '../input.ts'; export class GenericInputReader { public static async Run(command) { diff --git a/src/model/input-readers/git-repo.test.ts b/src/model/input-readers/git-repo.test.ts index 1e96db60..39ca27c1 100644 --- a/src/model/input-readers/git-repo.test.ts +++ b/src/model/input-readers/git-repo.test.ts @@ -1,4 +1,4 @@ -import { GitRepoReader } from './git-repo'; +import { GitRepoReader } from './git-repo.ts'; describe(`git repo tests`, () => { it(`Branch value parsed from CLI to not contain illegal characters`, async () => { diff --git a/src/model/input-readers/git-repo.ts b/src/model/input-readers/git-repo.ts index 3372089e..791ad9fb 100644 --- a/src/model/input-readers/git-repo.ts +++ b/src/model/input-readers/git-repo.ts @@ -1,18 +1,19 @@ -import { assert } from 'console'; -import fs from 'fs'; -import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system'; -import CloudRunnerLogger from '../cloud-runner/services/cloud-runner-logger'; -import Input from '../input'; +// import { assert } from '../../../node_modules/console'; +// import fs from '../../../node_modules/fs'; +import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system.ts'; +import CloudRunnerLogger from '../cloud-runner/services/cloud-runner-logger.ts'; +import Input from '../input.ts'; +// Todo - DENO - return assertions export class GitRepoReader { public static async GetRemote() { if (Input.cloudRunnerCluster === 'local') { return ''; } - assert(fs.existsSync(`.git`)); + // assert(fs.existsSync(`.git`)); const value = (await CloudRunnerSystem.Run(`git remote -v`, false, true)).replace(/ /g, ``); CloudRunnerLogger.log(`value ${value}`); - assert(value.includes('github.com')); + // assert(value.includes('github.com')); return value.split('github.com/')[1].split('.git')[0]; } @@ -21,7 +22,7 @@ export class GitRepoReader { if (Input.cloudRunnerCluster === 'local') { return ''; } - assert(fs.existsSync(`.git`)); + // assert(fs.existsSync(`.git`)); return (await CloudRunnerSystem.Run(`git branch --show-current`, false, true)) .split('\n')[0] diff --git a/src/model/input-readers/github-cli.test.ts b/src/model/input-readers/github-cli.test.ts index 424af059..751909b0 100644 --- a/src/model/input-readers/github-cli.test.ts +++ b/src/model/input-readers/github-cli.test.ts @@ -1,5 +1,5 @@ -import { GithubCliReader } from './github-cli'; -import * as core from '@actions/core'; +import { GithubCliReader } from './github-cli.ts'; +import * as core from '../../../node_modules/@actions/core'; describe(`github cli`, () => { // Todo - We can not assume that everyone has the GitHub cli installed locally. diff --git a/src/model/input-readers/github-cli.ts b/src/model/input-readers/github-cli.ts index 7ad6ef7a..5891a0ed 100644 --- a/src/model/input-readers/github-cli.ts +++ b/src/model/input-readers/github-cli.ts @@ -1,6 +1,6 @@ -import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system'; -import * as core from '@actions/core'; -import Input from '../input'; +import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system.ts'; +import * as core from '../../../node_modules/@actions/core'; +import Input from '../input.ts'; export class GithubCliReader { static async GetGitHubAuthToken() { diff --git a/src/model/input-readers/test-license-reader.ts b/src/model/input-readers/test-license-reader.ts index 5d072743..07c0c447 100644 --- a/src/model/input-readers/test-license-reader.ts +++ b/src/model/input-readers/test-license-reader.ts @@ -1,7 +1,7 @@ -import path from 'path'; -import fs from 'fs'; -import YAML from 'yaml'; -import Input from '../input'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; +import fs from '../../../node_modules/fs'; +import YAML from '../../../node_modules/yaml'; +import Input from '../input.ts'; export function ReadLicense() { if (Input.cloudRunnerCluster === 'local') { diff --git a/src/model/input.test.ts b/src/model/input.test.ts index 7cf2fc54..5d19a75d 100644 --- a/src/model/input.test.ts +++ b/src/model/input.test.ts @@ -1,7 +1,7 @@ -import * as core from '@actions/core'; +import * as core from '../../../node_modules/@actions/core'; -import Input from './input'; -import Platform from './platform'; +import Input from './input.ts'; +import Platform from './platform.ts'; afterEach(() => { jest.restoreAllMocks(); diff --git a/src/model/input.ts b/src/model/input.ts index d3bb8116..5203a916 100644 --- a/src/model/input.ts +++ b/src/model/input.ts @@ -1,8 +1,8 @@ -import fs from 'fs'; -import path from 'path'; -import { Cli } from './cli/cli'; -import CloudRunnerQueryOverride from './cloud-runner/services/cloud-runner-query-override'; -import Platform from './platform'; +import fs from '../../../node_modules/fs'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; +import { Cli } from './cli/cli.ts'; +import CloudRunnerQueryOverride from './cloud-runner/services/cloud-runner-query-override.ts'; +import Platform from './platform.ts'; const core = require('@actions/core'); diff --git a/src/model/mac-builder.ts b/src/model/mac-builder.ts index a95cf7cb..de82f9ab 100644 --- a/src/model/mac-builder.ts +++ b/src/model/mac-builder.ts @@ -1,5 +1,5 @@ -import { exec } from '@actions/exec'; -import { BuildParameters } from '.'; +import { exec } from '../../../node_modules/@actions/exec'; +import { BuildParameters } from './build-parameters.ts'; class MacBuilder { public static async run(actionFolder, workspace, buildParameters: BuildParameters, silent = false) { diff --git a/src/model/output.test.ts b/src/model/output.test.ts index c4fcb114..6fb618b5 100644 --- a/src/model/output.test.ts +++ b/src/model/output.test.ts @@ -1,4 +1,4 @@ -import Output from './output'; +import Output from './output.ts'; describe('Output', () => { describe('setBuildVersion', () => { diff --git a/src/model/platform-setup.ts b/src/model/platform-setup.ts index 7ef9d938..56b1addd 100644 --- a/src/model/platform-setup.ts +++ b/src/model/platform-setup.ts @@ -1,6 +1,6 @@ -import { BuildParameters } from '.'; -import { SetupMac, SetupWindows } from './platform-setup/'; -import ValidateWindows from './platform-validation/validate-windows'; +import { BuildParameters } from './index.ts'; +import { SetupMac, SetupWindows } from './platform-setup/index.ts'; +import ValidateWindows from './platform-validation/validate-windows.ts'; class PlatformSetup { static async setup(buildParameters: BuildParameters, actionFolder: string) { diff --git a/src/model/platform-setup/index.ts b/src/model/platform-setup/index.ts index cc2ab97b..87862a21 100644 --- a/src/model/platform-setup/index.ts +++ b/src/model/platform-setup/index.ts @@ -1,4 +1,4 @@ -import SetupWindows from './setup-windows'; -import SetupMac from './setup-mac'; +import SetupWindows from './setup-windows.ts'; +import SetupMac from './setup-mac.ts'; export { SetupWindows, SetupMac }; diff --git a/src/model/platform-setup/setup-mac.ts b/src/model/platform-setup/setup-mac.ts index beb55195..82a6e8b7 100644 --- a/src/model/platform-setup/setup-mac.ts +++ b/src/model/platform-setup/setup-mac.ts @@ -1,7 +1,7 @@ -import { BuildParameters } from '..'; -import { getUnityChangeset } from 'unity-changeset'; -import { exec } from '@actions/exec'; -import fs from 'fs'; +import { BuildParameters } from '../index.ts'; +import { getUnityChangeset } from '../../../node_modules/unity-changeset'; +import { exec } from '../../../node_modules/@actions/exec'; +import fs from '../../../node_modules/fs'; class SetupMac { static unityHubPath = `"/Applications/Unity Hub.app/Contents/MacOS/Unity Hub"`; diff --git a/src/model/platform-setup/setup-windows.ts b/src/model/platform-setup/setup-windows.ts index 2ba7ab36..ee268d68 100644 --- a/src/model/platform-setup/setup-windows.ts +++ b/src/model/platform-setup/setup-windows.ts @@ -1,5 +1,5 @@ -import { exec } from '@actions/exec'; -import fs from 'fs'; +import { exec } from '../../../node_modules/@actions/exec'; +import fs from '../../../node_modules/fs'; import { BuildParameters } from '..'; class SetupWindows { diff --git a/src/model/platform-validation/validate-windows.ts b/src/model/platform-validation/validate-windows.ts index 0a2c56ba..cf3a88b1 100644 --- a/src/model/platform-validation/validate-windows.ts +++ b/src/model/platform-validation/validate-windows.ts @@ -1,5 +1,5 @@ -import fs from 'fs'; -import { BuildParameters } from '..'; +import fs from '../../../node_modules/fs'; +import { BuildParameters } from '../index.ts'; class ValidateWindows { public static validate(buildParameters: BuildParameters) { diff --git a/src/model/platform.test.ts b/src/model/platform.test.ts index 7fb820b6..263ea0a0 100644 --- a/src/model/platform.test.ts +++ b/src/model/platform.test.ts @@ -1,4 +1,4 @@ -import Platform from './platform'; +import Platform from './platform.ts'; describe('Platform', () => { describe('default', () => { diff --git a/src/model/project.test.ts b/src/model/project.test.ts index b900929d..5da7915e 100644 --- a/src/model/project.test.ts +++ b/src/model/project.test.ts @@ -1,4 +1,4 @@ -import Project from './project'; +import Project from './project.ts'; jest.mock('./input'); diff --git a/src/model/project.ts b/src/model/project.ts index 71833120..a4d5e07d 100644 --- a/src/model/project.ts +++ b/src/model/project.ts @@ -1,6 +1,6 @@ -import Input from './input'; -import Unity from './unity'; -import Action from './action'; +import Input from './input.ts'; +import Unity from './unity.ts'; +import Action from './action.ts'; class Project { static get relativePath() { diff --git a/src/model/system.integration.test.ts b/src/model/system.integration.test.ts index 4d452fd1..07995b02 100644 --- a/src/model/system.integration.test.ts +++ b/src/model/system.integration.test.ts @@ -1,5 +1,5 @@ -import * as core from '@actions/core'; -import System from './system'; +import * as core from '../../../node_modules/@actions/core'; +import System from './system.ts'; jest.spyOn(core, 'debug').mockImplementation(() => {}); jest.spyOn(core, 'info').mockImplementation(() => {}); diff --git a/src/model/system.test.ts b/src/model/system.test.ts index ed4c43f5..3020e251 100644 --- a/src/model/system.test.ts +++ b/src/model/system.test.ts @@ -1,6 +1,6 @@ -import * as core from '@actions/core'; -import * as exec from '@actions/exec'; -import System from './system'; +import * as core from '../../../node_modules/@actions/core'; +import * as exec from '../../../node_modules/@actions/exec'; +import System from './system.ts'; jest.spyOn(core, 'debug').mockImplementation(() => {}); const info = jest.spyOn(core, 'info').mockImplementation(() => {}); diff --git a/src/model/system.ts b/src/model/system.ts index 9f1cb676..4255e5ad 100644 --- a/src/model/system.ts +++ b/src/model/system.ts @@ -1,5 +1,5 @@ -import * as core from '@actions/core'; -import { exec } from '@actions/exec'; +import * as core from '../../node_modules/@actions/core'; +import { exec } from '../../node_modules/@actions/exec'; class System { static async run(command, arguments_: any = [], options = {}, shouldLog = true) { diff --git a/src/model/unity-versioning.test.ts b/src/model/unity-versioning.test.ts index 94aa3c6a..2c863066 100644 --- a/src/model/unity-versioning.test.ts +++ b/src/model/unity-versioning.test.ts @@ -1,4 +1,4 @@ -import UnityVersioning from './unity-versioning'; +import UnityVersioning from './unity-versioning.ts'; describe('Unity Versioning', () => { describe('parse', () => { diff --git a/src/model/unity-versioning.ts b/src/model/unity-versioning.ts index a7ef2e26..aaa3cc70 100644 --- a/src/model/unity-versioning.ts +++ b/src/model/unity-versioning.ts @@ -1,5 +1,6 @@ -import * as fs from 'fs'; -import path from 'path'; +import * as fs from '../../../node_modules/fs'; +import * as fs from 'https://deno.land/std@0.141.0/fs/mod.ts'; +import * as path from 'https://deno.land/std@0.141.0/path/mod.ts'; export default class UnityVersioning { static get versionPattern() { diff --git a/src/model/unity.test.ts b/src/model/unity.test.ts index 05cd7d02..bbfe2b72 100644 --- a/src/model/unity.test.ts +++ b/src/model/unity.test.ts @@ -1,4 +1,4 @@ -import Unity from './unity'; +import Unity from './unity.ts'; describe('Unity', () => { describe('libraryFolder', () => { diff --git a/src/model/versioning.test.ts b/src/model/versioning.test.ts index 0451c74f..80eb38c0 100644 --- a/src/model/versioning.test.ts +++ b/src/model/versioning.test.ts @@ -1,8 +1,8 @@ -import * as core from '@actions/core'; -import NotImplementedException from './error/not-implemented-exception'; -import System from './system'; -import Versioning from './versioning'; -import { validVersionTagInputs, invalidVersionTagInputs } from './__data__/versions'; +import * as core from '../../../node_modules/@actions/core'; +import NotImplementedException from './error/not-implemented-exception.ts'; +import System from './system.ts'; +import Versioning from './versioning.ts'; +import { validVersionTagInputs, invalidVersionTagInputs } from './__data__/versions.ts'; afterEach(() => { jest.restoreAllMocks(); diff --git a/src/model/versioning.ts b/src/model/versioning.ts index 7ef0ca47..a58d51db 100644 --- a/src/model/versioning.ts +++ b/src/model/versioning.ts @@ -1,8 +1,8 @@ -import * as core from '@actions/core'; -import NotImplementedException from './error/not-implemented-exception'; -import ValidationError from './error/validation-error'; -import Input from './input'; -import System from './system'; +import * as core from '../../../node_modules/@actions/core'; +import NotImplementedException from './error/not-implemented-exception.ts'; +import ValidationError from './error/validation-error.ts'; +import Input from './input.ts'; +import System from './system.ts'; export default class Versioning { static get projectPath() {