remove ?. and bump version

solidjs · Mar 6, 2022 · b310f93 · b310f93
1 parent b57f3e9
commit b310f93
Show file tree

Hide file tree

Showing 3 changed files with 119 additions and 68 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-solid",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "description": "solid-js integration plugin for vite 2",
   "type": "module",
   "files": [
@@ -46,7 +46,7 @@
     "merge-anything": "^5.0.2",
     "solid-js": "^1.3.3",
     "solid-refresh": "^0.4.0",
-    "vite": "^2.7.13"
+    "vite": "^2.8.0"
   },
   "devDependencies": {
     "@babel/plugin-transform-typescript": "^7.16.8",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/index.ts b/src/index.ts
@@ -265,7 +265,10 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
       const legacyAlias = normalizeAliases(userConfig.alias);
 
       if (!userConfig.resolve) userConfig.resolve = {};
-      userConfig.resolve.alias = [...legacyAlias, ...normalizeAliases(userConfig.resolve?.alias)];
+      userConfig.resolve.alias = [
+        ...legacyAlias,
+        ...normalizeAliases(userConfig.resolve && userConfig.resolve.alias),
+      ];
 
       // fix for bundling dev in production
       const nestedDeps = replaceDev
@@ -302,7 +305,7 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
     },
 
     async transform(source, id, transformOptions) {
-      const isSsr = transformOptions?.ssr;
+      const isSsr = transformOptions && transformOptions.ssr;
       const currentFileExtension = getExtension(id);
 
       const extensionsToWatch = [...(options.extensions || []), '.tsx', '.jsx'];