feat: include plugin launch path plugin.html in built manifests [LIBS…

…-346] (#745)
dhis2 · Sep 16, 2022 · 8843f6b · 8843f6b
1 parent f455836
commit 8843f6b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/cli/src/lib/generateManifests.js b/cli/src/lib/generateManifests.js
@@ -108,7 +108,8 @@ module.exports = (paths, config, publicUrl) => {
  version: config.version,
  core_app: config.coreApp,
 
- launch_path: 'index.html',
+ launch_path: paths.launchPath,
+ plugin_launch_path: paths.pluginLaunchPath,
  default_locale: 'en',
  activities: {
  dhis: {
@@ -146,6 +147,10 @@ module.exports = (paths, config, publicUrl) => {
  // Write d2 config json
  const appConfig = { ...config }
  delete appConfig['entryPoints']
+ appConfig.entryPoints = {
+ app: paths.launchPath,
+ plugin: config.entryPoints.plugin ? paths.pluginLaunchPath : undefined,
+ }
  delete appConfig['pwa']
 
  fs.writeJsonSync(paths.shellPublicConfigJson, appConfig, { spaces: 2 })

diff --git a/cli/src/lib/paths.js b/cli/src/lib/paths.js
@@ -111,6 +111,9 @@ module.exports = (cwd = process.cwd()) => {
  ),
  buildLibBundleFile: '{name}-{version}.zip',
  buildLibBundleOutput: path.join(base),
+
+ launchPath: 'index.html',
+ pluginLaunchPath: 'plugin.html',
  }
 
  reporter.debug('PATHS', paths)

diff --git a/cli/src/lib/plugin/start.js b/cli/src/lib/plugin/start.js
@@ -20,7 +20,7 @@ module.exports = async ({ port, paths }) => {
  port,
  host,
  // open browser
- open: ['/plugin.html'],
+ open: [`/${paths.pluginLaunchPath}`],
  client: {
  logging: 'none',
  overlay: {

diff --git a/cli/src/lib/plugin/webpack.config.js b/cli/src/lib/plugin/webpack.config.js
@@ -135,7 +135,7 @@ module.exports = ({ env: webpackEnv, paths }) => {
  Object.assign(
  {
  inject: true,
- filename: 'plugin.html',
+ filename: paths.pluginLaunchPath,
  template: paths.shellPublicPluginHtml,
  },
  isProduction

diff --git a/cli/src/lib/pwa/injectPrecacheManifest.js b/cli/src/lib/pwa/injectPrecacheManifest.js
@@ -44,7 +44,7 @@ module.exports = function injectPrecacheManifest(paths, config) {
  globPatterns: ['**/*'],
  // Skip index.html and `static` directory;
  // CRA's workbox-webpack-plugin handles it smartly
- globIgnores: ['static/**/*', 'index.html'],
+ globIgnores: ['static/**/*', paths.launchPath],
  additionalManifestEntries: config.pwa.caching.additionalManifestEntries,
  injectionPoint: 'self.__WB_BUILD_MANIFEST',
  // Skip revision hashing for files with hash or semver in name: