From 9af9832b7e7bd815a5f52ac4e0d7e5a087838e7d Mon Sep 17 00:00:00 2001 From: Jonas Wanner Date: Tue, 26 Apr 2022 15:41:49 +0200 Subject: [PATCH 1/5] #33 remove localization feature from plain example --- examples/plain/.npmbundlerrc | 5 ++--- examples/plain/features/localization/Language.properties | 6 ------ examples/plain/package.json | 3 +-- 3 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 examples/plain/features/localization/Language.properties diff --git a/examples/plain/.npmbundlerrc b/examples/plain/.npmbundlerrc index cb0078f..9ba361b 100644 --- a/examples/plain/.npmbundlerrc +++ b/examples/plain/.npmbundlerrc @@ -3,8 +3,7 @@ "output-dir": "dist", "features": { "js-extender": true, - "web-context": "/plain", - "localization": "features/localization/Language" + "web-context": "/plain" } } -} \ No newline at end of file +} diff --git a/examples/plain/features/localization/Language.properties b/examples/plain/features/localization/Language.properties deleted file mode 100644 index 9eebd4c..0000000 --- a/examples/plain/features/localization/Language.properties +++ /dev/null @@ -1,6 +0,0 @@ -javax.portlet.title.plain=Plain - -portlet-namespace=Portlet Namespace -context-path=Context Path -portlet-element-id=Portlet Element ID -configuration=Configuration diff --git a/examples/plain/package.json b/examples/plain/package.json index 62af845..d3d62c0 100644 --- a/examples/plain/package.json +++ b/examples/plain/package.json @@ -13,8 +13,7 @@ "com.liferay.portlet.instanceable": true, "javax.portlet.name": "plain", "javax.portlet.display-name": "Plain", - "javax.portlet.security-role-ref": "power-user,user", - "javax.portlet.resource-bundle": "content.Language" + "javax.portlet.security-role-ref": "power-user,user" }, "main": "index", "devDependencies": { From 5bb0fa9b6c56d940a3b2ad786896fe2f0249beee Mon Sep 17 00:00:00 2001 From: Jonas Wanner Date: Tue, 26 Apr 2022 15:42:20 +0200 Subject: [PATCH 2/5] #33 cleanup imports --- bundler/rollup.config.ts | 4 ++-- bundler/src/handler/FeaturesHandler.ts | 2 +- bundler/src/handler/TemplateHandler.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundler/rollup.config.ts b/bundler/rollup.config.ts index 80c56ec..7dd3437 100644 --- a/bundler/rollup.config.ts +++ b/bundler/rollup.config.ts @@ -1,11 +1,11 @@ +import { getBabelOutputPlugin } from '@rollup/plugin-babel' import commonjs from '@rollup/plugin-commonjs' import eslint from '@rollup/plugin-eslint' import json from '@rollup/plugin-json' +import { RollupOptions } from 'rollup' import copy from 'rollup-plugin-copy' import esbuild from 'rollup-plugin-esbuild' -import { getBabelOutputPlugin } from '@rollup/plugin-babel' import { preserveShebangs } from 'rollup-plugin-preserve-shebangs' -import { RollupOptions } from 'rollup' const config: RollupOptions = { input: 'src/mod.ts', diff --git a/bundler/src/handler/FeaturesHandler.ts b/bundler/src/handler/FeaturesHandler.ts index a21f783..e2ac202 100644 --- a/bundler/src/handler/FeaturesHandler.ts +++ b/bundler/src/handler/FeaturesHandler.ts @@ -1,6 +1,6 @@ import { readFile } from 'fs' -import { promisify } from 'util' import { sep } from 'path' +import { promisify } from 'util' import npmbundlerrc from '../types/npmbundlerrc.types' import Pack from '../types/Pack.types' diff --git a/bundler/src/handler/TemplateHandler.ts b/bundler/src/handler/TemplateHandler.ts index 786a6c6..1bb25ae 100644 --- a/bundler/src/handler/TemplateHandler.ts +++ b/bundler/src/handler/TemplateHandler.ts @@ -1,6 +1,6 @@ import { access, readFile } from 'fs' -import { promisify } from 'util' import { sep } from 'path' +import { promisify } from 'util' import TemplatesNotFoundException from '../exceptions/TemplatesNotFoundException' export default class TemplateHandler { From 64044fdab5040f712c84fddf2626580f4a147ed5 Mon Sep 17 00:00:00 2001 From: Jonas Wanner Date: Tue, 26 Apr 2022 15:42:35 +0200 Subject: [PATCH 3/5] #33 cleanup imports --- bundler/src/handler/ProcessHandler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundler/src/handler/ProcessHandler.ts b/bundler/src/handler/ProcessHandler.ts index f836646..be4ddc9 100644 --- a/bundler/src/handler/ProcessHandler.ts +++ b/bundler/src/handler/ProcessHandler.ts @@ -1,6 +1,6 @@ import { access, copyFile, mkdir, readdir, readFile, rm } from 'fs' -import { promisify } from 'util' import { sep } from 'path' +import { promisify } from 'util' import { version } from '../../package.json' import { log } from '../log' import FeaturesHandler from './FeaturesHandler' From 19409f83fb32d439b6db804e414a713eec41df02 Mon Sep 17 00:00:00 2001 From: Jonas Wanner Date: Tue, 26 Apr 2022 15:43:06 +0200 Subject: [PATCH 4/5] #33 fix order of files inside the jar file --- bundler/src/handler/ProcessHandler.ts | 29 +++++++++++++++++---------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/bundler/src/handler/ProcessHandler.ts b/bundler/src/handler/ProcessHandler.ts index be4ddc9..1f1032d 100644 --- a/bundler/src/handler/ProcessHandler.ts +++ b/bundler/src/handler/ProcessHandler.ts @@ -96,6 +96,11 @@ export default class ProcessHandler { 'language-resource', ',liferay.resource.bundle;resource.bundle.base.name="content.Language"' ) + } else { + manifestMFTemplate.replace( + 'language-resource', + '' + ) } // process manifest.json @@ -104,17 +109,6 @@ export default class ProcessHandler { manifestJSONTemplate.replace('name', this.packageHandler.pack.name) manifestJSONTemplate.replace('version', this.packageHandler.pack.version) - // process localization - if (this.featuresHandler.hasLocalization) { - const files = await promisify(readdir)(this.featuresHandler.localizationPath) - for (const file of files) { - this.jarHandler.archive.append( - (await promisify(readFile)(`${this.featuresHandler.localizationPath}${sep}${file}`)).toString(), - { name: `/content/${file}` } - ) - } - } - // process jar file this.jarHandler.archive.append(manifestMFTemplate.processed, { name: `/META-INF/${manifestMFTemplate.name}` @@ -128,6 +122,19 @@ export default class ProcessHandler { this.jarHandler.archive.append(JSON.stringify(this.packageHandler.pack), { name: `/META-INF/resources/package.json` }) + + // process localization + if (this.featuresHandler.hasLocalization) { + const files = await promisify(readdir)(this.featuresHandler.localizationPath) + for (const file of files) { + this.jarHandler.archive.append( + ( + await promisify(readFile)(`${this.featuresHandler.localizationPath}${sep}${file}`) + ).toString(), + { name: `/content/${file}` } + ) + } + } } async create(): Promise { From 93a4de77f5c3b0788180e8d0deb8ea40dc6feec2 Mon Sep 17 00:00:00 2001 From: Jonas Wanner Date: Tue, 26 Apr 2022 15:43:17 +0200 Subject: [PATCH 5/5] #33 upgrade to version 1.0.4 --- bundler/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundler/package.json b/bundler/package.json index ee3ce10..34c9604 100644 --- a/bundler/package.json +++ b/bundler/package.json @@ -1,7 +1,7 @@ { "name": "liferay-npm-bundler-improved", "description": "A highly experimental and non-official module which bundles the javascript into the liferay loader and creates a jar file.", - "version": "1.0.3", + "version": "1.0.4", "author": "Jonas Wanner", "license": "ISC", "repository": {