@salesforce/pwa-kit-dev 3.8.0-preview.1-basepath → 3.8.0

package/configs/webpack/config.js

@@ -13,7 +13,6 @@ 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 _ssrPaths = require("@salesforce/pwa-kit-runtime/utils/ssr-paths");
 var _overridesPlugin = _interopRequireDefault(require("./overrides-plugin"));
 var _plugins = require("./plugins");
 var _configNames = require("./config-names");
@@ -92,6 +91,9 @@ 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
@@ -290,16 +292,12 @@ 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, _ssrPaths.getBundlePath)()}/development/`;
   return _objectSpread(_objectSpread({}, config), {}, {
     module: _objectSpread(_objectSpread({}, config.module), {}, {
       rules
     }),
     entry: _objectSpread(_objectSpread({}, config.entry), {}, {
-      main: ['webpack-hot-middleware/client?path=/__mrt/hmr', getAppEntryPoint()]
-    }),
-    output: _objectSpread(_objectSpread({}, config.output), {}, {
-      publicPath: hmrBasePath
+      main: ['webpack-hot-middleware/client?path=/__mrt/hmr', getPublicPathEntryPoint(), getAppEntryPoint()]
     }),
     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.8.0-preview.1-basepath",
+  "version": "3.8.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.8.0-preview.1-basepath",
+    "@salesforce/pwa-kit-runtime": "3.8.0",
     "@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.8.0-preview.1-basepath",
+    "internal-lib-build": "3.8.0",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",
     "superagent": "^6.1.0",
@@ -147,5 +147,5 @@
   "publishConfig": {
     "directory": "dist"
   },
-  "gitHead": "8704488ab2d14e7545c6acbe83fa1d4a330c6289"
+  "gitHead": "d6ed7107a4087093442b125f8cc212302046ab7e"
 }

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

@@ -19,7 +19,7 @@ var _open = _interopRequireDefault(require("open"));
 var _requireFromString = _interopRequireDefault(require("require-from-string"));
 var _buildRemoteServer = require("@salesforce/pwa-kit-runtime/ssr/server/build-remote-server");
 var _ssrShared = require("@salesforce/pwa-kit-runtime/utils/ssr-shared");
-var _ssrPaths = require("@salesforce/pwa-kit-runtime/utils/ssr-paths");
+var _ssrNamespacePaths = require("@salesforce/pwa-kit-runtime/utils/ssr-namespace-paths");
 var _configNames = require("../../configs/webpack/config-names");
 var _crypto = require("crypto");
 var _chalk = _interopRequireDefault(require("chalk"));
@@ -151,7 +151,7 @@ const DevServerMixin = exports.DevServerMixin = {
     if (config.some(cnf => cnf.name === _configNames.SERVER)) {
       app.__hotServerMiddleware = (0, _webpackHotServerMiddleware.default)(app.__compiler);
     }
-    app.use(`${(0, _ssrPaths.getBundlePath)()}/development`, app.__devMiddleware);
+    app.use(`${_ssrNamespacePaths.bundleBasePath}/development`, app.__devMiddleware);
     app.__hmrMiddleware = (_, res) => res.status(501).send('Hot Module Reloading is disabled.');
     const clientCompiler = app.__compiler.compilers.find(compiler => compiler.name === _configNames.CLIENT);
     if (clientCompiler && process.env.HMR !== 'false') {
@@ -184,7 +184,7 @@ const DevServerMixin = exports.DevServerMixin = {
   _addStaticAssetServing(app) {
     // Proxy bundle asset requests to the local
     // build directory.
-    app.use(`${(0, _ssrPaths.getBundlePath)()}/development`, _express.default.static(_path.default.resolve(process.cwd(), 'src'), {
+    app.use(`${_ssrNamespacePaths.bundleBasePath}/development`, _express.default.static(_path.default.resolve(process.cwd(), 'src'), {
       dotFiles: 'deny',
       setHeaders: setLocalAssetHeaders,
       fallthrough: true

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

@@ -60,32 +60,31 @@ 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: mobifyConfig,
+    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
+        }]
+      }
+    },
     quiet: true,
     port: TEST_PORT,
     protocol: 'http',
@@ -93,11 +92,6 @@ 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 = {

package/ssr/server/public-path.js

@@ -0,0 +1,21 @@
+"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/`;