Skip to content

Commit 9416975

Browse files
sghowerisghoweri
committed
chore: minor cleanup + adding dependencies needed for the workshop folder to remotely compile the Handlebars demo
1 parent 9d6be82 commit 9416975

5 files changed

Lines changed: 39 additions & 112 deletions

File tree

‎packages/uikit-workshop/build-tools.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const path = require('path');
33
const fs = require('fs-extra');
44

55
fs.mkdirp('./node_modules/@pattern-lab/');
6+
fs.unlinkSync('./dependencyGraph.json');
67
fs.ensureSymlink(__dirname, './node_modules/@pattern-lab/uikit-workshop');
78

89
const configKeysEndingWithASlash = [

‎packages/uikit-workshop/build/webpack-dev-server-waitpage/pl-loading.ejs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,13 @@
129129
overflow: visible;
130130
margin: 0 auto;
131131
}
132-
133-
.c-pl-logo__inner {
134-
padding: 1rem;
135-
}
136132
</style>
137133
</head>
138134
<body>
139135

140136
<div class="c-pl-logo">
141137
<div class="c-pl-logo__inner">
142-
<svg style="max-width: 200px;" width="100%" viewBox="0 0 187 185" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
138+
<svg style="max-width: 100px;" width="100%" viewBox="0 0 187 185" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
143139
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
144140
<g id="Group-6">
145141
<g id="Group-5">

‎packages/uikit-workshop/build/webpack-server.js‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ const hasha = require('hasha');
88
const webpackDevServerWaitpage = require('./webpack-dev-server-waitpage');
99
const webpackConfig = require('../webpack.config');
1010
const app = express();
11+
const portfinder = require('portfinder');
1112

1213
const fileHashes = {};
1314

1415
// @todo: move these configs + make customizable?
1516
const buildDir = 'www';
16-
const preferredPort = '3000';
17+
const root = path.resolve(__dirname, `../${buildDir}`);
18+
const preferredPort = 3000;
19+
portfinder.basePort = preferredPort;
1720

