Skip to content

Commit d8437f0

Browse files
authored
Merge branch 'master' into copypastefix
2 parents 3759a7e + d7c7c49 commit d8437f0

File tree

34 files changed

+32572
-103
lines changed

34 files changed

+32572
-103
lines changed

package-lock.json

Lines changed: 32079 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"@angular/platform-browser": "^10.1.0",
7777
"@angular/platform-browser-dynamic": "^10.1.0",
7878
"@angular/router": "^10.1.0",
79-
"@remix-project/remix-url-resolver": "0.0.19",
79+
"@remix-project/remix-url-resolver": "latest",
8080
"axios": "^0.21.1",
8181
"rxjs": "~6.5.5",
8282
"zone.js": "^0.10.2"

packages/api/src/lib/compiler/profile.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ICompiler } from './api'
22
import { LibraryProfile } from '@remixproject/plugin-utils'
33

44
export const compilerProfile: LibraryProfile<ICompiler> = {
5-
name: 'compiler',
6-
methods: ['compile', 'getCompilationResult'],
5+
name: 'solidity',
6+
methods: ['compile', 'getCompilationResult', 'compileWithParameters', 'setCompilerConfig'],
77
events: ['compilationFinished']
88
}

packages/api/src/lib/content-import/profile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ import { LibraryProfile } from '@remixproject/plugin-utils'
33

44
export const contentImportProfile: LibraryProfile<IContentImport> = {
55
name: 'contentImport',
6-
methods: ['resolve'],
6+
methods: ['resolve','resolveAndSave'],
77
}

packages/api/src/lib/dgit/api.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,18 @@ export interface IDgitSystem {
1515
checkout(cmd: any): void
1616
branches(): string[]
1717
currentbranch(): string
18-
push(): string
18+
push(cmd: any): string
1919
pull(cmd: any): void
2020
setIpfsConfig(config:any): boolean
2121
zip():void
2222
setItem(name:string, content:string):void
23-
getItem(name:string):string
23+
getItem(name: string): string
24+
import(cmd: any): void
25+
export(cmd: any): void
26+
remotes(): any[]
27+
addremote(cmd: any): void
28+
delremote(cmd: any): void
29+
clone(cmd: any): void
30+
localStorageUsed(): any
2431
};
2532
}

packages/api/src/lib/dgit/profile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ import { LibraryProfile } from '@remixproject/plugin-utils'
33

44
export const dGitProfile: LibraryProfile<IDgitSystem> = {
55
name: 'dGitProvider',
6-
methods: ['init', 'status', 'log', 'commit', 'add', 'rm', 'lsfiles', 'readblob', 'resolveref', 'branch', 'branches','checkout','currentbranch', 'zip', 'push', 'pull', 'setIpfsConfig','getItem','setItem']
6+
methods: ['clone', 'addremote', 'delremote', 'remotes', 'init', 'status', 'log', 'commit', 'add', 'rm', 'lsfiles', 'readblob', 'resolveref', 'branch', 'branches','checkout','currentbranch', 'zip', 'push', 'pull', 'setIpfsConfig','getItem','setItem', 'localStorageUsed']
77
}

packages/api/src/lib/editor/api.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { HighlightPosition, Annotation } from './type'
22
import { StatusEvents } from '@remixproject/plugin-utils'
33

44
export interface IEditor {
5-
events: {} & StatusEvents
5+
events: StatusEvents
66
methods: {
77
highlight(
88
position: HighlightPosition,
@@ -13,6 +13,7 @@ export interface IEditor {
1313
discardHighlightAt(line: number, filePath: string): void
1414
addAnnotation(annotation: Annotation): void
1515
clearAnnotations(): void
16+
gotoLine(line:number, col:number): void
1617
}
1718

1819
}

packages/api/src/lib/editor/profile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ import { LibraryProfile } from '@remixproject/plugin-utils'
33

44
export const editorProfile: LibraryProfile<IEditor> = {
55
name: 'editor',
6-
methods: ['discardHighlight', 'highlight'],
6+
methods: ['discardHighlight', 'highlight', 'addAnnotation', 'clearAnnotations', 'discardHighlightAt', 'gotoLine'],
77
}

packages/api/src/lib/file-system/file-manager/api.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ export interface IFileSystem {
3030
remove(path: string): void
3131
/** Get the name of the file currently focused if any */
3232
getCurrentFile(): string
33+
/** close all files */
34+
closeAllFiles(): void
35+
/** close a file */
36+
closeFile(): void
3337
// Old API
3438
/** @deprecated Use readdir */
3539
getFolder(path: string): Folder

packages/api/src/lib/file-system/file-manager/profile.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,9 @@ export const filSystemProfile: Profile<IFileSystem> & LocationProfile = {
2222
"copyFile",
2323
"mkdir",
2424
"readdir",
25+
"closeAllFiles",
26+
"closeFile",
27+
"remove",
2528
],
29+
events: ['currentFileChanged', 'fileAdded', 'fileClosed', 'fileRemoved', 'fileRenamed', 'fileSaved', 'noFileSelected']
2630
};

0 commit comments

Comments
 (0)