@salesforce/pwa-kit-dev 3.9.0-nightly-20241206124802 → 4.0.0-extensibility-preview.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-dev",
-  "version": "3.9.0-nightly-20241206124802",
+  "version": "4.0.0-extensibility-preview.0",
   "description": "Build tools for pwa-kit",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/pwa-kit-dev#readme",
   "bugs": {
@@ -26,7 +26,7 @@
   "scripts": {
     "build": "cross-env NODE_ENV=production internal-lib-build build",
     "build:watch": "nodemon --watch 'src/**' --watch 'bin/**' --exec 'npm run build'",
-    "format": "internal-lib-build format \"**/*.{js,jsx}\"",
+    "format": "internal-lib-build format \"**/*.{js,jsx,ts,tsx}\"",
     "lint": "npm run lint:js && npm run typecheck",
     "lint:fix": "npm run lint:js -- --fix",
     "lint:js": "eslint .",
@@ -58,14 +58,16 @@
     "@loadable/server": "^5.15.3",
     "@loadable/webpack-plugin": "^5.15.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
-    "@salesforce/pwa-kit-runtime": "3.9.0-nightly-20241206124802",
+    "@salesforce/pwa-kit-extension-sdk": "4.0.0-extensibility-preview.0",
+    "@salesforce/pwa-kit-runtime": "4.0.0-extensibility-preview.0",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
     "archiver": "1.3.0",
-    "babel-jest": "^26.6.3",
+    "babel-jest": "^27.1.0",
     "babel-loader": "^8.3.0",
     "babel-plugin-dynamic-import-node-babel-7": "^2.0.7",
     "babel-plugin-formatjs": "10.4.0",
+    "babel-plugin-module-resolver": "^5.0.2",
     "chalk": "^4.1.2",
     "commander": "^9.5.0",
     "compression": "1.7.4",
@@ -84,10 +86,10 @@
     "git-rev-sync": "^3.0.2",
     "glob": "7.2.3",
     "ignore-loader": "^0.1.2",
-    "jest": "^26.6.3",
-    "jest-cli": "^26.6.3",
-    "jest-environment-jsdom": "^26.6.2",
-    "jest-environment-jsdom-global": "^2.0.4",
+    "jest": "^27.1.0",
+    "jest-cli": "^27.1.0",
+    "jest-environment-jsdom": "^27.1.0",
+    "jest-environment-jsdom-global": "^3.0.0",
     "jest-expect-message": "1.1.3",
     "jest-fetch-mock": "^2.1.2",
     "mime-types": "2.1.35",
@@ -121,7 +123,7 @@
     "@types/node": "~16.0.3",
     "@types/node-fetch": "~2.6.3",
     "@types/validator": "~13.7.14",
-    "internal-lib-build": "3.9.0-nightly-20241206124802",
+    "internal-lib-build": "4.0.0-extensibility-preview.0",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",
     "superagent": "^6.1.0",
@@ -147,5 +149,5 @@
   "publishConfig": {
     "directory": "dist"
   },
-  "gitHead": "9985cd72ce9d7d508a3e5c229291ed295103b492"
+  "gitHead": "16a2673cbdb9b22e3071435e8afbc2e89b2e37da"
 }

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

@@ -16,6 +16,7 @@ var _webpackDevMiddleware = _interopRequireDefault(require("webpack-dev-middlewa
 var _webpackHotServerMiddleware = _interopRequireDefault(require("webpack-hot-server-middleware"));
 var _webpackHotMiddleware = _interopRequireDefault(require("webpack-hot-middleware"));
 var _open = _interopRequireDefault(require("open"));
+var _loggerInstance = _interopRequireDefault(require("../../utils/logger-instance"));
 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");
@@ -42,7 +43,7 @@ const DevServerMixin = exports.DevServerMixin = {
    * @private
    */
   _logStartupMessage(options) {
-    console.log(`Starting the DevServer on ${_chalk.default.cyan(this._getDevServerURL(options))}`);
+    _loggerInstance.default.log(`Starting the DevServer on ${_chalk.default.cyan(this._getDevServerURL(options))}`);
   },
   /**
    * @private

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

@@ -62,8 +62,15 @@ const insecureFetch = (url, opts) => {
 };
 const opts = (overrides = {}) => {
   const defaults = {
+    projectDir: testFixtures,
     buildDir: _path.default.join(testFixtures, 'build'),
     mobify: {
+      app: {
+        extensions: [
+        // temporary test CI
+        // 'ts-extension',
+        'test-extension', 'another-extension', 'extension-with-bad-setup-server', 'extension-with-setup-server-no-default-export', 'extension-without-setup-server']
+      },
       ssrEnabled: true,
       ssrOnly: ['main.js.map', 'ssr.js', 'ssr.js.map'],
       ssrShared: ['main.js', 'ssr-loader.js', 'worker.js'],
@@ -560,7 +567,7 @@ describe('DevServer rendering', () => {
 });
 describe('DevServer service worker', () => {
   let tmpDir;
-  beforeEach( /*#__PURE__*/_asyncToGenerator(function* () {
+  beforeEach(/*#__PURE__*/_asyncToGenerator(function* () {
     tmpDir = yield _fsExtra.default.mkdtemp(_path.default.join(_os.default.tmpdir(), 'pwa-kit-test-'));
   }));
   afterEach(() => {
@@ -652,4 +659,101 @@ describe('SLAS private client proxy', () => {
       }));
     }).toThrow();
   });
-});
+});
+
+// describe('extensions', () => {
+//     beforeEach(() => {
+//         jest.clearAllMocks()
+//     })
+
+//     test('can register extensions properly via _setupExtensions', () => {
+//         const app = NoWebpackDevServerFactory._createApp(opts())
+//         expect(app.__extensions).toBeDefined()
+//         return request(app)
+//             .get('/test-extension')
+//             .expect(200)
+//             .then((res) => {
+//                 expect(res.text).toBe('test')
+//             })
+//     })
+
+//     test('mixed types in extensions configuration', async () => {
+//         const options = opts({
+//             mobify: {app: {extensions: [['test-extension', {path: '/foo'}], 'another-extension']}}
+//         })
+//         const app = NoWebpackDevServerFactory._createApp(options)
+//         expect(app.__extensions).toBeDefined()
+
+//         await request(app)
+//             .get('/test-extension')
+//             .expect(200)
+//             .then((res) => {
+//                 expect(res.text).toBe('test')
+//             })
+
+//         await request(app)
+//             .get('/another-extension')
+//             .expect(200)
+//             .then((res) => {
+//                 expect(res.text).toBe('test')
+//             })
+
+//         await request(app)
+//             .get('/test-extension-config')
+//             .expect(200)
+//             .then((res) => {
+//                 // The config should have {enabled: true} by default
+//                 expect(res.text).toBe('{"enabled":true,"path":"/foo"}')
+//             })
+//     })
+
+//     test('disabled extension will not run', () => {
+//         const options = opts({mobify: {app: {extensions: [['test-extension', {enabled: false}]]}}})
+//         const app = NoWebpackDevServerFactory._createApp(options)
+//         expect(app.__extensions).toBeDefined()
+//         return request(app).get('/test-extension').expect(404)
+//     })
+
+//     test('logs warning when setup-server file is not found', () => {
+//         const warn = jest.spyOn(console, 'warn').mockImplementation(() => {})
+//         const app = NoWebpackDevServerFactory._createApp(
+//             opts({
+//                 mobify: {app: {extensions: ['extension-without-setup-server']}}
+//             })
+//         )
+//         expect(warn.mock.calls).toEqual([
+//             [
+//                 'pwa-kit-dev WARN No setup-server file found for extension-without-setup-server. Skipping.'
+//             ]
+//         ])
+//     })
+
+//     test('logs error when there is an error loading extension', () => {
+//         const errorlog = jest.spyOn(console, 'error').mockImplementation(() => {})
+//         const app = NoWebpackDevServerFactory._createApp(
+//             opts({
+//                 mobify: {app: {extensions: ['extension-with-bad-setup-server']}}
+//             })
+//         )
+//         expect(errorlog.mock.calls).toEqual([
+//             [
+//                 'pwa-kit-dev.DevServerMixin._setupExtensions ERROR Error setting extension extension-with-bad-setup-server: {"error":{}}'
+//             ]
+//         ])
+//     })
+
+//     test('logs error when instantiating extension throws an error', () => {
+//         const errorlog = jest.spyOn(console, 'error').mockImplementation(() => {})
+//         const app = NoWebpackDevServerFactory._createApp(
+//             opts({
+//                 mobify: {app: {extensions: ['extension-with-setup-server-no-default-export']}}
+//             })
+//         )
+
+//         expect(errorlog.mock.calls).toEqual([
+//             [
+//                 `pwa-kit-dev.DevServerMixin._setupExtensions ERROR 'extension-with-setup-server-no-default-export' is not a valid PWA-Kit Application Extension, please ensure you are exporting a class of type 'ApplicationExtension'. Skipping.`
+//             ]
+//         ])
+//     })
+// })