1821
async function serve(patternlab) {
1922
const webpackConfigs = await webpackConfig({
@@ -22,7 +25,15 @@ async function serve(patternlab) {
2225
buildDir: path.resolve(__dirname, `../${buildDir}`),
2326
});
2427

25-
const root = path.resolve(__dirname, `../${buildDir}`);
28+
const port = await portfinder
29+
.getPortPromise()
30+
.then(port => {
31+
return port;
32+
})
33+
.catch(err => {
34+
console.log(err);
35+
return 3000;
36+
});
2637

2738
// customize bs reload behavior based on the type of asset that's changed
2839
const filesToWatch = [
@@ -59,12 +70,13 @@ async function serve(patternlab) {
5970

6071
browserSync.init(
6172
{
62-
proxy: `127.0.0.1:${preferredPort}`,
73+
proxy: `127.0.0.1:${port}`,
6374
logLevel: 'info',
6475
ui: false,
6576
notify: false,
6677
open: false,
6778
tunnel: false,
79+
port,
6880
logFileChanges: false,
6981
reloadOnRestart: true,
7082
watchOptions: {
@@ -74,14 +86,14 @@ async function serve(patternlab) {
7486
},
7587
function(err, bs) {
7688
// assigned port from browsersync based on what's available
77-
const port = bs.options.get('port');
78-
opn(`http://localhost:${port}`);
89+
const assignedPort = bs.options.get('port');
90+
opn(`http://localhost:${assignedPort}`);
7991
const compiler = webpack(webpackConfigs);
8092

8193
app.use(
8294
webpackDevServerWaitpage(compiler, {
8395
proxyHeader: 'browsersync-proxy',
84-
redirectPath: `http://localhost:${port}`,
96+
redirectPath: `http://localhost:${assignedPort}`,
8597
})
8698
);
8799

@@ -94,9 +106,9 @@ async function serve(patternlab) {
94106
})
95107
);
96108

97-
app.use(express.static(path.resolve(__dirname, '../www')));
109+
app.use(express.static(root));
98110

99-
app.listen(port, '127.0.0.1', function onStart(error) {
111+
app.listen(assignedPort, '127.0.0.1', function onStart(error) {
100112
if (error) {
101113
console.log(error);
102114
}

‎packages/uikit-workshop/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,16 @@
3333
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",
3434
"devDependencies": {
3535
"@pattern-lab/core": "^5.3.0",
36+
"@pattern-lab/engine-handlebars": "^5.0.0",
37+
"@pattern-lab/engine-mustache": "^5.0.0",
38+
"browser-sync": "^2.26.7",
3639
"better-opn": "^1.0.0",
3740
"ejs": "^2.7.2",
3841
"express": "^4.17.1",
3942
"friendly-errors-webpack-plugin": "^1.7.0",
4043
"fs-extra": "^8.1.0",
4144
"hasha": "^5.1.0",
45+
"portfinder": "^1.0.25",
4246
"webpack-dev-middleware": "^3.7.2",
4347
"webpack-hot-middleware": "^2.25.0"
4448
},

‎yarn.lock‎

Lines changed: 13 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1860,11 +1860,6 @@
18601860
"@svgr/plugin-svgo" "^4.3.1"
18611861
loader-utils "^1.2.3"
18621862

1863-
"@types/color-name@^1.1.1":
1864-
version "1.1.1"
1865-
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
1866-
integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
1867-
18681863
"@types/events@*":
18691864
version "3.0.0"
18701865
resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -2320,14 +2315,6 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
23202315
dependencies:
23212316
color-convert "^1.9.0"
23222317

2323-
ansi-styles@^4.1.0:
2324-
version "4.2.0"
2325-
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172"
2326-
integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==
2327-
dependencies:
2328-
"@types/color-name" "^1.1.1"
2329-
color-convert "^2.0.1"
2330-
23312318
ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
23322319
version "0.1.0"
23332320
resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
@@ -2672,7 +2659,7 @@ async@1.5.2, async@^1.5.2:
26722659
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
26732660
integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
26742661

2675-
async@^2.0.0:
2662+
async@^2.0.0, async@^2.6.2:
26762663
version "2.6.3"
26772664
resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
26782665
integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -3776,14 +3763,6 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.
37763763
escape-string-regexp "^1.0.5"
37773764
supports-color "^5.3.0"
37783765

3779-
chalk@^3.0.0:
3780-
version "3.0.0"
3781-
resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
3782-
integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
3783-
dependencies:
3784-
ansi-styles "^4.1.0"
3785-
supports-color "^7.1.0"
3786-
37873766
change-case@^3.0.1:
37883767
version "3.1.0"
37893768
resolved "https://registry.yarnpkg.com/change-case/-/change-case-3.1.0.tgz#0e611b7edc9952df2e8513b27b42de72647dd17e"
@@ -4170,19 +4149,12 @@ color-convert@^1.9.0:
41704149
dependencies:
41714150
color-name "1.1.3"
41724151

4173-
color-convert@^2.0.1:
4174-
version "2.0.1"
4175-
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
4176-
integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
4177-
dependencies:
4178-
color-name "~1.1.4"
4179-
41804152
color-name@1.1.3:
41814153
version "1.1.3"
41824154
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
41834155
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
41844156

4185-
color-name@^1.0.0, color-name@~1.1.4:
4157+
color-name@^1.0.0:
41864158
version "1.1.4"
41874159
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
41884160
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -5214,7 +5186,7 @@ debug@4.1.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
52145186
dependencies:
52155187
ms "^2.1.1"
52165188

5217-
debug@^3.0.0, debug@^3.1.0, debug@^3.2.6:
5189+
debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
52185190
version "3.2.6"
52195191
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
52205192
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -5950,22 +5922,6 @@ es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
59505922
string.prototype.trimleft "^2.1.0"
59515923
string.prototype.trimright "^2.1.0"
59525924

5953-
es-abstract@^1.4.3:
5954-
version "1.16.0"
5955-
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d"
5956-
integrity sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==
5957-
dependencies:
5958-
es-to-primitive "^1.2.0"
5959-
function-bind "^1.1.1"
5960-
has "^1.0.3"
5961-
has-symbols "^1.0.0"
5962-
is-callable "^1.1.4"
5963-
is-regex "^1.0.4"
5964-
object-inspect "^1.6.0"
5965-
object-keys "^1.1.1"
5966-
string.prototype.trimleft "^2.1.0"
5967-
string.prototype.trimright "^2.1.0"
5968-
59695925
es-to-primitive@^1.2.0:
59705926
version "1.2.0"
59715927
resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
@@ -7160,7 +7116,7 @@ fstream@^1.0.0, fstream@^1.0.12:
71607116
mkdirp ">=0.5 0"
71617117
rimraf "2"
71627118

7163-
function-bind@^1.0.2, function-bind@^1.1.1:
7119+
function-bind@^1.1.1:
71647120
version "1.1.1"
71657121
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
71667122
integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
@@ -7862,11 +7818,6 @@ has-flag@^3.0.0:
78627818
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
78637819
integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
78647820

7865-
has-flag@^4.0.0:
7866-
version "4.0.0"
7867-
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
7868-
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
7869-
78707821
has-gulplog@^0.1.0:
78717822
version "0.1.0"
78727823
resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
@@ -10303,11 +10254,6 @@ memory-fs@^0.5.0:
1030310254
errno "^0.1.3"
1030410255
readable-stream "^2.0.1"
1030510256

10306-
memorystream@^0.3.1:
10307-
version "0.3.1"
10308-
resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
10309-
integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
10310-
1031110257
meow@^3.1.0, meow@^3.3.0, meow@^3.7.0:
1031210258
version "3.7.0"
1031310259
resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@@ -11179,21 +11125,6 @@ npm-pick-manifest@^3.0.0:
1117911125
npm-package-arg "^6.0.0"
1118011126
semver "^5.4.1"
1118111127

11182-
npm-run-all@^4.1.5:
11183-
version "4.1.5"
11184-
resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
11185-
integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
11186-
dependencies:
11187-
ansi-styles "^3.2.1"
11188-
chalk "^2.4.1"
11189-
cross-spawn "^6.0.5"
11190-
memorystream "^0.3.1"
11191-
minimatch "^3.0.4"
11192-
pidtree "^0.3.0"
11193-
read-pkg "^3.0.0"
11194-
shell-quote "^1.6.1"
11195-
string.prototype.padend "^3.0.0"
11196-
1119711128
npm-run-path@^2.0.0:
1119811129
version "2.0.2"
1119911130
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -12042,11 +11973,6 @@ picomatch@^2.0.5:
1204211973
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.1.0.tgz#0fd042f568d08b1ad9ff2d3ec0f0bfb3cb80e177"
1204311974
integrity sha512-uhnEDzAbrcJ8R3g2fANnSuXZMBtkpSjxTTgn2LeSiQlfmq72enQJWdQllXW24MBLYnA1SBD2vfvx2o0Zw3Ielw==
1204411975

12045-
pidtree@^0.3.0:
12046-
version "0.3.0"
12047-
resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
12048-
integrity sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==
12049-
1205011976
pify@^2.0.0, pify@^2.3.0:
1205111977
version "2.3.0"
1205211978
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -12132,6 +12058,15 @@ portfinder@^1.0.13:
1213212058
debug "^2.2.0"
1213312059
mkdirp "0.5.x"
1213412060

12061+
portfinder@^1.0.25:
12062+
version "1.0.25"
12063+
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
12064+
integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
12065+
dependencies:
12066+
async "^2.6.2"
12067+
debug "^3.1.1"
12068+
mkdirp "^0.5.1"
12069+
1213512070
portscanner@2.1.1:
1213612071
version "2.1.1"
1213712072
resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96"
@@ -13984,11 +13919,6 @@ shebang-regex@^1.0.0:
1398413919
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
1398513920
integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
1398613921

13987-
shell-quote@^1.6.1:
13988-
version "1.7.2"
13989-
resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
13990-
integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
13991-
1399213922
shelljs@0.3.x:
1399313923
version "0.3.0"
1399413924
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1"
@@ -14543,15 +14473,6 @@ string-width@^3.0.0, string-width@^3.1.0:
1454314473
is-fullwidth-code-point "^2.0.0"
1454414474
strip-ansi "^5.1.0"
1454514475

14546-
string.prototype.padend@^3.0.0:
14547-
version "3.0.0"
14548-
resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
14549-
integrity sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=
14550-
dependencies:
14551-
define-properties "^1.1.2"
14552-
es-abstract "^1.4.3"
14553-
function-bind "^1.0.2"
14554-
1455514476
string.prototype.trimleft@^2.1.0:
1455614477
version "2.1.0"
1455714478
resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
@@ -14751,13 +14672,6 @@ supports-color@^5.3.0, supports-color@^5.4.0:
1475114672
dependencies:
1475214673
has-flag "^3.0.0"
1475314674

14754-
supports-color@^7.1.0:
14755-
version "7.1.0"
14756-
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
14757-
integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
14758-
dependencies:
14759-
has-flag "^4.0.0"
14760-
1476114675
svg-baker-runtime@1.4.1:
1476214676
version "1.4.1"
1476314677
resolved "https://registry.yarnpkg.com/svg-baker-runtime/-/svg-baker-runtime-1.4.1.tgz#d3f77dffdf1f1a8b8f1e84ef67d2c1b53d60d770"

0 commit comments

Comments
 (0)