@salesforce/pwa-kit-dev 4.0.0-extensibility-preview.2 → 4.0.0-extensibility-preview.3

package/bin/pwa-kit-dev.js

@@ -299,7 +299,7 @@ const main = async () => {
                 ? projectWebpack
                 : p.join(__dirname, '..', 'configs', 'webpack', 'config.js')
             fse.emptyDirSync(buildDirectory)
-            execSync(`${webpack} --config ${webpackConf}`, {
+            execSync(`"${webpack}" --config "${webpackConf}"`, {
                 env: {
                     NODE_ENV: 'production',
                     ...process.env,

package/configs/babel/babel-config.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _utils = require("@salesforce/pwa-kit-extension-sdk/shared/utils");
 var _ssrConfig = require("@salesforce/pwa-kit-runtime/utils/ssr-config");
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /*
  * Copyright (c) 2021, salesforce.com, inc.
  * All rights reserved.
@@ -34,5 +36,22 @@ var _default = exports.default = {
       presets: [require('@babel/preset-env'), require('@babel/preset-react')],
       plugins: [require('babel-plugin-dynamic-import-node-babel-7')]
     }
-  }
+  },
+  ignore: [function (filepath) {
+    const normalizedPath = _path.default.normalize(filepath);
+    const extensionRegex = new RegExp(`node_modules\\${_path.default.sep}[^\\${_path.default.sep}]+\\${_path.default.sep}(pwa-kit-extension-sdk|@[^\\${_path.default.sep}]+\\${_path.default.sep}extension-|extension-)`);
+
+    // Return false if it's an allowed extension package @salesforce/pwa-kit-extension-sdk and extension-*
+    if (extensionRegex.test(normalizedPath)) {
+      return false;
+    }
+
+    // Return true if it's in node_modules (excluding allowed packages handled above)
+    if (/node_modules/.test(normalizedPath)) {
+      return true;
+    }
+
+    // Return false for all other files
+    return false;
+  }]
 };

package/configs/webpack/config.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SUPPORTED_FILE_EXTENSIONS = exports.EXTENIONS_NAMESPACE = exports.DEPS_TO_DEDUPE = void 0;
 var _webpackBundleAnalyzer = require("webpack-bundle-analyzer");
-var _path = require("path");
+var _path = _interopRequireWildcard(require("path"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _webpack = _interopRequireDefault(require("webpack"));
 var _copyWebpackPlugin = _interopRequireDefault(require("copy-webpack-plugin"));
@@ -20,6 +20,8 @@ var _webpack2 = require("@salesforce/pwa-kit-extension-sdk/configs/webpack");
 var _ssrConfig = require("@salesforce/pwa-kit-runtime/utils/ssr-config");
 var _utils = require("@salesforce/pwa-kit-extension-sdk/shared/utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -39,6 +41,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 const projectDir = process.cwd();
 const pkg = _fsExtra.default.readJsonSync((0, _path.resolve)(projectDir, 'package.json'));
 const buildDir = process.env.PWA_KIT_BUILD_DIR ? (0, _path.resolve)(process.env.PWA_KIT_BUILD_DIR) : (0, _path.resolve)(projectDir, 'build');
+const isMonoRepo = _fsExtra.default.existsSync((0, _path.resolve)(projectDir, '..', '..', 'lerna.json'));
 const production = 'production';
 const development = 'development';
 const analyzeBundle = process.env.MOBIFY_ANALYZE === 'true';
@@ -198,6 +201,10 @@ const baseConfig = target => {
               configured: (0, _utils.getConfiguredExtensions)((0, _ssrConfig.getConfig)()),
               target: 'node'
             }
+          }), (0, _webpack2.ruleForOverrideResolver)({
+            target,
+            projectDir,
+            isMonoRepo
           })].filter(Boolean)
         }
       });
@@ -253,6 +260,8 @@ const ruleForBabelLoader = babelPlugins => {
     id: 'babel-loader',
     test: /(\.js(x?)|\.ts(x?))$/,
     // NOTE: Because our extensions are just folders containing source code, we need to ensure that the babel-loader processes them.
+    // This regex exclude everything in node_modules, but node_modules/extensions-*/ folders
+    exclude: new RegExp(`node_modules\\${_path.default.sep}(?!(@?[^\\${_path.default.sep}]+\\${_path.default.sep})?extension-).*`, 'i'),
     use: [{
       loader: findDepInStack('babel-loader'),
       options: _objectSpread({

package/configs/webpack/plugins.js

@@ -7,7 +7,6 @@ exports.sdkReplacementPlugin = void 0;
 var _webpack = _interopRequireDefault(require("webpack"));
 var _path = _interopRequireWildcard(require("path"));
 var _glob = _interopRequireDefault(require("glob"));
-var _config = require("./config");
 var _utils = require("./utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -24,23 +23,7 @@ const projectDir = process.cwd();
 const pkg = require((0, _path.resolve)(projectDir, 'package.json'));
 const OVERRIDES_EXTENSIONS = '.+(js|jsx|ts|tsx)';
 const getOverridePath = relativePath => {
-  var _pkg$ccExtensibility;
-  const extendPath = pkg !== null && pkg !== void 0 && (_pkg$ccExtensibility = pkg.ccExtensibility) !== null && _pkg$ccExtensibility !== void 0 && _pkg$ccExtensibility.extends ? `node_modules/${_config.EXT_EXTENDS}` : '';
-  const overridePath = _config.EXT_OVERRIDES_DIR === null || _config.EXT_OVERRIDES_DIR === void 0 ? void 0 : _config.EXT_OVERRIDES_DIR.replace(/^\//, '');
-
-  // order matters here, we perform look ups starting in the following order:
-  // pkg.ccExtensibility.overridesDir => pkg.ccExtensibility.extends => current projectDir
-  if (_config.EXT_EXTENDS && _config.EXT_OVERRIDES_DIR) {
-    const filePath = `${(0, _path.resolve)(projectDir, overridePath, ...relativePath)}${OVERRIDES_EXTENSIONS}`;
-    const overrideFile = _glob.default.sync(filePath);
-    if (overrideFile !== null && overrideFile !== void 0 && overrideFile.length) {
-      return overrideFile === null || overrideFile === void 0 ? void 0 : overrideFile[0];
-    }
-    const extendFile = _glob.default.sync(`${(0, _path.resolve)(projectDir, extendPath, ...relativePath)}${OVERRIDES_EXTENSIONS}`);
-    if (extendFile !== null && extendFile !== void 0 && extendFile.length) {
-      return extendFile === null || extendFile === void 0 ? void 0 : extendFile[0];
-    }
-  }
+  // Perform lookups starting in the current projectDir
   const generatedProjectOverride = _glob.default.sync(`${(0, _path.resolve)(projectDir, ...relativePath)}${OVERRIDES_EXTENSIONS}`);
   return generatedProjectOverride !== null && generatedProjectOverride !== void 0 && generatedProjectOverride.length ? generatedProjectOverride === null || generatedProjectOverride === void 0 ? void 0 : generatedProjectOverride[0] : (0, _path.resolve)('node_modules', '@salesforce', 'pwa-kit-react-sdk', 'ssr', 'universal', ...relativePath.filter(item => item !== 'app'));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-dev",
-  "version": "4.0.0-extensibility-preview.2",
+  "version": "4.0.0-extensibility-preview.3",
   "description": "Build tools for pwa-kit",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/pwa-kit-dev#readme",
   "bugs": {
@@ -58,8 +58,8 @@
     "@loadable/server": "^5.15.3",
     "@loadable/webpack-plugin": "^5.15.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
-    "@salesforce/pwa-kit-extension-sdk": "4.0.0-extensibility-preview.2",
-    "@salesforce/pwa-kit-runtime": "4.0.0-extensibility-preview.2",
+    "@salesforce/pwa-kit-extension-sdk": "4.0.0-extensibility-preview.3",
+    "@salesforce/pwa-kit-runtime": "4.0.0-extensibility-preview.3",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
     "archiver": "1.3.0",
@@ -123,7 +123,7 @@
     "@types/node": "~16.0.3",
     "@types/node-fetch": "~2.6.3",
     "@types/validator": "~13.7.14",
-    "internal-lib-build": "4.0.0-extensibility-preview.2",
+    "internal-lib-build": "4.0.0-extensibility-preview.3",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",
     "superagent": "^6.1.0",
@@ -149,5 +149,5 @@
   "publishConfig": {
     "directory": "dist"
   },
-  "gitHead": "6b5da20f750f39d89c490cf77f1bf160c7e3d8f7"
+  "gitHead": "904de01e826117febeea952e034478349e16ea4d"
 }

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

@@ -43,7 +43,10 @@ const DevServerMixin = exports.DevServerMixin = {
    * @private
    */
   _logStartupMessage(options) {
-    _loggerInstance.default.log(`Starting the DevServer on ${_chalk.default.cyan(this._getDevServerURL(options))}`);
+    const {
+      startPath = '/'
+    } = options;
+    _loggerInstance.default.log(`Starting the DevServer on ${_chalk.default.cyan(this._getDevServerURL(options) + startPath)}`);
   },
   /**
    * @private
@@ -210,6 +213,11 @@ const DevServerMixin = exports.DevServerMixin = {
       next();
     });
   },
+  /**
+   * Serve static files from the app directory.
+   * @param filePath - The path to the file to serve.
+   * @param opts - Additional options.
+   */
   serveStaticFile(filePath, opts = {}) {
     // Warning: Ugly part of the Bundle spec that we need to maintain.
     //
@@ -233,8 +241,7 @@ const DevServerMixin = exports.DevServerMixin = {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const pkg = require(_path.default.resolve(process.cwd(), 'package.json'));
     return (req, res) => {
-      var _pkg$ccExtensibility, _pkg$ccExtensibility2, _pkg$ccExtensibility3;
-      const baseDir = _path.default.resolve(req.app.options.projectDir, pkg !== null && pkg !== void 0 && (_pkg$ccExtensibility = pkg.ccExtensibility) !== null && _pkg$ccExtensibility !== void 0 && _pkg$ccExtensibility.overridesDir ? pkg === null || pkg === void 0 ? void 0 : (_pkg$ccExtensibility2 = pkg.ccExtensibility) === null || _pkg$ccExtensibility2 === void 0 ? void 0 : (_pkg$ccExtensibility3 = _pkg$ccExtensibility2.overridesDir) === null || _pkg$ccExtensibility3 === void 0 ? void 0 : _pkg$ccExtensibility3.replace(/^\//, '') : '', 'app');
+      const baseDir = _path.default.resolve(req.app.options.projectDir, 'app');
       return this._serveStaticFile(req, res, baseDir, filePath, opts);
     };
   },
@@ -306,7 +313,8 @@ const DevServerMixin = exports.DevServerMixin = {
   _createHandler(app) {
     const {
       protocol,
-      sslFilePath
+      sslFilePath,
+      startPath = '/'
     } = app.options;
     const {
       hostname,
@@ -330,7 +338,9 @@ const DevServerMixin = exports.DevServerMixin = {
     }, () => {
       /* istanbul ignore next */
       if (process.env.NODE_ENV !== 'test') {
-        (0, _open.default)(`${this._getDevServerURL(app.options)}/__mrt/loading-screen/index.html?loading=1`);
+        const targetPath = encodeURIComponent(startPath);
+        const loadingPage = `${this._getDevServerURL(app.options)}/__mrt/loading-screen/index.html?loading=1&path=${targetPath}`;
+        (0, _open.default)(loadingPage);
       }
     });
     return {

package/utils/script-utils.js

@@ -378,18 +378,9 @@ const createBundle = exports.createBundle = /*#__PURE__*/function () {
     })).then(/*#__PURE__*/_asyncToGenerator(function* () {
       const {
         dependencies = {},
-        devDependencies = {},
-        ccExtensibility = {
-          extends: '',
-          overridesDir: ''
-        }
+        devDependencies = {}
       } = yield getProjectPkg();
-      const extendsTemplate = 'node_modules/' + ccExtensibility.extends;
-      let cc_overrides = [];
-      if (ccExtensibility.overridesDir) {
-        const overrides_files = yield _walkDir(ccExtensibility.overridesDir, ccExtensibility.overridesDir);
-        cc_overrides = Array.from(overrides_files).filter(item => (0, _fsExtra.existsSync)(_path.default.join(extendsTemplate, item)));
-      }
+      const cc_overrides = [];
       const dependencyTree = yield getProjectDependencyTree();
       // If we can't load the dependency tree, pretend that it's empty.
       // TODO: Should we report an error?