@merkur/create-widget 0.36.4 → 0.37.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/create-widget",
-  "version": "0.36.4",
+  "version": "0.37.0",
   "description": "CLI for creating merkur widget easily.",
   "bin": {
     "merkur-create-widget": "./bin/createWidget.mjs"
@@ -44,5 +44,5 @@
     "inquirer": "9.2.2",
     "yargs": "^17.7.2"
   },
-  "gitHead": "d980d225d1aea2186663940f0a984dafa1232c21"
+  "gitHead": "af826493e5ed4b37602dd43ce89a59baeeb1bada"
 }

package/template/.nvmrc

@@ -0,0 +1 @@
+20

package/template/jest.config.js

@@ -1,7 +1,7 @@
 const config = require('@merkur/tools/jest.config.js');
 
 config.transform = {
-  '^.+\\.[t|j]sx?$': 'esbuild-jest',
+  '^.+\\.[t|j]sx?$': 'es-jest',
 };
 
 module.exports = {

package/template/jsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "paths": {
+      "@/*": [
+        "./src/*"
+      ],
+    }
+  }
+}

package/template/package.json

@@ -16,12 +16,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@merkur/cli": "0.36.4",
-    "@merkur/core": "0.36.0",
-    "@merkur/integration": "0.36.0",
-    "@merkur/plugin-component": "0.36.0",
-    "@merkur/plugin-error": "0.36.0",
-    "@merkur/plugin-event-emitter": "0.36.0",
+    "@merkur/cli": "0.37.0",
+    "@merkur/core": "0.37.0",
+    "@merkur/integration": "0.37.0",
+    "@merkur/plugin-component": "0.37.0",
+    "@merkur/plugin-error": "0.37.0",
+    "@merkur/plugin-event-emitter": "0.37.0",
     "compression": "^1.7.4",
     "config": "^3.3.7",
     "cors": "^2.8.5",
@@ -32,10 +32,13 @@
     "morgan": "^1.10.0"
   },
   "devDependencies": {
-    "@merkur/tools": "0.36.0",
-    "esbuild-jest": "^0.5.0"
+    "@merkur/tools": "0.37.0",
+    "es-jest": "^2.1.0"
   },
   "engines": {
     "node": ">=20.0.0"
+  },
+  "imports": {
+    "@/*": "./src/*"
   }
 }

package/template/server/app.js

@@ -8,7 +8,7 @@ const morgan = require('morgan');
 const { resolveConfig } = require('@merkur/cli/server');
 
 const {
-  merkurConfig: { widgetServer, devServer },
+  merkurConfig: { widgetServer },
 } = resolveConfig();
 
 const {
@@ -40,14 +40,8 @@ app
       crossOriginEmbedderPolicy: false,
     }),
   )
-  .use(
-    cors({
-      origin: devServer.origin,
-      optionsSuccessStatus: 200, // some legacy browsers (IE11, various SmartTVs) choke on 204
-    }),
-  )
+  .use(cors(widgetServer.cors.options))
   .use(compression())
