build: update dependencies and add pnpm7 (#276)

* build: update dependencies and scripts for pnpm7

* ci: add ci pnpm7 support

* chore: add .nvmrc

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: pnpm/[email protected]
         with:
-          version: 6.23.2
+          version: 7
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
         with:
@@ -39,10 +39,6 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
-      - name: Lint
-        run: |
-          pnpm lint
-
       - name: Build
         run: |
           pnpm build:prod

.github/workflows/lint.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: pnpm/[email protected]
         with:
-          version: 6.23.2
+          version: 7
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
         with:
@@ -35,4 +35,4 @@ jobs:
         run: pnpm install
 
       - name: Lint
-        run: pnpm lint --filter @codeimage/*
+        run: pnpm lint

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: pnpm/[email protected]
         with:
-          version: 6.23.2
+          version: 7
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
         with:

.npmrc

@@ -1,6 +1,5 @@
 save-exact=true
 save-prefix=
-
 strict-peer-dependencies=true
 
 shell-emulator=true

.nvmrc

@@ -0,0 +1 @@
+v16.13.2

apps/codeimage/package.json

@@ -85,7 +85,7 @@
     "solid-app-router": "^0.3.3",
     "solid-codemirror": "^1.0.3",
     "solid-headless": "^0.10.12",
-    "solid-js": "^1.4.2",
+    "solid-js": "^1.4.4",
     "solid-use": "^0.3.4",
     "tinykeys": "^1.4.0",
     "workbox-precaching": "^6.5.3",

apps/codeimage/src/components/CustomEditor/CustomEditorPreview.tsx

@@ -85,7 +85,6 @@ export const CustomEditorPreview = (
 
   createEffect(() =>
     batch(() => {
-      // @ts-expect-error Deep type
       setOptions({
         value: props.code,
         extensions: [

apps/codeimage/src/core/hooks/from-observable-object.ts

@@ -1,13 +1,13 @@
 import {Observable} from 'rxjs';
-import {createStore, DeepReadonly, reconcile} from 'solid-js/store';
+import {createStore, reconcile} from 'solid-js/store';
 import {select} from '@ngneat/elf';
 import {onCleanup} from 'solid-js';
 
 export function fromObservableObject<T>(store: Observable<T>) {
   const initialValue = {} as T;
   const [state, setState] = createStore<T>(initialValue);
   const sub = store.pipe(select(state => state)).subscribe(nextState => {
-    setState(reconcile(nextState as DeepReadonly<T>));
+    setState(reconcile(nextState));
   });
   onCleanup(() => sub.unsubscribe());
   return state;

apps/codeimage/src/state/editor/createEditors.ts

@@ -48,7 +48,9 @@ function $createEditorsStore() {
   const isActive = createSelector(activeEditorId);
 
   onMount(async () => {
-    const idbState = await idb.get<PersistedEditorState>(IDB_KEY);
+    const idbState = await idb
+      .get<PersistedEditorState>(IDB_KEY)
+      .catch(() => null);
     if (idbState) {
       // Versioning state tabs -> TODO: not needed if id is not createUniqueId from solid
       const editors = idbState.editors.slice(0, MAX_TABS).map(editor => ({

package.json

@@ -35,13 +35,14 @@
   },
   "scripts": {
     "prepare": "husky install",
-    "dev": "pnpm dev --filter=@codeimage/app",
-    "libs:build": "pnpm --parallel --filter='./packages' --filter='!@codeimage/config' build && pnpm libs:build:config",
+    "dev": "pnpm --filter=@codeimage/app dev",
+    "libs:build": "pnpm libs:build:core && pnpm libs:build:config",
+    "libs:build:core": "pnpm --filter \"{packages/**}\" --filter='!@codeimage/config' --parallel build",
     "libs:build:config": "pnpm --filter=@codeimage/config build",
-    "libs:build:watch": "pnpm --parallel --aggregate-output --filter ./packages --filter='!@codeimage/config' --filter build:watch",
-    "lint": "pnpm lint --recursive --parallel --filter='@codeimage/*'",
-    "typecheck": "pnpm typecheck --recursive --parallel --filter='@codeimage/*'",
-    "build:prod": "pnpm patch-solid-exports && pnpm libs:build && pnpm --filter='@codeimage/config' --filter='@codeimage/app' build",
+    "libs:build:watch": "pnpm --filter \"{packages/**}\" --filter='!@codeimage/config' --parallel --aggregate-output build:watch",
+    "lint": "pnpm --filter='@codeimage/*' --parallel -r lint",
+    "typecheck": "pnpm --filter='@codeimage/*' --recursive --parallel typecheck",
+    "build:prod": "pnpm patch-solid-exports && pnpm libs:build && pnpm --filter=@codeimage/app build",
     "changeset:pr": "changeset version && ts-node scripts/sync-package.ts",
     "pre-commit": "lint-staged --relative",
     "pre-commit-prettier": "prettier --write",
@@ -76,7 +77,6 @@
     "typescript": "^4.7.3"
   },
   "engines": {
-    "node": ">=14.x",
-    "pnpm": ">=6.23.2"
+    "pnpm": ">=7"
   }
-}
+}

packages/config/package.json

@@ -46,18 +46,18 @@
     "@codemirror/view": "^0.20.6",
     "@codemirror/legacy-modes": "^0.20.0",
     "material-icon-theme": "^4.17.0",
-    "solid-js": "^1.4.2"
+    "solid-js": "^1.4.4"
   },
   "peerDependencies": {
     "@codeimage/theme": "workspace:*",
     "@codemirror/state": "^0.20.0",
     "@codemirror/view": "^0.20.4",
     "@codemirror/language": "^0.20.0",
-    "solid-js": "^1.4.2"
+    "solid-js": "^1.4.4"
   },
   "devDependencies": {
     "rimraf": "^3.0.2",
-    "typescript": "^4.6.4",
+    "typescript": "^4.7.3",
     "vite": "^2.9.8",
     "vite-plugin-dts": "^1.1.1",
     "vite-plugin-solid": "^2.2.6"

packages/dom-export/.eslintignore

@@ -0,0 +1,2 @@
+node_modules
+dist

packages/dom-export/.lintstagedrc

@@ -0,0 +1,7 @@
+{
+  "**/*.{ts,tsx,js,jsx,json}": [
+    "pnpm lint",
+    "pnpm pre-commit-prettier",
+    "pnpm pre-commit-eslint"
+  ]
+}

