@salesforce/pwa-kit-dev 3.11.0 → 3.12.0-dev

package/configs/webpack/config.js

@@ -13,6 +13,7 @@ var _webpackBundleAnalyzer = require("webpack-bundle-analyzer");
 var _webpackPlugin = _interopRequireDefault(require("@loadable/webpack-plugin"));
 var _reactRefreshWebpackPlugin = _interopRequireDefault(require("@pmmmwh/react-refresh-webpack-plugin"));
 var _speedMeasureWebpackPlugin = _interopRequireDefault(require("speed-measure-webpack-plugin"));
+var _ssrNamespacePaths = require("@salesforce/pwa-kit-runtime/utils/ssr-namespace-paths");
 var _overridesPlugin = _interopRequireDefault(require("./overrides-plugin"));
 var _plugins = require("./plugins");
 var _configNames = require("./config-names");
@@ -94,9 +95,6 @@ const entryPointExists = segments => {
 const getAppEntryPoint = () => {
   return (0, _path.resolve)('./', EXT_OVERRIDES_DIR_NO_SLASH, 'app', 'main');
 };
-const getPublicPathEntryPoint = () => {
-  return (0, _path.resolve)(projectDir, 'node_modules', '@salesforce', 'pwa-kit-dev', 'ssr', 'server', 'public-path');
-};
 const findDepInStack = pkg => {
   // Look for the SDK node_modules in two places because in CI,
   // pwa-kit-dev is published under a 'dist' directory, which
@@ -295,12 +293,16 @@ const enableReactRefresh = config => {
   }
   const newRule = ruleForBabelLoader([require.resolve('react-refresh/babel')]);
   const rules = findAndReplace(config.module.rules, rule => rule.id === 'babel-loader', newRule);
+  const hmrBasePath = `${(0, _ssrNamespacePaths.getEnvBasePath)()}${_ssrNamespacePaths.bundleBasePath}/development/`;
   return _objectSpread(_objectSpread({}, config), {}, {
     module: _objectSpread(_objectSpread({}, config.module), {}, {
       rules
     }),
     entry: _objectSpread(_objectSpread({}, config.entry), {}, {
-      main: ['webpack-hot-middleware/client?path=/__mrt/hmr', getPublicPathEntryPoint(), getAppEntryPoint()]
+      main: ['webpack-hot-middleware/client?path=/__mrt/hmr', getAppEntryPoint()]
+    }),
+    output: _objectSpread(_objectSpread({}, config.output), {}, {
+      publicPath: hmrBasePath
     }),
     plugins: [...config.plugins, new _webpack.default.HotModuleReplacementPlugin(), new _reactRefreshWebpackPlugin.default({
       overlay: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-dev",
-  "version": "3.11.0",
+  "version": "3.12.0-dev",
   "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.11.0",
+    "@salesforce/pwa-kit-runtime": "3.12.0-dev",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
     "archiver": "1.3.0",
@@ -121,7 +121,7 @@
     "@types/node": "~16.0.3",
     "@types/node-fetch": "~2.6.3",
     "@types/validator": "~13.7.14",
-    "internal-lib-build": "3.11.0",
+    "internal-lib-build": "3.12.0-dev",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",
     "superagent": "^6.1.0",
@@ -147,5 +147,5 @@
   "publishConfig": {
     "directory": "dist"
   },
-  "gitHead": "ce537dc2e48c980ca78607e03125f9cccf8314c5"
+  "gitHead": "60d9a47ad71824709be52bbe1110b092f7698244"
 }

package/ssr/server/build-dev-server.test.js

@@ -60,31 +60,32 @@ const insecureFetch = (url, opts) => {
     agent: _parsedURL => _parsedURL.protocol === 'https:' ? httpsAgent : httpAgent
   }));
 };
+const mobifyConfig = {
+  ssrEnabled: true,
+  ssrOnly: ['main.js.map', 'ssr.js', 'ssr.js.map'],
+  ssrShared: ['main.js', 'ssr-loader.js', 'worker.js'],
+  ssrParameters: {
+    proxyConfigs: [{
+      protocol: 'https',
+      host: 'test.proxy.com',
+      path: 'base'
+    }, {
+      protocol: 'https',
+      // This is intentionally an unreachable host
+      host: '0.0.0.0',
+      path: 'base2'
+    }, {
+      protocol: 'https',
+      host: 'test.proxy.com',
+      path: 'base3',
+      caching: true
+    }]
+  }
+};
 const opts = (overrides = {}) => {
   const defaults = {
     buildDir: _path.default.join(testFixtures, 'build'),
-    mobify: {
-      ssrEnabled: true,
-      ssrOnly: ['main.js.map', 'ssr.js', 'ssr.js.map'],
-      ssrShared: ['main.js', 'ssr-loader.js', 'worker.js'],
-      ssrParameters: {
-        proxyConfigs: [{
-          protocol: 'https',
-          host: 'test.proxy.com',
-          path: 'base'
-        }, {
-          protocol: 'https',
-          // This is intentionally an unreachable host
-          host: '0.0.0.0',
-          path: 'base2'
-        }, {
-          protocol: 'https',
-          host: 'test.proxy.com',
-          path: 'base3',
-          caching: true
-        }]
-      }
-    },
+    mobify: mobifyConfig,
     quiet: true,
     port: TEST_PORT,
     protocol: 'http',
@@ -92,6 +93,11 @@ const opts = (overrides = {}) => {
   };
   return _objectSpread(_objectSpread({}, defaults), overrides);
 };
+jest.mock('@salesforce/pwa-kit-runtime/utils/ssr-config', () => {
+  return {
+    getConfig: () => mobifyConfig
+  };
+});
 describe('DevServer error handlers', () => {
   const expectServerErrorHandled = (error, times) => {
     const proc = {
@@ -646,6 +652,7 @@ describe('DevServer serveStaticFile', () => {
 });
 describe('SLAS private client proxy', () => {
   test('should throw error if PWA_KIT_SLAS_CLIENT_SECRET env var not set', () => {
+    delete process.env.PWA_KIT_SLAS_CLIENT_SECRET;
     expect(() => {
       NoWebpackDevServerFactory._createApp(opts({
         useSLASPrivateClient: true

package/ssr/server/public-path.js

@@ -1,21 +0,0 @@
-"use strict";
-
-var _ssrNamespacePaths = require("@salesforce/pwa-kit-runtime/utils/ssr-namespace-paths");
-/*
- * Copyright (c) 2024, salesforce.com, inc.
- * All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-
-/**
- * This file is used to dynamically set the webpack public path used by HMR via the global webpack variable
- * __webpack_public_path__
- * See https://webpack.js.org/guides/public-path/
- *
- * Previously, we hard coded the public path in our webpack config to '/mobify/bundle/development/'
- * but we need something more dynamic to support namespaced /mobify paths.
- */
-
-/* global __webpack_public_path__: writable */
-__webpack_public_path__ = `${_ssrNamespacePaths.bundleBasePath}/development/`;