-  .use(widgetServer.staticPath, express.static(widgetServer.staticFolder))
   .use(
     widgetServer.staticPath,
     expressStaticGzip(widgetServer.staticFolder, expressStaticConfig),

package/template/server/server.js

@@ -6,7 +6,7 @@ const { merkurConfig } = resolveConfig();
 
 const { app } = require('./app');
 
-const { widgetServer, constant } = merkurConfig;
+const { widgetServer } = merkurConfig;
 
 process.on('uncaughtException', (error) => {
   console.error(error);
@@ -17,7 +17,7 @@ process.on('unhandledRejection', (error) => {
 });
 
 if (!widgetServer.clusters || !cluster.isMaster) {
-  const server = app.listen({ port: widgetServer.port, host: constant.HOST });
+  const server = app.listen({ port: widgetServer.port });
 
   const handleExit = () => {
     server.close(() => {

package/template/src/style.css

@@ -15,32 +15,29 @@ button {
   margin: 0 auto;
 }
 
-.merkur__page {
-}
-
-.merkur__headline {
+.merkur-headline {
   background-color: #282c34;
   padding: 120px 10px 80px 10px;
   color: #a2a8b6;
   text-align: center;
 }
 
-.merkur__headline a {
+.merkur-headline a {
   color: white;
   text-decoration: none;
 }
 
-.merkur__headline h1 {
+.merkur-headline h1 {
   font-size: 60px;
   margin: 0 0 20px 0;
 }
 
-.merkur__headline h2 {
+.merkur-headline h2 {
   margin: 0;
   line-height: 1.3;
 }
 
-.merkur__headline h3 {
+.merkur-headline h3 {
   margin: 40px 0 16px 0;
   line-height: 1.3;
 }

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

@@ -1,9 +1,11 @@
 const config = require('@merkur/tools/jest.config.js');
 
 config.setupFilesAfterEnv = ['./jest.setup.js'];
-config.snapshotSerializers = ['enzyme-to-json/serializer'];
 config.transform = {
-  '^.+\\.[t|j]sx?$': 'esbuild-jest',
+  '^.+\\.[t|j]sx?$': [
+    'es-jest',
+    { jsx: 'automatic', jsxImportSource: 'preact' },
+  ],
 };
 
 module.exports = {

package/views/preact/template/jest.setup.js

@@ -1,6 +1 @@
-import { configure } from 'enzyme';
-import Adapter from 'enzyme-adapter-preact-pure';
-import { createSerializer } from 'enzyme-to-json';
-
-configure({ adapter: new Adapter() });
-expect.addSnapshotSerializer(createSerializer({ mode: 'deep' }));
+import '@testing-library/jest-dom';

package/views/preact/template/src/views/__tests__/ViewSpec.jsx

@@ -1,8 +1,13 @@
 /**
  * @jest-environment jsdom
  */
-
-import { shallow } from 'enzyme';
+import {
+  render,
+  fireEvent,
+  cleanup,
+  prettyDOM,
+  screen,
+} from '@testing-library/preact';
 
 import { createMerkurWidget } from '@merkur/core';
 
@@ -15,15 +20,36 @@ describe('View', () => {
   beforeEach(async () => {
     widget = await createMerkurWidget({
       ...widgetProperties,
-      mount() {
-        return shallow(View(widget));
+      mount(widget) {
+        widget.$external.result = render(View(widget));
+        return widget.$external.result;
+      },
+      unmount() {
+        cleanup();
+      },
+      update() {
+        return widget.$external.result.rerender(View(widget));
       },
     });
   });
 
+  afterEach(() => {
+    widget.unmount();
+  });
+
   it('should display main view', async () => {
-    const wrapper = await widget.mount();
+    const { container } = await widget.mount();
+
+    expect(prettyDOM(container)).toMatchSnapshot();
+  });
+
+  it('should increase counter', async () => {
+    const { container } = await widget.mount();
+
+    const button = screen.getByText('increase counter');
+
+    fireEvent.click(button);
 
-    expect(wrapper).toMatchSnapshot();
+    expect(prettyDOM(container)).toMatchSnapshot();
   });
 });

package/views/preact/template.json

@@ -3,9 +3,8 @@
     "@merkur/preact": "0.36.0"
   },
   "devDependencies": {
-    "enzyme": "3.11.0",
-    "identity-obj-proxy": "^3.0.0",
-    "enzyme-adapter-preact-pure": "4.1.0",
-    "enzyme-to-json": "3.6.2"
+    "@testing-library/jest-dom": "^6.5.0",
+    "@testing-library/preact": "^3.2.4",
+    "identity-obj-proxy": "^3.0.0"
   }
 }

package/template/babel.config.js

@@ -1,5 +0,0 @@
-const config = require('@merkur/tools/babel.config.js');
-
-module.exports = {
-  ...config,
-};