package/ssr/server/test_fixtures/node_modules/another-extension/src/setup-server.js

@@ -0,0 +1,21 @@
+/*
+ * 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
+ */
+
+import {ApplicationExtension} from '@salesforce/pwa-kit-runtime/ssr/server/extensibility'
+
+class AnotherExtension extends ApplicationExtension {
+
+    extendApp(app) {
+        app.get('/another-extension', (req, res) => {
+            res.send('test')
+        })
+
+        return app
+    }
+}
+
+export default AnotherExtension

package/ssr/server/test_fixtures/node_modules/extension-with-bad-setup-server/src/setup-server.js

@@ -0,0 +1,17 @@
+/*
+ * 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
+ */
+
+import {ApplicationExtension} from '@salesforce/pwa-kit-runtime/ssr/server/extensibility'
+
+class Extension extends ApplicationExtension {
+
+    extendApp(app) {
+        throw new Error('extension will fail to initialize because of me')
+    }
+}
+
+export default Extension

package/ssr/server/test_fixtures/node_modules/extension-with-setup-server-no-default-export/src/setup-server.js

@@ -0,0 +1,17 @@
+/*
+ * 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
+ */
+import {ApplicationExtension} from '@salesforce/pwa-kit-runtime/ssr/server/extensibility'
+
+class AnotherExtension extends ApplicationExtension {
+    extendApp(app) {
+        app.get('/another-extension', (req, res) => {
+            res.send('test')
+        })
+
+        return app
+    }
+}

