Merge branch 'master' into handle-init-in-luigi-client

* master: Update Luigi core npm to 6.13.1 (SAP#990) Update INTERNAL-README.md (SAP#987) Edge browser back (SAP#992)
JohannesDoberer · Nov 29, 2019 · c80b7b6 · c80b7b6
2 parents 60fd5d3 + f8c0b19
commit c80b7b6
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 44 deletions.
diff --git a/core/examples/luigi-sample-angular/e2e/tests/luigi-client-link-manager-features.spec.js b/core/examples/luigi-sample-angular/e2e/tests/luigi-client-link-manager-features.spec.js
@@ -54,7 +54,7 @@ describe('Luigi client linkManager', () => {
       cy.wrap($iframeBody).should('contain', 'Called with params:');
       cy.wrap($iframeBody).should('contain', '"foo": "bar"');
 
-      cy.expectSearchToBe('?~foo=bar&');
+      cy.expectSearchToBe('?~foo=bar');
 
       cy.wrap($iframeBody)
         .contains('Click here')

diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/package.json b/core/package.json
@@ -52,7 +52,7 @@
     "bundle-ie11": "webpack --mode=production --display-error-details --config webpack-ie11.config.js",
     "bundle-develop": "npm run bundle-develop-evergreen",
     "bundle-develop-evergreen": "npm run bundle-evergreen -- -d --watch",
-    "bundle-develop-ie11": "webpack --display-error-details --config webpack-ie11.config.js --debug --devtool cheap-source-map --output-pathinfo --watch",
+    "bundle-develop-ie11": "MINIFY=false webpack --display-error-details --config webpack-ie11.config.js --debug --devtool cheap-source-map --output-pathinfo --watch",
     "test": "babel-node ./node_modules/nyc/bin/nyc.js mocha -- --recursive test",
     "test:watch": "npm run test -- --watch",
     "bundlesize": "npm run bundle && bundlesize",
@@ -126,7 +126,7 @@
     "url": "ssh://github.com/SAP/luigi.git"
   },
   "dependencies": {
-    "npm": "^6.13.0",
+    "npm": "^6.13.1",
     "test": "^0.6.0",
     "diff": ">=3.5.0"
   }

diff --git a/core/src/App.html b/core/src/App.html
@@ -399,14 +399,14 @@
 
     if (params.nodeParams && Object.keys(params.nodeParams).length) {
       path += '?';
-      Object.entries(params.nodeParams).forEach(entry => {
+      Object.entries(params.nodeParams).forEach((entry, index) => {
         path +=
           encodeURIComponent(
             RoutingHelpers.getContentViewParamPrefix() + entry[0]
           ) +
           '=' +
           encodeURIComponent(entry[1]) +
-          '&';
+          (index < Object.keys(params.nodeParams).length - 1 ? '&' : '');
       });
     }
     return path;

diff --git a/core/src/services/routing.js b/core/src/services/routing.js
@@ -116,11 +116,11 @@ class RoutingClass {
   }
 
   getModifiedPathname() {
-    if (!window.history.state) {
-      return '';
-    }
+    const path =
+      (window.history.state && window.history.state.path) ||
+      window.location.pathname;
 
-    return window.history.state.path
+    return path
       .split('/')
       .slice(1)
       .join('/');

diff --git a/core/src/utilities/helpers/routing-helpers.js b/core/src/utilities/helpers/routing-helpers.js
@@ -102,10 +102,13 @@ class RoutingHelpersClass {
   }
 
   getContentViewParamPrefix() {
-    return (
-      LuigiConfig.getConfigValue('routing.nodeParamPrefix') ||
-      this.defaultContentViewParamPrefix
-    );
+    let prefix = LuigiConfig.getConfigValue('routing.nodeParamPrefix');
+    if (prefix === false) {
+      prefix = '';
+    } else if (!prefix) {
+      prefix = this.defaultContentViewParamPrefix;
+    }
+    return prefix;
   }
 
   addRouteChangeListener(callback) {

diff --git a/core/test/services/routing.spec.js b/core/test/services/routing.spec.js
@@ -529,9 +529,13 @@ describe('Routing', function() {
   });
 
   describe('getModifiedPathname()', () => {
-    it('without state', () => {
+    it('without state, falls back to location', () => {
+      const mockPathName = 'projects';
       sinon.stub(window.history, 'state').returns(null);
-      assert.equal(Routing.getModifiedPathname(), '');
+      sinon.stub(window, 'location').value({
+        pathname: '/' + mockPathName
+      });
+      assert.equal(Routing.getModifiedPathname(), mockPathName);
     });
 
     it('with state path', () => {

diff --git a/core/webpack-ie11.config.js b/core/webpack-ie11.config.js
@@ -28,7 +28,8 @@ class PatchLuigiPlugin {
     if (compiler.hooks) {
       compiler.hooks.afterEmit.tap('Luigi Patch', () =>
         exec(
-          'babel public/luigi-ie11.js --out-file public/luigi-ie11.js --presets=@babel/preset-env --root . --root-mode upward --minified',
+          'babel public/luigi-ie11.js --out-file public/luigi-ie11.js --presets=@babel/preset-env --root . --root-mode upward' +
+            (process.env.MINIFY === 'false' ? '' : ' --minified'),
           PatchLuigiPlugin.execHandler
         )
       );

diff --git a/docs/application-setup.md b/docs/application-setup.md
@@ -46,7 +46,7 @@ The examples on this page demonstrate commands that perform each of the necessar
 <a name="noframework"></a> 
 ### Application setup for an application not using a framework 
 
-<!-- add-attribute:class:success -->
+<!-- add-attribute:class:warning -->
 > **NOTE:** You need a development server capable of hosting Single Page Applications. The recommended server is Live Server.
 
 1. If you do not have Live Server installed, use this command to install it.

diff --git a/website/docs/INTERNAL-README.md b/website/docs/INTERNAL-README.md
@@ -12,6 +12,7 @@ Development:
 
 Open [http://localhost:4000](http://localhost:4000), micro frontend is hosted on port 4001 and defined dynamically in configuration and sapper serve.
 
+
 Production build:
 
 `npm run export`

diff --git a/website/docs/src/client-js/internal-links.js b/website/docs/src/client-js/internal-links.js
@@ -6,7 +6,7 @@ export class InternalLinksHandler {
       if(this.initDone) { return; }
       this.initDone = true;
 
-      // modify internal links to be valid links for users and still make sapper happy 
+      // modify internal links to be valid links for users and still make sapper happy
       // since leaving them "wrong" (as local iframe links) in the first place
       let intvCount = 0;
       const intv = setInterval(() => {
@@ -19,21 +19,21 @@ export class InternalLinksHandler {
           clearInterval(intv);
         }
       }, 150);
-      
+
 
       // register click handler
       window.navigateInternal = (evt, elem) => {
         evt.preventDefault();
         evt.stopPropagation();
         let url;
         try {
-          url = new URL(elem.getAttribute('href'));
+          url = new URL(elem.getAttribute('href'), window.location.origin);
         } catch (error) {
           console.debug('navigateInternal URL parse error', elem, elem.getAttribute('href'), error);
         }
         const urlWithPath = url.pathname.replace(ctx.coreBaseUrl, '').replace('.md', '').replace('/docu-microfrontend', '');
         if (url.hash) {
-          LuigiClient.linkManager().withParams({hash: url.hash.toLowerCase()}).navigate(urlWithPath);
+          LuigiClient.linkManager().withParams({'section': url.hash.substring(1).toLowerCase()}).navigate(urlWithPath);
         } else {
           LuigiClient.linkManager().navigate(urlWithPath);
         }

diff --git a/website/docs/src/client-js/smooth-scroll-anchors.js b/website/docs/src/client-js/smooth-scroll-anchors.js
@@ -5,15 +5,23 @@ export class ScrollAnchorsHandler {
   init() {
     // scroll if navigate param found
     LuigiClient.addInitListener((ctx) => {
-      if(this.initDone) { return; }
+      if (this.initDone) { return; }
       this.initDone = true;
-      if (LuigiClient.getNodeParams().hash) {
-        this.scrollAnchor(null, LuigiClient.getNodeParams().hash);
+      if (LuigiClient.getNodeParams().section) {
+        this.scrollAnchor(null, LuigiClient.getNodeParams().section);
       }
       window.scrollAnchor = this.scrollAnchor;
     });
+
+    LuigiClient.addContextUpdateListener((ctx) => {
+      if (LuigiClient.getNodeParams().section) {
+        setTimeout(() => {
+          this.scrollAnchor(null, LuigiClient.getNodeParams().section);
+        });
+      }
+    });
   }
-  
+
   // Vanilla JavaScript Scroll to Anchor
   // @ https://perishablepress.com/vanilla-javascript-scroll-anchor/
   // modified so respond could be also just a string with the #hash
@@ -24,13 +32,13 @@ export class ScrollAnchorsHandler {
       targetID = (respond) ? respond.getAttribute('href') : this.getAttribute('href');
       targetID = `#${targetID.split('#').pop()}`;
     } else {
-      targetID = respond;
+      targetID = '#' + respond;
     }
 
     const targetAnchor = document.querySelector(targetID);
     if (!targetAnchor) return;
-    targetAnchor.scrollIntoView({ 
-      behavior: 'smooth' 
+    targetAnchor.scrollIntoView({
+      behavior: 'smooth'
     });
   }
-}
+}
diff --git a/website/docs/src/luigi-config/extended/routing.js b/website/docs/src/luigi-config/extended/routing.js
@@ -11,7 +11,7 @@ class Routing {
   /**
    * Prefix for reflecting params in the url, which is used when navigating .withParams() function.
    */
-  nodeParamPrefix = '~';
+  nodeParamPrefix = false;
 
   /**
    * skipRoutingForUrlPatterns

diff --git a/website/docs/src/unified-plugins/rehype-luigi-linkparser.js b/website/docs/src/unified-plugins/rehype-luigi-linkparser.js
@@ -28,13 +28,13 @@ export default function luigiLinkParser(options) {
       var parsed = url.parse(node.properties[prop]);
       if (
         parsed.href.startsWith(githubMaster + 'docs') && parsed.pathname && parsed.pathname.endsWith('.md') ||
-        parsed.pathname && parsed.pathname.endsWith('.md') 
+        parsed.pathname && parsed.pathname.endsWith('.md')
       ) {
         // internal link
         // sample links: https://..., file.md, should not start with /file.md or ../file.md
         node.properties['onclick'] = 'navigateInternal(event, this)';
         node.properties['data-linktype'] = 'internal';
-        
+
         let newHref = parsed.href.replace(githubMaster + 'docs/', '').replace('.md', '');
 
         // clean ./ from beginning of the link
@@ -50,7 +50,7 @@ export default function luigiLinkParser(options) {
       } else if (parsed.hash && !parsed.pathname && !parsed.hostname) {
         // current page anchor link
         node.properties['href'] = prependForExport() + '/docs/' + settings.shortName + parsed.hash.toLowerCase();
-        node.properties['onclick'] = 'scrollAnchor(event, event.target)';
+        node.properties['onclick'] = 'navigateInternal(event, this)';
       } else if (parsed.pathname && (
         parsed.pathname.startsWith('../') || parsed.pathname.startsWith('/')
       )) {
@@ -77,4 +77,4 @@ export default function luigiLinkParser(options) {
       // add logic here
     }
   }
-}
+}