Bump scaffold (#28)

compulim-workflow-bot[bot] · compulim · web-flow · commit bc123ef7c35a · 2024-03-31T15:18:10.000-07:00
* Bump scaffold * Update transformer * Move to JSX classic * Add entry --------- Co-authored-by: @compulim <@compulim> Co-authored-by: William Wong <compulim@hotmail.com>
diff --git a/.eslintrc.react.yml b/.eslintrc.react.yml
@@ -1,6 +1,5 @@
 extends:
   - plugin:react/recommended
-  - plugin:react/jsx-runtime
 plugins:
   - react
 settings:
diff --git a/.github/workflows/pull-request-validation.yml b/.github/workflows/pull-request-validation.yml
@@ -7,7 +7,11 @@ on:
 
 jobs:
   call-workflow:
+    strategy:
+      matrix:
+        react-version: [current, 16, 17, 18]
     uses: compulim/workflows/.github/workflows/pull-request-validation.yml@main
     with:
       package-name: use-memo-map
+      react-version: ${{ matrix.react-version }}
       skip-integration-test: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
       - [`react-test-renderer@18.2.0`](https://npmjs.com/package/react-test-renderer)
       - [`react@18.2.0`](https://npmjs.com/package/react)
       - [`typescript@5.4.3`](https://npmjs.com/package/typescript)
+- Updated pull request validation to test against various React versions, in PR [#28](https://github.com/compulim/use-memo-map/pull/28)
+   - Moved from JSX Runtime to JSX Classic to support testing against React 16
 
 ## [0.0.4] - 2023-10-09
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,6 +21,10 @@
     "postscaffold": "npm run postscaffold:eslint:react && npm run postscaffold --if-present --workspaces",
     "postscaffold:eslint:react": "npm run bump:eslintrc",
     "precommit": "npm run precommit --if-present --workspaces",
+    "switch:_": "npm run --if-present --workspaces switch && npm install --legacy-peer-deps --prefer-dedupe",
+    "switch:react:16": "SWITCH_NAME=react:16 npm run switch:_",
+    "switch:react:17": "SWITCH_NAME=react:17 npm run switch:_",
+    "switch:react:18": "SWITCH_NAME=react:18 npm run switch:_",
     "test": "npm run test --if-present --workspaces"
   },
   "devDependencies": {
diff --git a/packages/integration-test/babel.config.json b/packages/integration-test/babel.config.json
@@ -3,7 +3,7 @@
     [
       "@babel/preset-react",
       {
-        "runtime": "automatic"
+        "runtime": "classic"
       }
     ],
     [
diff --git a/packages/integration-test/jest.config.json b/packages/integration-test/jest.config.json
@@ -8,7 +8,7 @@
           [
             "@babel/preset-react",
             {
-              "runtime": "automatic"
+              "runtime": "classic"
             }
           ]
         ]
@@ -21,7 +21,7 @@
           [
             "@babel/preset-react",
             {
-              "runtime": "automatic"
+              "runtime": "classic"
             }
           ],
           [
diff --git a/packages/integration-test/package.json b/packages/integration-test/package.json
@@ -9,6 +9,7 @@
     "bump:dev": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.localPeerDependencies // {}) as $L | (.devDependencies // {}) | to_entries | map(select(.key as $K | $L | has($K) | not)) | map(.key + \"@latest\") | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
     "bump:prod": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.localPeerDependencies // {}) as $L | (.dependencies // {}) | to_entries | map(select(.key as $K | $L | has($K) | not)) | map(.key + \"@latest\") | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
     "precommit": "eslint --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts ./",
+    "switch": "cat package.json | jq --arg SWITCH_NAME $SWITCH_NAME -r '(.[\"switch:\" + $SWITCH_NAME] // {}) as $TEMPLATE | .devDependencies += ($TEMPLATE.devDependencies // {}) | .dependencies += ($TEMPLATE.dependencies // {})' | tee ./package.json.tmp && mv ./package.json.tmp ./package.json",
     "test": "jest"
   },
   "author": "William Wong (https://github.com/compulim)",
diff --git a/packages/integration-test/tsconfig.json b/packages/integration-test/tsconfig.json
@@ -1,6 +1,6 @@
 // This configuration file is for VSCode only.
 {
   "compilerOptions": {
-    "jsx": "react-jsx"
+    "jsx": "react"
   }
 }
diff --git a/packages/pages/package.json b/packages/pages/package.json
@@ -11,7 +11,8 @@
     "precommit": "npm run precommit:typescript",
     "precommit:typescript": "tsc --project ./src/tsconfig.json",
     "reinstall": "rm -r node_modules package-lock.json && npm install",
-    "start": "npm run build -- --servedir=./public"
+    "start": "npm run build -- --servedir=./public",
+    "switch": "cat package.json | jq --arg SWITCH_NAME $SWITCH_NAME -r '(.[\"switch:\" + $SWITCH_NAME] // {}) as $TEMPLATE | .devDependencies += ($TEMPLATE.devDependencies // {}) | .dependencies += ($TEMPLATE.dependencies // {})' | tee ./package.json.tmp && mv ./package.json.tmp ./package.json"
   },
   "author": "William Wong (https://github.com/compulim)",
   "license": "MIT",
diff --git a/packages/pages/src/app/App.tsx b/packages/pages/src/app/App.tsx
@@ -1,4 +1,4 @@
-import { useCallback } from 'react';
+import React, { useCallback } from 'react';
 import { useMemoMap } from 'use-memo-map';
 
 const App = () => {
diff --git a/packages/pages/src/app/index.tsx b/packages/pages/src/app/index.tsx
@@ -1,7 +1,11 @@
-import { createRoot } from 'react-dom/client';
+import React from 'react';
+// eslint-disable-next-line react/no-deprecated
+import { render } from 'react-dom';
+// import { createRoot } from 'react-dom/client';
 
 import App from './App';
 
 const rootElement = document.getElementById('root');
 
-rootElement && createRoot(rootElement).render(<App />);
+// rootElement && createRoot(rootElement).render(<App />);
+rootElement && render(<App />, rootElement);
diff --git a/packages/pages/src/tsconfig.json b/packages/pages/src/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "esModuleInterop": true,
-    "jsx": "react-jsx",
+    "jsx": "react",
     "lib": ["DOM", "ESNext", "WebWorker"],
     "moduleResolution": "Bundler",
     "noEmit": true,
diff --git a/packages/use-memo-map/__tests__/__setup__/typingTestTransformer.js b/packages/use-memo-map/__tests__/__setup__/typingTestTransformer.js
@@ -1,6 +1,7 @@
 // Notes: to test changes in this file, run "jest" with "--no-cache" argument.
 
 const run = ({ filename }) => {
+  const escapeStringRegexp = require('escape-string-regexp');
   const fs = require('fs/promises');
   const { extname } = require('path');
   const typeScript = require('typescript');
@@ -54,8 +55,17 @@ const run = ({ filename }) => {
 
           const expectedErrorLine = file.getFullText().split('\n')[line - 1];
           const expectedError = expectedErrorLine?.replace(/\s*\/\/\s+/u, '').trim();
+          let expectedErrors = [expectedError];
 
-          expect(message).toEqual(expect.stringContaining(expectedError));
+          try {
+            const parsed = JSON.parse(expectedError);
+
+            if (Array.isArray(expectedErrors) && expectedErrors.every(value => typeof value === 'string')) {
+              expectedErrors = parsed;
+            }
+          } catch {}
+
+          expect(message).toEqual(expect.stringMatching(new RegExp(expectedErrors.map(escapeStringRegexp).join('|'))));
         } else {
           throw new Error(typeScript.flattenDiagnosticMessageText(messageText, '\n'));
         }
diff --git a/packages/use-memo-map/babel.commonjs.config.json b/packages/use-memo-map/babel.commonjs.config.json
@@ -13,7 +13,7 @@
     [
       "@babel/preset-react",
       {
-        "runtime": "automatic"
+        "runtime": "classic"
       }
     ],
     [
diff --git a/packages/use-memo-map/babel.esmodules.config.json b/packages/use-memo-map/babel.esmodules.config.json
@@ -13,7 +13,7 @@
     [
       "@babel/preset-react",
       {
-        "runtime": "automatic"
+        "runtime": "classic"
       }
     ],
     [
diff --git a/packages/use-memo-map/jest.config.json b/packages/use-memo-map/jest.config.json
@@ -9,7 +9,7 @@
           [
             "@babel/preset-react",
             {
-              "runtime": "automatic"
+              "runtime": "classic"
             }
           ],
           [
diff --git a/packages/use-memo-map/package.json b/packages/use-memo-map/package.json
@@ -48,6 +48,7 @@
     "precommit:typescript:production": "tsc --noEmit --project ./src/tsconfig.precommit.production.json",
     "precommit:typescript:test": "tsc --noEmit --project ./src/tsconfig.precommit.test.json",
     "prepack": "cp ../../CHANGELOG.md . && cp ../../LICENSE . && cp ../../README.md .",
+    "switch": "cat package.json | jq --arg SWITCH_NAME $SWITCH_NAME -r '(.[\"switch:\" + $SWITCH_NAME] // {}) as $TEMPLATE | .devDependencies += ($TEMPLATE.devDependencies // {}) | .dependencies += ($TEMPLATE.dependencies // {})' | tee ./package.json.tmp && mv ./package.json.tmp ./package.json",
     "test": "jest"
   },
   "repository": {
@@ -79,6 +80,7 @@
     "@tsconfig/strictest": "^2.0.4",
     "@types/jest": "^29.5.12",
     "@types/react": "^18.2.70",
+    "escape-string-regexp": "^5.0.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "react": "^18.2.0",
diff --git a/packages/use-memo-map/src/tsconfig.declaration.json b/packages/use-memo-map/src/tsconfig.declaration.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "emitDeclarationOnly": true,
     "esModuleInterop": true,
-    "jsx": "react-jsx",
+    "jsx": "react",
     "noEmit": false
   },
   "exclude": ["**/*.spec.*", "**/*.test.*", "__tests__/**/*"],
diff --git a/packages/use-memo-map/src/tsconfig.json b/packages/use-memo-map/src/tsconfig.json
@@ -2,7 +2,7 @@
 {
   "compilerOptions": {
     "esModuleInterop": true,
-    "jsx": "react-jsx",
+    "jsx": "react",
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "noEmit": true,
diff --git a/packages/use-memo-map/src/tsconfig.precommit.production.json b/packages/use-memo-map/src/tsconfig.precommit.production.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "esModuleInterop": true,
-    "jsx": "react-jsx",
+    "jsx": "react",
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "noEmit": true,
diff --git a/packages/use-memo-map/src/tsconfig.precommit.test.json b/packages/use-memo-map/src/tsconfig.precommit.test.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "esModuleInterop": true,
-    "jsx": "react-jsx",
+    "jsx": "react",
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "noEmit": true,

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`[`
`4`	`4`	`"@babel/preset-react",`
`5`	`5`	`{`
`6`		`- "runtime": "automatic"`
	`6`	`+ "runtime": "classic"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`[`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`[`
`9`	`9`	`"@babel/preset-react",`
`10`	`10`	`{`
`11`		`- "runtime": "automatic"`
	`11`	`+ "runtime": "classic"`
`12`	`12`	`}`
`13`	`13`	`]`
`14`	`14`	`]`
`@@ -21,7 +21,7 @@`
`21`	`21`	`[`
`22`	`22`	`"@babel/preset-react",`
`23`	`23`	`{`
`24`		`- "runtime": "automatic"`
	`24`	`+ "runtime": "classic"`
`25`	`25`	`}`
`26`	`26`	`],`
`27`	`27`	`[`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// This configuration file is for VSCode only.`
`2`	`2`	`{`
`3`	`3`	`"compilerOptions": {`
`4`		`- "jsx": "react-jsx"`
	`4`	`+ "jsx": "react"`
`5`	`5`	`}`
`6`	`6`	`}`