@shuvi/platform-web 1.0.12 → 1.0.13

package/esm/shuvi-app/model/runtime.js

@@ -1,4 +1,4 @@
-import { doura } from 'doura';
+import { doura, devtool } from 'doura';
 import { createRuntimePlugin, getPageData } from '@shuvi/platform-shared/shared';
 let currentStore;
 const isServer = typeof window === 'undefined';
@@ -7,7 +7,8 @@ const isServer = typeof window === 'undefined';
 const initStore = ({ initialState, ctx }) => {
     const createStoreInstance = () => {
         return doura({
-            initialState
+            initialState,
+            plugins: process.env.NODE_ENV === 'development' ? [[devtool]] : []
         });
     };
     // for server

package/lib/node/targets/react/bundler/index.js

@@ -30,48 +30,71 @@ const path = __importStar(require("path"));
 const service_1 = require("@shuvi/service");
 const ReactRefreshWebpackPlugin_1 = __importDefault(require("@next/react-refresh-utils/ReactRefreshWebpackPlugin"));
 const shared_1 = require("../../../../shared");
+const isDefined = (value) => Boolean(value);
 const configWebpack = (config, { name, webpack }, context) => {
     const resolveLocal = (m, sub) => {
         const pck = path.dirname(require.resolve(`${m}/package.json`));
         return sub ? `${pck}/${sub}` : pck;
     };
-    const resolveUser = (m) => path.join(context.paths.rootDir, 'node_modules', m);
+    const resolveUser = (m, sub) => {
+        const { rootDir } = context.paths;
+        let userPkg = {
+            dependencies: {}
+        };
+        // Check if target dependency is declared at user's package.json
+        try {
+            userPkg = require(path.join(rootDir, `package.json`));
+            if (!userPkg.dependencies) {
+                userPkg.dependencies = {};
+            }
+        }
+        catch (_a) { }
+        if (m in userPkg.dependencies) {
+            // Resolve path of target dependency from user root path
+            try {
+                const module = sub ? `${m}/${sub}` : m;
+                return require.resolve(module, { paths: [rootDir] });
+            }
+            catch (_b) { }
+        }
+        return undefined;
+    };
     const isReactVersionAfter18 = () => {
         let version = '';
         try {
-            version = require(resolveUser('react-dom')).version;
+            const userReactDomPkgPath = resolveUser('react-dom', 'package.json');
+            if (userReactDomPkgPath) {
+                version = require(userReactDomPkgPath).version;
+            }
         }
-        catch (e) {
+        catch (_a) { }
+        if (!version) {
             version = require(resolveLocal('react-dom')).version;
         }
-        finally {
-        }
         const majorVersion = parseInt(version.split('.')[0] || '', 10);
         return majorVersion >= 18;
     };
     config.resolve.alias.set('@shuvi/service', resolveLocal('@shuvi/service'));
     config.resolve.alias.set('@shuvi/router$', resolveLocal('@shuvi/router'));
     config.resolve.alias.set('@shuvi/router-react$', resolveLocal('@shuvi/router-react'));
+    config.resolve.alias.set('react$', 
     // @ts-ignore
-    config.resolve.alias.set('react$', [
-        resolveUser('react'),
-        resolveLocal('react')
-    ]);
+    [resolveUser('react'), resolveLocal('react')].filter(isDefined));
+    config.resolve.alias.set('react/jsx-runtime$', 
     // @ts-ignore
-    config.resolve.alias.set('react/jsx-runtime$', [
-        resolveUser('react/jsx-runtime'),
+    [
+        resolveUser('react', 'jsx-runtime'),
         resolveLocal('react', 'jsx-runtime')
-    ]);
+    ].filter(isDefined));
+    config.resolve.alias.set('react/jsx-dev-runtime$', 
     // @ts-ignore
-    config.resolve.alias.set('react/jsx-dev-runtime$', [
-        resolveUser('react/jsx-dev-runtime'),
+    [
+        resolveUser('react', 'jsx-dev-runtime'),
         resolveLocal('react', 'jsx-dev-runtime')
-    ]);
+    ].filter(isDefined));
+    config.resolve.alias.set('react-dom$', 
     // @ts-ignore
-    config.resolve.alias.set('react-dom$', [
-        resolveUser('react-dom'),
-        resolveLocal('react-dom')
-    ]);
+    [resolveUser('react-dom'), resolveLocal('react-dom')].filter(isDefined));
     if (name === shared_1.BUNDLER_TARGET_CLIENT) {
         config.plugin('version-env-plugin').use(webpack.DefinePlugin, [
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -72,17 +72,17 @@
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/error-overlay": "1.0.12",
-    "@shuvi/hook": "1.0.12",
-    "@shuvi/platform-shared": "1.0.12",
+    "@shuvi/error-overlay": "1.0.13",
+    "@shuvi/hook": "1.0.13",
+    "@shuvi/platform-shared": "1.0.13",
     "doura": "0.0.7",
     "react-doura": "0.0.7",
-    "@shuvi/router": "1.0.12",
-    "@shuvi/router-react": "1.0.12",
-    "@shuvi/runtime": "1.0.12",
-    "@shuvi/shared": "1.0.12",
-    "@shuvi/toolpack": "1.0.12",
-    "@shuvi/utils": "1.0.12",
+    "@shuvi/router": "1.0.13",
+    "@shuvi/router-react": "1.0.13",
+    "@shuvi/runtime": "1.0.13",
+    "@shuvi/shared": "1.0.13",
+    "@shuvi/toolpack": "1.0.13",
+    "@shuvi/utils": "1.0.13",
     "content-type": "1.0.4",
     "core-js": "3.6.5",
     "ejs": "3.1.5",
@@ -98,7 +98,7 @@
     "whatwg-fetch": "3.0.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.12"
+    "@shuvi/service": "1.0.13"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",