@merkur/create-widget 0.27.2 → 0.27.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/create-widget",
-  "version": "0.27.2",
+  "version": "0.27.6",
   "description": "CLI for creating merkur widget easily.",
   "bin": {
     "merkur-create-widget": "./bin/createWidget.js"
@@ -44,5 +44,5 @@
     "inquirer": "^8.1.2",
     "yargs": "^17.1.1"
   },
-  "gitHead": "d0c1005a7c31754ee2fba6cc46d94d16f795410e"
+  "gitHead": "009ed11faf36f987d0237adedfaa167ecb054d4d"
 }

package/template/package.json

@@ -6,8 +6,8 @@
     "dev:server": "cross-env NODE_CONFIG_DIR='./server/config' NODE_ENV=development nodemon server/server.js --config nodemon.json",
     "test": "npm run test:all",
     "test:unit": "cross-env TEST_GROUP='unit' jest -c ./jest.config.js",
-    "test:integration": "npm run build; cross-env TEST_GROUP='integration' NODE_CONFIG_DIR='./server/config' jest -c ./jest.config.js",
-    "test:all": "npm run build; cross-env TEST_GROUP='all' NODE_CONFIG_DIR='./server/config' jest -c ./jest.config.js",
+    "test:integration": "cross-env TEST_GROUP='integration' NODE_CONFIG_DIR='./server/config' jest -c ./jest.config.js",
+    "test:all": "npm run build && cross-env TEST_GROUP='all' NODE_CONFIG_DIR='./server/config' jest -c ./jest.config.js",
     "test:watch": "cross-env TEST_GROUP='unit' jest -c ./jest.config.js --watchAll",
     "lint": "eslint -c ./.eslintrc.js --ignore-path ./.prettierignore './**/*.{js,jsx}'",
     "dev": "cross-env NODE_ENV=development webpack --config ./webpack.config.js --watch",
@@ -18,9 +18,9 @@
   "license": "ISC",
   "dependencies": {
     "@merkur/core": "0.27.1",
-    "@merkur/integration": "0.27.1",
+    "@merkur/integration": "0.27.5",
     "@merkur/plugin-component": "0.27.1",
-    "@merkur/plugin-error": "0.27.1",
+    "@merkur/plugin-error": "0.27.6",
     "@merkur/plugin-event-emitter": "0.27.1",
     "compression": "^1.7.4",
     "config": "^3.3.6",
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@merkur/tools": "0.27.1",
-    "@merkur/tool-webpack": "0.27.1",
+    "@merkur/tool-webpack": "0.27.4",
     "nodemon": "^2.0.12",
     "webpack": "^5.51.1",
     "webpack-cli": "^4.8.0"

package/template/server/server.js

@@ -16,9 +16,19 @@ process.on('unhandledRejection', (error) => {
 });
 
 if (!serverConfig.clusters || !cluster.isMaster) {
-  app.listen(config.get('server.port'), () => {
+  const server = app.listen(config.get('server.port'), () => {
     console.log(`listen on localhost:${config.get('server.port')}`); // eslint-disable-line no-console
   });
+
+  const handleExit = () => {
+    server.close(() => {
+      process.exit(0);
+    });
+  };
+
+  process.on('SIGINT', handleExit);
+  process.on('SIGQUIT', handleExit);
+  process.on('SIGTERM', handleExit);
 } else {
   let cpuCount = serverConfig.clusters || os.cpus().length;
 

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

@@ -12,7 +12,9 @@ const {
 function applyBabelLoader(config, { isProduction, environment, cache }) {
   config.module.rules.push({
     test: /\.(js|ts|tsx|mjs|jsx)$/,
-    exclude: /node_modules\/(?!(abort-controller)\/).*/,
+    exclude: (modulePath) =>
+      /node_modules/.test(modulePath) &&
+      !/node_modules\/(abort-controller|event-target-shim)/.test(modulePath),
     use: {
       loader: 'babel-loader',
       options: {
@@ -61,3 +63,5 @@ module.exports = createLiveReloadServer().then(() =>
     pipe(createNodeConfig, applyStyleLoaders, applyBabelLoader)(),
   ])
 );
+
+module.exports.applyBabelLoader = applyBabelLoader;

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

@@ -12,7 +12,9 @@ const {
 function applyBabelLoader(config, { isProduction, environment, cache }) {
   config.module.rules.push({
     test: /\.(js|ts|tsx|mjs|jsx)$/,
-    exclude: /node_modules\/(?!(abort-controller)\/).*/,
+    exclude: (modulePath) =>
+      /node_modules/.test(modulePath) &&
+      !/node_modules\/(abort-controller|event-target-shim)/.test(modulePath),
     use: {
       loader: 'babel-loader',
       options: {
@@ -60,3 +62,5 @@ module.exports = createLiveReloadServer().then(() =>
     pipe(createNodeConfig, applyStyleLoaders, applyBabelLoader)(),
   ])
 );
+
+module.exports.applyBabelLoader = applyBabelLoader;