From 7328e106f7523d006b9516651dc9f6dd5475b035 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 14 Sep 2023 09:15:47 +0200 Subject: [PATCH] Prepare multi JavaScript modules --- js/.externalToolBuilders/npm run build.launch | 4 ++-- js/Makefile | 8 ++++---- js/org.argeo.app.geo.js/bnd.bnd | 5 ----- .../.gitignore | 0 .../.project | 2 +- js/org.argeo.app.js/bnd.bnd | 6 ++++++ .../build.properties | 0 js/src/{org.argeo.app.geo.js => geo}/MapPart.js | 0 .../OpenLayerTileSources.js | 0 .../OpenLayersMapPart.js | 2 +- .../{org.argeo.app.geo.js => geo}/export-package.js | 0 js/src/{org.argeo.app.geo.js => geo}/index.html | 0 js/src/{org.argeo.app.geo.js => geo}/index.js | 0 js/webpack.common.js | 13 ++++++++----- .../src/org/argeo/app/geo/swt/SwtJSMapPart.java | 2 +- 15 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 js/org.argeo.app.geo.js/bnd.bnd rename js/{org.argeo.app.geo.js => org.argeo.app.js}/.gitignore (100%) rename js/{org.argeo.app.geo.js => org.argeo.app.js}/.project (92%) create mode 100644 js/org.argeo.app.js/bnd.bnd rename js/{org.argeo.app.geo.js => org.argeo.app.js}/build.properties (100%) rename js/src/{org.argeo.app.geo.js => geo}/MapPart.js (100%) rename js/src/{org.argeo.app.geo.js => geo}/OpenLayerTileSources.js (100%) rename js/src/{org.argeo.app.geo.js => geo}/OpenLayersMapPart.js (99%) rename js/src/{org.argeo.app.geo.js => geo}/export-package.js (100%) rename js/src/{org.argeo.app.geo.js => geo}/index.html (100%) rename js/src/{org.argeo.app.geo.js => geo}/index.js (100%) diff --git a/js/.externalToolBuilders/npm run build.launch b/js/.externalToolBuilders/npm run build.launch index 75fcedb..c706fc1 100644 --- a/js/.externalToolBuilders/npm run build.launch +++ b/js/.externalToolBuilders/npm run build.launch @@ -1,8 +1,8 @@ - + - + diff --git a/js/Makefile b/js/Makefile index 1e8cd43..4b42559 100644 --- a/js/Makefile +++ b/js/Makefile @@ -3,7 +3,7 @@ include ../sdk.mk A2_CATEGORY = org.argeo.suite BUNDLES = \ -org.argeo.app.geo.js \ +org.argeo.app.js \ all: webpack osgi @@ -17,10 +17,10 @@ clean: $(foreach bundle, $(BUNDLES), rm -rf $(bundle)/org) npm-install: - cd org.argeo.app.geo.js && npm install + npm install jsdoc: - org.argeo.app.geo.js/node_modules/.bin/jsdoc -r org.argeo.app.geo.js/src/org.argeo.app.geo.js \ - -d $(SDK_BUILD_BASE)/jsdoc/org.argeo.app.geo.js + node_modules/.bin/jsdoc -r src \ + -d $(SDK_BUILD_BASE)/jsdoc/argeo-suite-js include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk diff --git a/js/org.argeo.app.geo.js/bnd.bnd b/js/org.argeo.app.geo.js/bnd.bnd deleted file mode 100644 index 818a44c..0000000 --- a/js/org.argeo.app.geo.js/bnd.bnd +++ /dev/null @@ -1,5 +0,0 @@ -Export-Package: org.argeo.app.geo.js - - -Provide-Capability:\ -cms.publish;pkg=org.argeo.app.geo.js;file="*.png,*.js,*.map,*.css,*.html" diff --git a/js/org.argeo.app.geo.js/.gitignore b/js/org.argeo.app.js/.gitignore similarity index 100% rename from js/org.argeo.app.geo.js/.gitignore rename to js/org.argeo.app.js/.gitignore diff --git a/js/org.argeo.app.geo.js/.project b/js/org.argeo.app.js/.project similarity index 92% rename from js/org.argeo.app.geo.js/.project rename to js/org.argeo.app.js/.project index b4b7877..a2edfff 100644 --- a/js/org.argeo.app.geo.js/.project +++ b/js/org.argeo.app.js/.project @@ -1,6 +1,6 @@ - org.argeo.app.geo.js + org.argeo.app.js diff --git a/js/org.argeo.app.js/bnd.bnd b/js/org.argeo.app.js/bnd.bnd new file mode 100644 index 0000000..cac0263 --- /dev/null +++ b/js/org.argeo.app.js/bnd.bnd @@ -0,0 +1,6 @@ +Export-Package: \ +org.argeo.app.js,\ + + +Provide-Capability:\ +cms.publish;pkg=org.argeo.app.js;file="*.png,*.js,*.map,*.css,*.html",\ diff --git a/js/org.argeo.app.geo.js/build.properties b/js/org.argeo.app.js/build.properties similarity index 100% rename from js/org.argeo.app.geo.js/build.properties rename to js/org.argeo.app.js/build.properties diff --git a/js/src/org.argeo.app.geo.js/MapPart.js b/js/src/geo/MapPart.js similarity index 100% rename from js/src/org.argeo.app.geo.js/MapPart.js rename to js/src/geo/MapPart.js diff --git a/js/src/org.argeo.app.geo.js/OpenLayerTileSources.js b/js/src/geo/OpenLayerTileSources.js similarity index 100% rename from js/src/org.argeo.app.geo.js/OpenLayerTileSources.js rename to js/src/geo/OpenLayerTileSources.js diff --git a/js/src/org.argeo.app.geo.js/OpenLayersMapPart.js b/js/src/geo/OpenLayersMapPart.js similarity index 99% rename from js/src/org.argeo.app.geo.js/OpenLayersMapPart.js rename to js/src/geo/OpenLayersMapPart.js index f671b02..e1d8642 100644 --- a/js/src/org.argeo.app.geo.js/OpenLayersMapPart.js +++ b/js/src/geo/OpenLayersMapPart.js @@ -220,4 +220,4 @@ export default class OpenLayersMapPart extends MapPart { }); vectorLayer.setStyle(olStyleFunction); } -} +} \ No newline at end of file diff --git a/js/src/org.argeo.app.geo.js/export-package.js b/js/src/geo/export-package.js similarity index 100% rename from js/src/org.argeo.app.geo.js/export-package.js rename to js/src/geo/export-package.js diff --git a/js/src/org.argeo.app.geo.js/index.html b/js/src/geo/index.html similarity index 100% rename from js/src/org.argeo.app.geo.js/index.html rename to js/src/geo/index.html diff --git a/js/src/org.argeo.app.geo.js/index.js b/js/src/geo/index.js similarity index 100% rename from js/src/org.argeo.app.geo.js/index.js rename to js/src/geo/index.js diff --git a/js/webpack.common.js b/js/webpack.common.js index 88b22bc..1f2f2a2 100644 --- a/js/webpack.common.js +++ b/js/webpack.common.js @@ -5,13 +5,14 @@ const path = require('path'); module.exports = { entry: { - "org.argeo.app.geo.js": { - import: './src/org.argeo.app.geo.js/index.js', + "geo": { + import: './src/geo/index.js', } }, output: { filename: '[name].[contenthash].js', - path: path.resolve(__dirname, 'org.argeo.app.geo.js/org/argeo/app/geo/js'), + path: path.resolve(__dirname, 'org.argeo.app.js/org/argeo/app/js'), + publicPath:'/pkg/org.argeo.app.js', clean: true, }, optimization: { @@ -43,9 +44,11 @@ module.exports = { new MiniCssExtractPlugin(), // deal with HTML generation new HtmlWebpackPlugin({ - title: 'Open Layers', - template: 'src/org.argeo.app.geo.js/index.html', + title: 'Argeo Suite Geo JS', + template: 'src/geo/index.html', scriptLoading: 'module', + filename: 'geo.html', + chunks: ['geo'], }), ], diff --git a/swt/org.argeo.app.geo.swt/src/org/argeo/app/geo/swt/SwtJSMapPart.java b/swt/org.argeo.app.geo.swt/src/org/argeo/app/geo/swt/SwtJSMapPart.java index ece9508..ad1a9fa 100644 --- a/swt/org.argeo.app.geo.swt/src/org/argeo/app/geo/swt/SwtJSMapPart.java +++ b/swt/org.argeo.app.geo.swt/src/org/argeo/app/geo/swt/SwtJSMapPart.java @@ -19,7 +19,7 @@ public class SwtJSMapPart extends SwtBrowserJsPart implements MapPart { private final String mapName;// = "argeoMap"; public SwtJSMapPart(String mapName, Composite parent, int style) { - super(parent, style, "/pkg/org.argeo.app.geo.js/index.html"); + super(parent, style, "/pkg/org.argeo.app.js/geo.html"); this.mapName = mapName; } -- 2.30.2