From c793e15e9e37175ca386349ba1885f24c07ed394 Mon Sep 17 00:00:00 2001 From: Trygve Lie Date: Tue, 14 Jul 2020 22:03:46 +0200 Subject: [PATCH 01/21] ci: Set up next branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc21e568..8b7d89e1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# @podium/layout +# @podium/layout v5 A Module for composing full page layouts out of page fragments in a micro frontend architecture. From 7e0bb22c7756c8597422673f244caef493f08ad2 Mon Sep 17 00:00:00 2001 From: Trygve Lie Date: Tue, 14 Jul 2020 22:20:39 +0200 Subject: [PATCH 02/21] feat: Drop node 10.x support BREAKING CHANGE: Only support node 12 and 14. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 310844c4..4e7b22ed 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - node-version: [10.x, 12.x, 14.x] + node-version: [12.x, 14.x] steps: - uses: actions/checkout@v2 - name: Use Node.js ${{ matrix.node-version }} From 49da0fb9a2caed959da3f4fbd70b18cff6b8edf9 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 14 Jul 2020 20:25:55 +0000 Subject: [PATCH 03/21] chore(release): 5.0.0-next.1 [skip ci] # [5.0.0-next.1](https://github.com/podium-lib/layout/compare/v4.6.0...v5.0.0-next.1) (2020-07-14) ### Features * Drop node 10.x support ([7e0bb22](https://github.com/podium-lib/layout/commit/7e0bb22c7756c8597422673f244caef493f08ad2)) ### BREAKING CHANGES * Only support node 12 and 14. --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7e60d8d..fe7b1127 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# [5.0.0-next.1](https://github.com/podium-lib/layout/compare/v4.6.0...v5.0.0-next.1) (2020-07-14) + + +### Features + +* Drop node 10.x support ([7e0bb22](https://github.com/podium-lib/layout/commit/7e0bb22c7756c8597422673f244caef493f08ad2)) + + +### BREAKING CHANGES + +* Only support node 12 and 14. + # [4.6.0](https://github.com/podium-lib/layout/compare/v4.5.1...v4.6.0) (2020-06-28) diff --git a/package.json b/package.json index 079f3d06..a1cc8411 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@podium/layout", - "version": "4.6.0", + "version": "5.0.0-next.1", "description": "Module for composing full page layouts out of page fragments in a micro frontend architecture.", "main": "lib/layout.js", "license": "MIT", From e9052ed0b86f4690c8837dd09639ec5170f76e5c Mon Sep 17 00:00:00 2001 From: Trygve Lie Date: Tue, 21 Jul 2020 10:24:49 +0200 Subject: [PATCH 04/21] feat: Remove deprecated return value on .js and .css methods BREAKING CHANGE: In version 4 of podium it became possible to set multiple assets to a layout through its `.js()` and `.css()` methods. This did make it impossible to let these methods return a reasonable value, but to keep a backwards compatibility with version 3 of Podium, the first item passed in was returned for compatibility. This removes this compatibility with version 3 of Podium. This resolves https://github.com/podium-lib/issues/issues/23 --- lib/layout.js | 63 ++++--------------------- package.json | 10 ++-- tests/layout.js | 121 ++++++++++-------------------------------------- 3 files changed, 38 insertions(+), 156 deletions(-) diff --git a/lib/layout.js b/lib/layout.js index 19d44116..77f95c22 100644 --- a/lib/layout.js +++ b/lib/layout.js @@ -23,32 +23,11 @@ const Proxy = require('@podium/proxy'); const merge = require('lodash.merge'); const pkg = require('../package.json'); -const _compabillity = Symbol('_compabillity'); const _pathname = Symbol('_pathname'); const _sanitize = Symbol('_sanitize'); const _addCssAsset = Symbol('_addCssAsset'); const _addJsAsset = Symbol('_addJsAsset'); -function deprecateJsReturn() { - if (!deprecateJsReturn.warned) { - deprecateJsReturn.warned = true; - process.emitWarning( - 'Return value from method js() is now deprecated and will be removed in a future version. Please do not rely on this value.', - 'DeprecationWarning', - ); - } -} - -function deprecateCssReturn() { - if (!deprecateCssReturn.warned) { - deprecateCssReturn.warned = true; - process.emitWarning( - 'Return value from method css() is now deprecated and will be removed in a future version. Please do not rely on this value.', - 'DeprecationWarning', - ); - } -} - const PodiumLayout = class PodiumLayout { /* istanbul ignore next */ constructor({ @@ -185,18 +164,10 @@ const PodiumLayout = class PodiumLayout { } [_addCssAsset](options = {}) { - if (!options.value) { - const v = this[_compabillity](this.cssRoute); - return this[_sanitize](v, options.prefix); - } - - const clonedOptions = JSON.parse(JSON.stringify(options)); - const args = { ...clonedOptions, pathname: this._pathname }; - this.cssRoute.push(new AssetCss(args)); - - // deprecate - deprecateCssReturn(); - return this[_sanitize](args.value, args.prefix); + const clonedOptions = JSON.parse(JSON.stringify(options)); + clonedOptions.value = this[_sanitize](clonedOptions.value, clonedOptions.prefix) + const args = { prefix: true, ...clonedOptions, pathname: this._pathname }; + this.cssRoute.push(new AssetCss(args)); } css(options = {}) { @@ -206,17 +177,14 @@ const PodiumLayout = class PodiumLayout { } return; } - return this[_addCssAsset](options); + this[_addCssAsset](options); } [_addJsAsset](options = {}) { - if (!options.value) { - const v = this[_compabillity](this.jsRoute); - return this[_sanitize](v, options.prefix); - } - const clonedOptions = JSON.parse(JSON.stringify(options)); - const args = { ...clonedOptions, pathname: this._pathname }; + clonedOptions.value = this[_sanitize](clonedOptions.value, clonedOptions.prefix) + + const args = { prefix: true, ...clonedOptions, pathname: this._pathname }; // Convert data attribute object structure to array of key value objects if (typeof args.data === 'object' && args.data !== null) { @@ -231,10 +199,6 @@ const PodiumLayout = class PodiumLayout { } this.jsRoute.push(new AssetJs(args)); - - // deprecate - deprecateJsReturn(); - return this[_sanitize](args.value, args.prefix); } js(options = {}) { @@ -244,7 +208,7 @@ const PodiumLayout = class PodiumLayout { } return; } - return this[_addJsAsset](options); + this[_addJsAsset](options); } view(fn = null) { @@ -303,15 +267,6 @@ const PodiumLayout = class PodiumLayout { } return uri; } - - // This is here only to cater for compabillity between version 3 and 4 - // Can be removed when deprecation of the .assets terminated - [_compabillity](arr) { - const result = arr.map(obj => { - return obj.value; - }); - return result.length === 0 ? '' : result[0]; - } }; module.exports = PodiumLayout; diff --git a/package.json b/package.json index a1cc8411..cf354157 100644 --- a/package.json +++ b/package.json @@ -37,11 +37,11 @@ }, "dependencies": { "@metrics/client": "2.5.0", - "@podium/client": "4.4.2", - "@podium/context": "4.1.6", - "@podium/proxy": "4.2.1", - "@podium/schemas": "4.0.2", - "@podium/utils": "4.3.0", + "@podium/client": "5.0.0-next.4", + "@podium/context": "5.0.0-next.3", + "@podium/proxy": "5.0.0-next.2", + "@podium/schemas": "5.0.0-next.1", + "@podium/utils": "5.0.0-next.2", "abslog": "2.4.0", "lodash.merge": "4.6.2", "objobj": "1.0.0" diff --git a/tests/layout.js b/tests/layout.js index 5ef528d8..47bc7948 100644 --- a/tests/layout.js +++ b/tests/layout.js @@ -131,7 +131,7 @@ test('Layout() - metrics properly decorated', t => { }); app.get('/', async (req, res) => { - const response = await podletClient.fetch(res.locals.podium.context); + const response = await podletClient.fetch(res.locals.podium); res.send(response.content); }); @@ -219,58 +219,21 @@ test('Layout() - metrics properly decorated', t => { // .css() // ############################################# -test('.css() - call method with no arguments - should return default value', t => { +test('.css() - call method with no arguments - should throw', (t) => { const layout = new Layout(DEFAULT_OPTIONS); - const result = layout.css(); - t.equal(result, ''); - t.end(); -}); - -test('.css() - set legal value on "value" argument - should return set value', t => { - const layout = new Layout(DEFAULT_OPTIONS); - const result = layout.css({ value: '/foo/bar' }); - t.equal(result, '/foo/bar'); - t.end(); -}); - -test('.css() - set "prefix" argument to "true" - should prefix value returned by method', t => { - const options = { ...DEFAULT_OPTIONS, pathname: '/xyz' }; - const layout = new Layout(options); - const result = layout.css({ value: '/foo/bar', prefix: true }); - t.equal(result, '/xyz/foo/bar'); - t.end(); -}); - -test('.css() - set legal absolute value on "value" argument - should set "css" to set value', t => { - const layout = new Layout(DEFAULT_OPTIONS); - const result = layout.css({ value: 'http://somewhere.remote.com' }); - t.equal(result, 'http://somewhere.remote.com'); - t.end(); -}); - -test('.css() - set illegal value on "value" argument - should throw', t => { - const layout = new Layout(DEFAULT_OPTIONS); - t.throws(() => { - layout.css({ value: '/foo / bar' }); - }, 'Value for argument variable "value", "/foo / bar", is not valid'); - t.end(); -}); - -test('.css() - call method with "value" argument, then call it a second time with no argument - should return first set value on second call', t => { - const layout = new Layout(DEFAULT_OPTIONS); - layout.css({ value: '/foo/bar' }); - const result = layout.css(); - t.equal(result, '/foo/bar'); - t.end(); + layout.css(); + }, 'Value for argument variable "value", "undefined", is not valid'); + t.end() }); -test('.css() - call method twice with a value for "value" argument - should set both values', t => { +test('.css() - set legal absolute value on "value" argument - should set "css" to set value', t => { const layout = new Layout(DEFAULT_OPTIONS); - layout.css({ value: '/foo/bar' }); - layout.css({ value: '/bar/foo' }); - const result = layout.css(); - t.equal(result, '/foo/bar'); + layout.css({ value: 'http://somewhere.remote.com' }); + const result = JSON.parse(JSON.stringify(layout.cssRoute)); + t.same(result, [ + { rel: 'stylesheet', type: 'text/css', value: 'http://somewhere.remote.com' }, + ]); t.end(); }); @@ -327,6 +290,14 @@ test('.css() - passing an instance of AssetsCss - should return set value', t => // .js() // ############################################# +test('.js() - call method with no arguments - should throw', (t) => { + const layout = new Layout(DEFAULT_OPTIONS); + t.throws(() => { + layout.js(); + }, 'Value for argument variable "value", "undefined", is not valid'); + t.end() +}); + test('.js() - passing an instance of AssetsJs - should return set value', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.js(new AssetJs({ value: '/foo/bar', type: 'module' })); @@ -335,57 +306,13 @@ test('.js() - passing an instance of AssetsJs - should return set value', t => { t.end(); }); -test('.js() - call method with no arguments - should return default value', t => { - const layout = new Layout(DEFAULT_OPTIONS); - const result = layout.js(); - t.equal(result, ''); - t.end(); -}); - -test('.js() - set legal value on "value" argument - should return set value', t => { - const layout = new Layout(DEFAULT_OPTIONS); - const result = layout.js({ value: '/foo/bar' }); - t.equal(result, '/foo/bar'); - t.end(); -}); - -test('.js() - set "prefix" argument to "true" - should prefix value returned by method', t => { - const options = { ...DEFAULT_OPTIONS, pathname: '/xyz' }; - const layout = new Layout(options); - const result = layout.js({ value: '/foo/bar', prefix: true }); - t.equal(result, '/xyz/foo/bar'); - t.end(); -}); - test('.js() - set legal absolute value on "value" argument - should set "js" to set value', t => { const layout = new Layout(DEFAULT_OPTIONS); - const result = layout.js({ value: 'http://somewhere.remote.com' }); - t.equal(result, 'http://somewhere.remote.com'); - t.end(); -}); - -test('.js() - set illegal value on "value" argument - should throw', t => { - const layout = new Layout(DEFAULT_OPTIONS); - t.throws(() => { - layout.js({ value: '/foo / bar' }); - }, 'Value for argument variable "value", "/foo / bar", is not valid'); - t.end(); -}); - -test('.js() - call method with "value" argument, then call it a second time with no argument - should return first set value on second call', t => { - const layout = new Layout(DEFAULT_OPTIONS); - layout.js({ value: '/foo/bar' }); - const result = layout.js(); - t.equals(result, '/foo/bar'); - t.end(); -}); - -test('.js() - call method twice with a value for "value" argument - should set both values', t => { - const layout = new Layout(DEFAULT_OPTIONS); - layout.js({ value: '/foo/bar' }); - layout.js({ value: '/bar/foo' }); - const result = layout.js(); - t.equals(result, '/foo/bar'); + layout.js({ value: 'http://somewhere.remote.com' }); + const result = JSON.parse(JSON.stringify(layout.jsRoute)); + t.same(result, [ + { type: 'default', value: 'http://somewhere.remote.com' }, + ]); t.end(); }); From af5dbc2a8be35db6dc22b9b354d4242ff5fc17eb Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 21 Jul 2020 08:34:36 +0000 Subject: [PATCH 05/21] chore(release): 5.0.0-next.2 [skip ci] # [5.0.0-next.2](https://github.com/podium-lib/layout/compare/v5.0.0-next.1...v5.0.0-next.2) (2020-07-21) ### Features * Remove deprecated return value on .js and .css methods ([e9052ed](https://github.com/podium-lib/layout/commit/e9052ed0b86f4690c8837dd09639ec5170f76e5c)) ### BREAKING CHANGES * In version 4 of podium it became possible to set multiple assets to a layout through its `.js()` and `.css()` methods. This did make it impossible to let these methods return a reasonable value, but to keep a backwards compatibility with version 3 of Podium, the first item passed in was returned for compatibility. This removes this compatibility with version 3 of Podium. This resolves https://github.com/podium-lib/issues/issues/23 --- CHANGELOG.md | 14 ++++++++++++++ package.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe7b1127..44094bc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +# [5.0.0-next.2](https://github.com/podium-lib/layout/compare/v5.0.0-next.1...v5.0.0-next.2) (2020-07-21) + + +### Features + +* Remove deprecated return value on .js and .css methods ([e9052ed](https://github.com/podium-lib/layout/commit/e9052ed0b86f4690c8837dd09639ec5170f76e5c)) + + +### BREAKING CHANGES + +* In version 4 of podium it became possible to set multiple assets to a layout through its `.js()` and `.css()` methods. This did make it impossible to let these methods return a reasonable value, but to keep a backwards compatibility with version 3 of Podium, the first item passed in was returned for compatibility. This removes this compatibility with version 3 of Podium. + +This resolves https://github.com/podium-lib/issues/issues/23 + # [5.0.0-next.1](https://github.com/podium-lib/layout/compare/v4.6.0...v5.0.0-next.1) (2020-07-14) diff --git a/package.json b/package.json index cf354157..1fdab54c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@podium/layout", - "version": "5.0.0-next.1", + "version": "5.0.0-next.2", "description": "Module for composing full page layouts out of page fragments in a micro frontend architecture.", "main": "lib/layout.js", "license": "MIT", From ea2bc77e761c181fb97cb61fb74fccf91238c7d6 Mon Sep 17 00:00:00 2001 From: Trygve Lie <173003+trygve-lie@users.noreply.github.com> Date: Tue, 21 Jul 2020 12:35:56 +0200 Subject: [PATCH 06/21] fix: Remove lodash.merge (#157) * fix: Remove lodash.merge * fix: Removed unnecessary () Co-authored-by: Trygve Lie --- lib/layout.js | 37 ++++++++++--------------------------- package.json | 1 - 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/lib/layout.js b/lib/layout.js index 77f95c22..82621db1 100644 --- a/lib/layout.js +++ b/lib/layout.js @@ -20,7 +20,6 @@ const objobj = require('objobj'); const Client = require('@podium/client'); const abslog = require('abslog'); const Proxy = require('@podium/proxy'); -const merge = require('lodash.merge'); const pkg = require('../package.json'); const _pathname = Symbol('_pathname'); @@ -70,13 +69,7 @@ const PodiumLayout = class PodiumLayout { Object.defineProperty(this, 'client', { value: new Client( - merge( - { - name: this.name, - logger: this.log, - }, - client, - ), + { name: this.name, logger: this.log, ...client}, ), enumerable: true, }); @@ -84,32 +77,22 @@ const PodiumLayout = class PodiumLayout { Object.defineProperty(this, 'context', { enumerable: true, value: new Context( - merge( - { - name: this.name, - mountPathname: { - pathname: this[_pathname], - }, - publicPathname: { - pathname: this[_pathname], - }, - logger: this.log, + { name: this.name, + mountPathname: { + pathname: this[_pathname], + }, + publicPathname: { + pathname: this[_pathname], }, - context, - ), + logger: this.log, + ...context}, ), }); Object.defineProperty(this, 'httpProxy', { enumerable: true, value: new Proxy( - merge( - { - pathname: this[_pathname], - logger: this.log, - }, - proxy, - ), + { pathname: this[_pathname], logger: this.log, ...proxy}, ), }); diff --git a/package.json b/package.json index 1fdab54c..905ada9c 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,6 @@ "@podium/schemas": "5.0.0-next.1", "@podium/utils": "5.0.0-next.2", "abslog": "2.4.0", - "lodash.merge": "4.6.2", "objobj": "1.0.0" }, "devDependencies": { From bacdec8e873ec15834d7a7841b0b06f025538403 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 21 Jul 2020 10:37:42 +0000 Subject: [PATCH 07/21] chore(release): 5.0.0-next.3 [skip ci] # [5.0.0-next.3](https://github.com/podium-lib/layout/compare/v5.0.0-next.2...v5.0.0-next.3) (2020-07-21) ### Bug Fixes * Remove lodash.merge ([#157](https://github.com/podium-lib/layout/issues/157)) ([ea2bc77](https://github.com/podium-lib/layout/commit/ea2bc77e761c181fb97cb61fb74fccf91238c7d6)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44094bc2..5ffbd5d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [5.0.0-next.3](https://github.com/podium-lib/layout/compare/v5.0.0-next.2...v5.0.0-next.3) (2020-07-21) + + +### Bug Fixes + +* Remove lodash.merge ([#157](https://github.com/podium-lib/layout/issues/157)) ([ea2bc77](https://github.com/podium-lib/layout/commit/ea2bc77e761c181fb97cb61fb74fccf91238c7d6)) + # [5.0.0-next.2](https://github.com/podium-lib/layout/compare/v5.0.0-next.1...v5.0.0-next.2) (2020-07-21) diff --git a/package.json b/package.json index 905ada9c..57953d7d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@podium/layout", - "version": "5.0.0-next.2", + "version": "5.0.0-next.3", "description": "Module for composing full page layouts out of page fragments in a micro frontend architecture.", "main": "lib/layout.js", "license": "MIT", From be49970d317a8205762570f04962ba5f4c66eac9 Mon Sep 17 00:00:00 2001 From: Trygve Lie Date: Fri, 30 Apr 2021 16:49:33 +0200 Subject: [PATCH 08/21] fix: Resolve merge conflicts --- package.json | 10 +++++----- tests/layout.js | 32 +++++++++++--------------------- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index eeb84c30..56e4fff9 100644 --- a/package.json +++ b/package.json @@ -43,20 +43,19 @@ "@podium/schemas": "5.0.0-next.1", "@podium/utils": "5.0.0-next.2", "abslog": "2.4.0", + "ajv": "8.2.0", "lodash.merge": "4.6.2", - "objobj": "1.0.0", - "ajv": "8.2.0" + "objobj": "1.0.0" }, "devDependencies": { + "@podium/podlet": "4.4.20", + "@podium/test-utils": "2.3.0", "@semantic-release/changelog": "5.0.1", "@semantic-release/commit-analyzer": "8.0.1", "@semantic-release/git": "9.0.0", "@semantic-release/github": "7.2.1", "@semantic-release/npm": "7.1.1", "@semantic-release/release-notes-generator": "9.0.2", - "semantic-release": "17.4.2", - "@podium/podlet": "4.4.20", - "@podium/test-utils": "2.3.0", "eslint": "7.25.0", "eslint-config-airbnb-base": "14.2.1", "eslint-config-prettier": "8.3.0", @@ -65,6 +64,7 @@ "express": "4.17.1", "hbs": "4.1.2", "prettier": "2.2.1", + "semantic-release": "17.4.2", "stoppable": "1.1.0", "supertest": "6.1.3", "tap": "15.0.5" diff --git a/tests/layout.js b/tests/layout.js index 8525defb..d980c30d 100644 --- a/tests/layout.js +++ b/tests/layout.js @@ -308,33 +308,23 @@ test('.js() - passing an instance of AssetsJs - should return set value', t => { test('.js() - set legal absolute value on "value" argument - should set "js" to set value', t => { const layout = new Layout(DEFAULT_OPTIONS); - const result = layout.js({ value: 'http://somewhere.remote.com' }); - t.equal(result, 'http://somewhere.remote.com'); + layout.js({ value: 'http://somewhere.remote.com' }); + const result = JSON.parse(JSON.stringify(layout.jsRoute)); + t.same(result, [ + { type: 'default', value: 'http://somewhere.remote.com' }, + ]); t.end(); }); test('.js() - set illegal value on "value" argument - should throw', t => { - const layout = new Layout(DEFAULT_OPTIONS); - t.throws(() => { - layout.js({ value: '/foo / bar' }); - }, 'Value for argument variable "value", "/foo / bar", is not valid'); - t.end(); -}); - -test('.js() - call method with "value" argument, then call it a second time with no argument - should return first set value on second call', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.js({ value: '/foo/bar' }); - const result = layout.js(); - t.equal(result, '/foo/bar'); - t.end(); -}); - -test('.js() - call method twice with a value for "value" argument - should set both values', t => { - const layout = new Layout(DEFAULT_OPTIONS); - layout.js({ value: '/foo/bar' }); - layout.js({ value: '/bar/foo' }); - const result = layout.js(); - t.equal(result, '/foo/bar'); + layout.js({ value: '/bar/foo', type: 'module' }); + const result = JSON.parse(JSON.stringify(layout.jsRoute)); + t.same(result, [ + { type: 'default', value: '/foo/bar' }, + { type: 'module', value: '/bar/foo' }, + ]); t.end(); }); From 9237206a665db421b8f8321ff348942a5a0cc151 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 30 Apr 2021 14:52:12 +0000 Subject: [PATCH 09/21] chore(release): 5.0.0-next.4 [skip ci] # [5.0.0-next.4](https://github.com/podium-lib/layout/compare/v5.0.0-next.3...v5.0.0-next.4) (2021-04-30) ### Bug Fixes * Resolve merge conflicts ([be49970](https://github.com/podium-lib/layout/commit/be49970d317a8205762570f04962ba5f4c66eac9)) * **deps:** update [@podium](https://github.com/podium) packages ([0341eec](https://github.com/podium-lib/layout/commit/0341eec908ba773a81eb9cd7186023e7532984ac)) * **deps:** update all dependencies ([07bb8ce](https://github.com/podium-lib/layout/commit/07bb8ce331bffbb7abe9ebcfa8733ff6b4ae1a8c)) * **deps:** update all dependencies ([0c3e222](https://github.com/podium-lib/layout/commit/0c3e222ebc3da5e1e39781b64c8e271f7d1bee01)) * **deps:** update all dependencies ([a2e8893](https://github.com/podium-lib/layout/commit/a2e8893e815600e2dabc7ada23a974ce22ab07a4)) * **deps:** update dependency @podium/client to v4.4.10 ([478df11](https://github.com/podium-lib/layout/commit/478df11219386c82ff4c65d605f73a49489b666e)) * **deps:** update dependency @podium/context to v4.1.19 ([76cac98](https://github.com/podium-lib/layout/commit/76cac984beb549ce1f734739761bd6c05f087d9f)) * **deps:** update dependency @podium/context to v4.1.20 ([a555383](https://github.com/podium-lib/layout/commit/a555383e9b69c3e246fc849b9541b7d6c0ba0262)) * **deps:** update dependency @podium/context to v4.1.21 ([bf829fe](https://github.com/podium-lib/layout/commit/bf829fe999f6156e5c82f2bf18cb11f196f30f7b)) * **deps:** update dependency @podium/context to v4.1.22 ([e74e55f](https://github.com/podium-lib/layout/commit/e74e55f46bb3ab404768c05d263fbdc0a08455bc)) * **deps:** update dependency @podium/context to v4.1.24 ([4c5e034](https://github.com/podium-lib/layout/commit/4c5e034e73be62d2b7be7bedaf578eb28ae8bb55)) * **deps:** update dependency @podium/context to v4.1.26 ([c1e563b](https://github.com/podium-lib/layout/commit/c1e563b78868112e88894c1fe51546766a989707)) * **deps:** update dependency @podium/context to v4.1.28 ([03a0764](https://github.com/podium-lib/layout/commit/03a0764a7028b05175033def84377926225332bf)) * **deps:** update dependency @podium/context to v4.1.32 ([42bd4f5](https://github.com/podium-lib/layout/commit/42bd4f50f44edd813c6b1d8eb9371ffa542b334d)) * **deps:** update dependency @podium/proxy to v4.2.18 ([fb7c74d](https://github.com/podium-lib/layout/commit/fb7c74db51b6fc9b8573547c5c753dbf90e984f6)) * **deps:** update dependency @podium/proxy to v4.2.20 ([56f77bc](https://github.com/podium-lib/layout/commit/56f77bc5e29f7363e7f18743adbae6136f189be1)) * **deps:** update dependency @podium/proxy to v4.2.22 ([aa2d330](https://github.com/podium-lib/layout/commit/aa2d330b173dbbf554e19ac15f06c4fc392f9e15)) * **deps:** update dependency @podium/proxy to v4.2.23 ([7007883](https://github.com/podium-lib/layout/commit/7007883108c01c11611f5f22ff45e76805c28237)) * **deps:** update dependency @podium/proxy to v4.2.24 ([17e9b45](https://github.com/podium-lib/layout/commit/17e9b4509af930b86169035c8fa870802204527a)) * **deps:** update dependency @podium/proxy to v4.2.25 ([c75cbc9](https://github.com/podium-lib/layout/commit/c75cbc94463ac809330c1e2258667e52b1d15da4)) * **deps:** update dependency @podium/proxy to v4.2.26 ([d459021](https://github.com/podium-lib/layout/commit/d45902129e7066f83b67d8ce174e80e33515a4e0)) * **deps:** update dependency @podium/proxy to v4.2.28 ([a6f857a](https://github.com/podium-lib/layout/commit/a6f857a7b566594a452ae51fc1c53668035df8d3)) * **deps:** update dependency @podium/proxy to v4.2.30 ([3c75422](https://github.com/podium-lib/layout/commit/3c754227338f2e3da6eed6f89a6a32368283bd61)) * **deps:** update dependency @podium/schemas to v4.1.10 ([7a04d52](https://github.com/podium-lib/layout/commit/7a04d529c09519bcda65da0892d63966dea581dd)) * **deps:** update dependency @podium/schemas to v4.1.3 ([0cfb408](https://github.com/podium-lib/layout/commit/0cfb4085e291a926ef10e4cb912828a58bbd937f)) * **deps:** update dependency @podium/schemas to v4.1.4 ([eea2ab6](https://github.com/podium-lib/layout/commit/eea2ab688cbbe7e68fc84fcb987b2e7482941072)) * **deps:** update dependency @podium/schemas to v4.1.5 ([6ac52f9](https://github.com/podium-lib/layout/commit/6ac52f992e7250a41c7b67f5bead99cb1192a65e)) * **deps:** update dependency @podium/schemas to v4.1.6 ([a371d1c](https://github.com/podium-lib/layout/commit/a371d1c19d2b41b0a6f30d7ddfa80d06d14eb32d)) * **deps:** update dependency @podium/schemas to v4.1.7 ([61bf68b](https://github.com/podium-lib/layout/commit/61bf68b761e1689100e54365ed77de108167b1f1)) * **deps:** update dependency @podium/schemas to v4.1.8 ([8780c4d](https://github.com/podium-lib/layout/commit/8780c4d4a2cd261fdef39a9d26206ab81bedc7ab)) * **deps:** update dependency @podium/utils to v4.4.10 ([59b659e](https://github.com/podium-lib/layout/commit/59b659e5029a86ad1a7c1cd7178b9eca348d9a7d)) * **deps:** update dependency @podium/utils to v4.4.11 ([6fb2706](https://github.com/podium-lib/layout/commit/6fb2706a8411dd2ea1c85d3e372be13ed17cfcb5)) * **deps:** update dependency @podium/utils to v4.4.6 ([ba8e35b](https://github.com/podium-lib/layout/commit/ba8e35b3659aea0be708d5a3e3f1d120f9ed48e2)) * **deps:** update dependency @podium/utils to v4.4.7 ([003ce43](https://github.com/podium-lib/layout/commit/003ce43acded6b7efbc97efa39c7070ac8a6c027)) * **deps:** update dependency @podium/utils to v4.4.8 ([4d1a4b0](https://github.com/podium-lib/layout/commit/4d1a4b08a6ee48d30c786dba4121d5c9f31b9c2c)) * **deps:** update dependency @podium/utils to v4.4.9 ([c254099](https://github.com/podium-lib/layout/commit/c254099ee71ff25da605aa19cd2aac870841971d)) * **deps:** update dependency ajv to v8.0.2 ([7c8d0af](https://github.com/podium-lib/layout/commit/7c8d0aff014818afe66ca1f81bb79723ffd0c319)) * **deps:** update dependency ajv to v8.0.5 ([f1a90ac](https://github.com/podium-lib/layout/commit/f1a90ac61c7eb25a24c030280aefb6e02e6bab5a)) * **deps:** update dependency ajv to v8.2.0 ([4959bb7](https://github.com/podium-lib/layout/commit/4959bb71a8f8c08649e9576ee2c81d7db6f1f3b6)) * Update @podium/client to version 4.4.9 ([#255](https://github.com/podium-lib/layout/issues/255)) ([9a7cd06](https://github.com/podium-lib/layout/commit/9a7cd06cc9d9873b1839ac4956ce9fff74ab47c9)) * Update @podium/schema to version 4.1.9 to fix ajv error ([#254](https://github.com/podium-lib/layout/issues/254)) ([36d9677](https://github.com/podium-lib/layout/commit/36d96776416f5bd1f40a6568205288bee458f186)) * **deps:** update dependency @podium/client to v4.4.3 ([15de2ed](https://github.com/podium-lib/layout/commit/15de2ede947457f08b40e9efc0df27622314da2a)) * **deps:** update dependency @podium/client to v4.4.5 ([2eeb431](https://github.com/podium-lib/layout/commit/2eeb4314758dc4205b3787e681de0df8aa72daa8)) * **deps:** update dependency @podium/client to v4.4.6 ([df8b921](https://github.com/podium-lib/layout/commit/df8b9214d68cf53c845f3e6ec1c32381bc1d0df1)) * **deps:** update dependency @podium/client to v4.4.7 ([56eb5d3](https://github.com/podium-lib/layout/commit/56eb5d30d6271b7199306d5aeb7b89a66f991c01)) * **deps:** update dependency @podium/client to v4.4.8 ([5ba4812](https://github.com/podium-lib/layout/commit/5ba48127d1d29542c9e69c386c916177a4f7d382)) * **deps:** update dependency @podium/context to v4.1.10 ([82ad921](https://github.com/podium-lib/layout/commit/82ad9211dd802477a2289b71f4d9ca254b23b26a)) * **deps:** update dependency @podium/context to v4.1.11 ([14f9c21](https://github.com/podium-lib/layout/commit/14f9c2112b7bd2b2245200078da0cc7748c2973b)) * **deps:** update dependency @podium/context to v4.1.12 ([966f28e](https://github.com/podium-lib/layout/commit/966f28e785c7fea9ca60b1e8d394384dd4b34973)) * **deps:** update dependency @podium/context to v4.1.14 ([2b30c07](https://github.com/podium-lib/layout/commit/2b30c07b2a4961c8ebbaf8ee8f9812c5ea3f36cc)) * **deps:** update dependency @podium/context to v4.1.15 ([2b35fd6](https://github.com/podium-lib/layout/commit/2b35fd6dbab7de743f0dec33ef62e6eba8d526ab)) * **deps:** update dependency @podium/context to v4.1.16 ([9657933](https://github.com/podium-lib/layout/commit/96579330efe62ecfd7b12cd6bef2ae4a8733bc85)) * **deps:** update dependency @podium/context to v4.1.18 ([cb5d858](https://github.com/podium-lib/layout/commit/cb5d85894629fc861b64fe17310df817f652f442)) * **deps:** update dependency @podium/context to v4.1.7 ([2f0c735](https://github.com/podium-lib/layout/commit/2f0c735622eba8a51e5f51093716ba645a7cbf3e)) * **deps:** update dependency @podium/context to v4.1.8 ([3bee6fd](https://github.com/podium-lib/layout/commit/3bee6fd92fc25934120b7c0c268bf88d0187f7ac)) * **deps:** update dependency @podium/context to v4.1.9 ([2e6b6b9](https://github.com/podium-lib/layout/commit/2e6b6b98cc287cef515c17cf728b5bbda2ed3abc)) * **deps:** update dependency @podium/proxy to v4.2.10 ([3541c5a](https://github.com/podium-lib/layout/commit/3541c5a3ddcdfb11646812fbb660fc759bdb830f)) * **deps:** update dependency @podium/proxy to v4.2.12 ([a169f96](https://github.com/podium-lib/layout/commit/a169f96eb7db9475def7d686f78ae630dc187232)) * **deps:** update dependency @podium/proxy to v4.2.14 ([ef247fb](https://github.com/podium-lib/layout/commit/ef247fbb75059caa0906ea853649b0c58faa0070)) * **deps:** update dependency @podium/proxy to v4.2.16 ([1e4aa5d](https://github.com/podium-lib/layout/commit/1e4aa5db48b6113b0aa8add30dd454d5227774da)) * **deps:** update dependency @podium/proxy to v4.2.2 ([e04beba](https://github.com/podium-lib/layout/commit/e04beba1c4757b40e56c834f9ecf05e9e5ac97a2)) * **deps:** update dependency @podium/proxy to v4.2.3 ([83d7a7e](https://github.com/podium-lib/layout/commit/83d7a7e5a3d7dd7a523843efaaa8cb781aff4e78)) * **deps:** update dependency @podium/proxy to v4.2.4 ([426f376](https://github.com/podium-lib/layout/commit/426f37604a10501ab82c34f0ad87b21f31d021db)) * **deps:** update dependency @podium/proxy to v4.2.5 ([017d8c2](https://github.com/podium-lib/layout/commit/017d8c2738de65fdf826dd430ea4420336b4a579)) * **deps:** update dependency @podium/proxy to v4.2.6 ([0080ada](https://github.com/podium-lib/layout/commit/0080ada009deda88cea0d62068ee2e79130018bd)) * **deps:** update dependency @podium/proxy to v4.2.7 ([c7cfa11](https://github.com/podium-lib/layout/commit/c7cfa11701eda560c6ad47cb76c3ee3bda0ecdad)) * **deps:** update dependency @podium/proxy to v4.2.8 ([e2ad7ad](https://github.com/podium-lib/layout/commit/e2ad7ad97ba339fab2d2281ecb5c4389e049bc95)) * **deps:** update dependency @podium/proxy to v4.2.9 ([8fedc0d](https://github.com/podium-lib/layout/commit/8fedc0d530d811d44b686ca4471795ae91a7f8f5)) * **deps:** update dependency @podium/schemas to v4.0.4 ([eaa15a6](https://github.com/podium-lib/layout/commit/eaa15a6e4e357cf820d6d3c57f97c083011fa986)) * **deps:** update dependency @podium/schemas to v4.0.5 ([3f9a92e](https://github.com/podium-lib/layout/commit/3f9a92ec61d7bd889cbb4225d9c505434a309b62)) * **deps:** update dependency @podium/schemas to v4.0.7 ([cb86485](https://github.com/podium-lib/layout/commit/cb86485eca1edd390d28d95ac6ac21fda106ce3a)) * **deps:** update dependency @podium/schemas to v4.1.0 ([6226961](https://github.com/podium-lib/layout/commit/622696183c0a59c77f8574ad5e828bb73d74045d)) * **deps:** update dependency @podium/schemas to v4.1.1 ([e80b2cb](https://github.com/podium-lib/layout/commit/e80b2cbd7f8d906605a588e994e6ab355c77c162)) * **deps:** update dependency @podium/schemas to v4.1.2 ([15e7e05](https://github.com/podium-lib/layout/commit/15e7e0531245627d01814a546481b7327f618bde)) * **deps:** update dependency @podium/utils to v4.3.1 ([e437f19](https://github.com/podium-lib/layout/commit/e437f192891444b23b568326237c408536e2f866)) * **deps:** update dependency @podium/utils to v4.3.3 ([be4816a](https://github.com/podium-lib/layout/commit/be4816a9926ae45b2492d531997b348b21cf5b1f)) * **deps:** update dependency @podium/utils to v4.4.0 ([dcc6d60](https://github.com/podium-lib/layout/commit/dcc6d605871a0ce62e69ad9a1d0a0ec9699fcb61)) * **deps:** update dependency @podium/utils to v4.4.1 ([8a6eceb](https://github.com/podium-lib/layout/commit/8a6eceb3846c937a25fc447c680397cfd31ea32d)) * **deps:** update dependency @podium/utils to v4.4.2 ([b0c23a3](https://github.com/podium-lib/layout/commit/b0c23a30d82168cdff1b298a7875f8db9d03f2f8)) * **deps:** update dependency @podium/utils to v4.4.3 ([d4fb0cd](https://github.com/podium-lib/layout/commit/d4fb0cd62c00f5633c672633bdeffc13f8804a00)) * **deps:** update dependency @podium/utils to v4.4.4 ([0eddac0](https://github.com/podium-lib/layout/commit/0eddac079b4aba2adb4c80cac876ccb1e899ef1c)) * **deps:** update dependency @podium/utils to v4.4.5 ([067ccf1](https://github.com/podium-lib/layout/commit/067ccf103f7387414bf5d6408c88ae3973bc2f53)) --- CHANGELOG.md | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf2f098d..62dd7fad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,91 @@ +# [5.0.0-next.4](https://github.com/podium-lib/layout/compare/v5.0.0-next.3...v5.0.0-next.4) (2021-04-30) + + +### Bug Fixes + +* Resolve merge conflicts ([be49970](https://github.com/podium-lib/layout/commit/be49970d317a8205762570f04962ba5f4c66eac9)) +* **deps:** update [@podium](https://github.com/podium) packages ([0341eec](https://github.com/podium-lib/layout/commit/0341eec908ba773a81eb9cd7186023e7532984ac)) +* **deps:** update all dependencies ([07bb8ce](https://github.com/podium-lib/layout/commit/07bb8ce331bffbb7abe9ebcfa8733ff6b4ae1a8c)) +* **deps:** update all dependencies ([0c3e222](https://github.com/podium-lib/layout/commit/0c3e222ebc3da5e1e39781b64c8e271f7d1bee01)) +* **deps:** update all dependencies ([a2e8893](https://github.com/podium-lib/layout/commit/a2e8893e815600e2dabc7ada23a974ce22ab07a4)) +* **deps:** update dependency @podium/client to v4.4.10 ([478df11](https://github.com/podium-lib/layout/commit/478df11219386c82ff4c65d605f73a49489b666e)) +* **deps:** update dependency @podium/context to v4.1.19 ([76cac98](https://github.com/podium-lib/layout/commit/76cac984beb549ce1f734739761bd6c05f087d9f)) +* **deps:** update dependency @podium/context to v4.1.20 ([a555383](https://github.com/podium-lib/layout/commit/a555383e9b69c3e246fc849b9541b7d6c0ba0262)) +* **deps:** update dependency @podium/context to v4.1.21 ([bf829fe](https://github.com/podium-lib/layout/commit/bf829fe999f6156e5c82f2bf18cb11f196f30f7b)) +* **deps:** update dependency @podium/context to v4.1.22 ([e74e55f](https://github.com/podium-lib/layout/commit/e74e55f46bb3ab404768c05d263fbdc0a08455bc)) +* **deps:** update dependency @podium/context to v4.1.24 ([4c5e034](https://github.com/podium-lib/layout/commit/4c5e034e73be62d2b7be7bedaf578eb28ae8bb55)) +* **deps:** update dependency @podium/context to v4.1.26 ([c1e563b](https://github.com/podium-lib/layout/commit/c1e563b78868112e88894c1fe51546766a989707)) +* **deps:** update dependency @podium/context to v4.1.28 ([03a0764](https://github.com/podium-lib/layout/commit/03a0764a7028b05175033def84377926225332bf)) +* **deps:** update dependency @podium/context to v4.1.32 ([42bd4f5](https://github.com/podium-lib/layout/commit/42bd4f50f44edd813c6b1d8eb9371ffa542b334d)) +* **deps:** update dependency @podium/proxy to v4.2.18 ([fb7c74d](https://github.com/podium-lib/layout/commit/fb7c74db51b6fc9b8573547c5c753dbf90e984f6)) +* **deps:** update dependency @podium/proxy to v4.2.20 ([56f77bc](https://github.com/podium-lib/layout/commit/56f77bc5e29f7363e7f18743adbae6136f189be1)) +* **deps:** update dependency @podium/proxy to v4.2.22 ([aa2d330](https://github.com/podium-lib/layout/commit/aa2d330b173dbbf554e19ac15f06c4fc392f9e15)) +* **deps:** update dependency @podium/proxy to v4.2.23 ([7007883](https://github.com/podium-lib/layout/commit/7007883108c01c11611f5f22ff45e76805c28237)) +* **deps:** update dependency @podium/proxy to v4.2.24 ([17e9b45](https://github.com/podium-lib/layout/commit/17e9b4509af930b86169035c8fa870802204527a)) +* **deps:** update dependency @podium/proxy to v4.2.25 ([c75cbc9](https://github.com/podium-lib/layout/commit/c75cbc94463ac809330c1e2258667e52b1d15da4)) +* **deps:** update dependency @podium/proxy to v4.2.26 ([d459021](https://github.com/podium-lib/layout/commit/d45902129e7066f83b67d8ce174e80e33515a4e0)) +* **deps:** update dependency @podium/proxy to v4.2.28 ([a6f857a](https://github.com/podium-lib/layout/commit/a6f857a7b566594a452ae51fc1c53668035df8d3)) +* **deps:** update dependency @podium/proxy to v4.2.30 ([3c75422](https://github.com/podium-lib/layout/commit/3c754227338f2e3da6eed6f89a6a32368283bd61)) +* **deps:** update dependency @podium/schemas to v4.1.10 ([7a04d52](https://github.com/podium-lib/layout/commit/7a04d529c09519bcda65da0892d63966dea581dd)) +* **deps:** update dependency @podium/schemas to v4.1.3 ([0cfb408](https://github.com/podium-lib/layout/commit/0cfb4085e291a926ef10e4cb912828a58bbd937f)) +* **deps:** update dependency @podium/schemas to v4.1.4 ([eea2ab6](https://github.com/podium-lib/layout/commit/eea2ab688cbbe7e68fc84fcb987b2e7482941072)) +* **deps:** update dependency @podium/schemas to v4.1.5 ([6ac52f9](https://github.com/podium-lib/layout/commit/6ac52f992e7250a41c7b67f5bead99cb1192a65e)) +* **deps:** update dependency @podium/schemas to v4.1.6 ([a371d1c](https://github.com/podium-lib/layout/commit/a371d1c19d2b41b0a6f30d7ddfa80d06d14eb32d)) +* **deps:** update dependency @podium/schemas to v4.1.7 ([61bf68b](https://github.com/podium-lib/layout/commit/61bf68b761e1689100e54365ed77de108167b1f1)) +* **deps:** update dependency @podium/schemas to v4.1.8 ([8780c4d](https://github.com/podium-lib/layout/commit/8780c4d4a2cd261fdef39a9d26206ab81bedc7ab)) +* **deps:** update dependency @podium/utils to v4.4.10 ([59b659e](https://github.com/podium-lib/layout/commit/59b659e5029a86ad1a7c1cd7178b9eca348d9a7d)) +* **deps:** update dependency @podium/utils to v4.4.11 ([6fb2706](https://github.com/podium-lib/layout/commit/6fb2706a8411dd2ea1c85d3e372be13ed17cfcb5)) +* **deps:** update dependency @podium/utils to v4.4.6 ([ba8e35b](https://github.com/podium-lib/layout/commit/ba8e35b3659aea0be708d5a3e3f1d120f9ed48e2)) +* **deps:** update dependency @podium/utils to v4.4.7 ([003ce43](https://github.com/podium-lib/layout/commit/003ce43acded6b7efbc97efa39c7070ac8a6c027)) +* **deps:** update dependency @podium/utils to v4.4.8 ([4d1a4b0](https://github.com/podium-lib/layout/commit/4d1a4b08a6ee48d30c786dba4121d5c9f31b9c2c)) +* **deps:** update dependency @podium/utils to v4.4.9 ([c254099](https://github.com/podium-lib/layout/commit/c254099ee71ff25da605aa19cd2aac870841971d)) +* **deps:** update dependency ajv to v8.0.2 ([7c8d0af](https://github.com/podium-lib/layout/commit/7c8d0aff014818afe66ca1f81bb79723ffd0c319)) +* **deps:** update dependency ajv to v8.0.5 ([f1a90ac](https://github.com/podium-lib/layout/commit/f1a90ac61c7eb25a24c030280aefb6e02e6bab5a)) +* **deps:** update dependency ajv to v8.2.0 ([4959bb7](https://github.com/podium-lib/layout/commit/4959bb71a8f8c08649e9576ee2c81d7db6f1f3b6)) +* Update @podium/client to version 4.4.9 ([#255](https://github.com/podium-lib/layout/issues/255)) ([9a7cd06](https://github.com/podium-lib/layout/commit/9a7cd06cc9d9873b1839ac4956ce9fff74ab47c9)) +* Update @podium/schema to version 4.1.9 to fix ajv error ([#254](https://github.com/podium-lib/layout/issues/254)) ([36d9677](https://github.com/podium-lib/layout/commit/36d96776416f5bd1f40a6568205288bee458f186)) +* **deps:** update dependency @podium/client to v4.4.3 ([15de2ed](https://github.com/podium-lib/layout/commit/15de2ede947457f08b40e9efc0df27622314da2a)) +* **deps:** update dependency @podium/client to v4.4.5 ([2eeb431](https://github.com/podium-lib/layout/commit/2eeb4314758dc4205b3787e681de0df8aa72daa8)) +* **deps:** update dependency @podium/client to v4.4.6 ([df8b921](https://github.com/podium-lib/layout/commit/df8b9214d68cf53c845f3e6ec1c32381bc1d0df1)) +* **deps:** update dependency @podium/client to v4.4.7 ([56eb5d3](https://github.com/podium-lib/layout/commit/56eb5d30d6271b7199306d5aeb7b89a66f991c01)) +* **deps:** update dependency @podium/client to v4.4.8 ([5ba4812](https://github.com/podium-lib/layout/commit/5ba48127d1d29542c9e69c386c916177a4f7d382)) +* **deps:** update dependency @podium/context to v4.1.10 ([82ad921](https://github.com/podium-lib/layout/commit/82ad9211dd802477a2289b71f4d9ca254b23b26a)) +* **deps:** update dependency @podium/context to v4.1.11 ([14f9c21](https://github.com/podium-lib/layout/commit/14f9c2112b7bd2b2245200078da0cc7748c2973b)) +* **deps:** update dependency @podium/context to v4.1.12 ([966f28e](https://github.com/podium-lib/layout/commit/966f28e785c7fea9ca60b1e8d394384dd4b34973)) +* **deps:** update dependency @podium/context to v4.1.14 ([2b30c07](https://github.com/podium-lib/layout/commit/2b30c07b2a4961c8ebbaf8ee8f9812c5ea3f36cc)) +* **deps:** update dependency @podium/context to v4.1.15 ([2b35fd6](https://github.com/podium-lib/layout/commit/2b35fd6dbab7de743f0dec33ef62e6eba8d526ab)) +* **deps:** update dependency @podium/context to v4.1.16 ([9657933](https://github.com/podium-lib/layout/commit/96579330efe62ecfd7b12cd6bef2ae4a8733bc85)) +* **deps:** update dependency @podium/context to v4.1.18 ([cb5d858](https://github.com/podium-lib/layout/commit/cb5d85894629fc861b64fe17310df817f652f442)) +* **deps:** update dependency @podium/context to v4.1.7 ([2f0c735](https://github.com/podium-lib/layout/commit/2f0c735622eba8a51e5f51093716ba645a7cbf3e)) +* **deps:** update dependency @podium/context to v4.1.8 ([3bee6fd](https://github.com/podium-lib/layout/commit/3bee6fd92fc25934120b7c0c268bf88d0187f7ac)) +* **deps:** update dependency @podium/context to v4.1.9 ([2e6b6b9](https://github.com/podium-lib/layout/commit/2e6b6b98cc287cef515c17cf728b5bbda2ed3abc)) +* **deps:** update dependency @podium/proxy to v4.2.10 ([3541c5a](https://github.com/podium-lib/layout/commit/3541c5a3ddcdfb11646812fbb660fc759bdb830f)) +* **deps:** update dependency @podium/proxy to v4.2.12 ([a169f96](https://github.com/podium-lib/layout/commit/a169f96eb7db9475def7d686f78ae630dc187232)) +* **deps:** update dependency @podium/proxy to v4.2.14 ([ef247fb](https://github.com/podium-lib/layout/commit/ef247fbb75059caa0906ea853649b0c58faa0070)) +* **deps:** update dependency @podium/proxy to v4.2.16 ([1e4aa5d](https://github.com/podium-lib/layout/commit/1e4aa5db48b6113b0aa8add30dd454d5227774da)) +* **deps:** update dependency @podium/proxy to v4.2.2 ([e04beba](https://github.com/podium-lib/layout/commit/e04beba1c4757b40e56c834f9ecf05e9e5ac97a2)) +* **deps:** update dependency @podium/proxy to v4.2.3 ([83d7a7e](https://github.com/podium-lib/layout/commit/83d7a7e5a3d7dd7a523843efaaa8cb781aff4e78)) +* **deps:** update dependency @podium/proxy to v4.2.4 ([426f376](https://github.com/podium-lib/layout/commit/426f37604a10501ab82c34f0ad87b21f31d021db)) +* **deps:** update dependency @podium/proxy to v4.2.5 ([017d8c2](https://github.com/podium-lib/layout/commit/017d8c2738de65fdf826dd430ea4420336b4a579)) +* **deps:** update dependency @podium/proxy to v4.2.6 ([0080ada](https://github.com/podium-lib/layout/commit/0080ada009deda88cea0d62068ee2e79130018bd)) +* **deps:** update dependency @podium/proxy to v4.2.7 ([c7cfa11](https://github.com/podium-lib/layout/commit/c7cfa11701eda560c6ad47cb76c3ee3bda0ecdad)) +* **deps:** update dependency @podium/proxy to v4.2.8 ([e2ad7ad](https://github.com/podium-lib/layout/commit/e2ad7ad97ba339fab2d2281ecb5c4389e049bc95)) +* **deps:** update dependency @podium/proxy to v4.2.9 ([8fedc0d](https://github.com/podium-lib/layout/commit/8fedc0d530d811d44b686ca4471795ae91a7f8f5)) +* **deps:** update dependency @podium/schemas to v4.0.4 ([eaa15a6](https://github.com/podium-lib/layout/commit/eaa15a6e4e357cf820d6d3c57f97c083011fa986)) +* **deps:** update dependency @podium/schemas to v4.0.5 ([3f9a92e](https://github.com/podium-lib/layout/commit/3f9a92ec61d7bd889cbb4225d9c505434a309b62)) +* **deps:** update dependency @podium/schemas to v4.0.7 ([cb86485](https://github.com/podium-lib/layout/commit/cb86485eca1edd390d28d95ac6ac21fda106ce3a)) +* **deps:** update dependency @podium/schemas to v4.1.0 ([6226961](https://github.com/podium-lib/layout/commit/622696183c0a59c77f8574ad5e828bb73d74045d)) +* **deps:** update dependency @podium/schemas to v4.1.1 ([e80b2cb](https://github.com/podium-lib/layout/commit/e80b2cbd7f8d906605a588e994e6ab355c77c162)) +* **deps:** update dependency @podium/schemas to v4.1.2 ([15e7e05](https://github.com/podium-lib/layout/commit/15e7e0531245627d01814a546481b7327f618bde)) +* **deps:** update dependency @podium/utils to v4.3.1 ([e437f19](https://github.com/podium-lib/layout/commit/e437f192891444b23b568326237c408536e2f866)) +* **deps:** update dependency @podium/utils to v4.3.3 ([be4816a](https://github.com/podium-lib/layout/commit/be4816a9926ae45b2492d531997b348b21cf5b1f)) +* **deps:** update dependency @podium/utils to v4.4.0 ([dcc6d60](https://github.com/podium-lib/layout/commit/dcc6d605871a0ce62e69ad9a1d0a0ec9699fcb61)) +* **deps:** update dependency @podium/utils to v4.4.1 ([8a6eceb](https://github.com/podium-lib/layout/commit/8a6eceb3846c937a25fc447c680397cfd31ea32d)) +* **deps:** update dependency @podium/utils to v4.4.2 ([b0c23a3](https://github.com/podium-lib/layout/commit/b0c23a30d82168cdff1b298a7875f8db9d03f2f8)) +* **deps:** update dependency @podium/utils to v4.4.3 ([d4fb0cd](https://github.com/podium-lib/layout/commit/d4fb0cd62c00f5633c672633bdeffc13f8804a00)) +* **deps:** update dependency @podium/utils to v4.4.4 ([0eddac0](https://github.com/podium-lib/layout/commit/0eddac079b4aba2adb4c80cac876ccb1e899ef1c)) +* **deps:** update dependency @podium/utils to v4.4.5 ([067ccf1](https://github.com/podium-lib/layout/commit/067ccf103f7387414bf5d6408c88ae3973bc2f53)) + # [5.0.0-next.3](https://github.com/podium-lib/layout/compare/v5.0.0-next.2...v5.0.0-next.3) (2020-07-21) ## [4.6.81](https://github.com/podium-lib/layout/compare/v4.6.80...v4.6.81) (2021-04-27) diff --git a/package.json b/package.json index 56e4fff9..99ff6d86 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@podium/layout", - "version": "5.0.0-next.3", + "version": "5.0.0-next.4", "description": "Module for composing full page layouts out of page fragments in a micro frontend architecture.", "main": "lib/layout.js", "license": "MIT", From 4c2e4f30004e87df1053cba560903fd283ffcc26 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 9 May 2021 19:47:13 +0000 Subject: [PATCH 10/21] chore(release): 5.0.0-next.5 [skip ci] # [5.0.0-next.5](https://github.com/podium-lib/layout/compare/v5.0.0-next.4...v5.0.0-next.5) (2021-05-09) ### Bug Fixes * **deps:** update all dependencies ([eaeaf2d](https://github.com/podium-lib/layout/commit/eaeaf2d8f441a3e145136a234ab9f6f561ed0b77)) * **deps:** update all dependencies ([321c474](https://github.com/podium-lib/layout/commit/321c47474e4f678ed1447e236cdff896837de432)) * **deps:** update dependency ajv to v8.3.0 ([a7a8c2c](https://github.com/podium-lib/layout/commit/a7a8c2c56167c2ad68231a1681e89699e174f4b2)) --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 259028e1..8dd39b64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# [5.0.0-next.5](https://github.com/podium-lib/layout/compare/v5.0.0-next.4...v5.0.0-next.5) (2021-05-09) + + +### Bug Fixes + +* **deps:** update all dependencies ([eaeaf2d](https://github.com/podium-lib/layout/commit/eaeaf2d8f441a3e145136a234ab9f6f561ed0b77)) +* **deps:** update all dependencies ([321c474](https://github.com/podium-lib/layout/commit/321c47474e4f678ed1447e236cdff896837de432)) +* **deps:** update dependency ajv to v8.3.0 ([a7a8c2c](https://github.com/podium-lib/layout/commit/a7a8c2c56167c2ad68231a1681e89699e174f4b2)) + # [5.0.0-next.4](https://github.com/podium-lib/layout/compare/v5.0.0-next.3...v5.0.0-next.4) (2021-04-30) ## [4.6.84](https://github.com/podium-lib/layout/compare/v4.6.83...v4.6.84) (2021-05-09) diff --git a/package.json b/package.json index 7d7aaea0..a1dfbb38 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@podium/layout", - "version": "5.0.0-next.4", + "version": "5.0.0-next.5", "description": "Module for composing full page layouts out of page fragments in a micro frontend architecture.", "main": "lib/layout.js", "license": "MIT", From 7824568ddd2f4d3d81d5b7308da34fd38ae34ae0 Mon Sep 17 00:00:00 2001 From: Trygve Lie <173003+trygve-lie@users.noreply.github.com> Date: Mon, 10 May 2021 09:52:28 +0200 Subject: [PATCH 11/21] feat: Convert to ESM (#286) * feat: Convert to ESM BREAKING CHANGE: Convert from CommonJS module to ESM * fix: Set type to be module Co-authored-by: Trygve Lie --- .eslintignore | 6 +- .eslintrc | 28 +++---- .github/workflows/publish.yml | 4 +- .github/workflows/test.yml | 2 +- .gitignore | 3 +- dist/package.json | 3 + lib/layout.js | 38 +++++----- package.json | 38 ++++++---- release.config.js => release.config.cjs | 0 rollup.config.js | 25 +++++++ tests/layout.js | 97 +++++++++++++------------ 11 files changed, 146 insertions(+), 98 deletions(-) create mode 100644 dist/package.json rename release.config.js => release.config.cjs (100%) create mode 100644 rollup.config.js diff --git a/.eslintignore b/.eslintignore index 94c2e315..91e6ca73 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,5 @@ +tap-snapshots/ coverage/ -coverage -tap-snapshots \ No newline at end of file +benchmark/ +example/ +dist/ \ No newline at end of file diff --git a/.eslintrc b/.eslintrc index 3c18e5fc..5b2cd9ee 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,18 +1,20 @@ { - "root": true, - "extends": ["airbnb-base", "prettier"], - "overrides": [ - { - "files": "__tests__/**/*", - "env": { - "jest": true - } - } - ], - "plugins": ["prettier"], + "extends": ["airbnb-base", "prettier"], + "plugins": ["prettier"], + "parser": "babel-eslint", + "parserOptions": { + "ecmaVersion": 11, + "sourceType": "module" + }, "rules": { - "strict": [0, "global"], + "import/prefer-default-export": "off", "class-methods-use-this": [0], - "no-param-reassign": [0] + "lines-between-class-members": [0], + "import/extensions": ["error", { + "js": "ignorePackages" + } + ] } } + + diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a8464641..d58d1b24 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v1 with: - node-version: 12.x + node-version: 14.x - name: npm install run: | npm install @@ -38,7 +38,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v1 with: - node-version: 12.x + node-version: 14.x - name: npm install run: | npm install diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4e7b22ed..cfd46235 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - node-version: [12.x, 14.x] + node-version: [12.x, 14.x, 16.x] steps: - uses: actions/checkout@v2 - name: Use Node.js ${{ matrix.node-version }} diff --git a/.gitignore b/.gitignore index 89511099..a681964e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ node_modules/**/* tmp/**/* .idea .idea/**/* -coverage \ No newline at end of file +coverage +dist \ No newline at end of file diff --git a/dist/package.json b/dist/package.json new file mode 100644 index 00000000..6a0d2ef2 --- /dev/null +++ b/dist/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} \ No newline at end of file diff --git a/lib/layout.js b/lib/layout.js index df40054c..1dc51533 100644 --- a/lib/layout.js +++ b/lib/layout.js @@ -1,10 +1,9 @@ /* eslint-disable consistent-return */ /* eslint-disable no-underscore-dangle */ /* eslint-disable no-restricted-syntax */ +/* eslint-disable no-param-reassign */ -'use strict'; - -const { +import { HttpIncoming, template, isFunction, @@ -12,23 +11,28 @@ const { uriIsRelative, AssetCss, AssetJs, -} = require('@podium/utils'); -const { validate } = require('@podium/schemas'); -const Context = require('@podium/context'); -const Metrics = require('@metrics/client'); -const objobj = require('objobj'); -const Client = require('@podium/client'); -const abslog = require('abslog'); -const Proxy = require('@podium/proxy'); -const pkg = require('../package.json'); +} from '@podium/utils'; +import * as schema from '@podium/schemas'; +import Context from '@podium/context'; +import Metrics from '@metrics/client'; +import objobj from 'objobj'; +import Client from '@podium/client'; +import abslog from 'abslog'; +import Proxy from '@podium/proxy'; +import { join, dirname } from 'path'; +import { fileURLToPath } from 'url'; +import fs from 'fs'; + +const currentDirectory = dirname(fileURLToPath(import.meta.url)); +const pkgJson = fs.readFileSync(join(currentDirectory, '../package.json'), 'utf-8'); +const pkg = JSON.parse(pkgJson); const _pathname = Symbol('_pathname'); const _sanitize = Symbol('_sanitize'); const _addCssAsset = Symbol('_addCssAsset'); const _addJsAsset = Symbol('_addJsAsset'); -const PodiumLayout = class PodiumLayout { - /* istanbul ignore next */ +export default class PodiumLayout { constructor({ name = '', pathname = '', @@ -37,12 +41,12 @@ const PodiumLayout = class PodiumLayout { client = {}, proxy = {}, } = {}) { - if (validate.name(name).error) + if (schema.name(name).error) throw new Error( `The value, "${name}", for the required argument "name" on the Layout constructor is not defined or not valid.`, ); - if (validate.uri(pathname).error) + if (schema.uri(pathname).error) throw new Error( `The value, "${pathname}", for the required argument "pathname" on the Layout constructor is not defined or not valid.`, ); @@ -249,5 +253,3 @@ const PodiumLayout = class PodiumLayout { return uri; } }; - -module.exports = PodiumLayout; diff --git a/package.json b/package.json index a1dfbb38..f54e69d2 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "@podium/layout", "version": "5.0.0-next.5", + "type": "module", "description": "Module for composing full page layouts out of page fragments in a micro frontend architecture.", - "main": "lib/layout.js", "license": "MIT", "keywords": [ "micro services", @@ -24,39 +24,46 @@ "index.d.ts", "README.md", "LICENSE", + "dist", "lib" ], + "main": "./dist/layout.js", + "exports": { + "require": "./dist/layout.js", + "import": "./lib/layout.js" + }, "types": "index.d.ts", "scripts": { "lint": "eslint .", "lint:fix": "eslint --fix .", "test": "tap --no-check-coverage", "test:snapshots": "tap --snapshot --no-check-coverage", - "lint:format": "eslint --fix .", - "precommit": "lint-staged" + "prepare": "npm run -s build", + "build": "rollup -c" }, "dependencies": { "@metrics/client": "2.5.0", - "@podium/client": "5.0.0-next.4", - "@podium/context": "5.0.0-next.3", - "@podium/proxy": "5.0.0-next.2", - "@podium/schemas": "5.0.0-next.1", - "@podium/utils": "5.0.0-next.2", + "@podium/client": "5.0.0-next.7", + "@podium/context": "5.0.0-next.5", + "@podium/proxy": "5.0.0-next.5", + "@podium/schemas": "5.0.0-next.4", + "@podium/utils": "5.0.0-next.6", "abslog": "2.4.0", + "ajv": "8.3.0", "lodash.merge": "4.6.2", - "objobj": "1.0.0", - "ajv": "8.3.0" + "objobj": "1.0.0" }, "devDependencies": { - "@podium/podlet": "4.4.21", + "@podium/podlet": "5.0.0-next.4", "@podium/test-utils": "2.3.0", "@semantic-release/changelog": "5.0.1", "@semantic-release/commit-analyzer": "8.0.1", "@semantic-release/git": "9.0.0", - "@semantic-release/github": "7.2.1", - "@semantic-release/npm": "7.1.1", + "@semantic-release/github": "7.2.3", + "@semantic-release/npm": "7.1.3", "@semantic-release/release-notes-generator": "9.0.2", - "eslint": "7.25.0", + "babel-eslint": "10.1.0", + "eslint": "7.26.0", "eslint-config-airbnb-base": "14.2.1", "eslint-config-prettier": "8.3.0", "eslint-plugin-import": "2.22.1", @@ -64,9 +71,10 @@ "express": "4.17.1", "hbs": "4.1.2", "prettier": "2.2.1", + "rollup": "2.46.0", "semantic-release": "17.4.2", "stoppable": "1.1.0", "supertest": "6.1.3", - "tap": "15.0.6" + "tap": "15.0.9" } } diff --git a/release.config.js b/release.config.cjs similarity index 100% rename from release.config.js rename to release.config.cjs diff --git a/rollup.config.js b/rollup.config.js new file mode 100644 index 00000000..f8678006 --- /dev/null +++ b/rollup.config.js @@ -0,0 +1,25 @@ +export default { + input: 'lib/layout.js', + external: [ + '@podium/schemas', + '@podium/context', + '@metrics/client', + '@podium/client', + '@podium/utils', + '@podium/proxy', + '@podium/utils', + 'abslog', + 'objobj', + 'path', + 'url', + 'fs', + ], + output: [ + { + exports: 'auto', + format: 'cjs', + dir: 'dist/', + preserveModules: true, + } + ], +}; diff --git a/tests/layout.js b/tests/layout.js index d980c30d..9648173d 100644 --- a/tests/layout.js +++ b/tests/layout.js @@ -1,15 +1,22 @@ -'use strict'; +/* eslint-disable no-param-reassign */ -const { test } = require('tap'); -const { destinationObjectStream } = require('@podium/test-utils'); -const { HttpIncoming, AssetJs, AssetCss } = require('@podium/utils'); -const PodletClientResponse = require('@podium/client/lib/response'); -const stoppable = require('stoppable'); -const express = require('express'); -const request = require('supertest'); -const Podlet = require('@podium/podlet'); +import tap from 'tap'; +import { destinationObjectStream } from '@podium/test-utils'; +import { HttpIncoming, AssetJs, AssetCss } from '@podium/utils'; +import stoppable from 'stoppable'; +import express from 'express'; +import request from 'supertest'; +import Podlet from '@podium/podlet'; -const Layout = require(".."); + +import { join, dirname } from 'path'; +import { fileURLToPath } from 'url'; +import fs from 'fs'; +import Layout from '../lib/layout.js'; + +const currentDirectory = dirname(fileURLToPath(import.meta.url)); +const pkgJson = fs.readFileSync(join(currentDirectory, '../package.json'), 'utf-8'); +const pkg = JSON.parse(pkgJson); const SIMPLE_REQ = { headers: {}, @@ -25,54 +32,54 @@ const DEFAULT_OPTIONS = { name: 'foo', pathname: '/' }; * Constructor */ -test('Layout() - instantiate new layout object - should create an object', t => { +tap.test('Layout() - instantiate new layout object - should create an object', t => { const layout = new Layout({ name: 'foo', pathname: '/' }); t.ok(layout instanceof Layout); t.end(); }); -test('Layout() - object tag - should be PodiumLayout', t => { +tap.test('Layout() - object tag - should be PodiumLayout', t => { const layout = new Layout({ name: 'foo', pathname: '/' }); t.equal(Object.prototype.toString.call(layout), '[object PodiumLayout]'); t.end(); }); -test('Layout() - no value given to "name" argument - should throw', t => { +tap.test('Layout() - no value given to "name" argument - should throw', t => { t.throws(() => { const layout = new Layout({ pathname: '/' }); // eslint-disable-line no-unused-vars }, 'The value, "", for the required argument "name" on the Layout constructor is not defined or not valid.'); t.end(); }); -test('Layout() - invalid value given to "name" argument - should throw', t => { +tap.test('Layout() - invalid value given to "name" argument - should throw', t => { t.throws(() => { const layout = new Layout({ name: 'foo bar', pathname: '/' }); // eslint-disable-line no-unused-vars }, 'The value, "foo bar", for the required argument "name" on the Layout constructor is not defined or not valid.'); t.end(); }); -test('Layout() - no value given to "pathname" argument - should throw', t => { +tap.test('Layout() - no value given to "pathname" argument - should throw', t => { t.throws(() => { const layout = new Layout({ name: 'foo' }); // eslint-disable-line no-unused-vars }, 'The value, "", for the required argument "pathname" on the Layout constructor is not defined or not valid.'); t.end(); }); -test('Layout() - invalid value given to "name" argument - should throw', t => { +tap.test('Layout() - invalid value given to "name" argument - should throw', t => { t.throws(() => { const layout = new Layout({ name: 'foo', pathname: 'foo bar' }); // eslint-disable-line no-unused-vars }, 'The value, "foo bar", for the required argument "pathname" on the Layout constructor is not defined or not valid.'); t.end(); }); -test('Layout() - should collect metric with version info', t => { +tap.test('Layout() - should collect metric with version info', t => { const layout = new Layout(DEFAULT_OPTIONS); const dest = destinationObjectStream(arr => { t.equal(arr[0].name, 'podium_layout_version_info'); t.equal(arr[0].labels[0].name, 'version'); // eslint-disable-next-line global-require - t.equal(arr[0].labels[0].value, require('../package.json').version); + t.equal(arr[0].labels[0].value, pkg.version); t.equal(arr[0].labels[1].name, 'major'); t.equal(arr[0].labels[2].name, 'minor'); t.equal(arr[0].labels[3].name, 'patch'); @@ -86,7 +93,7 @@ test('Layout() - should collect metric with version info', t => { }); }); -test('Layout() - metrics properly decorated', t => { +tap.test('Layout() - metrics properly decorated', t => { // podlet const podletApp = express(); @@ -219,7 +226,7 @@ test('Layout() - metrics properly decorated', t => { // .css() // ############################################# -test('.css() - call method with no arguments - should throw', (t) => { +tap.test('.css() - call method with no arguments - should throw', (t) => { const layout = new Layout(DEFAULT_OPTIONS); t.throws(() => { layout.css(); @@ -227,7 +234,7 @@ test('.css() - call method with no arguments - should throw', (t) => { t.end() }); -test('.css() - set legal absolute value on "value" argument - should set "css" to set value', t => { +tap.test('.css() - set legal absolute value on "value" argument - should set "css" to set value', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.css({ value: 'http://somewhere.remote.com' }); const result = JSON.parse(JSON.stringify(layout.cssRoute)); @@ -237,7 +244,7 @@ test('.css() - set legal absolute value on "value" argument - should set "css" t t.end(); }); -test('.css() - "options" argument as an array - should accept an array of values', t => { +tap.test('.css() - "options" argument as an array - should accept an array of values', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.css([{ value: '/foo/bar' }, { value: '/bar/foo' }]); const result = JSON.parse(JSON.stringify(layout.cssRoute)); @@ -248,7 +255,7 @@ test('.css() - "options" argument as an array - should accept an array of values t.end(); }); -test('.css() - "options" argument as an array - call method twice - should set all values', t => { +tap.test('.css() - "options" argument as an array - call method twice - should set all values', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.css([{ value: '/foo/bar' }, { value: '/bar/foo' }]); layout.css([{ value: '/foo/bar/baz' }, { value: '/bar/foo/baz' }]); @@ -262,7 +269,7 @@ test('.css() - "options" argument as an array - call method twice - should set a t.end(); }); -test('.css() - "options" argument as an array - should NOT set additional keys', t => { +tap.test('.css() - "options" argument as an array - should NOT set additional keys', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.css([ { value: '/foo/bar', fake: 'prop' }, @@ -276,7 +283,7 @@ test('.css() - "options" argument as an array - should NOT set additional keys', t.end(); }); -test('.css() - passing an instance of AssetsCss - should return set value', t => { +tap.test('.css() - passing an instance of AssetsCss - should return set value', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.css(new AssetCss({ value: '/foo/bar', type: 'text/css' })); const result = JSON.parse(JSON.stringify(layout.cssRoute)); @@ -290,7 +297,7 @@ test('.css() - passing an instance of AssetsCss - should return set value', t => // .js() // ############################################# -test('.js() - call method with no arguments - should throw', (t) => { +tap.test('.js() - call method with no arguments - should throw', (t) => { const layout = new Layout(DEFAULT_OPTIONS); t.throws(() => { layout.js(); @@ -298,7 +305,7 @@ test('.js() - call method with no arguments - should throw', (t) => { t.end() }); -test('.js() - passing an instance of AssetsJs - should return set value', t => { +tap.test('.js() - passing an instance of AssetsJs - should return set value', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.js(new AssetJs({ value: '/foo/bar', type: 'module' })); const result = JSON.parse(JSON.stringify(layout.jsRoute)); @@ -306,7 +313,7 @@ test('.js() - passing an instance of AssetsJs - should return set value', t => { t.end(); }); -test('.js() - set legal absolute value on "value" argument - should set "js" to set value', t => { +tap.test('.js() - set legal absolute value on "value" argument - should set "js" to set value', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.js({ value: 'http://somewhere.remote.com' }); const result = JSON.parse(JSON.stringify(layout.jsRoute)); @@ -316,7 +323,7 @@ test('.js() - set legal absolute value on "value" argument - should set "js" to t.end(); }); -test('.js() - set illegal value on "value" argument - should throw', t => { +tap.test('.js() - set illegal value on "value" argument - should throw', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.js({ value: '/foo/bar' }); layout.js({ value: '/bar/foo', type: 'module' }); @@ -328,7 +335,7 @@ test('.js() - set illegal value on "value" argument - should throw', t => { t.end(); }); -test('.js() - "type" argument is set to "module" - should set "type" to "module"', t => { +tap.test('.js() - "type" argument is set to "module" - should set "type" to "module"', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.js({ value: '/foo/bar' }); layout.js({ value: '/bar/foo', type: 'module' }); @@ -340,7 +347,7 @@ test('.js() - "type" argument is set to "module" - should set "type" to "module" t.end(); }); -test('.js() - "options" argument as an array - should accept an array of values', t => { +tap.test('.js() - "options" argument as an array - should accept an array of values', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.js([{ value: '/foo/bar' }, { value: '/bar/foo', type: 'module' }]); const result = JSON.parse(JSON.stringify(layout.jsRoute)); @@ -351,7 +358,7 @@ test('.js() - "options" argument as an array - should accept an array of values' t.end(); }); -test('.js() - "options" argument as an array - call method twice - should set all values', t => { +tap.test('.js() - "options" argument as an array - call method twice - should set all values', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.js([{ value: '/foo/bar' }, { value: '/bar/foo', type: 'module' }]); layout.js([ @@ -368,7 +375,7 @@ test('.js() - "options" argument as an array - call method twice - should set al t.end(); }); -test('.js() - "options" argument as an array - should NOT set additional keys', t => { +tap.test('.js() - "options" argument as an array - should NOT set additional keys', t => { const layout = new Layout(DEFAULT_OPTIONS); layout.js([ { value: '/foo/bar', fake: 'prop' }, @@ -382,7 +389,7 @@ test('.js() - "options" argument as an array - should NOT set additional keys', t.end(); }); -test('.js() - data attribute object - should convert to array of key / value objects', (t) => { +tap.test('.js() - data attribute object - should convert to array of key / value objects', (t) => { const layout = new Layout(DEFAULT_OPTIONS); layout.js([ { @@ -417,7 +424,7 @@ test('.js() - data attribute object - should convert to array of key / value obj // .process() // ############################################# -test('.process() - call method with HttpIncoming - should return HttpIncoming', async t => { +tap.test('.process() - call method with HttpIncoming - should return HttpIncoming', async t => { const layout = new Layout(DEFAULT_OPTIONS); const incoming = new HttpIncoming(SIMPLE_REQ, SIMPLE_RES); const result = await layout.process(incoming); @@ -425,7 +432,7 @@ test('.process() - call method with HttpIncoming - should return HttpIncoming', t.end(); }); -test('.process() - idempotence - manipulating the HttpIncoming should not affect layout', async t => { +tap.test('.process() - idempotence - manipulating the HttpIncoming should not affect layout', async t => { const layout = new Layout(DEFAULT_OPTIONS); t.same(layout.jsRoute, []); t.same(layout.cssRoute, []); @@ -435,19 +442,17 @@ test('.process() - idempotence - manipulating the HttpIncoming should not affect await layout.process(incoming); // Simulate layout route - incoming.podlets = [ - new PodletClientResponse({ - js: [{ value: '/foo/bar' }], - css: [{ value: '/bar/foo' }], - }), - ]; + incoming.podlets = [{ + js: [{ value: '/foo/bar' }], + css: [{ value: '/bar/foo' }], + }]; t.same(layout.jsRoute, []); t.same(layout.cssRoute, []); t.end(); }); -test('Layout() - rendering using a string', async t => { +tap.test('Layout() - rendering using a string', async t => { const app = express(); const layout = new Layout({ @@ -472,7 +477,7 @@ test('Layout() - rendering using a string', async t => { t.end(); }); -test('Layout() - rendering using a string - with assets', async t => { +tap.test('Layout() - rendering using a string - with assets', async t => { const app = express(); const layout = new Layout({ @@ -506,7 +511,7 @@ test('Layout() - rendering using a string - with assets', async t => { t.end(); }); -test('Layout() - setting a custom view template', async t => { +tap.test('Layout() - setting a custom view template', async t => { const app = express(); const layout = new Layout({ @@ -537,7 +542,7 @@ test('Layout() - setting a custom view template', async t => { t.end(); }); -test('Layout() - request url parsing', async t => { +tap.test('Layout() - request url parsing', async t => { const app = express(); const layout = new Layout({ From e0e56caf9eb83701afac0b8f402543b69f76ee1f Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 10 May 2021 07:54:10 +0000 Subject: [PATCH 12/21] chore(release): 5.0.0-next.6 [skip ci] # [5.0.0-next.6](https://github.com/podium-lib/layout/compare/v5.0.0-next.5...v5.0.0-next.6) (2021-05-10) ### Features * Convert to ESM ([#286](https://github.com/podium-lib/layout/issues/286)) ([7824568](https://github.com/podium-lib/layout/commit/7824568ddd2f4d3d81d5b7308da34fd38ae34ae0)) ### BREAKING CHANGES * Convert from CommonJS module to ESM * fix: Set type to be module Co-authored-by: Trygve Lie --- CHANGELOG.md | 16 ++++++++++++++++ package.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dd39b64..d9fc1161 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +# [5.0.0-next.6](https://github.com/podium-lib/layout/compare/v5.0.0-next.5...v5.0.0-next.6) (2021-05-10) + + +### Features + +* Convert to ESM ([#286](https://github.com/podium-lib/layout/issues/286)) ([7824568](https://github.com/podium-lib/layout/commit/7824568ddd2f4d3d81d5b7308da34fd38ae34ae0)) + + +### BREAKING CHANGES + +* Convert from CommonJS module to ESM + +* fix: Set type to be module + +Co-authored-by: Trygve Lie + # [5.0.0-next.5](https://github.com/podium-lib/layout/compare/v5.0.0-next.4...v5.0.0-next.5) (2021-05-09) diff --git a/package.json b/package.json index f54e69d2..2c33bff1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@podium/layout", - "version": "5.0.0-next.5", + "version": "5.0.0-next.6", "type": "module", "description": "Module for composing full page layouts out of page fragments in a micro frontend architecture.", "license": "MIT", From a8e08aeeabdfe7e82a36374c7ee4814be051b907 Mon Sep 17 00:00:00 2001 From: Trygve Lie <173003+trygve-lie@users.noreply.github.com> Date: Tue, 10 May 2022 17:04:50 +1000 Subject: [PATCH 13/21] chore: Bring next branch up to date (#389) Co-authored-by: Trygve Lie --- .eslintrc | 30 +++++++++++++++--------------- .github/workflows/test.yml | 2 +- dist/package.json | 3 --- package.json | 15 +++------------ rollup.config.js | 25 ------------------------- tests/layout.js | 18 +++++++++--------- 6 files changed, 28 insertions(+), 65 deletions(-) delete mode 100644 dist/package.json delete mode 100644 rollup.config.js diff --git a/.eslintrc b/.eslintrc index 5b2cd9ee..069d89b6 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,20 +1,20 @@ { - "extends": ["airbnb-base", "prettier"], - "plugins": ["prettier"], - "parser": "babel-eslint", - "parserOptions": { - "ecmaVersion": 11, - "sourceType": "module" - }, - "rules": { - "import/prefer-default-export": "off", - "class-methods-use-this": [0], - "lines-between-class-members": [0], - "import/extensions": ["error", { - "js": "ignorePackages" + "extends": ["airbnb-base", "prettier"], + "plugins": ["prettier"], + "parser": "@babel/eslint-parser", + "parserOptions": { + "requireConfigFile": false, + "ecmaVersion": 2020, + "sourceType": "module" + }, +"rules": { + "default-param-last": [0], + "import/prefer-default-export": "off", + "class-methods-use-this": [0], + "lines-between-class-members": [0], + "import/extensions": ["error", { + "js": "ignorePackages" } ] } } - - diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7e9a8d80..defd1374 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - node-version: [12.x, 14.x, 16.x] + node-version: [16.x, 18.x] steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} diff --git a/dist/package.json b/dist/package.json deleted file mode 100644 index 6a0d2ef2..00000000 --- a/dist/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "commonjs" -} \ No newline at end of file diff --git a/package.json b/package.json index 30f7a8b3..e32da1f5 100644 --- a/package.json +++ b/package.json @@ -27,19 +27,13 @@ "dist", "lib" ], - "main": "./dist/layout.js", - "exports": { - "require": "./dist/layout.js", - "import": "./lib/layout.js" - }, + "main": "./lib/layout.js", "types": "index.d.ts", "scripts": { "lint": "eslint .", "lint:fix": "eslint --fix .", "test": "tap --no-check-coverage", - "test:snapshots": "tap --snapshot --no-check-coverage", - "prepare": "npm run -s build", - "build": "rollup -c" + "test:snapshots": "tap --snapshot --no-check-coverage" }, "dependencies": { "@metrics/client": "2.5.0", @@ -55,11 +49,7 @@ }, "devDependencies": { "@semantic-release/changelog": "6.0.1", - "@semantic-release/commit-analyzer": "9.0.2", "@semantic-release/git": "10.0.1", - "@semantic-release/github": "8.0.4", - "@semantic-release/npm": "9.0.1", - "@semantic-release/release-notes-generator": "10.0.3", "semantic-release": "19.0.2", "@podium/podlet": "4.4.64", "@podium/test-utils": "2.5.2", @@ -68,6 +58,7 @@ "eslint-config-prettier": "8.5.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-prettier": "4.0.0", + "@babel/eslint-parser": "7.17.0", "express": "4.18.1", "hbs": "4.2.0", "prettier": "2.6.2", diff --git a/rollup.config.js b/rollup.config.js deleted file mode 100644 index f8678006..00000000 --- a/rollup.config.js +++ /dev/null @@ -1,25 +0,0 @@ -export default { - input: 'lib/layout.js', - external: [ - '@podium/schemas', - '@podium/context', - '@metrics/client', - '@podium/client', - '@podium/utils', - '@podium/proxy', - '@podium/utils', - 'abslog', - 'objobj', - 'path', - 'url', - 'fs', - ], - output: [ - { - exports: 'auto', - format: 'cjs', - dir: 'dist/', - preserveModules: true, - } - ], -}; diff --git a/tests/layout.js b/tests/layout.js index 9648173d..646ab326 100644 --- a/tests/layout.js +++ b/tests/layout.js @@ -133,7 +133,7 @@ tap.test('Layout() - metrics properly decorated', t => { app.use(layout.middleware()); const podletClient = layout.client.register({ - uri: 'http://localhost:5021/manifest.json', + uri: 'http://0.0.0.0:5021/manifest.json', name: 'myPodlet', }); @@ -208,10 +208,10 @@ tap.test('Layout() - metrics properly decorated', t => { const s2 = stoppable(app.listen(5022), 0); - request('http://localhost:5022') + request('http://0.0.0.0:5022') .get('/') .then(async result => { - const apiResponse = await request('http://localhost:5022').get( + const apiResponse = await request('http://0.0.0.0:5022').get( '/podium-resource/myPodlet/api', ); t.equal(result.text, 'this is podlet content'); @@ -468,7 +468,7 @@ tap.test('Layout() - rendering using a string', async t => { const s1 = stoppable(app.listen(4010), 0); - const result = await request('http://localhost:4010').get('/'); + const result = await request('http://0.0.0.0:4010').get('/'); t.match(result.text, '
should be wrapped in a doc
'); t.match(result.text, ' { const s1 = stoppable(app.listen(4011), 0); - const result = await request('http://localhost:4011').get('/'); + const result = await request('http://0.0.0.0:4011').get('/'); t.matchSnapshot(result.text); @@ -534,7 +534,7 @@ tap.test('Layout() - setting a custom view template', async t => { const s1 = stoppable(app.listen(4012), 0); - const result = await request('http://localhost:4012').get('/'); + const result = await request('http://0.0.0.0:4012').get('/'); t.matchSnapshot(result.text); @@ -553,10 +553,10 @@ tap.test('Layout() - request url parsing', async t => { app.use(layout.middleware()); app.get('/', async (req, res) => { - t.equal(res.locals.podium.url.href, 'http://localhost:4013/'); + t.equal(res.locals.podium.url.href, 'http://0.0.0.0:4013/'); t.equal( res.locals.podium.context['podium-mount-origin'], - 'http://localhost:4013', + 'http://0.0.0.0:4013', ); t.equal(res.locals.podium.context['podium-mount-pathname'], '/'); res.send('ok'); @@ -564,7 +564,7 @@ tap.test('Layout() - request url parsing', async t => { const s1 = stoppable(app.listen(4013), 0); - await request('http://localhost:4013').get('/'); + await request('http://0.0.0.0:4013').get('/'); s1.stop(); }); From adaf2ddf2ca5f951dab141bc6e394870eea34f87 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 10 May 2022 07:06:37 +0000 Subject: [PATCH 14/21] chore(release): 5.0.0-next.7 [skip ci] # [5.0.0-next.7](https://github.com/podium-lib/layout/compare/v5.0.0-next.6...v5.0.0-next.7) (2022-05-10) ### Bug Fixes * **deps:** update all dependencies ([c597284](https://github.com/podium-lib/layout/commit/c5972848deec24e0d53365c181d4d7a25bba2921)) * **deps:** update all dependencies ([dc50304](https://github.com/podium-lib/layout/commit/dc5030414adf9e193022fdac011c7db22971982d)) * **deps:** update all dependencies ([78f476d](https://github.com/podium-lib/layout/commit/78f476d8bef56f3632d609030bdc820df2cee223)) * **deps:** update all dependencies ([d0169c0](https://github.com/podium-lib/layout/commit/d0169c0406376026027314edeb897f86f1cbf497)) * **deps:** update all dependencies ([b719baa](https://github.com/podium-lib/layout/commit/b719baaa617bb4e60ca8a0411a8fd705fd65ed22)) * **deps:** update all dependencies ([5341f5a](https://github.com/podium-lib/layout/commit/5341f5ae9dea8d7e5a5a90fa0b56b39d2bdd033b)) * **deps:** update all dependencies ([b870f4f](https://github.com/podium-lib/layout/commit/b870f4fc38e71d8d78ebdf600a73261de4ebeaa5)) * **deps:** update all dependencies ([1406c94](https://github.com/podium-lib/layout/commit/1406c94256b375379ea084c9a3e9a24b699650f2)) * **deps:** update all dependencies ([c1a7226](https://github.com/podium-lib/layout/commit/c1a7226cc33e8d66fac32c6b4c705b9ba7384faa)) * **deps:** update all dependencies ([a9bb493](https://github.com/podium-lib/layout/commit/a9bb4932dffc515a5e43dfce54c9105e185585b3)) * **deps:** update all dependencies ([1b55e44](https://github.com/podium-lib/layout/commit/1b55e44baf875977e5608276c8e69a83edaa1321)) * **deps:** update all dependencies ([4116e56](https://github.com/podium-lib/layout/commit/4116e56a5318e830718ae4e1137544d4bce60660)) * **deps:** update all dependencies ([4ac5610](https://github.com/podium-lib/layout/commit/4ac56102538221e5a550f48025b650fe2b6b718b)) * **deps:** update all dependencies ([#343](https://github.com/podium-lib/layout/issues/343)) ([c8c4d14](https://github.com/podium-lib/layout/commit/c8c4d14be915bfdadefea6a7b46c6f884393ece8)) * **deps:** update all dependencies (non-major) ([4a7ba72](https://github.com/podium-lib/layout/commit/4a7ba72e7830c68f8349db7c5edbee3bf3eb684e)) * **deps:** update all dependencies (non-major) ([23f5964](https://github.com/podium-lib/layout/commit/23f59644eaa989269fe8de578d5a8b3d8b458488)) * **deps:** update dependency @podium/client to v4.5.0 ([#320](https://github.com/podium-lib/layout/issues/320)) ([3da1a8c](https://github.com/podium-lib/layout/commit/3da1a8ca005fe495fa3509019b20decc1a41b012)) * **deps:** update dependency @podium/context to v4.1.59 ([14e0e5d](https://github.com/podium-lib/layout/commit/14e0e5deb2e20232b3c5cf6c7f608a9d470a1476)) * **deps:** update dependency @podium/proxy to v4.2.75 ([5b353d8](https://github.com/podium-lib/layout/commit/5b353d859e4037ac519fb2e9e37a1d1641ee4092)) * **deps:** update dependency @podium/schemas to v4.1.23 ([3b6830b](https://github.com/podium-lib/layout/commit/3b6830b7416de6ef1f9fabd66c7033b622815e6e)) * **deps:** update dependency @podium/schemas to v4.1.27 ([eb9bc4c](https://github.com/podium-lib/layout/commit/eb9bc4ca12bfd8fc756fdf897ab7ddbf02572024)) * **deps:** update dependency ajv to v8.5.0 ([e82c51e](https://github.com/podium-lib/layout/commit/e82c51e63022991ed09f9522dda57b71654c1585)) * **deps:** update dependency ajv to v8.6.0 ([4568822](https://github.com/podium-lib/layout/commit/456882276b91ce1f5acd66b7bcfcce090e85ef9e)) * **deps:** update dependency ajv to v8.6.1 ([cba88f1](https://github.com/podium-lib/layout/commit/cba88f13b1b9f9b6c1fbd73a5489b67855bfc03f)) * **deps:** update dependency ajv to v8.6.2 ([8bb6671](https://github.com/podium-lib/layout/commit/8bb667150785eb6f8afb1a62fc8bedb6ecdbac32)) * **deps:** update dependency ajv to v8.7.1 ([a9740cc](https://github.com/podium-lib/layout/commit/a9740cc839199f0d07641f42e4ba010eb4d9f4d3)) * update Proxy module to fix trailer header vulnerability ([fe43e65](https://github.com/podium-lib/layout/commit/fe43e655432b0a5f07b6475f67babcc2588fb039)) --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40bdf33f..ca8052b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,36 @@ +# [5.0.0-next.7](https://github.com/podium-lib/layout/compare/v5.0.0-next.6...v5.0.0-next.7) (2022-05-10) + + +### Bug Fixes + +* **deps:** update all dependencies ([c597284](https://github.com/podium-lib/layout/commit/c5972848deec24e0d53365c181d4d7a25bba2921)) +* **deps:** update all dependencies ([dc50304](https://github.com/podium-lib/layout/commit/dc5030414adf9e193022fdac011c7db22971982d)) +* **deps:** update all dependencies ([78f476d](https://github.com/podium-lib/layout/commit/78f476d8bef56f3632d609030bdc820df2cee223)) +* **deps:** update all dependencies ([d0169c0](https://github.com/podium-lib/layout/commit/d0169c0406376026027314edeb897f86f1cbf497)) +* **deps:** update all dependencies ([b719baa](https://github.com/podium-lib/layout/commit/b719baaa617bb4e60ca8a0411a8fd705fd65ed22)) +* **deps:** update all dependencies ([5341f5a](https://github.com/podium-lib/layout/commit/5341f5ae9dea8d7e5a5a90fa0b56b39d2bdd033b)) +* **deps:** update all dependencies ([b870f4f](https://github.com/podium-lib/layout/commit/b870f4fc38e71d8d78ebdf600a73261de4ebeaa5)) +* **deps:** update all dependencies ([1406c94](https://github.com/podium-lib/layout/commit/1406c94256b375379ea084c9a3e9a24b699650f2)) +* **deps:** update all dependencies ([c1a7226](https://github.com/podium-lib/layout/commit/c1a7226cc33e8d66fac32c6b4c705b9ba7384faa)) +* **deps:** update all dependencies ([a9bb493](https://github.com/podium-lib/layout/commit/a9bb4932dffc515a5e43dfce54c9105e185585b3)) +* **deps:** update all dependencies ([1b55e44](https://github.com/podium-lib/layout/commit/1b55e44baf875977e5608276c8e69a83edaa1321)) +* **deps:** update all dependencies ([4116e56](https://github.com/podium-lib/layout/commit/4116e56a5318e830718ae4e1137544d4bce60660)) +* **deps:** update all dependencies ([4ac5610](https://github.com/podium-lib/layout/commit/4ac56102538221e5a550f48025b650fe2b6b718b)) +* **deps:** update all dependencies ([#343](https://github.com/podium-lib/layout/issues/343)) ([c8c4d14](https://github.com/podium-lib/layout/commit/c8c4d14be915bfdadefea6a7b46c6f884393ece8)) +* **deps:** update all dependencies (non-major) ([4a7ba72](https://github.com/podium-lib/layout/commit/4a7ba72e7830c68f8349db7c5edbee3bf3eb684e)) +* **deps:** update all dependencies (non-major) ([23f5964](https://github.com/podium-lib/layout/commit/23f59644eaa989269fe8de578d5a8b3d8b458488)) +* **deps:** update dependency @podium/client to v4.5.0 ([#320](https://github.com/podium-lib/layout/issues/320)) ([3da1a8c](https://github.com/podium-lib/layout/commit/3da1a8ca005fe495fa3509019b20decc1a41b012)) +* **deps:** update dependency @podium/context to v4.1.59 ([14e0e5d](https://github.com/podium-lib/layout/commit/14e0e5deb2e20232b3c5cf6c7f608a9d470a1476)) +* **deps:** update dependency @podium/proxy to v4.2.75 ([5b353d8](https://github.com/podium-lib/layout/commit/5b353d859e4037ac519fb2e9e37a1d1641ee4092)) +* **deps:** update dependency @podium/schemas to v4.1.23 ([3b6830b](https://github.com/podium-lib/layout/commit/3b6830b7416de6ef1f9fabd66c7033b622815e6e)) +* **deps:** update dependency @podium/schemas to v4.1.27 ([eb9bc4c](https://github.com/podium-lib/layout/commit/eb9bc4ca12bfd8fc756fdf897ab7ddbf02572024)) +* **deps:** update dependency ajv to v8.5.0 ([e82c51e](https://github.com/podium-lib/layout/commit/e82c51e63022991ed09f9522dda57b71654c1585)) +* **deps:** update dependency ajv to v8.6.0 ([4568822](https://github.com/podium-lib/layout/commit/456882276b91ce1f5acd66b7bcfcce090e85ef9e)) +* **deps:** update dependency ajv to v8.6.1 ([cba88f1](https://github.com/podium-lib/layout/commit/cba88f13b1b9f9b6c1fbd73a5489b67855bfc03f)) +* **deps:** update dependency ajv to v8.6.2 ([8bb6671](https://github.com/podium-lib/layout/commit/8bb667150785eb6f8afb1a62fc8bedb6ecdbac32)) +* **deps:** update dependency ajv to v8.7.1 ([a9740cc](https://github.com/podium-lib/layout/commit/a9740cc839199f0d07641f42e4ba010eb4d9f4d3)) +* update Proxy module to fix trailer header vulnerability ([fe43e65](https://github.com/podium-lib/layout/commit/fe43e655432b0a5f07b6475f67babcc2588fb039)) + # [5.0.0-next.6](https://github.com/podium-lib/layout/compare/v5.0.0-next.5...v5.0.0-next.6) (2021-05-10) diff --git a/package.json b/package.json index e32da1f5..65cc38b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@podium/layout", - "version": "5.0.0-next.6", + "version": "5.0.0-next.7", "type": "module", "description": "Module for composing full page layouts out of page fragments in a micro frontend architecture.", "license": "MIT", From eb8486a67ba99d2efd13e984b0482715c8b19dd1 Mon Sep 17 00:00:00 2001 From: Trygve Lie Date: Wed, 1 Jun 2022 06:04:44 +0200 Subject: [PATCH 15/21] doc: Convert examples to ESM --- example/extending/custom-context.js | 4 +- example/extending/custom-layout.js | 8 ++-- example/server/server.js | 69 +++++++++-------------------- example/server/views/layout.hbs | 40 ----------------- example/server/views/template.js | 24 ++++++++++ package.json | 1 - 6 files changed, 50 insertions(+), 96 deletions(-) delete mode 100644 example/server/views/layout.hbs create mode 100644 example/server/views/template.js diff --git a/example/extending/custom-context.js b/example/extending/custom-context.js index 1772b1c0..a52e9cef 100644 --- a/example/extending/custom-context.js +++ b/example/extending/custom-context.js @@ -1,5 +1,3 @@ -'use strict'; - const CustomContextParser = class CustomContextParser { get [Symbol.toStringTag]() { return 'CustomContextParser'; @@ -12,4 +10,4 @@ const CustomContextParser = class CustomContextParser { } }; -module.exports = CustomContextParser; +export default CustomContextParser; diff --git a/example/extending/custom-layout.js b/example/extending/custom-layout.js index 0ac8808e..ef024d4f 100644 --- a/example/extending/custom-layout.js +++ b/example/extending/custom-layout.js @@ -1,7 +1,5 @@ -'use strict'; - -const CustomContext = require('./custom-context'); -const PodiumLayout = require("../.."); +import CustomContext from './custom-context.js'; +import PodiumLayout from '../../lib/layout.js'; const CustomLayout = class CustomLayout extends PodiumLayout { constructor(name) { @@ -17,4 +15,4 @@ const CustomLayout = class CustomLayout extends PodiumLayout { } }; -module.exports = CustomLayout; +export default CustomLayout; diff --git a/example/server/server.js b/example/server/server.js index f1906bfe..aa61fb56 100644 --- a/example/server/server.js +++ b/example/server/server.js @@ -1,11 +1,8 @@ /* eslint-disable import/no-extraneous-dependencies */ /* eslint-disable no-console */ - -'use strict'; - -const express = require('express'); -const path = require('path'); -const Layout = require("../.."); +import express from 'express'; +import Layout from '../../lib/layout.js'; +import template from './views/template.js'; const layout = new Layout({ pathname: '/foo', @@ -38,52 +35,30 @@ const footer = layout.client.register({ resolveCss: true, }); +layout.css({ value: '/foo/assets/grid.css' }); + const app = express(); -app.set('view engine', 'hbs'); -app.set('views', path.resolve(__dirname, './views/')); +app.use(layout.pathname(), layout.middleware()); + +app.get(`${layout.pathname()}/:bar?`,async (req, res, next) => { + const incoming = res.locals.podium; + const podlets = await Promise.all([ + header.fetch(incoming), + menu.fetch(incoming), + content.fetch(incoming), + footer.fetch(incoming), + ]); -/* -app.use((req, res, next) => { - res.locals.locale = 'nb-NO'; - next(); -}); -*/ + incoming.view = { + title: 'Example application', + }; -app.use(layout.pathname(), layout.middleware()); + incoming.podlets = podlets; -app.get( - `${layout.pathname()}/:bar?`, - (req, res, next) => { - const ctx = res.locals.podium.context; - Promise.all([ - content.fetch(ctx), - header.fetch(ctx), - menu.fetch(ctx), - footer.fetch(ctx), - ]) - .then(result => { - res.locals = { - title: 'Podium - Layout', - podlets: { - content: result[0], - header: result[1], - menu: result[2], - footer: result[3], - }, - }; - next(); - }) - .catch(error => { - next(error); - }); - }, - (req, res) => { - res.locals.css = layout.client.css(); - res.locals.js = layout.client.js(); - res.status(200).render('layout', res.locals); - }, -); + const markup = template(podlets); + res.status(200).podiumSend(markup); +}); app.use(`${layout.pathname()}/assets`, express.static('assets')); diff --git a/example/server/views/layout.hbs b/example/server/views/layout.hbs deleted file mode 100644 index f981f97f..00000000 --- a/example/server/views/layout.hbs +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - {{#each css}} - - {{/each}} - {{#each js}} - - {{/each}} - {{title}} - - - -
-
-
- {{{podlets.header}}} -
-
-
-
- {{{podlets.menu}}} -
-
- {{{podlets.content}}} -
-
-
-
- {{{podlets.footer}}} -
-
-
- - - diff --git a/example/server/views/template.js b/example/server/views/template.js new file mode 100644 index 00000000..bd23fd2e --- /dev/null +++ b/example/server/views/template.js @@ -0,0 +1,24 @@ +const template = (podlets = []) => { + return ` +
+
+
+ ${podlets[0].content} +
+
+
+
+ ${podlets[1].content} +
+
+ ${podlets[2].content} +
+
+
+
+ ${podlets[3].content} +
+
+
`; +} +export default template; \ No newline at end of file diff --git a/package.json b/package.json index 65cc38b2..903448e0 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,6 @@ "eslint-plugin-prettier": "4.0.0", "@babel/eslint-parser": "7.17.0", "express": "4.18.1", - "hbs": "4.2.0", "prettier": "2.6.2", "stoppable": "1.1.0", "supertest": "6.2.3", From 40354617b85a866448faa30410c5b0c4cb42ad60 Mon Sep 17 00:00:00 2001 From: Trygve Lie <173003+trygve-lie@users.noreply.github.com> Date: Wed, 21 Sep 2022 23:59:42 +1000 Subject: [PATCH 16/21] fix: Use latest client and proxy (#399) Co-authored-by: Trygve Lie --- lib/layout.js | 5 ++++- package.json | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/lib/layout.js b/lib/layout.js index 1dc51533..63f70f45 100644 --- a/lib/layout.js +++ b/lib/layout.js @@ -141,7 +141,10 @@ export default class PodiumLayout { this.context.metrics.pipe(this.metrics); this.client.metrics.pipe(this.metrics); - this.client.registry.pipe(this.httpProxy.registry); + // Register proxy endpoints + this.client.registry.on('set', (key, item) => { + this.httpProxy.register(item.newVal); + }); } get [Symbol.toStringTag]() { diff --git a/package.json b/package.json index 903448e0..9905cec1 100644 --- a/package.json +++ b/package.json @@ -37,11 +37,11 @@ }, "dependencies": { "@metrics/client": "2.5.0", - "@podium/client": "5.0.0-next.7", - "@podium/context": "5.0.0-next.5", - "@podium/proxy": "5.0.0-next.5", - "@podium/schemas": "5.0.0-next.4", - "@podium/utils": "5.0.0-next.6", + "@podium/client": "5.0.0-next.13", + "@podium/context": "5.0.0-next.6", + "@podium/proxy": "5.0.0-next.7", + "@podium/schemas": "5.0.0-next.6", + "@podium/utils": "5.0.0-next.8", "abslog": "2.4.0", "lodash.merge": "4.6.2", "objobj": "1.0.0", @@ -50,19 +50,19 @@ "devDependencies": { "@semantic-release/changelog": "6.0.1", "@semantic-release/git": "10.0.1", - "semantic-release": "19.0.2", - "@podium/podlet": "4.4.64", + "semantic-release": "19.0.5", + "@podium/podlet": "4.4.65", "@podium/test-utils": "2.5.2", - "eslint": "8.15.0", + "eslint": "8.23.1", "eslint-config-airbnb-base": "15.0.0", "eslint-config-prettier": "8.5.0", "eslint-plugin-import": "2.26.0", - "eslint-plugin-prettier": "4.0.0", - "@babel/eslint-parser": "7.17.0", + "eslint-plugin-prettier": "4.2.1", + "@babel/eslint-parser": "7.19.1", "express": "4.18.1", - "prettier": "2.6.2", + "prettier": "2.7.1", "stoppable": "1.1.0", - "supertest": "6.2.3", - "tap": "16.2.0" + "supertest": "6.2.4", + "tap": "16.3.0" } } From b1b9060e09f658044edde0128ec7a122cc2b5f8c Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 21 Sep 2022 14:01:28 +0000 Subject: [PATCH 17/21] chore(release): 5.0.0-next.8 [skip ci] # [5.0.0-next.8](https://github.com/podium-lib/layout/compare/v5.0.0-next.7...v5.0.0-next.8) (2022-09-21) ### Bug Fixes * Use latest client and proxy ([#399](https://github.com/podium-lib/layout/issues/399)) ([4035461](https://github.com/podium-lib/layout/commit/40354617b85a866448faa30410c5b0c4cb42ad60)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca8052b6..d28b5bb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [5.0.0-next.8](https://github.com/podium-lib/layout/compare/v5.0.0-next.7...v5.0.0-next.8) (2022-09-21) + + +### Bug Fixes + +* Use latest client and proxy ([#399](https://github.com/podium-lib/layout/issues/399)) ([4035461](https://github.com/podium-lib/layout/commit/40354617b85a866448faa30410c5b0c4cb42ad60)) + # [5.0.0-next.7](https://github.com/podium-lib/layout/compare/v5.0.0-next.6...v5.0.0-next.7) (2022-05-10) diff --git a/package.json b/package.json index 9905cec1..a971cce1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@podium/layout", - "version": "5.0.0-next.7", + "version": "5.0.0-next.8", "type": "module", "description": "Module for composing full page layouts out of page fragments in a micro frontend architecture.", "license": "MIT", From fbe6f75a4974848ad3d6eecd8034811a9dc7cae3 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 21 Sep 2022 21:49:59 +0000 Subject: [PATCH 18/21] chore(release): 5.0.0-next.9 [skip ci] # [5.0.0-next.9](https://github.com/podium-lib/layout/compare/v5.0.0-next.8...v5.0.0-next.9) (2022-09-21) ### Bug Fixes * **deps:** update dependency @podium/client to v4.5.23 ([#398](https://github.com/podium-lib/layout/issues/398)) ([ad5c84c](https://github.com/podium-lib/layout/commit/ad5c84c22645a485f47351ad43531227d7697f69)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 850c6a27..2332b496 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [5.0.0-next.9](https://github.com/podium-lib/layout/compare/v5.0.0-next.8...v5.0.0-next.9) (2022-09-21) + + +### Bug Fixes + +* **deps:** update dependency @podium/client to v4.5.23 ([#398](https://github.com/podium-lib/layout/issues/398)) ([ad5c84c](https://github.com/podium-lib/layout/commit/ad5c84c22645a485f47351ad43531227d7697f69)) + # [5.0.0-next.8](https://github.com/podium-lib/layout/compare/v5.0.0-next.7...v5.0.0-next.8) (2022-09-21) ## [4.6.112](https://github.com/podium-lib/layout/compare/v4.6.111...v4.6.112) (2022-09-01) diff --git a/package.json b/package.json index a971cce1..69e94978 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@podium/layout", - "version": "5.0.0-next.8", + "version": "5.0.0-next.9", "type": "module", "description": "Module for composing full page layouts out of page fragments in a micro frontend architecture.", "license": "MIT", From d9d544a5356f29f83cfa01529539e789491fb3bb Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 29 Nov 2023 00:18:46 +0000 Subject: [PATCH 19/21] chore(release): 5.0.0-next.10 [skip ci] # [5.0.0-next.10](https://github.com/podium-lib/layout/compare/v5.0.0-next.9...v5.0.0-next.10) (2023-11-29) ### Bug Fixes * add type definitions ([afb0649](https://github.com/podium-lib/layout/commit/afb06496bbc1390860e8fd411b076ac5d30dca18)) * **deps:** update all dependencies (non-major) ([4033719](https://github.com/podium-lib/layout/commit/4033719370f2c9ea9a28b91f7b4be50146721680)) * **deps:** update all dependencies (non-major) ([a27c20b](https://github.com/podium-lib/layout/commit/a27c20bd530750e1a655df480ee236a859580235)) * **deps:** update all dependencies (non-major) ([1f2de8d](https://github.com/podium-lib/layout/commit/1f2de8d23b52abf824f19a9dff15d4f008af732d)) * **deps:** update all dependencies (non-major) ([cbc1350](https://github.com/podium-lib/layout/commit/cbc13509b73c67a66f13333a58a7c5a153e2d8ff)) * **deps:** update all dependencies (non-major) ([977a0f0](https://github.com/podium-lib/layout/commit/977a0f0845dad45525b154f9ceb79822ce2e569d)) * **deps:** update all dependencies (non-major) ([c4c22b2](https://github.com/podium-lib/layout/commit/c4c22b2d19bb10a71326d05c6ba35677dde493ff)) * **deps:** update all dependencies (non-major) ([5f373fb](https://github.com/podium-lib/layout/commit/5f373fbe537fe5bd27c201ff84cbf6cd7503fb04)) * **deps:** update dependency @podium/client to v4.5.24 ([#402](https://github.com/podium-lib/layout/issues/402)) ([4a7ea4e](https://github.com/podium-lib/layout/commit/4a7ea4e9d2ca5086f45eec64b2b41f828546ba0f)) * **deps:** update dependency @podium/client to v4.5.30 ([e1cb17b](https://github.com/podium-lib/layout/commit/e1cb17b39f3a841ac17f6e70db9219265511f615)) * **deps:** update dependency @podium/client to v4.5.31 ([#426](https://github.com/podium-lib/layout/issues/426)) ([5e7e504](https://github.com/podium-lib/layout/commit/5e7e5046210017ee0a7981768739259d1ac0c1b0)) * **deps:** update dependency @podium/context to v4.1.75 ([a7f5cab](https://github.com/podium-lib/layout/commit/a7f5cabae9468ecd1b3c61f8131e9800fbb36b19)) * **deps:** update dependency @podium/context to v4.1.78 ([caba9ae](https://github.com/podium-lib/layout/commit/caba9ae9afe6300e21af20897074b04d2dda0b5a)) --- CHANGELOG.md | 19 +++++++++++++++++++ package.json | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06f3c961..82924ece 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +# [5.0.0-next.10](https://github.com/podium-lib/layout/compare/v5.0.0-next.9...v5.0.0-next.10) (2023-11-29) + + +### Bug Fixes + +* add type definitions ([afb0649](https://github.com/podium-lib/layout/commit/afb06496bbc1390860e8fd411b076ac5d30dca18)) +* **deps:** update all dependencies (non-major) ([4033719](https://github.com/podium-lib/layout/commit/4033719370f2c9ea9a28b91f7b4be50146721680)) +* **deps:** update all dependencies (non-major) ([a27c20b](https://github.com/podium-lib/layout/commit/a27c20bd530750e1a655df480ee236a859580235)) +* **deps:** update all dependencies (non-major) ([1f2de8d](https://github.com/podium-lib/layout/commit/1f2de8d23b52abf824f19a9dff15d4f008af732d)) +* **deps:** update all dependencies (non-major) ([cbc1350](https://github.com/podium-lib/layout/commit/cbc13509b73c67a66f13333a58a7c5a153e2d8ff)) +* **deps:** update all dependencies (non-major) ([977a0f0](https://github.com/podium-lib/layout/commit/977a0f0845dad45525b154f9ceb79822ce2e569d)) +* **deps:** update all dependencies (non-major) ([c4c22b2](https://github.com/podium-lib/layout/commit/c4c22b2d19bb10a71326d05c6ba35677dde493ff)) +* **deps:** update all dependencies (non-major) ([5f373fb](https://github.com/podium-lib/layout/commit/5f373fbe537fe5bd27c201ff84cbf6cd7503fb04)) +* **deps:** update dependency @podium/client to v4.5.24 ([#402](https://github.com/podium-lib/layout/issues/402)) ([4a7ea4e](https://github.com/podium-lib/layout/commit/4a7ea4e9d2ca5086f45eec64b2b41f828546ba0f)) +* **deps:** update dependency @podium/client to v4.5.30 ([e1cb17b](https://github.com/podium-lib/layout/commit/e1cb17b39f3a841ac17f6e70db9219265511f615)) +* **deps:** update dependency @podium/client to v4.5.31 ([#426](https://github.com/podium-lib/layout/issues/426)) ([5e7e504](https://github.com/podium-lib/layout/commit/5e7e5046210017ee0a7981768739259d1ac0c1b0)) +* **deps:** update dependency @podium/context to v4.1.75 ([a7f5cab](https://github.com/podium-lib/layout/commit/a7f5cabae9468ecd1b3c61f8131e9800fbb36b19)) +* **deps:** update dependency @podium/context to v4.1.78 ([caba9ae](https://github.com/podium-lib/layout/commit/caba9ae9afe6300e21af20897074b04d2dda0b5a)) + ## [4.6.125](https://github.com/podium-lib/layout/compare/v4.6.124...v4.6.125) (2023-10-23) diff --git a/package.json b/package.json index 19d9e3d2..a0c24c1f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@podium/layout", - "version": "5.0.0-next.9", + "version": "5.0.0-next.10", "type": "module", "description": "Module for composing full page layouts out of page fragments in a micro frontend architecture.", "license": "MIT", From 6db900416134a85f518ee2e4f7d60ec429161858 Mon Sep 17 00:00:00 2001 From: Richard Walker Date: Wed, 29 Nov 2023 13:25:29 +1300 Subject: [PATCH 20/21] chore(deps): update dependencies --- .gitignore | 3 ++- package.json | 36 +++++++++++++------------- tap-snapshots/tests/layout.js.test.cjs | 8 +++--- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index a681964e..63aa4c38 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ tmp/**/* .idea .idea/**/* coverage -dist \ No newline at end of file +dist +.tap \ No newline at end of file diff --git a/package.json b/package.json index a0c24c1f..9950d3ba 100644 --- a/package.json +++ b/package.json @@ -32,16 +32,16 @@ "scripts": { "lint": "eslint .", "lint:fix": "eslint --fix .", - "test": "tap --no-check-coverage", - "test:snapshots": "tap --snapshot --no-check-coverage" + "test": "tap --disable-coverage --allow-empty-coverage", + "test:snapshots": "tap --snapshot --disable-coverage --allow-empty-coverage" }, "dependencies": { "@metrics/client": "2.5.2", - "@podium/client": "5.0.0-next.13", - "@podium/context": "5.0.0-next.6", - "@podium/proxy": "5.0.0-next.7", - "@podium/schemas": "5.0.0-next.6", - "@podium/utils": "5.0.0-next.8", + "@podium/client": "5.0.0", + "@podium/context": "5.0.0", + "@podium/proxy": "5.0.0", + "@podium/schemas": "5.0.0", + "@podium/utils": "5.0.0", "abslog": "2.4.0", "lodash.merge": "4.6.2", "objobj": "1.0.0", @@ -51,23 +51,23 @@ "@podium/podlet": "5.0.0", "@podium/test-utils": "2.5.2", "@semantic-release/changelog": "6.0.3", - "@semantic-release/commit-analyzer": "9.0.2", + "@semantic-release/commit-analyzer": "11.1.0", "@semantic-release/git": "10.0.1", - "@semantic-release/github": "8.1.0", - "@semantic-release/npm": "9.0.2", - "@semantic-release/release-notes-generator": "10.0.3", - "semantic-release": "19.0.5", - "eslint": "8.52.0", + "@semantic-release/github": "9.2.3", + "@semantic-release/npm": "11.0.1", + "@semantic-release/release-notes-generator": "12.1.0", + "semantic-release": "22.0.8", + "eslint": "8.54.0", "eslint-config-airbnb-base": "15.0.0", - "eslint-config-prettier": "8.10.0", + "eslint-config-prettier": "9.0.0", "eslint-plugin-import": "2.29.0", - "eslint-plugin-prettier": "4.2.1", - "@babel/eslint-parser": "7.19.1", + "eslint-plugin-prettier": "5.0.1", + "@babel/eslint-parser": "7.23.3", "express": "4.18.2", "hbs": "4.2.0", - "prettier": "2.8.8", + "prettier": "3.1.0", "stoppable": "1.1.0", "supertest": "6.3.3", - "tap": "16.3.9" + "tap": "18.6.1" } } diff --git a/tap-snapshots/tests/layout.js.test.cjs b/tap-snapshots/tests/layout.js.test.cjs index af36fad0..e6602624 100644 --- a/tap-snapshots/tests/layout.js.test.cjs +++ b/tap-snapshots/tests/layout.js.test.cjs @@ -5,7 +5,7 @@ * Make sure to inspect the output below. Do not ignore changes! */ 'use strict' -exports[`tests/layout.js TAP Layout() - rendering using a string - with assets > must match snapshot 1`] = ` +exports[`tests/layout.js > TAP > Layout() - rendering using a string - with assets > must match snapshot 1`] = ` @@ -13,16 +13,18 @@ exports[`tests/layout.js TAP Layout() - rendering using a string - with assets > - + awesome page extra head stuff
should be wrapped in a doc
+ + ` -exports[`tests/layout.js TAP Layout() - setting a custom view template > must match snapshot 1`] = ` +exports[`tests/layout.js > TAP > Layout() - setting a custom view template > must match snapshot 1`] = ` extra head stuff
should be wrapped in a doc
` From 5304f8028a49a93a957b026f7ea224f6417d270a Mon Sep 17 00:00:00 2001 From: Richard Walker Date: Wed, 29 Nov 2023 13:28:25 +1300 Subject: [PATCH 21/21] chore: fix run version for semantic release --- .github/workflows/publish.yml | 4 ++-- .github/workflows/test.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6aa01471..f9d4a946 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 20.x - name: npm install run: | npm install @@ -38,7 +38,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 20.x - name: npm install run: | npm install diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index defd1374..b6fc788d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - node-version: [16.x, 18.x] + node-version: [16.x, 18.x, 20.x] steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }}