Skip to content

Commit 2307334

Browse files
committed
fix: build
1 parent 048182a commit 2307334

File tree

3 files changed

+57
-22
lines changed

3 files changed

+57
-22
lines changed

hatch_build.py

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
from hatchling.builders.hooks.plugin.interface import BuildHookInterface
1313

1414

15-
JLPM = 'npm'
16-
# JLPM = 'jlpm'
15+
JLPM = 'jlpm'
1716

1817

1918
HERE = os.path.abspath(os.path.dirname(__file__))
@@ -27,22 +26,18 @@ def clean_dist():
2726
print(f"Cleaned dist folder: {dist_path}")
2827

2928
# Also remove tsconfig.tsbuildinfo if it exists
30-
tsbuildinfo_path = os.path.join(HERE, 'tsconfig.tsbuildinfo')
31-
if os.path.exists(tsbuildinfo_path):
32-
os.remove(tsbuildinfo_path)
33-
print(f"Removed tsconfig.tsbuildinfo: {tsbuildinfo_path}")
29+
# tsbuildinfo_path = os.path.join(HERE, 'tsconfig.tsbuildinfo')
30+
# if os.path.exists(tsbuildinfo_path):
31+
# os.remove(tsbuildinfo_path)
32+
# print(f"Removed tsconfig.tsbuildinfo: {tsbuildinfo_path}")
3433

3534

3635
def build_javascript():
37-
clean_dist()
38-
if not (Path("jupyter_viewer/labextension/static/style.js")).exists():
39-
check_call([JLPM, 'install'], cwd=HERE)
40-
check_call(
41-
[JLPM, 'install'],
42-
cwd=HERE,
43-
)
36+
# clean_dist()
37+
# if not (Path("jupyter_viewer/labextension/static/style.js")).exists():
38+
check_call([JLPM, 'install'], cwd=HERE)
4439
check_call(
45-
[JLPM, 'run', 'build:webpack:prod'],
40+
[JLPM, 'build:webpack:prod'],
4641
cwd=HERE,
4742
)
4843
for file in glob.glob(r'./dist/*.*'):

package.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,12 @@
108108
"@types/webpack-env": "^1.18.2",
109109
"@typescript-eslint/eslint-plugin": "^8.29.1",
110110
"@typescript-eslint/parser": "^8.29.1",
111+
"assert": "^2.0.0",
111112
"babel-loader": "^9.1.2",
113+
"browserify-zlib": "^0.2.0",
114+
"buffer": "^6.0.3",
112115
"cross-env": "^7.0.3",
116+
"crypto-browserify": "^3.12.1",
113117
"css-loader": "^6.9.1",
114118
"eslint": "^9.0.0",
115119
"eslint-config-prettier": "^10.1.2",
@@ -120,8 +124,12 @@
120124
"jest-playwright-preset": "^3.0.1",
121125
"mkdirp": "^1.0.3",
122126
"npm-run-all": "^4.1.5",
127+
"os-browserify": "^0.3.0",
128+
"path-browserify": "^1.0.1",
123129
"playwright": "^1.31.1",
124130
"prettier": "^3.3.2",
131+
"process": "^0.11.10",
132+
"querystring-es3": "^0.2.1",
125133
"raw-loader": "^4.0.2",
126134
"rimraf": "^6.0.1",
127135
"stream": "^0.0.2",
@@ -134,7 +142,9 @@
134142
"svg-url-loader": "^7.1.1",
135143
"ts-jest": "^29.0.5",
136144
"typescript": "^5.8.3",
145+
"url": "^0.11.4",
137146
"url-loader": "^4.0.0",
147+
"util": "^0.12.5",
138148
"webpack": "^5.74.0",
139149
"webpack-bundle-analyzer": "^4.5.0",
140150
"webpack-cli": "^4.10.0",

webpack.lab-config.js

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,47 @@
11
/*
2-
* Copyright (c) 2021-2025 Datalayer, Inc.
3-
* Distributed under the terms of the Modified BSD License.
4-
*/
5-
6-
/*
7-
* Copyright (c) 2021-2023 Datalayer, Inc.
2+
* Copyright (c) 2021-2024 Datalayer, Inc.
83
*
9-
* MIT License
4+
* Datalayer License
105
*/
116

127
module.exports = {
8+
externals: {
9+
'keytar': 'commonjs keytar',
10+
},
11+
resolve: {
12+
fallback: {
13+
"fs": false,
14+
"path": require.resolve("path-browserify"),
15+
"stream": require.resolve("stream-browserify"),
16+
"crypto": require.resolve("crypto-browserify"),
17+
"buffer": require.resolve("buffer"),
18+
"util": require.resolve("util"),
19+
"assert": require.resolve("assert"),
20+
"url": require.resolve("url"),
21+
"querystring": require.resolve("querystring-es3"),
22+
"os": require.resolve("os-browserify/browser"),
23+
"zlib": require.resolve("browserify-zlib"),
24+
"process": require.resolve("process/browser"),
25+
},
26+
},
27+
experiments: {
28+
asyncWebAssembly: true,
29+
syncWebAssembly: true,
30+
},
1331
module: {
1432
rules: [
33+
{
34+
test: /\.jsx$/,
35+
loader: 'babel-loader',
36+
options: {
37+
presets: ['@babel/preset-react'],
38+
cacheDirectory: true
39+
}
40+
},
41+
{
42+
test: /\.s[ac]ss$/i,
43+
use: [ "style-loader", "css-loader", "sass-loader" ],
44+
},
1545
// Rule to deal with the service-worker.ts file
1646
// It will include the transpiled file as a text file named `[name][ext]`
1747
// That file is available from the static folder of this extension. That
@@ -41,4 +71,4 @@ module.exports = {
4171
},
4272
],
4373
},
44-
};
74+
};

0 commit comments

Comments
 (0)