Skip to content

Commit

Permalink
Merge branch 'dev' into refactor-updated-further-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
mfranzke committed Mar 23, 2021
2 parents 46e97da + 6431987 commit 3b11ab2
Show file tree
Hide file tree
Showing 14 changed files with 1,836 additions and 1,864 deletions.
534 changes: 267 additions & 267 deletions CHANGELOG.md

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions packages/cli/bin/scaffold.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';
const path = require('path');
const execa = require('execa');
const fs = require('fs-extra');
const fs = require('fs');
const wrapAsync = require('./utils').wrapAsync;
const mkdirsAsync = require('./utils').mkdirsAsync;

Expand All @@ -18,7 +18,6 @@ const scaffold = (projectDir, sourceDir, publicDir, exportDir) =>
wrapAsync(function*() {
const projectPath = path.join(process.cwd(), projectDir);
if (!fs.existsSync(path.join(projectPath, 'package.json'))) {
fs.ensureDirSync(projectPath);
execa.sync('npm', ['init', '-y'], {
cwd: projectPath,
});
Expand Down
8 changes: 2 additions & 6 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@
"lodash": "4.17.20",
"ora": "2.1.0",
"path-exists": "3.0.0",
"sanitize-filename": "1.6.1",
"starterkit-mustache-acidtest": "0.0.3",
"starterkit-mustache-bootstrap": "0.1.1",
"starterkit-mustache-foundation": "0.1.1",
"starterkit-mustache-materialdesign": "0.1.2"
"sanitize-filename": "1.6.1"
},
"devDependencies": {
"eslint": "4.18.2",
Expand All @@ -49,7 +45,7 @@
],
"scripts": {
"lint": "eslint ./{bin,test}",
"test:separate": "tap ./test/*.test.js --reporter spec --timeout=120"
"test:separate": "tap './test/*.test.js' --reporter spec --timeout=120"
},
"repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli",
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",
Expand Down
24 changes: 0 additions & 24 deletions packages/core/src/lib/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,6 @@ const server = patternlab => {
patternlab.config.paths.public.root
)
);
defaults.assets = [
path.resolve(
path.join(
process.cwd(),
patternlab.config.paths.source.js,
'**',
'*.js' // prevent preprocessors like typescript from reloading
)
),
path.resolve(
path.join(process.cwd(), patternlab.config.paths.source.images)
),
path.resolve(
path.join(process.cwd(), patternlab.config.paths.source.fonts)
),
path.resolve(
path.join(
process.cwd(),
patternlab.config.paths.source.css,
'**',
'*.css' // prevent preprocessors from reloading
)
),
];

// allow for overrides should they exist inside patternlab-config.json
const liveServerConfig = Object.assign(
Expand Down
124 changes: 62 additions & 62 deletions packages/create/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,66 +123,66 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline




# [5.4.0](https://github.com/pattern-lab/patternlab-node/compare/v5.3.3...v5.4.0) (2019-11-26)

**Note:** Version bump only for package create-pattern-lab





# [5.3.0](https://github.com/pattern-lab/patternlab-node/compare/v5.2.0...v5.3.0) (2019-11-13)

**Note:** Version bump only for package create-pattern-lab





# [5.1.0](https://github.com/pattern-lab/patternlab-node/compare/v5.0.2...v5.1.0) (2019-10-29)

**Note:** Version bump only for package create-pattern-lab





# [5.0.0](https://github.com/pattern-lab/patternlab-node/compare/v3.0.0-beta.3...v5.0.0) (2019-10-25)

**Note:** Version bump only for package create-pattern-lab






## [1.0.11](https://github.com/pattern-lab/patternlab-node/compare/[email protected]@1.0.11) (2019-10-14)

**Note:** Version bump only for package create-pattern-lab






## [1.0.8](https://github.com/pattern-lab/patternlab-node/compare/[email protected]@1.0.8) (2019-08-23)

**Note:** Version bump only for package create-pattern-lab





## [1.0.7](https://github.com/pattern-lab/patternlab-node/compare/[email protected]@1.0.7) (2019-08-23)

**Note:** Version bump only for package create-pattern-lab






## [1.0.6](https://github.com/sghoweri/patternlab-node/compare/[email protected]@1.0.6) (2019-05-16)


# [5.4.0](https://github.com/pattern-lab/patternlab-node/compare/v5.3.3...v5.4.0) (2019-11-26)

**Note:** Version bump only for package create-pattern-lab





# [5.3.0](https://github.com/pattern-lab/patternlab-node/compare/v5.2.0...v5.3.0) (2019-11-13)

**Note:** Version bump only for package create-pattern-lab





# [5.1.0](https://github.com/pattern-lab/patternlab-node/compare/v5.0.2...v5.1.0) (2019-10-29)

**Note:** Version bump only for package create-pattern-lab





# [5.0.0](https://github.com/pattern-lab/patternlab-node/compare/v3.0.0-beta.3...v5.0.0) (2019-10-25)

**Note:** Version bump only for package create-pattern-lab






## [1.0.11](https://github.com/pattern-lab/patternlab-node/compare/[email protected]@1.0.11) (2019-10-14)

**Note:** Version bump only for package create-pattern-lab






## [1.0.8](https://github.com/pattern-lab/patternlab-node/compare/[email protected]@1.0.8) (2019-08-23)

**Note:** Version bump only for package create-pattern-lab





## [1.0.7](https://github.com/pattern-lab/patternlab-node/compare/[email protected]@1.0.7) (2019-08-23)

**Note:** Version bump only for package create-pattern-lab






## [1.0.6](https://github.com/sghoweri/patternlab-node/compare/[email protected]@1.0.6) (2019-05-16)

**Note:** Version bump only for package create-pattern-lab
Loading

0 comments on commit 3b11ab2

Please sign in to comment.