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

Feature: move squid-js to ocean-lib-js #30

Merged
merged 35 commits into from
May 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
67af4d1
first cut, highly WIP
alexcos20 May 26, 2020
dd38471
Delete FactoryAbi.ts
alexcos20 May 26, 2020
7104a56
Delete OceanSecretStore.ts
alexcos20 May 26, 2020
be7831e
add Approve&Lock to datatokens class
alexcos20 May 26, 2020
15f7d44
Merge branch 'feature/alex_play' of https://github.com/oceanprotocol/…
alexcos20 May 26, 2020
725b60d
Delete add-vendors-plugin.js
alexcos20 May 26, 2020
a531c00
Delete AccessStatus.ts
alexcos20 May 26, 2020
8adda9c
Delete Balance.ts
alexcos20 May 26, 2020
8d9beec
Delete InputType.ts
alexcos20 May 26, 2020
bab0f2e
Delete MethodReflection.ts
alexcos20 May 26, 2020
0572347
Delete ValuePair.ts
alexcos20 May 26, 2020
fcd1b87
Delete ValueType.ts
alexcos20 May 26, 2020
260a4d9
Update Account.ts
alexcos20 May 26, 2020
38234a2
Delete OceanAccounts.ts
alexcos20 May 26, 2020
4a727c6
Rename OceanAssets.ts to Assets.ts
alexcos20 May 26, 2020
b54b212
Update Ocean.ts
alexcos20 May 26, 2020
6e0d298
Delete OceanTokens.ts
alexcos20 May 26, 2020
d47f09f
Delete OceanUtils.ts
alexcos20 May 26, 2020
271f451
Delete ServiceAgreement.ts
alexcos20 May 26, 2020
83fa8a7
Delete ServiceUtils.ts
alexcos20 May 26, 2020
58ebd23
Delete SignatureUtils.ts
alexcos20 May 26, 2020
9764743
fix rename OceanCompute to Compute
arseneeth May 26, 2020
0ce31d7
fix versions
0x3bfc May 26, 2020
1235d48
update imports
0x3bfc May 26, 2020
79422dd
Merge pull request #22 from oceanprotocol/feature/replace-compute
May 26, 2020
cba15c3
replace OceanAssets with Assets
alexcos20 May 26, 2020
6ab7581
Merge branch 'feature/alex_play' into fix/Replace_OceanAssets
alexcos20 May 26, 2020
faaf890
fix compute
alexcos20 May 26, 2020
248ad18
Merge pull request #27 from oceanprotocol/fix/Replace_OceanAssets
May 26, 2020
6d98da8
fix compute merge
alexcos20 May 26, 2020
ba04565
Merge pull request #23 from oceanprotocol/feature/cleanOceanVersions
May 26, 2020
25811f9
fixes
alexcos20 May 28, 2020
7795953
fixes
alexcos20 May 28, 2020
71c0d20
fixes
alexcos20 May 28, 2020
fdd067f
fix metadata
alexcos20 May 28, 2020
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
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# https://editorconfig.org

root = true

[*]
charset = utf-8
indent_size = 4
end_of_line = lf
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{json,yml,yaml,md}]
indent_size = 2

48 changes: 48 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"parser": "@typescript-eslint/parser",
"parserOptions": {
"sourceType": "module",
"ecmaFeatures": {
"jsx": false
},
"project": [
"./tsconfig.json",
"./test/unit/tsconfig.json",
"./test/integration/tsconfig.json"
]
},
"extends": [
"oceanprotocol",
"prettier/standard",
"plugin:prettier/recommended",
"plugin:@typescript-eslint/recommended",
"prettier/@typescript-eslint"
],
"plugins": ["@typescript-eslint", "prettier"],
"rules": {
"@typescript-eslint/member-delimiter-style": [
"error",
{ "multiline": { "delimiter": "none" } }
],
"@typescript-eslint/ban-ts-ignore": "off",
"@typescript-eslint/indent": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-inferrable-types": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/explicit-member-accessibility": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-use-before-define": "off",
"@typescript-eslint/no-object-literal-type-assertion": "off",
"@typescript-eslint/no-parameter-properties": "off",
"no-empty": ["error", { "allowEmptyCatch": true }],
"prefer-destructuring": ["warn"],
"no-dupe-class-members": ["warn"],
"no-useless-constructor": ["warn"]
},
"env": {
"es6": true,
"browser": true,
"mocha": true
}
}
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
node_modules/
dist/
.nyc_output/
coverage/
doc/
test/**/*.js
src/**/*.js

src/metadata\.json
.idea
.vscode
21 changes: 21 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
node_modules/
coverage/
.github
.nyc_output
.travis.yml
test/
src/
tsconfig.json
tslint.json
oceanprotocol-squid-*.tgz
squid-js.json
barge/
integration/
plugins/
scripts/
webpack*
ganache*
.prettierrc
.editorconfig
.eslintrc
SQUID_INTERFACE.md
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v12
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"semi": false,
"singleQuote": true,
"printWidth": 90,
"trailingComma": "none"
}
10 changes: 10 additions & 0 deletions library.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "Ocean Library",
"repository": {
"type": "git",
"url": "https://github.com/oceanprotocol/ocean-lib-js.git"
},
"dependencies": [

]
}
Loading