Skip to content

Commit 64e2c22

Browse files
committed
fix build command failing
1 parent 1afa810 commit 64e2c22

File tree

3 files changed

+7
-21
lines changed

3 files changed

+7
-21
lines changed

buildScripts/PatternlabPlugin.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const globby = require('globby');
22
const minimatch = require('minimatch');
33
const { resolve, join } = require('path');
44
const fs = require('fs-extra');
5-
const { info, warn } = require('@vue/cli-shared-utils');
5+
const { warn, done } = require('@vue/cli-shared-utils');
66
const patternlabCore = require('@pattern-lab/core');
77

88
const VueService = process.VUE_CLI_SERVICE;
@@ -18,6 +18,7 @@ class PatternlabPlugin {
1818
this.patternlab = patternlabCore(plConfig);
1919
this.PlPatternPath = resolve(VueService.context, plConfig.paths.source.patterns);
2020

21+
this.buildPatternlab();
2122
// fix html webpack plugin error child compilation failed
2223
// due to missing index.html inside the content base dir
2324
// because patternlab build not finished before html plugin init :(
@@ -41,7 +42,6 @@ class PatternlabPlugin {
4142
patternFiles.forEach(item => {
4243
compilation.fileDependencies.add(item);
4344
});
44-
info('addPatternLabFiles', 'aftercompile');
4545

4646
if (compilation.contextDependencies && !compilation.contextDependencies.has(this.PlPatternPath)) {
4747
compilation.contextDependencies.add(this.PlPatternPath);
@@ -98,7 +98,6 @@ class PatternlabPlugin {
9898
}
9999

100100
watchRun(compilation, callback) {
101-
info('watchRun');
102101
const changedFiles = Array.from(compilation.fileTimestamps.keys()).filter(
103102
watchfile => {
104103
return (
@@ -129,7 +128,7 @@ class PatternlabPlugin {
129128
try {
130129
this.patternlab.build(options)
131130
.then(r => {
132-
info('Patternlab build complete');
131+
done('Patternlab build complete');
133132
})
134133
.catch((error) => {
135134
warn(`Patternlab build error: ${error}`);

buildScripts/patternlabWebpackPlugins.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,6 @@ const plConfig = require('../patternlab-config.json');
88
const { ifDevelopment } = getIfUtils(process.env.NODE_ENV);
99
const contentBaseDir = join(VueService.context, plConfig.paths.public.root);
1010

11-
const patternLabPlugin = new PatternLabPlugin();
12-
const patternlabWebpackPlugins = [
13-
ifDevelopment(
14-
patternLabPlugin,
15-
),
16-
];
17-
18-
if (ifDevelopment()) { patternLabPlugin.buildPatternlab();}
19-
20-
exports.patternlabWebpackPlugins = patternlabWebpackPlugins;
21-
2211
const patternlabVuePluginConfig = (config) => {
2312
config
2413
.plugin('html')
@@ -27,6 +16,10 @@ const patternlabVuePluginConfig = (config) => {
2716
return args;
2817
});
2918

19+
if (ifDevelopment()) {
20+
config.plugin('patternlabplugin').use(PatternLabPlugin)
21+
}
22+
3023
config.devServer.contentBase(contentBaseDir);
3124
};
3225

vue.config.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
const {
2-
patternlabWebpackPlugins,
32
patternlabVuePluginConfig
43
} = require('./buildScripts/patternlabWebpackPlugins');
54

65
// vue.config.js
76
module.exports = {
8-
configureWebpack: {
9-
plugins: [
10-
...patternlabWebpackPlugins,
11-
]
12-
},
137
chainWebpack: (config) => {
148
patternlabVuePluginConfig(config);
159
}

0 commit comments

Comments
 (0)