@merkur/create-widget 0.27.6 → 0.28.0

package/bin/createWidget.mjs

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+import { execaSync } from 'execa';
+import chalk from 'chalk';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
+
+const { argv } = yargs(hideBin(process.argv));
+
+if (argv._.length === 0) {
+  // eslint-disable-next-line no-console
+  console.log(`
+Please specify your new project directory: 
+  ${chalk.blue('@merkur/create-widget')} ${chalk.green('<project-directory>')}
+For example:
+  ${chalk.blue('@merkur/create-widget')} ${chalk.green('my-widget')}`);
+
+  process.exit(0);
+}
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+execaSync(
+  'node',
+  [path.resolve(__dirname, '../scripts/create.mjs'), ...process.argv.slice(2)],
+  {
+    stdio: 'inherit',
+  }
+);

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@merkur/create-widget",
-  "version": "0.27.6",
+  "version": "0.28.0",
   "description": "CLI for creating merkur widget easily.",
   "bin": {
-    "merkur-create-widget": "./bin/createWidget.js"
+    "merkur-create-widget": "./bin/createWidget.mjs"
   },
   "scripts": {
     "test": "echo 'Tests pass.'",
@@ -38,11 +38,11 @@
     "node": ">=12"
   },
   "dependencies": {
-    "chalk": "^4.1.2",
-    "execa": "^5.1.1",
-    "fs-extra": "^10.0.0",
-    "inquirer": "^8.1.2",
-    "yargs": "^17.1.1"
+    "chalk": "^5.0.1",
+    "execa": "^6.1.0",
+    "fs-extra": "^10.1.0",
+    "inquirer": "^8.2.2",
+    "yargs": "^17.4.1"
   },
-  "gitHead": "009ed11faf36f987d0237adedfaa167ecb054d4d"
+  "gitHead": "8760a1cedbbfc37348055418bacbfc69199a3c06"
 }

package/scripts/{create.js → create.mjs}

@@ -1,11 +1,18 @@
-const execa = require('execa');
-const fs = require('fs');
-const fsx = require('fs-extra');
-const path = require('path');
-const chalk = require('chalk');
-const inquirer = require('inquirer');
-const argv = require('yargs').argv;
+import path from 'path';
+import { fileURLToPath } from 'url';
+import fs from 'fs';
+import fsx from 'fs-extra';
+import { execaSync } from 'execa';
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
+
+const { argv } = yargs(hideBin(process.argv));
+
 const { info, error } = console;
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const dir = argv._[0];
 
@@ -97,10 +104,10 @@ function createMerkurApp(dirName, view) {
 
   // Overwrite package.json with template
   const pkgJsonPath = path.join(appRoot, 'package.json');
-  const pkgJson = require(pkgJsonPath);
+  const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath));
 
   const packageTemplatePath = path.join(viewRoot, 'template.json');
-  const packageTemplate = require(packageTemplatePath);
+  const packageTemplate = JSON.parse(fs.readFileSync(packageTemplatePath));
 
   pkgJson.name = projName;
 
@@ -127,7 +134,7 @@ function createMerkurApp(dirName, view) {
   console.log(chalk.dim('      Press CTRL+C to cancel.\n'));
 
   const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-  execa.sync(npm, ['install'], {
+  execaSync(npm, ['install'], {
     stdio: 'inherit',
     cwd: appRoot,
   });

package/template/package.json

@@ -17,28 +17,28 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@merkur/core": "0.27.1",
-    "@merkur/integration": "0.27.5",
-    "@merkur/plugin-component": "0.27.1",
-    "@merkur/plugin-error": "0.27.6",
-    "@merkur/plugin-event-emitter": "0.27.1",
+    "@merkur/core": "0.28.0",
+    "@merkur/integration": "0.28.0",
+    "@merkur/plugin-component": "0.28.0",
+    "@merkur/plugin-error": "0.28.0",
+    "@merkur/plugin-event-emitter": "0.28.0",
     "compression": "^1.7.4",
-    "config": "^3.3.6",
+    "config": "^3.3.7",
     "cors": "^2.8.5",
     "cross-env": "^7.0.3",
     "ejs": "^3.1.6",
-    "express": "^4.17.1",
-    "express-static-gzip": "^2.1.1",
+    "express": "^4.17.3",
+    "express-static-gzip": "^2.1.5",
     "got": "^11.8.2",
-    "helmet": "^3.23.3",
+    "helmet": "^5.0.2",
     "morgan": "^1.10.0"
   },
   "devDependencies": {
-    "@merkur/tools": "0.27.1",
-    "@merkur/tool-webpack": "0.27.4",
-    "nodemon": "^2.0.12",
-    "webpack": "^5.51.1",
-    "webpack-cli": "^4.8.0"
+    "@merkur/tools": "0.28.0",
+    "@merkur/tool-webpack": "0.28.0",
+    "nodemon": "^2.0.15",
+    "webpack": "^5.72.0",
+    "webpack-cli": "^4.9.2"
   },
   "engines": {
     "node": ">=14.0.0"

package/views/preact/template/webpack.config.js

@@ -31,7 +31,7 @@ function applyBabelLoader(config, { isProduction, environment, cache }) {
         cacheIdentifier: createCacheKey(
           environment,
           config?.name,
-          ...cache?.versionDependencies
+          ...(cache?.versionDependencies ?? [])
         ),
         cacheDirectory: true,
         cacheCompression: false,

package/views/react/template/webpack.config.js

@@ -30,7 +30,7 @@ function applyBabelLoader(config, { isProduction, environment, cache }) {
         cacheIdentifier: createCacheKey(
           environment,
           config?.name,
-          ...cache?.versionDependencies
+          ...(cache?.versionDependencies ?? [])
         ),
         cacheDirectory: true,
         cacheCompression: false,

package/bin/createWidget.js

@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-
-const path = require('path');
-const execa = require('execa');
-const chalk = require('chalk');
-const argv = require('yargs').argv;
-
-if (argv._.length === 0) {
-  // eslint-disable-next-line no-console
-  console.log(`
-Please specify your new project directory: 
-  ${chalk.blue('@merkur/create-widget')} ${chalk.green('<project-directory>')}
-For example:
-  ${chalk.blue('@merkur/create-widget')} ${chalk.green('my-widget')}`);
-
-  process.exit(0);
-}
-
-execa.sync(
-  'node',
-  [path.resolve(__dirname, '../scripts/create.js'), ...process.argv.slice(2)],
-  {
-    stdio: 'inherit',
-  }
-);