Skip to content

Commit 9d6be82

Browse files
committed
chore: revert file changes not required for this round of updates
1 parent c56ff20 commit 9d6be82

6 files changed

Lines changed: 19 additions & 174 deletions

File tree

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
"nohoist": [
77
"@pattern-lab/engine-*",
88
"**/@pattern-lab/engine-*",
9-
"**/@pattern-lab/uikit-workshop",
10-
"**/@pattern-lab/starterkit-handlebars-vanilla"
9+
"**/@pattern-lab/uikit-workshop"
1110
]
1211
},
1312
"dependencies": {

packages/core/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"version": "5.3.0",
55
"main": "./src/index.js",
66
"dependencies": {
7-
"better-opn": "^1.0.0",
8-
"browser-sync": "^2.26.7",
97
"@pattern-lab/engine-mustache": "^5.0.0",
108
"@pattern-lab/live-server": "^5.0.0",
119
"chalk": "1.1.3",

packages/core/src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const patternlab_module = function(config) {
8383
* @memberof patternlab
8484
* @name getConfig
8585
* @instance
86-
* @returns {string} the current patternlab-node config (defaults + customizations)
86+
* @returns {object} the current patternlab-node config (defaults + customizations)
8787
*/
8888
getConfig() {
8989
return config;

packages/core/src/lib/server.js

Lines changed: 15 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
'use strict';
22

33
const path = require('path');
4-
const browserSync = require('browser-sync').create();
5-
const opn = require('better-opn');
4+
const liveServer = require('@pattern-lab/live-server');
65

76
const events = require('./events');
87
const logger = require('./log');
@@ -49,7 +48,10 @@ const server = patternlab => {
4948
//watch for builds to complete
5049
patternlab.events.on(events.PATTERNLAB_BUILD_END, () => {
5150
if (serverReady) {
52-
browserSync.reload();
51+
_module.reload({
52+
file: '',
53+
action: 'reload',
54+
});
5355
}
5456
});
5557
};
@@ -60,42 +62,9 @@ const server = patternlab => {
6062
let resolveMsg = '';
6163
setTimeout(() => {
6264
try {
63-
browserSync.init(
64-
{
65-
logLevel: 'info',
66-
ui: false,
67-
notify: false,
68-
open: false,
69-
logFileChanges: false,
70-
reloadOnRestart: true,
71-
port: liveServerConfig.port, // try to use this port but choose another if unavailable
72-
server: liveServerConfig.root,
73-
files: [
74-
`${liveServerConfig.root}/**/*.css`,
75-
`${liveServerConfig.root}/**/*.js`,
76-
],
77-
watchOptions: {
78-
ignoreInitial: false,
79-
},
80-
},
81-
function(err, bs) {
82-
const port = bs.options.get('port');
83-
serverReady = true; // so we only spin this up once Webpack has finished up initially
84-
85-
resolveMsg = `Pattern Lab is being served from http://127.0.0.1:${port}`;
86-
opn(`http://127.0.0.1:${port}`);
87-
logger.info(resolveMsg);
88-
}
89-
);
90-
91-
browserSync.watch(
92-
`${liveServerConfig.root}/**.html`,
93-
(event, file) => {
94-
if (!patternlab.isBusy) {
95-
browserSync.reload('**/*.html');
96-
}
97-
}
98-
);
65+
liveServer.start(liveServerConfig);
66+
resolveMsg = `Pattern Lab is being served from http://127.0.0.1:${liveServerConfig.port}`;
67+
logger.info(resolveMsg);
9968
} catch (e) {
10069
const err = `Pattern Lab serve failed to start: ${e}`;
10170
logger.error(`Pattern Lab serve failed to start: ${e}`);
@@ -120,15 +89,13 @@ const server = patternlab => {
12089
let action;
12190
try {
12291
if (!patternlab.isBusy) {
123-
// @todo: re-evaluate to see if this specific logic is still necessary
124-
// if (_data.file.indexOf('css') > -1 || _data.action === 'refresh') {
125-
// action = 'refreshed CSS';
126-
// // browserSync.refreshCSS();
127-
// } else {
128-
// action = 'reloaded';
129-
// // browserSync.reload();
130-
// }
131-
browserSync.reload();
92+
if (_data.file.indexOf('css') > -1 || _data.action === 'refresh') {
93+
action = 'refreshed CSS';
94+
liveServer.refreshCSS();
95+
} else {
96+
action = 'reloaded';
97+
liveServer.reload();
98+
}
13299
resolve(`Server ${action} successfully`);
133100
}
134101
} catch (e) {

packages/development-edition-engine-handlebars/build-tools.js

Lines changed: 0 additions & 114 deletions
This file was deleted.

packages/development-edition-engine-handlebars/package.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
"pl:help": "patternlab --help",
99
"pl:install": "patternlab install --config ./patternlab-config.json",
1010
"pl:serve": "patternlab serve --config ./patternlab-config.json",
11-
"pl:version": "patternlab --version",
12-
"setup": "yarn --force && npx patternlab add --starterkits '@pattern-lab/starterkit-handlebars-vanilla' && npm run pl:build && npm run uikit:build",
13-
"start": "npm-run-all -p uikit:watch pl:serve",
14-
"uikit:watch": "cd ../uikit-workshop && npm run watch",
15-
"uikit:build": "cd ../uikit-workshop && npm run build"
11+
"pl:version": "patternlab --version"
1612
},
1713
"keywords": [
1814
"Pattern Lab",
@@ -37,7 +33,6 @@
3733
"@pattern-lab/engine-mustache": "^5.0.0",
3834
"@pattern-lab/plugin-tab": "^5.3.0",
3935
"@pattern-lab/starterkit-mustache-demo": "^5.0.0",
40-
"@pattern-lab/uikit-workshop": "^5.3.2",
41-
"npm-run-all": "^4.1.5"
36+
"@pattern-lab/uikit-workshop": "^5.3.2"
4237
}
4338
}

0 commit comments

Comments
 (0)