gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: Fix running webpack on ESM

Browse Source
This commit is contained in:
Elian Doran 2024-07-23 00:12:08 +03:00
parent 6f6ce38538
commit 3dbf8fb1c1
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -34,7 +34,7 @@
"build-backend-docs": "rimraf ./docs/backend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/backend_api src/becca/entities/*.js src/services/backend_script_api.js src/services/sql.js", "build-backend-docs": "rimraf ./docs/backend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/backend_api src/becca/entities/*.js src/services/backend_script_api.js src/services/sql.js",
"build-frontend-docs": "rimraf ./docs/frontend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js src/public/app/widgets/basic_widget.js src/public/app/widgets/note_context_aware_widget.js src/public/app/widgets/right_panel_widget.js", "build-frontend-docs": "rimraf ./docs/frontend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js src/public/app/widgets/basic_widget.js src/public/app/widgets/note_context_aware_widget.js src/public/app/widgets/right_panel_widget.js",
"build-docs": "npm run build-backend-docs && npm run build-frontend-docs", "build-docs": "npm run build-backend-docs && npm run build-frontend-docs",
"webpack": "webpack -c webpack.config.ts", "webpack": "cross-env NODE_OPTIONS=--loader=ts-node/esm webpack -c webpack.config.ts",
"test-jasmine": "cross-env TRILIUM_DATA_DIR=./data-test tsx ./node_modules/.bin/jasmine", "test-jasmine": "cross-env TRILIUM_DATA_DIR=./data-test tsx ./node_modules/.bin/jasmine",
"test-es6": "tsx -r esm spec-es6/attribute_parser.spec.ts", "test-es6": "tsx -r esm spec-es6/attribute_parser.spec.ts",
"test": "npm run test-jasmine && npm run test-es6", "test": "npm run test-jasmine && npm run test-es6",

2
src/services/asset_path.ts
View File

@ -1,3 +1,3 @@
import packageJson from "../../package.json"; import packageJson from "../../package.json" assert { type: "json" };
export default `assets/v${packageJson.version}`; export default `assets/v${packageJson.version}`;

2
tsconfig.json
View File

@ -1,7 +1,7 @@
{ {
"compilerOptions": { "compilerOptions": {
"moduleResolution": "Bundler", "moduleResolution": "Bundler",
"module": "ES2022", "module": "ESNext",
"target": "ES2020", "target": "ES2020",
"declaration": false, "declaration": false,
"sourceMap": true, "sourceMap": true,

6
webpack.config.ts
View File

@ -1,7 +1,9 @@
import { fileURLToPath } from "url";
import path from "path"; import path from "path";
import assetPath from "./src/services/asset_path.js"; import assetPath from "./src/services/asset_path.js";
module.exports = { const rootDir = path.dirname(fileURLToPath(import.meta.url));
export default {
mode: 'production', mode: 'production',
entry: { entry: {
setup: './src/public/app/setup.js', setup: './src/public/app/setup.js',
@ -10,7 +12,7 @@ module.exports = {
}, },
output: { output: {
publicPath: `${assetPath}/app-dist/`, publicPath: `${assetPath}/app-dist/`,
path: path.resolve(__dirname, 'src/public/app-dist'), path: path.resolve(rootDir, 'src/public/app-dist'),
filename: '[name].js', filename: '[name].js',
}, },
devtool: 'source-map', devtool: 'source-map',