@caweb/cli 1.6.12 → 1.6.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -31,8 +31,6 @@ export default async function webpack({
|
|
|
31
31
|
|
|
32
32
|
// we use our default config from the @caweb/html-webpack-plugin
|
|
33
33
|
const defaultConfigPath = path.resolve(projectPath, '..', 'webpack', 'webpack.config.js' );
|
|
34
|
-
let webpackConfig = await import('file://' + defaultConfigPath);
|
|
35
|
-
let customConfig = {};
|
|
36
34
|
|
|
37
35
|
// Since we use @wordpress/scripts webpack config we can leverage
|
|
38
36
|
// the environment variables as well.
|
|
@@ -53,8 +51,6 @@ export default async function webpack({
|
|
|
53
51
|
'--merge'
|
|
54
52
|
)
|
|
55
53
|
|
|
56
|
-
customConfig = await import('file://' + path.join(appPath, 'webpack.config.cjs' )).default;
|
|
57
|
-
|
|
58
54
|
// ESM
|
|
59
55
|
}else if( fs.existsSync(path.join(appPath, 'webpack.config.js' )) ){
|
|
60
56
|
webPackArgs.push(
|
|
@@ -63,13 +59,8 @@ export default async function webpack({
|
|
|
63
59
|
'--merge'
|
|
64
60
|
)
|
|
65
61
|
|
|
66
|
-
customConfig = await import('file://' + path.join(appPath, 'webpack.config.js' ));
|
|
67
62
|
}
|
|
68
63
|
|
|
69
|
-
if( customConfig.length ){
|
|
70
|
-
webpackConfig = deepmerge(webpackConfig.default, customConfig.default);
|
|
71
|
-
}
|
|
72
|
-
|
|
73
64
|
// add the template flag to the node options
|
|
74
65
|
process.env.NODE_OPTIONS = `${process.env.NODE_OPTIONS} --template ${template}`;
|
|
75
66
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@caweb/cli",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.14",
|
|
4
4
|
"description": "CAWebPublishing Command Line Interface.",
|
|
5
5
|
"exports": "./lib/env.js",
|
|
6
6
|
"type": "module",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
}
|
|
57
57
|
},
|
|
58
58
|
"dependencies": {
|
|
59
|
-
"@caweb/webpack": "^1.2.
|
|
59
|
+
"@caweb/webpack": "^1.2.14",
|
|
60
60
|
"@inquirer/prompts": "^5.5.0",
|
|
61
61
|
"@wordpress/create-block": "^4.50.0",
|
|
62
62
|
"@wordpress/env": "^10.7.0",
|