package/{configs/webpack/test/overrides/path/data.js → ssr/server/test_fixtures/node_modules/extension-without-setup-server/src/random-file.js}

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2023, Salesforce, Inc.
+ * 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
  */
-"use strict";
+// intentionally empty

package/ssr/server/test_fixtures/node_modules/test-extension/src/setup-server.js

@@ -0,0 +1,23 @@
+/*
+ * 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
+ */
+import {ApplicationExtension} from '@salesforce/pwa-kit-runtime/ssr/server/extensibility'
+
+class TestExtension extends ApplicationExtension{
+    extendApp(app) {
+        app.get('/test-extension', (req, res) => {
+            res.send('test')
+        })
+        app.get('/test-extension-config', (req, res) => {
+            const config = JSON.stringify(this.getConfig())
+            res.send(config)
+        })
+
+        return app
+    }
+}
+
+export default TestExtension

package/ssr/server/test_fixtures/node_modules/ts-extension/src/setup-server.ts

@@ -0,0 +1,23 @@
+/*
+ * 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
+ */
+
+import {Application, ApplicationExtension} from '@salesforce/pwa-kit-runtime/ssr/server/extensibility'
+// import {Application} from 'express'
+
+class TypeScriptExtension extends ApplicationExtension {
+
+    extendApp(app: Application): Application {
+
+        app.get('/test-extension', (req, res) => {
+            res.send('test')
+        })
+
+        return app
+    }
+}
+
+export default TypeScriptExtension

