@salesforce/pwa-kit-dev 3.1.0-preview.4 → 3.1.0

package/bin/pwa-kit-dev.js

@@ -59,6 +59,19 @@ const getProjectName = async () => {
     return projectPkg.name
 }
 
+const getAppEntrypoint = async () => {
+    const defaultPath = p.join(process.cwd(), 'app', 'ssr.js')
+    if (await fse.pathExists(defaultPath)) return defaultPath
+
+    const projectPkg = await scriptUtils.getProjectPkg()
+    const {overridesDir} = projectPkg?.ccExtensibility ?? {}
+    if (!overridesDir || typeof overridesDir !== 'string') return null
+
+    const overridePath = p.join(process.cwd(), p.sep + overridesDir, 'app', 'ssr.js')
+    if (await fse.pathExists(overridePath)) return overridePath
+    return null
+}
+
 const main = async () => {
     const pkgRoot = p.join(__dirname, '..')
     process.env.CONTEXT = process.cwd()
@@ -177,20 +190,6 @@ const main = async () => {
             }
         })
 
-    const appSSRpath = p.join(process.cwd(), 'app', 'ssr.js')
-    const appSSRexists = fse.pathExistsSync(appSSRpath)
-    const {overridesDir} = scriptUtils.getProjectPkg()?.ccExtensibility ?? {}
-    const overrideSSRpath = p.join(
-        process.cwd(),
-        typeof overridesDir === 'string' && !overridesDir?.startsWith(p.sep)
-            ? p.sep + overridesDir
-            : overridesDir || '',
-        'app',
-        'ssr.js'
-    )
-    const overrideSSRexists = fse.pathExistsSync(overrideSSRpath)
-    const resolvedSSRPath = appSSRexists ? appSSRpath : overrideSSRexists ? overrideSSRpath : null
-
     program
         .command('start')
         .description(`develop your app locally`)
@@ -208,7 +207,14 @@ const main = async () => {
                 '.bin',
                 'babel-node'
             )
-            execSync(`${babelNode} ${inspect ? '--inspect' : ''} ${resolvedSSRPath}`, {
+
+            const entrypoint = await getAppEntrypoint()
+            if (!entrypoint) {
+                error('Could not determine app entrypoint.')
+                process.exit(1)
+            }
+
+            execSync(`${babelNode} ${inspect ? '--inspect' : ''} ${entrypoint}`, {
                 env: {
                     ...process.env,
                     ...(noHMR ? {HMR: 'false'} : {})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-dev",
-  "version": "3.1.0-preview.4",
+  "version": "3.1.0",
   "description": "Build tools for pwa-kit",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/pwa-kit-dev#readme",
   "bugs": {
@@ -58,7 +58,7 @@
     "@loadable/server": "^5.15.3",
     "@loadable/webpack-plugin": "^5.15.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
-    "@salesforce/pwa-kit-runtime": "3.1.0-preview.4",
+    "@salesforce/pwa-kit-runtime": "3.1.0",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
     "archiver": "1.3.0",
@@ -119,7 +119,7 @@
     "@types/node-fetch": "^2.6.3",
     "@types/validator": "^13.7.14",
     "eslint-plugin-no-relative-import-paths": "^1.5.2",
-    "internal-lib-build": "3.1.0-preview.4",
+    "internal-lib-build": "3.1.0",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",
     "superagent": "^6.1.0",
@@ -148,5 +148,5 @@
   "publishConfig": {
     "directory": "dist"
   },
-  "gitHead": "8ef8310dabf77dfdc50b76fbe2464f771c6a69c0"
+  "gitHead": "9903df6beef25919921962f4fa950f91352adee2"
 }