Skip to content

Commit cae1528

Browse files
committed
Merge branch 'dev' into refactor-updated-dependency-node-sass
2 parents bff9389 + be17657 commit cae1528

File tree

18 files changed

+1968
-2293
lines changed

18 files changed

+1968
-2293
lines changed

CHANGELOG.md

Lines changed: 267 additions & 267 deletions
Large diffs are not rendered by default.

packages/cli/bin/scaffold.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22
const path = require('path');
33
const execa = require('execa');
4-
const fs = require('fs-extra');
4+
const fs = require('fs');
55
const wrapAsync = require('./utils').wrapAsync;
66
const mkdirsAsync = require('./utils').mkdirsAsync;
77

@@ -18,7 +18,6 @@ const scaffold = (projectDir, sourceDir, publicDir, exportDir) =>
1818
wrapAsync(function*() {
1919
const projectPath = path.join(process.cwd(), projectDir);
2020
if (!fs.existsSync(path.join(projectPath, 'package.json'))) {
21-
fs.ensureDirSync(projectPath);
2221
execa.sync('npm', ['init', '-y'], {
2322
cwd: projectPath,
2423
});

packages/cli/package.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@
2424
"lodash": "4.17.20",
2525
"ora": "2.1.0",
2626
"path-exists": "3.0.0",
27-
"sanitize-filename": "1.6.1",
28-
"starterkit-mustache-acidtest": "0.0.3",
29-
"starterkit-mustache-bootstrap": "0.1.1",
30-
"starterkit-mustache-foundation": "0.1.1",
31-
"starterkit-mustache-materialdesign": "0.1.2"
27+
"sanitize-filename": "1.6.1"
3228
},
3329
"devDependencies": {
3430
"eslint": "4.18.2",
@@ -49,7 +45,7 @@
4945
],
5046
"scripts": {
5147
"lint": "eslint ./{bin,test}",
52-
"test:separate": "tap ./test/*.test.js --reporter spec --timeout=120"
48+
"test:separate": "tap './test/*.test.js' --reporter spec --timeout=120"
5349
},
5450
"repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli",
5551
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@pattern-lab/engine-mustache": "^5.14.0",
88
"@pattern-lab/live-server": "^5.13.0",
99
"chalk": "1.1.3",
10-
"chokidar": "1.7.0",
10+
"chokidar": "3.5.1",
1111
"dive": "0.5.0",
1212
"fs-extra": "5.0.0",
1313
"glob": "7.0.0",

packages/core/src/lib/server.js

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,6 @@ const server = patternlab => {
3636
patternlab.config.paths.public.root
3737
)
3838
);
39-
defaults.assets = [
40-
path.resolve(
41-
path.join(
42-
process.cwd(),
43-
patternlab.config.paths.source.js,
44-
'**',
45-
'*.js' // prevent preprocessors like typescript from reloading
46-
)
47-
),
48-
path.resolve(
49-
path.join(process.cwd(), patternlab.config.paths.source.images)
50-
),
51-
path.resolve(
52-
path.join(process.cwd(), patternlab.config.paths.source.fonts)
53-
),
54-
path.resolve(
55-
path.join(
56-
process.cwd(),
57-
patternlab.config.paths.source.css,
58-
'**',
59-
'*.css' // prevent preprocessors from reloading
60-
)
61-
),
62-
];
6339

6440
// allow for overrides should they exist inside patternlab-config.json
6541
const liveServerConfig = Object.assign(

packages/create/CHANGELOG.md

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -123,66 +123,66 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
123123

124124

125125

126-
127-
# [5.4.0](https://github.com/pattern-lab/patternlab-node/compare/v5.3.3...v5.4.0) (2019-11-26)
128-
129-
**Note:** Version bump only for package create-pattern-lab
130-
131-
132-
133-
134-
135-
# [5.3.0](https://github.com/pattern-lab/patternlab-node/compare/v5.2.0...v5.3.0) (2019-11-13)
136-
137-
**Note:** Version bump only for package create-pattern-lab
138-
139-
140-
141-
142-
143-
# [5.1.0](https://github.com/pattern-lab/patternlab-node/compare/v5.0.2...v5.1.0) (2019-10-29)
144-
145-
**Note:** Version bump only for package create-pattern-lab
146-
147-
148-
149-
150-
151-
# [5.0.0](https://github.com/pattern-lab/patternlab-node/compare/v3.0.0-beta.3...v5.0.0) (2019-10-25)
152-
153-
**Note:** Version bump only for package create-pattern-lab
154-
155-
156-
157-
158-
159-
160-
## [1.0.11](https://github.com/pattern-lab/patternlab-node/compare/[email protected]@1.0.11) (2019-10-14)
161-
162-
**Note:** Version bump only for package create-pattern-lab
163-
164-
165-
166-
167-
168-
169-
## [1.0.8](https://github.com/pattern-lab/patternlab-node/compare/[email protected]@1.0.8) (2019-08-23)
170-
171-
**Note:** Version bump only for package create-pattern-lab
172-
173-
174-
175-
176-
177-
## [1.0.7](https://github.com/pattern-lab/patternlab-node/compare/[email protected]@1.0.7) (2019-08-23)
178-
179-
**Note:** Version bump only for package create-pattern-lab
180-
181-
182-
183-
184-
185-
186-
## [1.0.6](https://github.com/sghoweri/patternlab-node/compare/[email protected]@1.0.6) (2019-05-16)
187-
126+
127+
# [5.4.0](https://github.com/pattern-lab/patternlab-node/compare/v5.3.3...v5.4.0) (2019-11-26)
128+
129+
**Note:** Version bump only for package create-pattern-lab
130+
131+
132+
133+
134+
135+
# [5.3.0](https://github.com/pattern-lab/patternlab-node/compare/v5.2.0...v5.3.0) (2019-11-13)
136+
137+
**Note:** Version bump only for package create-pattern-lab
138+
139+
140+
141+
142+
143+
# [5.1.0](https://github.com/pattern-lab/patternlab-node/compare/v5.0.2...v5.1.0) (2019-10-29)
144+
145+
**Note:** Version bump only for package create-pattern-lab
146+
147+
148+
149+
150+
151+
# [5.0.0](https://github.com/pattern-lab/patternlab-node/compare/v3.0.0-beta.3...v5.0.0) (2019-10-25)
152+
153+
**Note:** Version bump only for package create-pattern-lab
154+
155+
156+
157+
158+
159+
160+
## [1.0.11](https://github.com/pattern-lab/patternlab-node/compare/[email protected]@1.0.11) (2019-10-14)
161+
162+
**Note:** Version bump only for package create-pattern-lab
163+
164+
165+
166+
167+
168+
169+
## [1.0.8](https://github.com/pattern-lab/patternlab-node/compare/[email protected]@1.0.8) (2019-08-23)
170+
171+
**Note:** Version bump only for package create-pattern-lab
172+
173+
174+
175+
176+
177+
## [1.0.7](https://github.com/pattern-lab/patternlab-node/compare/[email protected]@1.0.7) (2019-08-23)
178+
179+
**Note:** Version bump only for package create-pattern-lab
180+
181+
182+
183+
184+
185+
186+
## [1.0.6](https://github.com/sghoweri/patternlab-node/compare/[email protected]@1.0.6) (2019-05-16)
187+
188188
**Note:** Version bump only for package create-pattern-lab

0 commit comments

Comments
 (0)