diff --git a/.changeset/afraid-coats-rescue.md b/.changeset/afraid-coats-rescue.md new file mode 100644 index 00000000..2a7886b4 --- /dev/null +++ b/.changeset/afraid-coats-rescue.md @@ -0,0 +1,9 @@ +--- +"@web-std/blob": minor +"@web-std/fetch": minor +"@web-std/file": minor +"@web-std/form-data": minor +"@web-std/stream": minor +--- + +Export CJS version for browser diff --git a/.github/workflows/blob.yml b/.github/workflows/blob.yml index c147ad9c..8346c0db 100644 --- a/.github/workflows/blob.yml +++ b/.github/workflows/blob.yml @@ -17,6 +17,7 @@ jobs: name: Typecheck runs-on: ubuntu-latest strategy: + fail-fast: false matrix: node-version: - 16 @@ -42,9 +43,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: node-version: - - 14 - 16 os: - ubuntu-latest diff --git a/.github/workflows/fetch.yml b/.github/workflows/fetch.yml index 663430c7..65d022fc 100644 --- a/.github/workflows/fetch.yml +++ b/.github/workflows/fetch.yml @@ -18,6 +18,7 @@ jobs: name: Typecheck runs-on: ubuntu-latest strategy: + fail-fast: false matrix: node-version: - 16 @@ -44,9 +45,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: node-version: - - 14 - 16 os: - ubuntu-latest @@ -54,12 +55,6 @@ jobs: - macos-latest project: - fetch - exclude: - - os: windows-latest - node-version: 14 - # On macOS, run tests with only the LTS environments. - - os: macos-latest - node-version: 14 steps: - uses: actions/checkout@v2 @@ -75,12 +70,5 @@ jobs: - name: Test (ESM) run: yarn --cwd packages/${{matrix.project}} test -- --colors - # upload coverage only once - - name: Coveralls - uses: coverallsapp/github-action@master - if: matrix.node == '14' && matrix.os == 'ubuntu-latest' - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - - name: Test (CJS) run: yarn --cwd packages/${{matrix.project}} test:cjs diff --git a/.github/workflows/file.yml b/.github/workflows/file.yml index 5ffe24c1..04c49b8e 100644 --- a/.github/workflows/file.yml +++ b/.github/workflows/file.yml @@ -17,6 +17,7 @@ jobs: name: Typecheck runs-on: ubuntu-latest strategy: + fail-fast: false matrix: node-version: - 16 @@ -42,9 +43,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: node-version: - - 14 - 16 os: - ubuntu-latest diff --git a/.github/workflows/form-data.yml b/.github/workflows/form-data.yml index 6238204b..0cf3ada8 100644 --- a/.github/workflows/form-data.yml +++ b/.github/workflows/form-data.yml @@ -18,6 +18,7 @@ jobs: name: Typecheck runs-on: ubuntu-latest strategy: + fail-fast: false matrix: node-version: - 16 @@ -43,9 +44,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: node-version: - - 14 - 16 os: - ubuntu-latest diff --git a/.github/workflows/stream.yml b/.github/workflows/stream.yml index e93c5349..321ef927 100644 --- a/.github/workflows/stream.yml +++ b/.github/workflows/stream.yml @@ -17,6 +17,7 @@ jobs: name: Typecheck runs-on: ubuntu-latest strategy: + fail-fast: false matrix: node-version: - 16 @@ -43,9 +44,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: node-version: - - 14 - 16 os: - ubuntu-latest @@ -76,6 +77,7 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: node-version: - 16 diff --git a/packages/blob/package.json b/packages/blob/package.json index b4ccef8a..7ff85153 100644 --- a/packages/blob/package.json +++ b/packages/blob/package.json @@ -19,7 +19,10 @@ "exports": { ".": { "types": "./dist/src/lib.d.ts", - "browser": "./src/lib.js", + "browser": { + "require": "./dist/src/lib.cjs", + "import": "./src/lib.js" + }, "require": "./dist/src/lib.node.cjs", "import": "./src/lib.node.js" } diff --git a/packages/fetch/package.json b/packages/fetch/package.json index ce445225..63e33112 100644 --- a/packages/fetch/package.json +++ b/packages/fetch/package.json @@ -10,7 +10,10 @@ "exports": { ".": { "types": "./dist/src/lib.node.d.ts", - "browser": "./src/lib.js", + "browser": { + "require": "./dist/lib.cjs", + "import": "./src/lib.js" + }, "require": "./dist/lib.node.cjs", "import": "./src/lib.node.js" }, diff --git a/packages/fetch/rollup.config.js b/packages/fetch/rollup.config.js index e079c7a8..5651fadb 100644 --- a/packages/fetch/rollup.config.js +++ b/packages/fetch/rollup.config.js @@ -1,18 +1,35 @@ import {builtinModules} from 'module'; import {dependencies} from './package.json'; -export default { - input: 'src/lib.node.js', - output: { - file: 'dist/lib.node.cjs', - format: 'cjs', - esModule: false, - interop: false, - sourcemap: true, - preferConst: true, - exports: 'named', - // https://github.com/rollup/rollup/issues/1961#issuecomment-534977678 - outro: 'exports = module.exports = Object.assign(fetch, exports);' +export default [ + { + input: 'src/lib.js', + output: { + file: 'dist/lib.cjs', + format: 'cjs', + esModule: false, + interop: false, + sourcemap: true, + preferConst: true, + exports: 'named', + // https://github.com/rollup/rollup/issues/1961#issuecomment-534977678 + outro: 'exports = module.exports = Object.assign(fetch, exports);' + }, + external: [...builtinModules, ...Object.keys(dependencies)] }, - external: [...builtinModules, ...Object.keys(dependencies)] -}; + { + input: 'src/lib.node.js', + output: { + file: 'dist/lib.node.cjs', + format: 'cjs', + esModule: false, + interop: false, + sourcemap: true, + preferConst: true, + exports: 'named', + // https://github.com/rollup/rollup/issues/1961#issuecomment-534977678 + outro: 'exports = module.exports = Object.assign(fetch, exports);' + }, + external: [...builtinModules, ...Object.keys(dependencies)] + }, +]; diff --git a/packages/file/package.json b/packages/file/package.json index 17b9c562..ee53e231 100644 --- a/packages/file/package.json +++ b/packages/file/package.json @@ -24,7 +24,10 @@ "exports": { ".": { "types": "./dist/src/lib.d.ts", - "browser": "./src/lib.js", + "browser": { + "require": "./dist/src/lib.cjs", + "import": "./src/lib.js" + }, "require": "./dist/src/lib.node.cjs", "node": "./src/lib.node.js" } diff --git a/packages/form-data/package.json b/packages/form-data/package.json index 5b95fb95..0e3cb356 100644 --- a/packages/form-data/package.json +++ b/packages/form-data/package.json @@ -22,7 +22,10 @@ "exports": { ".": { "types": "./dist/src/lib.d.ts", - "browser": "./src/lib.js", + "browser": { + "require": "./dist/src/lib.cjs", + "import": "./src/lib.js" + }, "require": "./dist/src/lib.node.cjs", "import": "./src/lib.node.js" } diff --git a/packages/stream/package.json b/packages/stream/package.json index 8b019ac5..aacf7a1a 100644 --- a/packages/stream/package.json +++ b/packages/stream/package.json @@ -24,7 +24,10 @@ "exports": { ".": { "types": "./src/lib.d.ts", - "browser": "./src/lib.js", + "browser": { + "require": "./src/stream.cjs", + "import": "./src/lib.js" + }, "require": "./src/stream.cjs", "import": "./src/lib.node.js" }