Skip to content

Commit 75bea27

Browse files
authored
fix: Remove package exports and replace subpaths script (#8438)
* fix: Remove package exports and replace subpaths script * adding more subpaths in the event 'next' or 'deprecated' have relative paths
1 parent caf893d commit 75bea27

File tree

8 files changed

+40
-21
lines changed

8 files changed

+40
-21
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,13 @@
6767
"typescript": "^4.0.0"
6868
},
6969
"scripts": {
70-
"build": "yarn build:generate && yarn build:esm && yarn build:cjs",
70+
"build": "yarn build:generate && yarn build:esm && yarn build:subpaths && yarn build:cjs",
7171
"build:cjs": "tsc --build --verbose packages/tsconfig.cjs.json",
7272
"build:esm": "tsc --build --verbose packages/tsconfig.json",
7373
"build:integration": "lerna run build:demo-app --stream",
7474
"build:docs": "yarn workspace @patternfly/react-docs build:docs",
7575
"build:generate": "lerna run generate --parallel --stream",
76+
"build:subpaths": "lerna run subpaths --parallel --stream",
7677
"build:umd": "lerna run build:umd --parallel --stream",
7778
"clean": "yarn clean:build && lerna run clean --parallel",
7879
"clean:build": "rimraf .cache .eslintcache coverage",

packages/react-core/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/next
2+
/deprecated
3+
/components
4+
/layouts
5+
/helpers

packages/react-core/package.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@
55
"main": "dist/js/index.js",
66
"module": "dist/esm/index.js",
77
"types": "dist/esm/index.d.ts",
8-
"exports": {
9-
".": "./dist/esm/index.js",
10-
"./dist/*": "./dist/*",
11-
"./next": "./dist/esm/next",
12-
"./deprecated": "./dist/esm/deprecated",
13-
"./package.json": "./package.json"
14-
},
158
"typesVersions": {
169
"*": {
1710
"next": [
@@ -48,7 +41,8 @@
4841
"scripts": {
4942
"build:umd": "rollup -c --environment IS_PRODUCTION",
5043
"clean": "rimraf dist",
51-
"generate": "node scripts/copyStyles.js"
44+
"generate": "node scripts/copyStyles.js",
45+
"subpaths": "node scripts/copySubpaths.js"
5246
},
5347
"dependencies": {
5448
"@patternfly/react-icons": "^4.93.3",
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/**
2+
* Copy subpath modules into the package root directory for ease of access.
3+
*/
4+
const { copySync } = require('fs-extra');
5+
const { resolve, dirname } = require('path');
6+
7+
['next', 'deprecated', 'components', 'layouts', 'helpers'].forEach(subPathName => {
8+
const source = dirname(require.resolve(`@patternfly/react-core/dist/esm/${subPathName}`));
9+
const destination = resolve(__dirname, `../${subPathName}`);
10+
11+
copySync(source, destination);
12+
});

packages/react-core/tsconfig.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@
77
"tsBuildInfoFile": "dist/esm.tsbuildinfo",
88
"baseUrl": ".",
99
"paths": {
10-
"*/next": ["./src/next"],
11-
"*/deprecated": ["./src/deprecated"],
10+
"./next": ["./src/next"],
11+
"./deprecated": ["./src/deprecated"]
1212
}
1313
},
14-
"include": [
15-
"./src/*",
16-
"./src/**/*"
17-
],
14+
"include": ["./src/*", "./src/**/*"],
1815
"references": [
1916
{
2017
"path": "../react-styles"

packages/react-table/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/deprecated
2+
/components

packages/react-table/package.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
"main": "dist/js/index.js",
66
"module": "dist/esm/index.js",
77
"types": "dist/esm/index.d.ts",
8-
"exports": {
9-
".": "./dist/esm/index.js",
10-
"./deprecated": "./dist/esm/deprecated/index.js",
11-
"./package.json": "./package.json"
12-
},
138
"typesVersions": {
149
"*": {
1510
"deprecated": [
@@ -40,7 +35,8 @@
4035
"homepage": "https://github.com/patternfly/patternfly-react/tree/main/packages/react-table#readme",
4136
"scripts": {
4237
"build:umd": "rollup -c --environment IS_PRODUCTION",
43-
"clean": "rimraf dist"
38+
"clean": "rimraf dist",
39+
"subpaths": "node scripts/copySubpaths.js"
4440
},
4541
"dependencies": {
4642
"@patternfly/react-core": "^4.267.5",
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/**
2+
* Copy subpath modules into the package root directory for ease of access.
3+
*/
4+
const { copySync } = require('fs-extra');
5+
const { resolve, dirname } = require('path');
6+
7+
['deprecated', 'components'].forEach(subPathName => {
8+
const source = dirname(require.resolve(`@patternfly/react-table/dist/esm/${subPathName}`));
9+
const destination = resolve(__dirname, `../${subPathName}`);
10+
11+
copySync(source, destination);
12+
});

0 commit comments

Comments
 (0)