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

Use Preconstruct to build packages #2416

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ jobs:
- name: Install Dependencies
run: yarn

- name: Build
run: yarn build

- name: Create Release Pull Request or Publish to npm
uses: changesets/action@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion examples/error-demo/test/sagas.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ test('error in helper: shows correct error logs with source of error', (t) => {
.catch((/* error */) => {
const expected = [
'undefinedIsNotAFunction is not defined',
'The above error occurred in task retry\n created by errorInRetrySaga src/sagas/index.js?73\n',
'The above error occurred in task retry$1\n created by errorInRetrySaga src/sagas/index.js?73\n',
]
t.deepEqual(actual, expected)
t.end()
Expand Down
15 changes: 14 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "redux-saga-repo",
"private": true,
"workspaces": [
"examples/*",
Expand All @@ -9,7 +10,7 @@
"lint": "eslint packages/*/{src,test}",
"test": "lerna --concurrency 1 run test",
"clean": "lerna run --parallel clean && lerna clean --yes && rimraf node_modules",
"build": "lerna run --parallel build",
"build": "preconstruct build",
"counter": "yarn --cwd examples/counter start",
"error-demo": "yarn --cwd examples/error-demo start",
"cancellable-counter": "yarn --cwd examples/cancellable-counter start",
Expand Down Expand Up @@ -51,6 +52,7 @@
"@babel/runtime": "^7.6.3",
"@changesets/changelog-github": "^0.4.6",
"@changesets/cli": "^2.24.2",
"@preconstruct/cli": "^2.8.3",
"babel-7-jest": "^21.3.3",
"babel-eslint": "^8.2.1",
"babel-loader": "^8.0.6",
Expand Down Expand Up @@ -98,5 +100,16 @@
"webpack-dev-middleware": "^3.7.2",
"webpack-dev-server": "^3.8.2",
"webpack-hot-middleware": "^2.25.0"
},
"preconstruct": {
"packages": [
"packages/*"
],
"exports": {
"importConditionDefaultExport": "default"
},
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
"importsConditions": true
}
}
}
16 changes: 15 additions & 1 deletion packages/babel-plugin-redux-saga/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,22 @@
"babel-plugin",
"redux-saga"
],
"main": "./src/index",
"main": "dist/babel-plugin-redux-saga.cjs.js",
"module": "dist/babel-plugin-redux-saga.esm.js",
"exports": {
".": {
"types": {
"import": "./dist/babel-plugin-redux-saga.cjs.mjs",
"default": "./dist/babel-plugin-redux-saga.cjs.js"
},
"module": "./dist/babel-plugin-redux-saga.esm.js",
"import": "./dist/babel-plugin-redux-saga.cjs.mjs",
"default": "./dist/babel-plugin-redux-saga.cjs.js"
},
"./package.json": "./package.json"
},
"files": [
"dist",
"src"
],
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/effects/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@redux-saga/core/effects",
"private": true,
"main": "../dist/redux-saga-effects.cjs.js",
"module": "../dist/redux-saga-effects.esm.js",
"types": "./effects.d.ts",
"main": "dist/redux-saga-core-effects.cjs.js",
"module": "dist/redux-saga-core-effects.esm.js",
"types": "../types/effects.d.ts",
"typesVersions": {
">=4.2": {
"*": [
Expand Down
4 changes: 0 additions & 4 deletions packages/core/import-condition-proxy.mjs

This file was deleted.

1 change: 0 additions & 1 deletion packages/core/index.d.ts

This file was deleted.

45 changes: 23 additions & 22 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,38 @@
"name": "@redux-saga/core",
"version": "1.3.0",
"description": "Saga middleware for Redux to handle Side Effects",
"main": "./dist/redux-saga-core.cjs.js",
"module": "./dist/redux-saga-core.esm.js",
"main": "dist/redux-saga-core.cjs.js",
"module": "dist/redux-saga-core.esm.js",
"files": [
"dist",
"effects",
"types",
"import-condition-proxy.mjs"
"types"
],
"exports": {
"./effects": {
"types": "./types/ts4.2/effects.d.ts",
"module": "./dist/redux-saga-effects.esm.js",
"default": "./dist/redux-saga-effects.cjs.js"
},
".": {
"types": "./types/ts4.2/index.d.ts",
"types": {
"import": "./dist/redux-saga-core.cjs.mjs",
"default": "./dist/redux-saga-core.cjs.js"
},
"module": "./dist/redux-saga-core.esm.js",
"import": "./import-condition-proxy.mjs",
"import": "./dist/redux-saga-core.cjs.mjs",
"default": "./dist/redux-saga-core.cjs.js"
},
"./effects": {
"types": {
"import": "./effects/dist/redux-saga-core-effects.cjs.mjs",
"default": "./effects/dist/redux-saga-core-effects.cjs.js"
},
"module": "./effects/dist/redux-saga-core-effects.esm.js",
"import": "./effects/dist/redux-saga-core-effects.cjs.mjs",
"default": "./effects/dist/redux-saga-core-effects.cjs.js"
},
"./package.json": "./package.json"
},
"scripts": {
"test": "yarn test:types && yarn test:jest",
"test:jest": "jest",
"test:types": "dtslint types/ts4.2",
"clean": "rimraf dist",
"prebuild": "yarn clean",
"build": "rollup -c",
"postbuild": "node ./scripts/createProxyCjsEntries.js",
"prepare": "yarn build",
"preversion": "npm test"
},
"repository": "https://github.com/redux-saga/redux-saga/tree/main/packages/core",
Expand Down Expand Up @@ -81,12 +82,6 @@
"lerna-alias": "^3.0.2",
"mitt": "^1.1.2",
"redux": "^4.0.4",
"rimraf": "^3.0.0",
"rollup": "^1.23.1",
"rollup-plugin-alias": "^1.4.0",
"rollup-plugin-babel": "5.0.0-alpha.0",
"rollup-plugin-node-resolve": "^4.0.0",
"rollup-plugin-replace": "^1.1.1",
"typescript": "^3.6.4"
},
"types": "./index.d.ts",
Expand All @@ -106,5 +101,11 @@
"./types/*"
]
}
},
"preconstruct": {
"entrypoints": [
"./index.js",
"./effects.js"
]
}
}
107 changes: 0 additions & 107 deletions packages/core/rollup.config.js