packages/dom-export/package.json

@@ -25,7 +25,7 @@
     "svg"
   ],
   "scripts": {
-    "lint": "eslint 'src/**/*.{js,ts}?(x)' --fix",
+    "lint": "eslint . --ext .js,.jsx,.mjs,.ts,.tsx -c ../../.eslintrc.js",
     "build": "vite build"
   },
   "lint-staged": {
@@ -53,7 +53,6 @@
   ],
   "devDependencies": {
     "@types/node": "17.0.40",
-    "imagediff": "^1.0.8",
     "lint-staged": "^13.0.0",
     "prettier": "^2.6.2",
     "rimraf": "^3.0.2",

packages/locale/package.json

@@ -26,14 +26,14 @@
   },
   "dependencies": {
     "@solid-primitives/i18n": "^1.1.0",
-    "solid-js": "^1.4.2"
+    "solid-js": "^1.4.4"
   },
   "peerDependencies": {
     "solid-js": "^1.4.2"
   },
   "devDependencies": {
     "rimraf": "^3.0.2",
-    "typescript": "^4.6.4",
+    "typescript": "^4.7.3",
     "vite": "^2.9.8",
     "vite-plugin-dts": "^1.1.1",
     "vite-plugin-solid": "^2.2.6"

packages/theme/package.json

@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "rimraf": "^3.0.2",
-    "typescript": "^4.6.4",
+    "typescript": "^4.7.3",
     "vite": "^2.9.9",
     "vite-plugin-dts": "^1.1.1",
     "vite-plugin-solid": "^2.2.6"

packages/ui/package.json

@@ -28,15 +28,15 @@
     "@vanilla-extract/recipes": "^0.2.4",
     "@vanilla-extract/dynamic": "^2.0.2",
     "solid-headless": "^0.10.12",
-    "@solid-aria/interactions": "^0.0.5",
-    "@solid-aria/focus": "^0.0.7",
-    "@solid-aria/overlays": "^0.0.3",
-    "@solid-aria/utils": "^0.0.5",
+    "@solid-aria/interactions": "^0.0.7",
+    "@solid-aria/focus": "^0.0.9",
+    "@solid-aria/overlays": "^0.0.5",
+    "@solid-aria/utils": "^0.0.6",
     "@solid-primitives/utils": "^2.0.1",
     "@solid-primitives/refs": "^0.2.0",
     "@solid-primitives/props": "^2.1.2",
     "solid-use": "^0.3.4",
-    "solid-js": "^1.4.2",
+    "solid-js": "^1.4.4",
     "csstype": "^3.1.0",
     "clsx": "^1.1.1",
     "@floating-ui/dom": "^0.5.1",
@@ -55,22 +55,22 @@
     "clsx": "^1.1.1",
     "@floating-ui/dom": "^0.5.1",
     "@floating-ui/core": "^0.7.1",
-    "@solid-aria/interactions": "^0.0.5",
-    "@solid-aria/focus": "^0.0.7",
-    "@solid-aria/overlays": "^0.0.3",
-    "@solid-aria/utils": "^0.0.5",
-    "@solid-aria/dialog": "^0.0.2",
-    "@solid-aria/button": "^0.0.4",
-    "@solid-aria/i18n": "^0.0.6",
-    "@solid-primitives/utils": "^2.0.1",
+    "@solid-aria/interactions": "^0.0.7",
+    "@solid-aria/focus": "^0.0.9",
+    "@solid-aria/overlays": "^0.0.5",
+    "@solid-aria/utils": "^0.0.6",
+    "@solid-aria/dialog": "^0.0.5",
+    "@solid-aria/button": "^0.0.6",
+    "@solid-aria/i18n": "^0.0.7",
+    "@solid-primitives/utils": "^2.1.0",
     "@solid-primitives/refs": "^0.2.0",
-    "@solid-primitives/props": "^2.1.2"
+    "@solid-primitives/props": "^2.1.7"
   },
   "devDependencies": {
     "@types/node": "^17.0.31",
     "rimraf": "^3.0.2",
-    "solid-js": "^1.4.2",
-    "typescript": "^4.6.4",
+    "solid-js": "^1.4.4",
+    "typescript": "^4.7.3",
     "vite": "^2.9.8",
     "vite-plugin-dts": "^1.1.1",
     "vite-plugin-solid": "^2.2.6",

packages/ui/src/lib/primitives/ColorPicker/ColorPicker.tsx

@@ -32,7 +32,7 @@ export function ColorPicker(props: PropsWithChildren<ColorPickerProps>) {
 
   const {buttonProps} = createButton(
     {
-      onPress: () => state.open(),
+      onClick: () => state.open(),
     },
     () => triggerRef,
   );