From 7fd5d6dd91a91de91de12f554813ffdad75677fb Mon Sep 17 00:00:00 2001 From: Matthew Couch Date: Tue, 19 Mar 2019 10:23:49 -0500 Subject: [PATCH 01/48] fix(plugin): correct spelling error and function locations Fix for https://github.com/pattern-lab/patternlab-node/issues/916 --- packages/uikit-workshop/src/scripts/components/plugin-loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/uikit-workshop/src/scripts/components/plugin-loader.js b/packages/uikit-workshop/src/scripts/components/plugin-loader.js index 239e1b992..7a7cc5c64 100644 --- a/packages/uikit-workshop/src/scripts/components/plugin-loader.js +++ b/packages/uikit-workshop/src/scripts/components/plugin-loader.js @@ -10,7 +10,7 @@ const scriptjs = require('scriptjs'); export const pluginLoader = { init() { for (let i = 0; i < window.plugins.length; ++i) { - const plugin = window.lugins[i]; + const plugin = window.plugins[i]; // load the templates for (const key in plugin.templates) { From 0ea5bff8d27be10c154335b6af79de32b54f91d0 Mon Sep 17 00:00:00 2001 From: Brian Muenzenmeyer Date: Fri, 23 Aug 2019 10:24:20 -0500 Subject: [PATCH 02/48] fix(uikit-workshop): fix merge problem likely broke when manually merging https://github.com/pattern-lab/patternlab-node/pull/1008 --- .../uikit-workshop/src/scripts/components/panels-viewer.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/uikit-workshop/src/scripts/components/panels-viewer.js b/packages/uikit-workshop/src/scripts/components/panels-viewer.js index 76785bc1e..c45a3922f 100644 --- a/packages/uikit-workshop/src/scripts/components/panels-viewer.js +++ b/packages/uikit-workshop/src/scripts/components/panels-viewer.js @@ -366,6 +366,3 @@ export const panelsViewer = { * 5) Add mouseup event to the body so that when drag is released, the modal * stops resizing and modal cover doesn't display anymore. */ -// eslint-disable-next-line no-unused-vars -$('.pl-js-modal-resizer').mousedown(function(event) { - /* 1 */ From 40139bfa7d2999876dd6fe3569332266cb576c29 Mon Sep 17 00:00:00 2001 From: Brian Muenzenmeyer Date: Fri, 23 Aug 2019 12:59:28 -0500 Subject: [PATCH 03/48] Publish - @pattern-lab/cli@0.1.0 - @pattern-lab/core@3.0.2 - create-pattern-lab@1.0.7 - @pattern-lab/development-edition-engine-handlebars@0.1.0 - @pattern-lab/engine-react-testing-tree@0.1.3 - @pattern-lab/edition-node-gulp@2.0.3 - @pattern-lab/edition-node@2.0.0 - @pattern-lab/edition-twig@3.1.2 - @pattern-lab/engine-handlebars@2.0.0 - @pattern-lab/engine-nunjucks@0.2.0 - @pattern-lab/engine-twig-php@3.0.2 - @pattern-lab/starterkit-handlebars-demo@1.0.1 - @pattern-lab/uikit-workshop@1.0.2 --- packages/uikit-workshop/CHANGELOG.md | 21 +++++++++++++++++++++ packages/uikit-workshop/package.json | 16 ++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/packages/uikit-workshop/CHANGELOG.md b/packages/uikit-workshop/CHANGELOG.md index 1aabdab9c..0a127025a 100644 --- a/packages/uikit-workshop/CHANGELOG.md +++ b/packages/uikit-workshop/CHANGELOG.md @@ -3,6 +3,27 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.0.2](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/compare/@pattern-lab/uikit-workshop@1.0.1...@pattern-lab/uikit-workshop@1.0.2) (2019-08-23) + + +### Bug Fixes + +* add better pre-rendering support ([8ecd615](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/8ecd615)) +* add missing @babel/runtime package to address silent error getting thrown on Travis ([1918d04](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/1918d04)) +* add missing preact-render-to-string library ([881296a](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/881296a)) +* fix incorrect Webpack version in package.json ([9788e89](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/9788e89)) +* fix issue with viewport height exceeding the space available ([95cd1cf](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/95cd1cf)) +* minor CSS fixes + fresh prod build ([8ac2c1f](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/8ac2c1f)) +* squashing minor UI bugs ([a8a606c](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/a8a606c)) +* update initial PL iframe path default ([a26fbb9](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/a26fbb9)) +* updates to fix eslint / prettier issues; update packages/core to reuse root .eslintrc.js file ([5b7a057](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/5b7a057)) +* **uikit-workshop:** fix merge problem ([d245b3b](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/d245b3b)) + + + + + + ## [1.0.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/compare/@pattern-lab/uikit-workshop@1.0.1-alpha.0...@pattern-lab/uikit-workshop@1.0.1) (2019-05-16) diff --git a/packages/uikit-workshop/package.json b/packages/uikit-workshop/package.json index f7325dad6..543a62bce 100644 --- a/packages/uikit-workshop/package.json +++ b/packages/uikit-workshop/package.json @@ -1,6 +1,6 @@ { "name": "@pattern-lab/uikit-workshop", - "version": "1.0.1", + "version": "1.0.2", "description": "Front-end assets and templates for the default Pattern Lab workshop view", "main": "gulpfile.js", "scripts": { @@ -29,12 +29,12 @@ "repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop", "bugs": "https://github.com/pattern-lab/patternlab-node/issues", "devDependencies": { - "copy-webpack-plugin": "^5.0.2", "@svgr/webpack": "^4.1.0", "autoprefixer": "^9.1.0", "babel-loader": "^8.0.2", "clean-css-loader": "^1.0.1", "clean-webpack-plugin": "0.1.19", + "copy-webpack-plugin": "^5.0.2", "cosmiconfig": "^5.0.6", "critical": "^1.3.4", "critical-css-webpack-plugin": "^0.2.0", @@ -56,7 +56,7 @@ "workbox-build": "^3.4.1" }, "dependencies": { - "@babel/runtime": "^7.5.4", + "@babel/core": "^7.5.4", "@babel/plugin-proposal-class-properties": "^7.5.0", "@babel/plugin-proposal-decorators": "^7.4.4", "@babel/plugin-syntax-dynamic-import": "^7.2.0", @@ -64,12 +64,12 @@ "@babel/plugin-transform-react-jsx": "^7.3.0", "@babel/plugin-transform-runtime": "^7.5.0", "@babel/preset-env": "^7.5.4", - "@ungap/url-search-params": "^0.1.2", - "@babel/core": "^7.5.4", + "@babel/runtime": "^7.5.4", "@reach/visually-hidden": "^0.1.2", "@skatejs/element-preact": "^0.0.1", "@skatejs/renderer-lit-html": "^0.2.2", "@skatejs/renderer-preact": "^0.3.3", + "@ungap/url-search-params": "^0.1.2", "@webcomponents/custom-elements": "^1.2.4", "@webcomponents/shadydom": "^1.6.0", "@webcomponents/template": "^1.4.0", @@ -77,9 +77,9 @@ "clipboard": "^2.0.1", "core-js": "^3.1.4", "deepmerge": "^2.1.1", + "document-register-element": "^1.13.3", "element-closest": "2.0.2", "es6-promise": "^4.2.4", - "document-register-element": "^1.13.3", "fg-loadcss": "^2.1.0", "fg-loadjs": "^1.1.0", "fuse.js": "^3.2.1", @@ -88,14 +88,15 @@ "hogan.js": "^3.0.2", "htm": "^1.0.1", "iframe-resizer": "^3.6.5", - "mousetrap": "^1.6.2", "lit-html": "^1.1.1", + "mousetrap": "^1.6.2", "preact": "8.4.2", "preact-compat": "3.19.0", "preact-context": "1.1.3", "preact-render-to-string": "^4.1.0", "preload-webpack-plugin": "^3.0.0-beta.3", "prerender-spa-plugin": "^3.4.0", + "pretty": "^2.0.0", "prismjs": "^1.15.0", "pwa-helpers": "^0.9.0", "react": "^16.8.6", @@ -115,7 +116,6 @@ "webpack-cli": "^3.3.5", "whendefined": "^0.0.1", "wolfy87-eventemitter": "^5.2.6", - "pretty": "^2.0.0", "yargs": "^13.3.0" } } From 3a7ce3c4031e782f1fbdc5376ef1886b7b5b2210 Mon Sep 17 00:00:00 2001 From: Salem Ghoweri Date: Tue, 27 Aug 2019 21:56:11 -0400 Subject: [PATCH 04/48] fix: update autoprefixer browserslist config to address warning messages --- packages/uikit-workshop/package.json | 7 ++++++- packages/uikit-workshop/webpack.config.js | 13 +------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/packages/uikit-workshop/package.json b/packages/uikit-workshop/package.json index 543a62bce..b771b0a5d 100644 --- a/packages/uikit-workshop/package.json +++ b/packages/uikit-workshop/package.json @@ -117,5 +117,10 @@ "whendefined": "^0.0.1", "wolfy87-eventemitter": "^5.2.6", "yargs": "^13.3.0" - } + }, + "browserslist": [ + ">0.25%", + "ie 11", + "not op_mini all" + ] } diff --git a/packages/uikit-workshop/webpack.config.js b/packages/uikit-workshop/webpack.config.js index 7ef0b4033..c41419670 100644 --- a/packages/uikit-workshop/webpack.config.js +++ b/packages/uikit-workshop/webpack.config.js @@ -57,18 +57,7 @@ module.exports = function() { loader: 'postcss-loader', options: { sourceMap: config.sourceMaps, - plugins: () => [ - autoprefixer({ - browsers: [ - 'last 2 version', - 'safari 5', - 'ie 8', - 'ie 9', - 'opera 12.1', - 'android 4', - ], - }), - ], + plugins: () => [autoprefixer()], }, }, { From 8216df3baefe1838b351f0bccdb3e7d07c3dbefd Mon Sep 17 00:00:00 2001 From: Salem Ghoweri Date: Tue, 27 Aug 2019 21:56:51 -0400 Subject: [PATCH 05/48] fix: temporarily downgrade Preact version so tooltip used for displaying viewport sizes renders correctly --- packages/uikit-workshop/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/uikit-workshop/package.json b/packages/uikit-workshop/package.json index b771b0a5d..d69d21f66 100644 --- a/packages/uikit-workshop/package.json +++ b/packages/uikit-workshop/package.json @@ -90,9 +90,9 @@ "iframe-resizer": "^3.6.5", "lit-html": "^1.1.1", "mousetrap": "^1.6.2", - "preact": "8.4.2", - "preact-compat": "3.19.0", - "preact-context": "1.1.3", + "preact": "8.3.1", + "preact-compat": "3.18.4", + "preact-context": "1.1.2", "preact-render-to-string": "^4.1.0", "preload-webpack-plugin": "^3.0.0-beta.3", "prerender-spa-plugin": "^3.4.0", From f1999f0f38e4224d3fb66fb302f5dee7ba72c8c4 Mon Sep 17 00:00:00 2001 From: Salem Ghoweri Date: Tue, 27 Aug 2019 21:57:48 -0400 Subject: [PATCH 06/48] fix: update Javascript to address merge conflict issue with previous PR merge / recent release --- .../src/scripts/patternlab-viewer.js | 47 +++---------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/packages/uikit-workshop/src/scripts/patternlab-viewer.js b/packages/uikit-workshop/src/scripts/patternlab-viewer.js index 51b36e5b6..721ebaed9 100755 --- a/packages/uikit-workshop/src/scripts/patternlab-viewer.js +++ b/packages/uikit-workshop/src/scripts/patternlab-viewer.js @@ -12,47 +12,12 @@ import './components/pl-toggle-theme/pl-toggle-theme'; import './components/pl-tools-menu/pl-tools-menu'; import './components/pl-search/pl-search'; -loadPolyfills.then(() => { - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-layout' */ './components/pl-layout/pl-layout' - ); - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-controls' */ './components/pl-controls/pl-controls' - ); - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-drawer' */ './components/pl-drawer/pl-drawer' - ); - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-header' */ './components/pl-header/pl-header' - ); - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-iframe' */ './components/pl-viewport/pl-viewport' - ); - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-nav' */ './components/pl-nav/pl-nav' - ); - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-search' */ './components/pl-search/pl-search' - ); - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-toggle-info' */ './components/pl-toggle-info/pl-toggle-info' - ); - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-toggle-layout' */ './components/pl-toggle-layout/pl-toggle-layout' - ); - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-toggle-theme' */ './components/pl-toggle-theme/pl-toggle-theme' - ); - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-tools-menu' */ './components/pl-tools-menu/pl-tools-menu' - ); - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-styleguide' */ './components/styleguide' - ); - import( - /* webpackMode: 'lazy', webpackChunkName: 'pl-modal-viewer' */ './components/modal-viewer' - ); -}); +import( + /* webpackChunkName: "pl-viewport-sizes" */ + /* webpackMode: "lazy" */ + /* webpackPrefetch: true */ + './components/pl-viewport-size-list/pl-viewport-size-list' +); import( /* webpackChunkName: "pl-modal-viewer" */ From ffb15b7cd436a2455f5896e36e78171c92c68e4e Mon Sep 17 00:00:00 2001 From: Salem Ghoweri Date: Tue, 27 Aug 2019 21:58:29 -0400 Subject: [PATCH 07/48] fix: temporarily disable Random and Disco viewport controls until the full JS logic for these is re-enabled --- .../pl-viewport-size-list/pl-viewport-size-list.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/uikit-workshop/src/scripts/components/pl-viewport-size-list/pl-viewport-size-list.js b/packages/uikit-workshop/src/scripts/components/pl-viewport-size-list/pl-viewport-size-list.js index 43a700bf6..c618a28d3 100644 --- a/packages/uikit-workshop/src/scripts/components/pl-viewport-size-list/pl-viewport-size-list.js +++ b/packages/uikit-workshop/src/scripts/components/pl-viewport-size-list/pl-viewport-size-list.js @@ -214,12 +214,8 @@ class ViewportSizes extends BaseComponent { )} - {!this.ishControlsHide.random && ( + {/* {!this.ishControlsHide.random && (
  • - {/* */} -
    • - )} - {!this.ishControlsHide.disco && ( + )} */} + {/* {!this.ishControlsHide.disco && (
    • - )} + )} */} {!this.ishControlsHide.hay && (