Skip to content

Commit 3ecfae2

Browse files
authored
fix: import.meta.resolve error (#276)
* fix: import.meta.resolve error * feat: remove copy file plugin
1 parent 93d3e47 commit 3ecfae2

File tree

5 files changed

+11
-58
lines changed

5 files changed

+11
-58
lines changed

copy-elk-storybook.js

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

package-lock.json

Lines changed: 4 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"scripts": {
66
"build": "vite build --mode library",
77
"build:watch": "vite build --watch --mode library",
8-
"build-storybook": "storybook build && node copy-elk-storybook.js",
8+
"build-storybook": "storybook build",
99
"prettier": "prettier --loglevel warn --write 'src/**/*.{ts,tsx,js,jsx}'",
1010
"lint": "eslint --ext js,ts,tsx",
1111
"lint:fix": "eslint --ext js,ts,tsx --fix src",
@@ -63,7 +63,8 @@
6363
"react-fast-compare": "^3.2.2",
6464
"react-use-gesture": "^8.0.1",
6565
"reakeys": "^2.0.5",
66-
"undoo": "^0.5.0"
66+
"undoo": "^0.5.0",
67+
"web-worker": "^1.5.0"
6768
},
6869
"peerDependencies": {
6970
"react": ">=16",
@@ -110,8 +111,7 @@
110111
"vite-plugin-dts": "^3.3.1",
111112
"vite-plugin-svgr": "^3.2.0",
112113
"vite-tsconfig-paths": "^4.2.0",
113-
"vitest": "^0.33.0",
114-
"web-worker": "^1.5.0"
114+
"vitest": "^0.33.0"
115115
},
116116
"lint-staged": {
117117
"src/**/*.{js,jsx,ts,tsx}": [

src/layout/elkLayout.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -336,15 +336,12 @@ const getElk = async () => {
336336
return elkInstance;
337337
} else {
338338
const ELKModule = await import('elkjs/lib/elk-api');
339-
let workerPath = await import.meta.resolve('./elk-worker.min.js');
340-
if (import.meta.env.DEV) {
341-
workerPath = '/node_modules/elkjs/lib/elk-worker.min.js';
342-
}
343339

344340
elkInstance = new ELKModule.default({
345341
algorithms: ['layered'],
346342
workerFactory: () => {
347-
return new Worker(workerPath);
343+
const workerUrl = new URL('elkjs/lib/elk-worker.min.js', import.meta.url).href;
344+
return new Worker(workerUrl);
348345
}
349346
});
350347

vite.config.ts

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,6 @@ import { resolve } from 'path';
99
import external from 'rollup-plugin-peer-deps-external';
1010
import dts from 'vite-plugin-dts';
1111
import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
12-
import fs from 'fs';
13-
14-
// Custom plugin to copy elk-worker.min.js to the output directory
15-
const copyElkWorker = () => {
16-
return {
17-
name: 'copy-elk-worker',
18-
closeBundle() {
19-
const sourceFile = 'node_modules/elkjs/lib/elk-worker.min.js';
20-
const targetFile = 'dist/elk-worker.min.js';
21-
22-
if (fs.existsSync(sourceFile)) {
23-
const content = fs.readFileSync(sourceFile);
24-
fs.writeFileSync(targetFile, content);
25-
console.log('Successfully copied elk-worker.min.js to dist directory');
26-
} else {
27-
console.error('Error: Could not find elk-worker.min.js in node_modules');
28-
}
29-
}
30-
};
31-
};
3212

3313
export default defineConfig(({ mode }) =>
3414
mode === 'library'
@@ -44,8 +24,7 @@ export default defineConfig(({ mode }) =>
4424
}),
4525
checker({
4626
typescript: true
47-
}),
48-
copyElkWorker()
27+
})
4928
],
5029
test: {
5130
globals: true,

0 commit comments

Comments
 (0)