Commit 2f7928a
authored
This reverts commit d1838d7.
Was getting build errors when consuming in Enterprise:
```
> Task :web-client-ui:ideClient FAILED
✓ 1043 modules transformed.
Could not resolve '../scss/GoldenLayout.module.css' from node_modules/@deephaven/golden-layout/dist/GoldenLayoutThemeExport.js
error during build:
Error: Could not resolve '../scss/GoldenLayout.module.css' from node_modules/@deephaven/golden-layout/dist/GoldenLayoutThemeExport.js
at error (file:///Users/bender/dev/illumon/iris/web/client-ui/node_modules/rollup/dist/es/shared/rollup.js:1858:30)
at ModuleLoader.handleResolveId (file:///Users/bender/dev/illumon/iris/web/client-ui/node_modules/rollup/dist/es/shared/rollup.js:22156:24)
at file:///Users/bender/dev/illumon/iris/web/client-ui/node_modules/rollup/dist/es/shared/rollup.js:22119:26
ERROR: "build-js" exited with 1.
```
In the `dist/GoldenLayoutThemeExport.js`, the import ends up being:
```
import GoldenLayout from "../scss/GoldenLayout.module.css"; // parseInt for unitless values, stripping "px"
```
But in the scss folder it’s `GoldenLayout.module.scss`, not `.css`
The babel preset converts the scss imports to css:
```
[
'transform-rename-import',
{
// The babel-plugin-add-import-extension adds the .js to .scss imports, just convert them back to .css
original: '^(.+?)\\.s?css.js$',
replacement: '$1.css',
},
],
```
Will need to resolve this issue before re-merging this refactor.
1 parent 4c3fe24 commit 2f7928a
23 files changed
Lines changed: 483 additions & 320 deletions
File tree
- packages
- dashboard/src
- layout
- golden-layout
- scss
- src
- tests
- golden-layout.spec.ts-snapshots
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | 12 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
0 commit comments