This file was deleted.

21 changes: 0 additions & 21 deletions packages/core/scripts/createProxyCjsEntries.js

This file was deleted.

File renamed without changes.
1 change: 1 addition & 0 deletions packages/core/src/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from '../types'
4 changes: 0 additions & 4 deletions packages/deferred/import-condition-proxy.mjs

This file was deleted.

27 changes: 10 additions & 17 deletions packages/deferred/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,25 @@
"name": "@redux-saga/deferred",
"version": "1.2.1",
"description": "Helper for creating \"exposed\" promise object (with resolve & reject methods).",
"main": "./dist/redux-saga-deferred.cjs.js",
"module": "./dist/redux-saga-deferred.esm.js",
"main": "dist/redux-saga-deferred.cjs.js",
"module": "dist/redux-saga-deferred.esm.js",
"typings": "./index.d.ts",
"files": [
"dist",
"*.d.ts",
"import-condition-proxy.mjs"
"dist"
],
"exports": {
".": {
"types": "./index.d.ts",
"types": {
"import": "./dist/redux-saga-deferred.cjs.mjs",
"default": "./dist/redux-saga-deferred.cjs.js"
},
"module": "./dist/redux-saga-deferred.esm.js",
"import": "./import-condition-proxy.mjs",
"import": "./dist/redux-saga-deferred.cjs.mjs",
"default": "./dist/redux-saga-deferred.cjs.js"
},
"./package.json": "./package.json"
},
"scripts": {
"clean": "rimraf dist",
"prebuild": "yarn clean",
"build": "rollup -c",
"prepare": "yarn build"
},
"scripts": {},
"repository": "https://github.com/redux-saga/redux-saga/tree/main/packages/deferred",
"keywords": [
"promise",
Expand All @@ -46,9 +42,6 @@
"devDependencies": {
"@babel/core": "^7.6.4",
"@babel/preset-env": "^7.6.3",
"babel-plugin-annotate-pure-calls": "^0.4.0",
"rimraf": "^3.0.0",
"rollup": "^1.23.1",
"rollup-plugin-babel": "5.0.0-alpha.0"
"babel-plugin-annotate-pure-calls": "^0.4.0"
}
}