Skip to content

Commit 2c7be90

Browse files
WillsonHawWillsonHaw
committed
Fix packages not importing properly in some cases
1 parent 8c8eb3b commit 2c7be90

File tree

18 files changed

+71
-121
lines changed

18 files changed

+71
-121
lines changed

‎.changeset/giant-toes-send.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
"@plexinc/react-native-lightning-components": patch
3+
"@plexinc/react-lightning-components": patch
4+
"@plexinc/vite-plugin-msdf-fontgen": patch
5+
"@plexinc/react-native-lightning": patch
6+
"@plexinc/react-lightning-plugin-css-transform": patch
7+
"@plexinc/react-lightning-plugin-flexbox-lite": patch
8+
"@plexinc/react-lightning-plugin-reanimated": patch
9+
"@plexinc/react-lightning": patch
10+
"@plexinc/react-lightning-plugin-flexbox": patch
11+
"@repo/rollup-config": patch
12+
---
13+
14+
Fix packages not importing properly in some cases

‎packages/plugin-css-transform/package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
"url": "https://github.com/plexinc/react-lightning/issues/new"
1313
},
1414
"type": "module",
15-
"main": "dist/cjs/index.js",
16-
"types": "dist/types/index.d.ts",
17-
"source": "src/index.ts",
1815
"files": [
1916
"dist"
2017
],
@@ -27,16 +24,16 @@
2724
"access": "public",
2825
"exports": {
2926
".": {
27+
"default": "./dist/esm/index.mjs",
3028
"import": "./dist/esm/index.mjs",
3129
"require": "./dist/cjs/index.js",
32-
"default": "./dist/cjs/index.js",
3330
"types": "./dist/types/index.d.ts"
3431
},
3532
"./jsx": "./dist/types/types/jsx.d.ts"
3633
}
3734
},
3835
"scripts": {
39-
"build": "pnpm run build:types && pnpm run build:bundle",
36+
"build": "pnpm run clean && pnpm run build:types && pnpm run build:bundle",
4037
"build:bundle": "rollup -c --failAfterWarnings",
4138
"build:types": "tsc --outDir dist/lib --declarationDir dist/types --declaration true --emitDeclarationOnly true && pnpm run build:copy-dts",
4239
"build:copy-dts": "copyfiles -f src/types/jsx.d.ts dist/types/types",

‎packages/plugin-flexbox-lite/package.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
"url": "https://github.com/plexinc/react-lightning/issues/new"
1313
},
1414
"type": "module",
15-
"main": "dist/cjs/index.js",
16-
"module": "dist/esm/index.mjs",
17-
"types": "dist/types/index.d.ts",
18-
"source": "src/index.ts",
1915
"files": [
2016
"dist"
2117
],
@@ -28,16 +24,16 @@
2824
"access": "public",
2925
"exports": {
3026
".": {
27+
"default": "./dist/esm/index.mjs",
3128
"import": "./dist/esm/index.mjs",
3229
"require": "./dist/cjs/index.js",
33-
"default": "./dist/cjs/index.js",
3430
"types": "./dist/types/index.d.ts"
3531
},
3632
"./jsx": "./dist/types/types/jsx.d.ts"
3733
}
3834
},
3935
"scripts": {
40-
"build": "pnpm run build:types && pnpm run build:bundle",
36+
"build": "pnpm run clean && pnpm run build:types && pnpm run build:bundle",
4137
"build:bundle": "rollup -c --failAfterWarnings",
4238
"build:types": "tsc --outDir dist/lib --declarationDir dist/types --declaration true --emitDeclarationOnly true && pnpm run build:copy-dts",
4339
"build:copy-dts": "copyfiles -f src/types/jsx.d.ts dist/types/types",

‎packages/plugin-flexbox/package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
"url": "https://github.com/plexinc/react-lightning/issues/new"
1313
},
1414
"type": "module",
15-
"main": "dist/cjs/index.js",
16-
"types": "dist/types/index.d.ts",
17-
"source": "src/index.ts",
1815
"files": [
1916
"dist"
2017
],
@@ -27,16 +24,16 @@
2724
"access": "public",
2825
"exports": {
2926
".": {
27+
"default": "./dist/esm/index.mjs",
3028
"import": "./dist/esm/index.mjs",
3129
"require": "./dist/cjs/index.js",
32-
"default": "./dist/cjs/index.js",
3330
"types": "./dist/types/index.d.ts"
3431
},
3532
"./jsx": "./dist/types/types/jsx.d.ts"
3633
}
3734
},
3835
"scripts": {
39-
"build": "pnpm run build:types && pnpm run build:bundle",
36+
"build": "pnpm run clean && pnpm run build:types && pnpm run build:bundle",
4037
"build:bundle": "rollup -c --failAfterWarnings",
4138
"build:types": "tsc --outDir dist/lib --declarationDir dist/types --declaration true --emitDeclarationOnly true && pnpm run build:copy-dts",
4239
"build:copy-dts": "copyfiles -f src/types/jsx.d.ts dist/types/types",

‎packages/plugin-reanimated/config/vite.config.mjs

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎packages/plugin-reanimated/package.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,26 @@
1212
"url": "https://github.com/plexinc/react-lightning/issues/new"
1313
},
1414
"type": "module",
15-
"main": "dist/cjs/index.js",
16-
"types": "dist/types/index.d.ts",
17-
"source": "src/index.ts",
1815
"files": [
19-
"config",
2016
"dist"
2117
],
2218
"exports": {
23-
".": "./src/index.ts",
24-
"./config/vite": "./config/vite.config.mjs"
19+
".": "./src/index.ts"
2520
},
2621
"publishConfig": {
2722
"provenance": true,
2823
"access": "public",
2924
"exports": {
3025
".": {
26+
"default": "./dist/esm/index.mjs",
3127
"import": "./dist/esm/index.mjs",
3228
"require": "./dist/cjs/index.js",
33-
"default": "./dist/cjs/index.js",
3429
"types": "./dist/types/index.d.ts"
35-
},
36-
"./config/vite": "./config/vite.config.mjs"
30+
}
3731
}
3832
},
3933
"scripts": {
40-
"build": "pnpm run build:types && pnpm run build:bundle",
34+
"build": "pnpm run clean && pnpm run build:types && pnpm run build:bundle",
4135
"build:bundle": "rollup -c --failAfterWarnings",
4236
"build:types": "tsc --outDir dist/lib --declarationDir dist/types --declaration true --emitDeclarationOnly true",
4337
"clean": "del ./dist",

‎packages/react-lightning-components/package.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,11 @@
1212
"url": "https://github.com/plexinc/react-lightning/issues/new"
1313
},
1414
"type": "module",
15-
"main": "dist/cjs/index.js",
16-
"types": "dist/types/index.d.ts",
17-
"source": "src/index.ts",
1815
"files": [
1916
"dist"
2017
],
2118
"exports": {
22-
".": "./src/index.ts",
19+
".": "./src/exports/index.ts",
2320
"./layout/Row": "./src/exports/layout/Row.tsx",
2421
"./layout/Column": "./src/exports/layout/Column.tsx",
2522
"./text/StyledText": "./src/exports/text/StyledText.tsx",
@@ -30,39 +27,39 @@
3027
"access": "public",
3128
"exports": {
3229
".": {
30+
"default": "./dist/esm/index.mjs",
3331
"import": "./dist/esm/index.mjs",
3432
"require": "./dist/cjs/index.js",
35-
"default": "./dist/cjs/index.js",
3633
"types": "./dist/types/index.d.ts"
3734
},
3835
"./layout/Row": {
36+
"default": "./dist/esm/layout/Row.mjs",
3937
"import": "./dist/esm/layout/Row.mjs",
4038
"require": "./dist/cjs/layout/Row.js",
41-
"default": "./dist/cjs/layout/Row.js",
4239
"types": "./dist/types/layout/Row.d.ts"
4340
},
4441
"./layout/Column": {
42+
"default": "./dist/esm/layout/Column.mjs",
4543
"import": "./dist/esm/layout/Column.mjs",
4644
"require": "./dist/cjs/layout/Column.js",
47-
"default": "./dist/cjs/layout/Column.js",
4845
"types": "./dist/types/layout/Column.d.ts"
4946
},
5047
"./text/StyledText": {
48+
"default": "./dist/esm/text/StyledText.mjs",
5149
"import": "./dist/esm/text/StyledText.mjs",
5250
"require": "./dist/cjs/text/StyledText.js",
53-
"default": "./dist/cjs/text/StyledText.js",
5451
"types": "./dist/types/text/StyledText.d.ts"
5552
},
5653
"./util/FPSMonitor": {
54+
"default": "./dist/esm/util/FPSMonitor.mjs",
5755
"import": "./dist/esm/util/FPSMonitor.mjs",
5856
"require": "./dist/cjs/util/FPSMonitor.js",
59-
"default": "./dist/cjs/util/FPSMonitor.js",
6057
"types": "./dist/types/util/FPSMonitor.d.ts"
6158
}
6259
}
6360
},
6461
"scripts": {
65-
"build": "pnpm run build:types && pnpm run build:bundle",
62+
"build": "pnpm run clean && pnpm run build:types && pnpm run build:bundle",
6663
"build:bundle": "rollup -c --failAfterWarnings",
6764
"build:types": "tsc --outDir dist/lib --declarationDir dist/types --declaration true --emitDeclarationOnly true",
6865
"clean": "del ./dist",

‎packages/react-lightning-components/rollup.config.mjs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
import { dirname } from 'node:path';
1+
import path from 'node:path';
22
import createRollupConfig from '@repo/rollup-config';
3-
import { globSync } from 'glob';
43

5-
const exportFiles = globSync(['src/index.ts', './src/exports/*/*.{tsx,ts}']);
6-
7-
const configs = exportFiles.map((file) => {
8-
const outputDir = dirname(file.replace(/src(\/exports)?/i, ''));
9-
10-
return createRollupConfig({
11-
input: file,
12-
outputDir: (format) => `./dist/${format}${outputDir}`,
13-
external: ['@plexinc/react-lightning', 'react', 'react/jsx-runtime'],
14-
});
4+
export default createRollupConfig({
5+
input: 'src/exports/index.ts',
6+
preserveModules: true,
7+
preserveModulesRoot: path.join('src', 'exports'),
8+
external: ['@plexinc/react-lightning', 'react', 'react/jsx-runtime'],
159
});
16-
17-
export default configs.flat();

‎packages/react-lightning-components/src/exports/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export { default as Column } from './layout/Column';
2+
export { default as Row } from './layout/Row';
3+
export { default as StyledText } from './text/StyledText';
4+
export { default as FPSMonitor } from './util/FPSMonitor';

‎packages/react-lightning-components/src/index.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)