@merkur/tools 0.26.0 → 0.28.0

package/CHANGELOG.md

@@ -3,6 +3,53 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.28.0](https://github.com/mjancarik/merkur/compare/v0.27.6...v0.28.0) (2022-04-20)
+
+
+### Code Refactoring
+
+* 💡 move liveReloadServer to merkur/tools ([f81e0e8](https://github.com/mjancarik/merkur/commit/f81e0e89eff4a72985c89d23079be6a9344a3b2e))
+
+
+### BREAKING CHANGES
+
+* 🧨 The liveReloadServer.cjs file is moved to @merkur/tools. The
+@merkur/tool-webpack re-export createLiveReloadServer for keeping
+backward compatability.
+
+
+
+
+
+## [0.27.1](https://github.com/mjancarik/merkur/compare/v0.27.0...v0.27.1) (2021-09-30)
+
+
+### Bug Fixes
+
+* 🐛 Removed unused @merkur/tools pkg dependencies ([#109](https://github.com/mjancarik/merkur/issues/109)) ([c1a28b0](https://github.com/mjancarik/merkur/commit/c1a28b00f1b9510eeab897ab0232f59a0f6a3c0f))
+
+
+
+
+
+# [0.27.0](https://github.com/mjancarik/merkur/compare/v0.26.1...v0.27.0) (2021-09-29)
+
+
+### Features
+
+* 🎸 Added eslint plugin import and eslint react-hooks plugi ([#108](https://github.com/mjancarik/merkur/issues/108)) ([db8ca75](https://github.com/mjancarik/merkur/commit/db8ca75e701f1e9d57dc55c3a3a5e1fb7cfc4787))
+* 🎸 Automatically generate free port for livereload server ([#101](https://github.com/mjancarik/merkur/issues/101)) ([a083a1b](https://github.com/mjancarik/merkur/commit/a083a1b31edc818a2d94e000a78cbb03cc8dc022))
+
+
+### BREAKING CHANGES
+
+* 🧨 createLiveReloadServer() function must be promise chained in
+webpack.config.js before returning any config array.
+
+
+
+
+
 # [0.26.0](https://github.com/mjancarik/merkur/compare/v0.25.0...v0.26.0) (2021-08-27)
 
 

package/eslint.config.js

@@ -1,25 +1,72 @@
 module.exports = {
   root: true,
-  extends: ['eslint:recommended', 'plugin:react/recommended', 'prettier'],
+  extends: [
+    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:react-hooks/recommended',
+    'plugin:import/recommended',
+    'prettier',
+  ],
   rules: {
+    'no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
     'prettier/prettier': [
       'error',
       {
         singleQuote: true,
-        jsxBracketSameLine: true,
+        jsxSingleQuote: true,
+        jsxBracketSameLine: false,
       },
     ],
-
     'no-console': [
       'error',
       {
         allow: ['warn', 'error'],
       },
     ],
-
     'react/prop-types': 0,
     'react/wrap-multilines': 0,
     'react/no-deprecated': 0,
+    'react/jsx-uses-react': 'off',
+    'react/react-in-jsx-scope': 'off',
+    'react/jsx-fragments': 'off',
+    'react/jsx-no-undef': 'off',
+    'import/first': ['error'],
+    'import/no-unresolved': 'off',
+    'import/order': [
+      'error',
+      {
+        groups: ['builtin', 'external', 'internal'],
+        pathGroups: [
+          {
+            pattern: '{preact|react|svelte}{/**,**}',
+            group: 'external',
+            position: 'before',
+          },
+          {
+            pattern: '@merkur{/**,**}',
+            group: 'external',
+            position: 'after',
+          },
+          {
+            pattern: '#/**',
+            group: 'internal',
+            position: 'after',
+          },
+          {
+            pattern: '*.{css,less,json}',
+            group: 'object',
+            patternOptions: { matchBase: true },
+            position: 'after',
+          },
+        ],
+        pathGroupsExcludedImportTypes: ['#/', '@merkur'],
+        'newlines-between': 'always',
+        alphabetize: {
+          order: 'asc',
+          caseInsensitive: true,
+        },
+      },
+    ],
   },
   plugins: ['prettier', 'jest', 'react', 'jasmine'],
   settings: {
@@ -28,6 +75,10 @@ module.exports = {
     react: {
       version: '16',
     },
+    'import/ignore': [
+      'node_modules',
+      '\\.(coffee|scss|css|less|hbs|svg|json)$',
+    ],
   },
   parserOptions: {
     sourceType: 'module',

package/liveReloadServer.cjs

@@ -0,0 +1,20 @@
+const fp = require('find-free-port');
+const WebSocket = require('./websocket.cjs');
+
+async function createLiveReloadServer() {
+  if (process.env.NODE_ENV === 'development') {
+    try {
+      const [freePort] = await fp(4321);
+      process.env.MERKUR_PLAYGROUND_LIVERELOAD_PORT = freePort;
+
+      WebSocket.createServer({
+        port: freePort,
+      });
+    } catch (error) {
+      console.error(error);
+      throw new Error('Unable to retrieve free port for livereload server.');
+    }
+  }
+}
+
+module.exports = { createLiveReloadServer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/tools",
-  "version": "0.26.0",
+  "version": "0.28.0",
   "description": "Merkur tools.",
   "bin": {
     "merkur-tools": "./bin/merkurTools.js"
@@ -30,38 +30,30 @@
   },
   "homepage": "https://merkur.js.org/",
   "dependencies": {
-    "@babel/core": "7.15.0",
-    "@babel/eslint-parser": "7.15.0",
-    "@babel/preset-env": "7.15.0",
-    "babel-jest": "27.0.6",
-    "babel-loader": "8.2.2",
-    "clean-webpack-plugin": "^3.0.0",
-    "compression-webpack-plugin": "^8.0.1",
-    "core-js": "3.16.2",
-    "css-loader": "6.2.0",
-    "eslint": "7.32.0",
+    "@babel/core": "7.17.9",
+    "@babel/eslint-parser": "7.17.0",
+    "@babel/preset-env": "7.16.11",
+    "babel-jest": "27.5.1",
+    "core-js": "3.22.0",
+    "eslint": "8.13.0",
     "eslint-config-last": "0.0.5",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-jasmine": "4.1.2",
-    "eslint-plugin-jest": "24.4.0",
-    "eslint-plugin-prettier": "3.4.0",
-    "eslint-plugin-react": "7.24.0",
-    "jest": "27.0.6",
-    "jest-watch-typeahead": "^0.6.4",
-    "json-loader": "0.5.7",
-    "mini-css-extract-plugin": "2.2.0",
-    "prettier": "2.3.2",
-    "supertest": "6.1.6",
-    "webpack-bundle-analyzer": "^4.4.2",
-    "webpack-manifest-plugin": "4.0.2",
-    "webpack-modules": "1.0.0",
-    "webpack-node-externals": "3.0.0",
-    "webpack-shell-plugin-next": "^2.2.2",
-    "ws": "8.2.0",
-    "yargs": "17.1.1"
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jasmine": "4.1.3",
+    "eslint-plugin-jest": "26.1.4",
+    "eslint-plugin-prettier": "4.0.0",
+    "eslint-plugin-react": "7.29.4",
+    "eslint-plugin-react-hooks": "^4.4.0",
+    "find-free-port": "^2.0.0",
+    "jest": "27.5.1",
+    "jest-watch-typeahead": "^1.0.0",
+    "prettier": "2.6.2",
+    "supertest": "6.2.2",
+    "ws": "8.5.0",
+    "yargs": "17.4.1"
   },
   "peerDependencies": {
     "express": "*"
   },
-  "gitHead": "be0e958eb5be85eb9d8aefc1110ef4fede9e9df0"
+  "gitHead": "8760a1cedbbfc37348055418bacbfc69199a3c06"
 }

package/static/livereload.js

@@ -20,7 +20,7 @@ class WebSocketMerkur {
     /**
      * @type {Object}
      */
-    this._options = Object.assign({ url: 'ws://localhost:4321' }, options);
+    this._options = Object.assign({}, options);
   }
 
   init() {
@@ -124,6 +124,8 @@ class WebSocketMerkur {
 }
 
 window.__merkur_dev__ = window.__merkur_dev__ || {};
+window.__merkur_dev__.webSocketOptions =
+  window.__merkur_dev__.webSocketOptions || {};
 window.__merkur_dev__.webSocket = new WebSocketMerkur(
   window.__merkur_dev__.webSocketOptions
 )

package/websocket.cjs

@@ -2,10 +2,6 @@
 
 const WebSocket = require('ws');
 
-const DEFAULT_OPTIONS = {
-  port: 4321,
-};
-
 function broadcastMessage(server, fromClient, data) {
   server.clients.forEach(function each(toClient) {
     sendMessage(fromClient, toClient, data);
@@ -19,12 +15,16 @@ function sendMessage(fromClient, toClient, data) {
 }
 
 function createServer(options = {}) {
-  options = Object.assign({}, DEFAULT_OPTIONS, options);
+  options = Object.assign(
+    {},
+    { port: process.env.MERKUR_PLAYGROUND_LIVERELOAD_PORT },
+    options
+  );
+
   let server = null;
 
   try {
     server = new WebSocket.Server(options);
-
     server.on('connection', function connection(ws) {
       ws.on('message', function incoming(data, isBinary) {
         data = isBinary ? data : data.toString();
@@ -39,14 +39,16 @@ function createServer(options = {}) {
 }
 
 function createClient(options) {
-  options = Object.assign({}, DEFAULT_OPTIONS, options);
-  const client = new WebSocket('ws://localhost:' + options.port);
+  options = Object.assign(
+    {},
+    { port: process.env.MERKUR_PLAYGROUND_LIVERELOAD_PORT },
+    options
+  );
 
-  return client;
+  return new WebSocket('ws://localhost:' + options.port);
 }
 
 module.exports = {
-  DEFAULT_OPTIONS,
   createServer,
   createClient,
 };