package/utils/logger-instance.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _loggerFactory = _interopRequireDefault(require("@salesforce/pwa-kit-runtime/utils/logger-factory"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+/*
+ * Copyright (c) 2024, Salesforce, 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
+ */
+
+const logger = Object.freeze((0, _loggerFactory.default)({
+  packageName: 'pwa-kit-dev'
+}));
+var _default = exports.default = logger;

package/utils/script-utils.js

@@ -77,17 +77,17 @@ const getProjectPkg = exports.getProjectPkg = /*#__PURE__*/function () {
  * @param dir Directory to walk
  * @returns Set of file paths within the directory
  */
-const walkDir = exports.walkDir = /*#__PURE__*/function () {
+const _walkDir = exports.walkDir = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator(function* (dir, baseDir, fileSet) {
     fileSet = fileSet || new Set();
     const entries = yield (0, _fsExtra.readdir)(dir, {
       withFileTypes: true
     });
-    yield Promise.all(entries.map( /*#__PURE__*/function () {
+    yield Promise.all(entries.map(/*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator(function* (entry) {
         const entryPath = _path.default.join(dir, entry.name);
         if (entry.isDirectory()) {
-          yield walkDir(entryPath, baseDir, fileSet);
+          yield _walkDir(entryPath, baseDir, fileSet);
         } else {
           var _fileSet;
           (_fileSet = fileSet) === null || _fileSet === void 0 ? void 0 : _fileSet.add(entryPath.replace(baseDir + _path.default.sep, ''));
@@ -272,7 +272,7 @@ class CloudAPIClient {
         /** Milliseconds to wait between checks. */
         const delay = 30_000;
         /** Check the deployment status to see whether it has finished. */
-        const check = /*#__PURE__*/function () {
+        const _check = /*#__PURE__*/function () {
           var _ref6 = _asyncToGenerator(function* () {
             const url = new _url.URL(`/api/projects/${project}/target/${environment}`, _this4.opts.origin);
             const res = yield _this4.opts.fetch(url, {
@@ -299,7 +299,7 @@ class CloudAPIClient {
               case 'PUBLISH_IN_PROGRESS':
                 // In progress - check again after the next delay
                 // `check` is async, so we need to use .catch to properly handle errors
-                setTimeout(() => void check().catch(reject), delay);
+                setTimeout(() => void _check().catch(reject), delay);
                 return;
               case 'CREATE_FAILED':
               case 'PUBLISH_FAILED':
@@ -318,7 +318,7 @@ class CloudAPIClient {
           };
         }();
         // Start checking after the first delay!
-        setTimeout(() => void check().catch(reject), delay);
+        setTimeout(() => void _check().catch(reject), delay);
       });
     })();
   }
@@ -375,7 +375,7 @@ const createBundle = exports.createBundle = /*#__PURE__*/function () {
       archive.on('error', reject);
       output.on('finish', resolve);
       archive.finalize();
-    })).then( /*#__PURE__*/_asyncToGenerator(function* () {
+    })).then(/*#__PURE__*/_asyncToGenerator(function* () {
       const {
         dependencies = {},
         devDependencies = {},
@@ -387,7 +387,7 @@ const createBundle = exports.createBundle = /*#__PURE__*/function () {
       const extendsTemplate = 'node_modules/' + ccExtensibility.extends;
       let cc_overrides = [];
       if (ccExtensibility.overridesDir) {
-        const overrides_files = yield walkDir(ccExtensibility.overridesDir, 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 dependencyTree = yield getProjectDependencyTree();

package/utils/script-utils.test.js

@@ -41,7 +41,7 @@ jest.mock('child_process', () => {
 describe('scriptUtils', () => {
   const originalEnv = process.env;
   let tmpDir;
-  beforeEach( /*#__PURE__*/_asyncToGenerator(function* () {
+  beforeEach(/*#__PURE__*/_asyncToGenerator(function* () {
     process.env = _objectSpread({}, originalEnv);
     tmpDir = yield (0, _fsExtra.mkdtemp)(_path.default.join(_os.default.tmpdir(), 'scriptUtils-tests'));
     // This is a workaround for jest.spyOn(), since I guess it doesn't work with our imports?
@@ -49,7 +49,7 @@ describe('scriptUtils', () => {
     _fsExtra.readJson.mockReset().mockImplementation(actualReadJson);
     _child_process.execSync.mockReset().mockImplementation(actualExecSync);
   }));
-  afterEach( /*#__PURE__*/_asyncToGenerator(function* () {
+  afterEach(/*#__PURE__*/_asyncToGenerator(function* () {
     process.env = originalEnv;
     tmpDir && (yield (0, _fsExtra.rm)(tmpDir, {
       recursive: true
@@ -250,14 +250,14 @@ describe('scriptUtils', () => {
     }));
     test('should throw', /*#__PURE__*/_asyncToGenerator(function* () {
       const thePath = _path.default.join(tmpDir, '.mobify.test');
-      yield expect( /*#__PURE__*/_asyncToGenerator(function* () {
+      yield expect(/*#__PURE__*/_asyncToGenerator(function* () {
         return yield scriptUtils.readCredentials(thePath);
       })).rejects.toThrow(Error);
     }));
   });
   describe('createBundle', () => {
     test('should throw if ssr_only and ssr_shared is empty', /*#__PURE__*/_asyncToGenerator(function* () {
-      yield expect( /*#__PURE__*/_asyncToGenerator(function* () {
+      yield expect(/*#__PURE__*/_asyncToGenerator(function* () {
         return yield scriptUtils.createBundle({
           message: null,
           ssr_parameters: {},
@@ -269,7 +269,7 @@ describe('scriptUtils', () => {
       })).rejects.toThrow('no ssrOnly or ssrShared files are defined');
     }));
     test('should throw buildDir does not exist', /*#__PURE__*/_asyncToGenerator(function* () {
-      yield expect( /*#__PURE__*/_asyncToGenerator(function* () {
+      yield expect(/*#__PURE__*/_asyncToGenerator(function* () {
         return yield scriptUtils.createBundle({
           message: null,
           ssr_parameters: {},
@@ -357,7 +357,7 @@ describe('scriptUtils', () => {
           text,
           json
         };
-        const fetchMock = jest.fn( /*#__PURE__*/_asyncToGenerator(function* () {
+        const fetchMock = jest.fn(/*#__PURE__*/_asyncToGenerator(function* () {
           return responseMock;
         }));
         const client = new scriptUtils.CloudAPIClient({
@@ -410,7 +410,7 @@ describe('scriptUtils', () => {
       const json = () => Promise.resolve({
         token: 'token-value'
       });
-      const fetchMock = jest.fn( /*#__PURE__*/_asyncToGenerator(function* () {
+      const fetchMock = jest.fn(/*#__PURE__*/_asyncToGenerator(function* () {
         return {
           status: 200,
           text,
@@ -474,8 +474,8 @@ describe('scriptUtils', () => {
   });
   describe('walkDir', () => {
     const files = ['a', 'b/1', 'b/2', 'c/d/e'].map(_path.default.normalize);
-    beforeEach( /*#__PURE__*/_asyncToGenerator(function* () {
-      yield Promise.all(files.map( /*#__PURE__*/function () {
+    beforeEach(/*#__PURE__*/_asyncToGenerator(function* () {
+      yield Promise.all(files.map(/*#__PURE__*/function () {
         var _ref38 = _asyncToGenerator(function* (file) {
           return yield (0, _fsExtra.createFile)(_path.default.join(tmpDir, file));
         });

package/configs/webpack/overrides-plugin.js

@@ -1,168 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _glob = _interopRequireDefault(require("glob"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/*
- * Copyright (c) 2023, Salesforce, 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
- */
-
-/**
- * @class OverridesResolverPlugin
- *
- *  This plugin provides the "Overrides" behavior of the Template Extensibility feature,
- *  allowing third party implementations that depend on an npm module for the base implementation
- *  and then overriding only specific files
- */
-class OverridesResolverPlugin {
-  /**
-   *
-   * @param options
-   * @param {string} options.overridesDir path to application base
-   * @param {string[]} options.overrides paths to overrides
-   * @param {string} options.projectDir path to project directory
-   */
-  constructor(options) {
-    var _options$overridesDir, _options$projectDir, _this$pkg, _this$pkg$ccExtensibi, _this$pkg$ccExtensibi2, _this$pkg$ccExtensibi3, _this$pkg2, _this$pkg2$ccExtensib;
-    // always coerce to posix fs paths, as glob sync and es6 imports don't use windows paths
-    this.overridesDir = ((_options$overridesDir = options.overridesDir) === null || _options$overridesDir === void 0 ? void 0 : _options$overridesDir.replace(/\\/g, '/')) || '';
-    this.extends = options.extends || [];
-    // always coerce to posix fs paths, as glob sync and es6 imports don't use windows paths
-    this.projectDir = (_options$projectDir = options.projectDir) === null || _options$projectDir === void 0 ? void 0 : _options$projectDir.replace(/\\/g, '/');
-    this._allSearchDirs = [this.projectDir + this.overridesDir, ...this.extends];
-    this.pkg = require(_path.default.resolve(this.projectDir, 'package.json'));
-    this.extendsHashMap = new Map();
-
-    // everything except directories
-    // NOTE that the glob library expects posix so we replace windows file paths here
-    const globPattern = `${(_this$pkg = this.pkg) === null || _this$pkg === void 0 ? void 0 : (_this$pkg$ccExtensibi = _this$pkg.ccExtensibility) === null || _this$pkg$ccExtensibi === void 0 ? void 0 : (_this$pkg$ccExtensibi2 = _this$pkg$ccExtensibi.overridesDir) === null || _this$pkg$ccExtensibi2 === void 0 ? void 0 : (_this$pkg$ccExtensibi3 = _this$pkg$ccExtensibi2.replace(/\\/g, '/')) === null || _this$pkg$ccExtensibi3 === void 0 ? void 0 : _this$pkg$ccExtensibi3.replace(/^\//, '')}/**/*.*`;
-    const overridesFsRead = _glob.default.sync(globPattern);
-    const overrideReplace = ((_this$pkg2 = this.pkg) === null || _this$pkg2 === void 0 ? void 0 : (_this$pkg2$ccExtensib = _this$pkg2.ccExtensibility) === null || _this$pkg2$ccExtensib === void 0 ? void 0 : _this$pkg2$ccExtensib.overridesDir) + '/';
-
-    // For each filepath in the overrides directory:
-    // Split it in one of two ways:
-    // If the filepath is like /pages/home/index.js,
-    //    split on index and 'key' is /pages/home/
-    // If the filepath is like /pages/home/data.js,
-    //    split on the . and 'key' is /pages/home/data
-    // The negative lookaheads ensure the split occurs on the last occurence of .
-    //    This avoids collisions when both index.js and index.test.js are
-    //    present in the same directory
-    overridesFsRead.forEach(item => {
-      const end = item.substring(item.lastIndexOf('/index'));
-      const [key, ...rest] = item.split(/(index(?!(\.[^.]*\.))|\.(?!([^.]*\.)))/);
-      this.extendsHashMap.set(key.replace(overrideReplace, '').replace(/\/$/, ''), [end, rest.filter(Boolean)]);
-    });
-  }
-  /**
-   * This takes an import with the overrides dir / extends package removed and finds
-   * the corresponding path from overridesFsRead
-   *
-   * Ie. Given an import @salesforce/retail-react-app/app/components/header,
-   * requestPath is app/components/header
-   *
-   * @param requestPath - relative import path
-   * @param dirs - this._allSearchDirs
-   */
-  findFileFromMap(requestPath, dirs) {
-    const fileExt = _path.default.extname(requestPath);
-    for (const dir of dirs) {
-      let base = _path.default.join(dir, requestPath);
-      if (fileExt) {
-        const noExtPath = requestPath.replace(fileExt, '');
-        if (this.extendsHashMap.has(noExtPath)) {
-          return base;
-        }
-      } else {
-        if (this.extendsHashMap.has(requestPath)) {
-          const end = this.extendsHashMap.get(requestPath)[1];
-          const isRequestingIndex = end[0] === 'index';
-          let result = (base === null || base === void 0 ? void 0 : base.replace(/$\//, '')) + end.join('');
-          if (isRequestingIndex) {
-            result = _path.default.join(base, this.extendsHashMap.get(requestPath)[1].join(''));
-          }
-          return result;
-        }
-      }
-    }
-  }
-
-  /*
-      Given an import request, this function removes the override dir
-      or the package name defined in extends.
-       For example:
-      import * from 'src/configs/webpack/test/overrides/path/data.js resolves to
-          path/data.js
-      import * from '@salesforce/retail-react-app/app/component/header resolves to
-          app/component/header
-       TODO: This function is only called if isFromExtends is true. In other words,
-      this function is only called if the import request contains a package in extends
-      We can probably simplify this function or rename it
-  */
-  toOverrideRelative(filepath) {
-    const override = this._allSearchDirs.find(dir => {
-      return filepath.indexOf(dir) === 0;
-    });
-    return filepath.substring((override === null || override === void 0 ? void 0 : override.length) + 1);
-  }
-
-  /*
-      Helper function that returns true only if the import request points to a package in 'extends'
-      and the issuer path (the file making the import request) is not located in the overrides dir.
-       If true, we re-route the import request to the overrides dir.
-      If false, the import request proceeds to the base package in node_modules
-       For example, given an import request to a package defined in 'extends'
-          (ie. @salesforce/retail-react-app):
-      This will return true if the issuer is a file in a base template
-      This will return false if the issuer is a file in the overrides dir
-       This allow the base template to import from overrides and allows the overrides to import from
-      the base template using the same syntax (ie. import from @salesforce/retail-react-app/...)
-  */
-  isFromExtends(request, filepath) {
-    var _this$extends, _this$extends$, _this$extends$$starts;
-    const pkgName = request.split(/(\/|\\)/).filter(item => !item.match(/(\/|\\)/)).slice(0, (_this$extends = this.extends) !== null && _this$extends !== void 0 && (_this$extends$ = _this$extends[0]) !== null && _this$extends$ !== void 0 && (_this$extends$$starts = _this$extends$.startsWith) !== null && _this$extends$$starts !== void 0 && _this$extends$$starts.call(_this$extends$, '@') ? 2 : 1).join('/');
-
-    // we split by path delimeters (OS agnostic), filter out
-    // separators, then spread both to form a normalized
-    // '/base', 'path', 'to', 'dir' when both halves are joined
-    const issuerPath = _path.default.join(...this.projectDir.split(_path.default.sep).filter(item => !item.match(/(\/|\\)/)), ...this.overridesDir.replace(/^(\/|\\)/, '').split('/').filter(item => !item.match(/(\/|\\)/)));
-    return (
-      // request includes extends
-      this.extends.includes(pkgName) &&
-      //
-      // this is very important, to avoid circular imports, check that the
-      // `issuer` (requesting context) isn't the overrides directory
-
-      // request is not issued from overrides
-      !filepath.includes(issuerPath)
-    );
-  }
-  handleHook(requestContext, resolveContext, callback, resolver) {
-    let targetFile;
-    let overrideRelative;
-    if (this.isFromExtends(requestContext.request, requestContext.path)) {
-      overrideRelative = this.toOverrideRelative(requestContext.request).replace(/$\//, '');
-      targetFile = this.findFileFromMap(overrideRelative, this._allSearchDirs);
-    }
-    if (targetFile) {
-      const target = resolver.ensureHook('resolved');
-      requestContext.path = _path.default.sep === '/' ? targetFile : targetFile.replace('/', _path.default.sep);
-      resolver.doResolve(target, requestContext, `${this.constructor.name} found base override file`, resolveContext, callback);
-    } else {
-      return callback();
-    }
-  }
-  apply(resolver) {
-    resolver.getHook('resolve').tapAsync('FeatureResolverPlugin', (requestContext, resolveContext, callback) => {
-      this.handleHook(requestContext, resolveContext, callback, resolver);
-    });
-  }
-}
-var _default = exports.default = OverridesResolverPlugin;