Merge pull request #437 from MicroPad/next-dev

v4.2.3
MicroPad · Apr 19, 2023 · 461a301 · 461a301
2 parents 9064d0e + d54e777
commit 461a301
Show file tree

Hide file tree

Showing 9 changed files with 716 additions and 913 deletions.
diff --git a/app/.gitignore b/app/.gitignore
@@ -1,4 +1,4 @@
-build.js
+/_build/build.mjs
 *.tsbuildinfo
 .reports
 

diff --git a/app/.yarn/releases/yarn-3.4.1.cjs → app/.yarn/releases/yarn-3.5.0.cjs b/app/.yarn/releases/yarn-3.4.1.cjs → app/.yarn/releases/yarn-3.5.0.cjs
diff --git a/app/.yarnrc.yml b/app/.yarnrc.yml
@@ -12,9 +12,12 @@ packageExtensions:
     dependencies:
       events: ^3.3.0
       timers: "npm:timers-browserify@^2.0.12"
+  semver@*:
+    dependencies:
+      util: ~0.12.5
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.4.1.cjs
+yarnPath: .yarn/releases/yarn-3.5.0.cjs
diff --git a/app/_build/build.ts → app/_build/build.mts b/app/_build/build.ts → app/_build/build.mts
@@ -4,10 +4,12 @@ import { join } from 'path';
 import { injectManifest } from 'workbox-build';
 import { minify as minifyHtml } from 'html-minifier';
 import { esbuildPluginBrowserslist } from 'esbuild-plugin-browserslist';
-import browserslist, { clearCaches as clearBrowserslistCache } from 'browserslist';
+import browserslist from 'browserslist';
 import servor from 'servor';
-import { getUserAgentRegExp } from 'browserslist-useragent-regexp';
+import { getUserAgentRegex } from 'browserslist-useragent-regexp';
 import { createHash } from 'crypto';
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
 
 const OUT_DIR = 'build';
 const isDev = process.env.NODE_ENV !== 'production';
@@ -16,7 +18,7 @@ const PORT: number = (() => {
 	return !!port ? parseInt(port, 10) : 3000;
 })();
 
