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.

Sign up for GitHub

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

Revert typescript CI Lint changes #6602

Merged
merged 2 commits into from
May 8, 2023
Merged

Revert typescript CI Lint changes #6602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a18a9f
Revert "Fix lint CI (#6567)"
somebody1234 May 8, 2023
b315b8d
Revert "Run typecheck and eslint on `./run lint` (#6314)"
somebody1234 May 8, 2023
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: 2 additions & 3 deletions app/ide-desktop/lib/client/src/file-associations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export function isFileOpenable(path: string): boolean {
* we manually start a new instance of the application and pass the file path to it (using the
* Windows-style command).
*/
export function onFileOpened(event: Event, path: string): string | null {
export function onFileOpened(event: Event, path: string): string | void {
logger.log(`Received 'open-file' event for path '${path}'.`)
if (isFileOpenable(path)) {
logger.log(`The file '${path}' is openable.`)
Expand All @@ -114,6 +114,7 @@ export function onFileOpened(event: Event, path: string): string | null {
if (!electron.app.isReady() && CLIENT_ARGUMENTS.length === 0) {
event.preventDefault()
logger.log(`Opening file '${path}'.`)
// eslint-disable-next-line no-restricted-syntax
return handleOpenFile(path)
} else {
// We need to start another copy of the application, as the first one is already running.
Expand All @@ -127,11 +128,9 @@ export function onFileOpened(event: Event, path: string): string | null {
})
// Prevent parent (this) process from waiting for the child to exit.
child.unref()
return null
}
} else {
logger.log(`The file '${path}' is not openable, ignoring the 'open-file' event.`)
return null
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/ide-desktop/lib/content-config/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import * as semver from 'semver'

import * as linkedDist from '../../../../../target/ensogl-pack/linked-dist'
import * as linkedDist from '../../../../../target/ensogl-pack/linked-dist/index'
import BUILD_INFO from '../../../build.json' assert { type: 'json' }

// Aliases with the same name as the original.
Expand Down
17 changes: 0 additions & 17 deletions app/ide-desktop/lib/types/modules.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,6 @@
*
* This file MUST NOT `export {}` for the modules to be visible to other files. */

declare module '*/build.json' {
interface BuildInfo {
commit: string
version: string
engineVersion: string
name: string
}

const BUILD_INFO: BuildInfo
export default BUILD_INFO
}

declare module '*/ensogl-pack/linked-dist' {
// eslint-disable-next-line no-restricted-syntax
export * from '../../../../lib/rust/ensogl/pack/js/src/runner/index'
}

declare module '*/gui/config.yaml' {
interface Config {
windowAppScopeName: string
Expand Down
6 changes: 0 additions & 6 deletions build/cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ use ide_ci::programs::git;
use ide_ci::programs::git::clean;
use ide_ci::programs::rustc;
use ide_ci::programs::Cargo;
use ide_ci::programs::Npm;
use ide_ci::programs::Npx;
use std::time::Duration;
use tempfile::tempdir;
use tokio::process::Child;
Expand Down Expand Up @@ -837,10 +835,6 @@ pub async fn main_internal(config: Option<enso_build::config::Config>) -> Result
.await?;

prettier::check(&ctx.repo_root).await?;
let js_modules_root = ctx.repo_root.join("app/ide-desktop");
Npm.cmd()?.current_dir(&js_modules_root).args(["install"]).run_ok().await?;
Npm.cmd()?.current_dir(&js_modules_root).args(["run", "typecheck"]).run_ok().await?;
Npx.cmd()?.current_dir(&js_modules_root).args(["eslint", "."]).run_ok().await?;
}
Target::Fmt => {
let prettier = prettier::write(&ctx.repo_root);
Expand Down