diff --git a/.github/workflows/access-api.yml b/.github/workflows/access-api.yml index c8f1b1b3b..226adb312 100644 --- a/.github/workflows/access-api.yml +++ b/.github/workflows/access-api.yml @@ -5,7 +5,7 @@ env: on: push: branches: - - master + - main paths: - 'packages/access-api/**' - '.github/workflows/access-api.yml' @@ -21,11 +21,11 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: pnpm/action-setup@v2.0.1 + - uses: actions/checkout@v3 + - uses: pnpm/action-setup@v2.2.3 with: version: 7 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: 18 cache: 'pnpm' @@ -34,7 +34,7 @@ jobs: - run: pnpm -r --filter @web3-storage/access-api run test deploy-staging: needs: test - if: github.head_ref == 'release-please--branches--master--components--access-api' + if: github.head_ref == 'release-please--branches--main--components--access-api' uses: './.github/workflows/reuse-deploy-api.yml' with: environment: staging diff --git a/.github/workflows/access.yml b/.github/workflows/access.yml index 392db5843..ab4bb798c 100644 --- a/.github/workflows/access.yml +++ b/.github/workflows/access.yml @@ -5,7 +5,7 @@ env: on: push: branches: - - master + - main paths: - 'packages/access/**' - '.github/workflows/access.yml' @@ -19,11 +19,11 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: pnpm/action-setup@v2.0.1 + - uses: actions/checkout@v3 + - uses: pnpm/action-setup@v2.2.3 with: version: 7 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: 18 cache: 'pnpm' diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 5d945cf49..a044128d8 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -25,11 +25,11 @@ jobs: runs-on: ubuntu-latest if: github.event.inputs.package == 'wallet' steps: - - uses: actions/checkout@v2 - - uses: pnpm/action-setup@v2.0.1 + - uses: actions/checkout@v3 + - uses: pnpm/action-setup@v2.2.3 with: version: 7 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: 16 cache: 'pnpm' @@ -41,7 +41,7 @@ jobs: ${{ runner.os }}-nextjs-${{ hashFiles('**/pnpm-lock.yaml') }}- - run: pnpm install - run: pnpm -r --filter wallet run build - - run: pnpm exec wrangler pages publish --project-name ucan-protocol --branch master ./packages/wallet/out + - run: pnpm exec wrangler pages publish --project-name ucan-protocol --branch main ./packages/wallet/out env: CLOUDFLARE_API_TOKEN: ${{ secrets.CF_TOKEN }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} @@ -55,11 +55,11 @@ jobs: runs-on: ubuntu-latest if: github.event.inputs.package == 'access' steps: - - uses: actions/checkout@v2 - - uses: pnpm/action-setup@v2.0.1 + - uses: actions/checkout@v3 + - uses: pnpm/action-setup@v2.2.3 with: version: 7 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: 18 registry-url: 'https://registry.npmjs.org' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8f65ed2f5..7c8b402a0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,14 +5,14 @@ env: on: push: branches: - - master + - main jobs: release: runs-on: ubuntu-latest outputs: paths_released: ${{ steps.release.outputs.paths_released }} steps: - - uses: GoogleCloudPlatform/release-please-action@v3 + - uses: google-github-actions/release-please-action@v3 id: release with: token: ${{ secrets.GH_TOKEN }} @@ -24,11 +24,11 @@ jobs: if: contains(fromJson(needs.release.outputs.paths_released), 'packages/access') runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: pnpm/action-setup@v2.0.1 + - uses: actions/checkout@v3 + - uses: pnpm/action-setup@v2.2.3 with: version: 7 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: 18 registry-url: 'https://registry.npmjs.org' diff --git a/.github/workflows/reuse-deploy-api.yml b/.github/workflows/reuse-deploy-api.yml index 728cc8bbe..ff4b4c30f 100644 --- a/.github/workflows/reuse-deploy-api.yml +++ b/.github/workflows/reuse-deploy-api.yml @@ -26,11 +26,11 @@ jobs: runs-on: ubuntu-latest environment: ${{ inputs.environment }} steps: - - uses: actions/checkout@v2 - - uses: pnpm/action-setup@v2.0.1 + - uses: actions/checkout@v3 + - uses: pnpm/action-setup@v2.2.3 with: version: 7 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: 18 cache: 'pnpm' diff --git a/.github/workflows/store.yml b/.github/workflows/store.yml new file mode 100644 index 000000000..f0b95e312 --- /dev/null +++ b/.github/workflows/store.yml @@ -0,0 +1,31 @@ +name: Store API + +on: + workflow_dispatch: + push: + branches: + - main + paths: + - 'packages/store/**' + - '.github/workflows/store.yml' + - 'pnpm-lock.yaml' + pull_request: + paths: + - 'packages/store/**' + - '.github/workflows/store.yml' + - 'pnpm-lock.yaml' +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: pnpm/action-setup@v2.2.3 + with: + version: 7 + - uses: actions/setup-node@v3 + with: + node-version: 18 + cache: 'pnpm' + - run: pnpm install + - run: pnpm -r --filter @web3-storage/store run lint + - run: pnpm -r --filter @web3-storage/store run test diff --git a/.github/workflows/w3-store.yml b/.github/workflows/w3-store.yml deleted file mode 100644 index 8e1b4bdfc..000000000 --- a/.github/workflows/w3-store.yml +++ /dev/null @@ -1,78 +0,0 @@ -name: w3-store - -on: - workflow_dispatch: - push: - branches: - - main - - master - paths: - - 'packages/sigv4/**' - - 'packages/store/**' - pull_request: - branches: - - main - - master - paths: - - 'packages/sigv4/**' - - 'packages/store/**' - - '.github/workflows/w3-store.yml' -jobs: - check: - name: Typecheck - runs-on: ubuntu-latest - strategy: - matrix: - node-version: - - 16 - project: - - store - steps: - - uses: actions/checkout@v2 - - - name: Setup node ${{ matrix.node-version }} - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - - - name: Install dependencies - uses: pnpm/action-setup@v2.0.1 - id: pnpm-install - with: - version: 7 - run_install: true - - - name: Typecheck - uses: gozala/typescript-error-reporter-action@v1.0.8 - with: - project: packages/${{matrix.project}}/tsconfig.json - test: - name: Test - runs-on: ${{ matrix.os }} - - strategy: - matrix: - node-version: - - 16 - os: - - ubuntu-latest - project: - - store - - steps: - - uses: actions/checkout@v2 - - - name: Setup Node - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - - - name: Install dependencies - uses: pnpm/action-setup@v2.0.1 - id: pnpm-install - with: - version: 7 - run_install: true - - - name: Test (Node) - run: pnpm run --if-present --dir packages/${{matrix.project}} test:node diff --git a/packages/access/package.json b/packages/access/package.json index 7ec261e18..4db8d5f82 100644 --- a/packages/access/package.json +++ b/packages/access/package.json @@ -2,6 +2,12 @@ "name": "@web3-storage/access", "version": "2.1.1", "description": "w3access SDK", + "homepage": "https://github.com/web3-storage/w3-protocol/tree/main/packages/access", + "repository": { + "type": "git", + "url": "https://github.com/web3-storage/w3-protocol.git", + "directory": "packages/access" + }, "author": "Hugo Dias (hugodias.me)", "license": "(Apache-2.0 OR MIT)", "type": "module", diff --git a/packages/store/package.json b/packages/store/package.json index d21fec41a..ac56e0cd8 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -1,5 +1,5 @@ { - "name": "w3-store", + "name": "@web3-storage/store", "description": "web3.storage upload service", "version": "1.1.0", "types": "./dist/src/lib.d.ts", @@ -13,9 +13,10 @@ ], "repository": { "type": "git", - "url": "https://github.com/web3-storage/ucanto.git" + "url": "https://github.com/web3-storage/w3-protocol.git", + "directory": "packages/store" }, - "homepage": "https://github.com/web3-storage/ucanto/tree/demo/upload-v2", + "homepage": "https://github.com/web3-storage/w3-protocol/tree/main/packages/store", "scripts": { "check": "tsc --build", "test": "npm run test:node", diff --git a/packages/store/src/identity/lib.js b/packages/store/src/identity/lib.js index b8dcfc071..6621d8a7c 100644 --- a/packages/store/src/identity/lib.js +++ b/packages/store/src/identity/lib.js @@ -55,6 +55,7 @@ export const connect = ({ id, url, transport = { encoder: CAR, decoder: CBOR }, + // @ts-ignore fetch = webfetch, method, }) => diff --git a/packages/store/src/signer/lib.js b/packages/store/src/signer/lib.js index a066d9f42..6eac79939 100644 --- a/packages/store/src/signer/lib.js +++ b/packages/store/src/signer/lib.js @@ -13,6 +13,7 @@ export const sign = (link, { bucket, expires = 1000, ...options }) => { accessKeyId: options.accessKeyId, secretAccessKey: options.secretAccessKey, region: options.region, + // @ts-ignore sessionToken: options.sessionToken, }) diff --git a/packages/store/src/type/identity.ts b/packages/store/src/type/identity.ts index 678e82b35..e25201a65 100644 --- a/packages/store/src/type/identity.ts +++ b/packages/store/src/type/identity.ts @@ -1,10 +1,4 @@ -import type { - Capability, - ServiceMethod, - DID, - Resource, - Failure, -} from '@ucanto/server' +import type { Capability, ServiceMethod, DID } from '@ucanto/server' import type { ServiceError } from './error' export interface Identity { diff --git a/packages/store/tsconfig.json b/packages/store/tsconfig.json index 9cefbbda8..ecfc111e3 100644 --- a/packages/store/tsconfig.json +++ b/packages/store/tsconfig.json @@ -1,107 +1,10 @@ { + "extends": "../../tsconfig.json", "compilerOptions": { - /* Visit https://aka.ms/tsconfig.json to read more about this file */ - - /* Projects */ - "incremental": true /* Enable incremental compilation */, - "composite": true /* Enable constraints that allow a TypeScript project to be used with project references. */, - // "tsBuildInfoFile": "./dist", /* Specify the folder for .tsbuildinfo incremental compilation files. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - - /* Language and Environment */ - "target": "ES2020" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - // "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ - // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */ - // "reactNamespace": "", /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - - /* Modules */ - "module": "ES2020" /* Specify what module code is generated. */, - // "rootDir": "./", /* Specify the root folder within your source files. */ - "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */, - "baseUrl": "./" /* Specify the base directory to resolve non-relative module names. */, - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like `./node_modules/@types`. */ - // "types": [], /* Specify type package names to be included without being referenced in a source file. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "resolveJsonModule": true, /* Enable importing .json files */ - // "noResolve": true, /* Disallow `import`s, `require`s or ``s from expanding the number of files TypeScript should add to a project. */ - - /* JavaScript Support */ - "allowJs": true /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */, - "checkJs": true /* Enable error reporting in type-checked JavaScript files. */, - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */ - - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - "declarationMap": true /* Create sourcemaps for d.ts files. */, - "emitDeclarationOnly": true /* Only output d.ts files and not JavaScript files. */, - // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./dist/" /* Specify an output folder for all emitted files. */, - // "removeComments": true, /* Disable emitting comments. */ - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have `@internal` in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like `__extends` in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing `const enum` declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ - - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */, - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, - - /* Type Checking */ - "strict": true /* Enable all strict type-checking options. */, - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied `any` type.. */ - // "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */ - // "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ + "outDir": "dist", + "lib": ["ESNext"], + "noUnusedLocals": false }, - "include": ["src", "test"], - "references": [ - { - "path": "../sigv4" - } - ] + "include": ["src", "scripts", "test", "package.json"], + "exclude": ["**/node_modules/**"] }