-clearBrowserslistCache();
+browserslist.clearCaches();
 const esBuildTargets = browserslist().filter(browser => !browser.endsWith('TP'));
 
 (async () => {
@@ -39,7 +41,7 @@ const esBuildTargets = browserslist().filter(browser => !browser.endsWith('TP'))
 		metafile: true,
 		watch: isDev,
 		define: {
-			'build.defs.SUPPORTED_BROWSERS_REGEX': `"${getUserAgentRegExp({ allowHigherVersions: true }).source.replaceAll('\\', '\\\\')}"`,
+			'build.defs.SUPPORTED_BROWSERS_REGEX': `"${getUserAgentRegex({ allowHigherVersions: true }).source.replaceAll('\\', '\\\\')}"`,
 			'process.env.NODE_ENV': `"${process.env.NODE_ENV}"`,
 			'process.env.PUBLIC_URL': `"${process.env.PUBLIC_URL}"`
 		},

diff --git a/app/_build/tsconfig.json b/app/_build/tsconfig.json
@@ -5,7 +5,7 @@
     /* Basic Options */
     // "incremental": true,                         /* Enable incremental compilation */
     "target": "es2018",                                /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */
-    "module": "commonjs",                           /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+    "module": "ES2022",                           /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
     "lib": ["ESNEXT"],                                   /* Specify library files to be included in the compilation. */
     // "allowJs": true,                             /* Allow javascript files to be compiled. */
     // "checkJs": true,                             /* Report errors in .js files. */
@@ -44,7 +44,7 @@
     // "noPropertyAccessFromIndexSignature": true,  /* Require undeclared properties from index signatures to use element accesses. */
 
     /* Module Resolution Options */
-    // "moduleResolution": "node",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+     "moduleResolution": "NodeNext",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
     // "baseUrl": "./",                             /* Base directory to resolve non-absolute module names. */
     // "paths": {},                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */

diff --git a/app/package.json b/app/package.json
@@ -1,13 +1,13 @@
 {
   "name": "micropad",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "private": true,
   "scripts": {
     "preinstall": "python3 ../libs/build-libs.py && ./get_precache_files.py > src/extraPrecacheFiles.ts",
     "prestart": "tsc -p _build/tsconfig.json",
-    "start": "yarn prestart && NODE_ENV='' node _build/build.js",
+    "start": "yarn prestart && NODE_ENV='' node --experimental-import-meta-resolve _build/build.mjs",
     "prebuild": "tsc -p _build/tsconfig.json",
-    "build": "yarn prebuild && NODE_ENV=production node _build/build.js",
+    "build": "yarn prebuild && NODE_ENV=production node --experimental-import-meta-resolve _build/build.mjs",
     "test": "TZ=NZ jest",
     "typecheck": "tsc --noEmit --p ./tsconfig.json",
     "typecheck:watch": "tsc --noEmit --watch -p ./tsconfig.json",
@@ -18,23 +18,23 @@
   },
   "dependencies": {
     "@fontsource/abeezee": "^4.5.10",
-    "@monaco-editor/react": "^4.4.6",
+    "@monaco-editor/react": "^4.5.0",
     "@nick_webster/photon": "^0.3.1",
     "@redux-devtools/extension": "^3.2.5",
-    "@reduxjs/toolkit": "^1.9.3",
-    "@sentry/integrations": "^7.41.0",
-    "@sentry/react": "^7.41.0",
-    "@sentry/tracing": "^7.41.0",
-    "browserslist-useragent-regexp": "^3.0.2",
+    "@reduxjs/toolkit": "^1.9.5",
+    "@sentry/integrations": "^7.48.0",
+    "@sentry/react": "^7.48.0",
+    "@sentry/tracing": "^7.48.0",
+    "browserslist-useragent-regexp": "^4.0.0",
     "date-fns": "^2.29.3",
     "deep-freeze": "~0.0.1",
-    "fend-wasm-web": "^1.1.5",
+    "fend-wasm-web": "^1.1.6",
     "json-stringify-safe": "^5.0.1",
     "jszip": "^3.10.1",
     "localforage": "^1.10.0",
     "material-icons-font": "^2.1.0",
     "materialize-css": "^1.0.0",
-    "monaco-editor": "~0.36.1",
+    "monaco-editor": "~0.37.1",
     "mousetrap": "^1.6.5",
     "opus-recorder": "^4.1.4",
     "pdfobject": "^2.2.8",
@@ -44,15 +44,15 @@
     "react-draggable": "^4.4.5",
     "react-materialize": "^3.10.0",
     "react-redux": "^8.0.5",
-    "react-select": "^5.7.0",
+    "react-select": "^5.7.2",
     "react-treeview": "~0.4.7",
     "redux": "^4.2.1",
     "redux-observable": "^2.0.0",
     "rxjs": "^7.8.0",
     "save-as": "^0.1.8",
-    "semver": "^7.3.8",
+    "semver": "^7.5.0",
     "showdown": "^1.9.1",
-    "typescript": "~4.9.5",
+    "typescript": "~5.0.4",
     "typescript-fsa": "^3.0.0",
     "upad-parse": "^7.5.2",
     "vex-dialog": "^1.1.0",
@@ -138,28 +138,28 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.21.0",
-    "@babel/plugin-syntax-flow": "^7.18.6",
+    "@babel/core": "^7.21.4",
+    "@babel/plugin-syntax-flow": "^7.21.4",
     "@babel/plugin-transform-react-jsx": "^7.21.0",
     "@types/deep-freeze": "^0.1.2",
     "@types/html-minifier": "^4.0.2",
     "@types/jest": "^27.5.2",
     "@types/jest-image-snapshot": "^4.3.2",
     "@types/json-stringify-safe": "^5.0.0",
     "@types/mousetrap": "^1.6.11",
-    "@types/node": "^18.14.6",
-    "@types/react": "^17.0.53",
+    "@types/node": "^18.15.11",
+    "@types/react": "^17.0.58",
     "@types/react-dom": "^17.0.19",
     "@types/semver": "^7.3.13",
     "@types/showdown": "^1.9.4",
-    "@typescript-eslint/eslint-plugin": "^5.54.1",
-    "@typescript-eslint/parser": "^5.54.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.0",
+    "@typescript-eslint/parser": "^5.59.0",
     "babel-eslint": "^10.1.0",
     "browserslist": "^4.21.5",
     "esbuild": "~0.16.17",
-    "esbuild-plugin-browserslist": "~0.5.3",
+    "esbuild-plugin-browserslist": "~0.7.0",
     "esbuild-plugin-manifest": "~0.5.0",
-    "eslint": "^8.35.0",
+    "eslint": "^8.38.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-import": "^2.27.5",
@@ -177,7 +177,7 @@
     "jest-junit": "^13.2.0",
     "jest-playwright-preset": "^1.7.2",
     "jest-runner": "^27.5.1",
-    "playwright": "^1.31.2",
+    "playwright": "^1.32.3",
     "servor": "^4.0.2",
     "ts-jest": "^27.1.5",
     "workbox-build": "^6.5.4"
@@ -189,5 +189,5 @@
     "rxjs": "^7.5.7",
     "playwright-core": "^1.27.1"
   },
-  "packageManager": "yarn@3.4.1"
+  "packageManager": "yarn@3.5.0"
 }
diff --git a/app/src/app/assets/Help.npx b/app/src/app/assets/Help.npx
diff --git a/app/tsconfig.json b/app/tsconfig.json
@@ -21,7 +21,6 @@
     "noImplicitThis": true,
     "noImplicitAny": false,
     "strictNullChecks": true,
-    "suppressImplicitAnyIndexErrors": true,
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
     "noImplicitOverride": false,