fix: optimize component registration for top level stateful components (

#36)
marko-js · Mar 17, 2020 · 4d1787b · 4d1787b
1 parent 18f72b4
commit 4d1787b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 70 deletions.
diff --git a/...xtures/with-class-component-plugin-dynamic-bundle/__snapshots__/browser-A--test_YDNP.A.js b/...xtures/with-class-component-plugin-dynamic-bundle/__snapshots__/browser-A--test_YDNP.A.js
@@ -52,11 +52,7 @@ marko_template.Component = marko_defineComponent(marko_component, marko_template
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-
-      const { register } = __webpack_require__(/*! marko/components */ "marko/components");
-      const component = __webpack_require__(/*! ./index.marko */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/index.marko");
-      register("/@marko/webpack-tests$x.x.x/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/index.marko", component);
-
+__webpack_require__(/*! ./index.marko */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/index.marko");
 __webpack_require__(/*! ./style.css */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/style.css");
 
 /***/ }),
@@ -109,17 +105,6 @@ __webpack_require__(/*! ./components/nested/index.marko?dependencies */ "./src/_
 
 
 
-/***/ }),
-
-/***/ "marko/components":
-/*!***********************************!*\
-  !*** external "marko/components" ***!
-  \***********************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-module.exports = marko/components;
-
 /***/ }),
 
 /***/ "marko/dist/runtime/components/defineComponent":

diff --git a/...xtures/with-class-component-plugin-dynamic-bundle/__snapshots__/browser-B--test_YDNP.B.js b/...xtures/with-class-component-plugin-dynamic-bundle/__snapshots__/browser-B--test_YDNP.B.js
@@ -52,11 +52,7 @@ marko_template.Component = marko_defineComponent(marko_component, marko_template
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-
-      const { register } = __webpack_require__(/*! marko/components */ "marko/components");
-      const component = __webpack_require__(/*! ./index.marko */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/index.marko");
-      register("/@marko/webpack-tests$x.x.x/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/index.marko", component);
-
+__webpack_require__(/*! ./index.marko */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/index.marko");
 __webpack_require__(/*! ./style.css */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/style.css");
 
 /***/ }),
@@ -109,17 +105,6 @@ __webpack_require__(/*! ./components/nested/index.marko?dependencies */ "./src/_
 
 
 
-/***/ }),
-
-/***/ "marko/components":
-/*!***********************************!*\
-  !*** external "marko/components" ***!
-  \***********************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-module.exports = marko/components;
-
 /***/ }),
 
 /***/ "marko/dist/runtime/components/defineComponent":

diff --git a/...xtures/with-class-component-plugin-dynamic-bundle/__snapshots__/browser-C--test_YDNP.C.js b/...xtures/with-class-component-plugin-dynamic-bundle/__snapshots__/browser-C--test_YDNP.C.js
@@ -52,11 +52,7 @@ marko_template.Component = marko_defineComponent(marko_component, marko_template
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-
-      const { register } = __webpack_require__(/*! marko/components */ "marko/components");
-      const component = __webpack_require__(/*! ./index.marko */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/index.marko");
-      register("/@marko/webpack-tests$x.x.x/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/index.marko", component);
-
+__webpack_require__(/*! ./index.marko */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/index.marko");
 __webpack_require__(/*! ./style.css */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/style.css");
 
 /***/ }),
@@ -109,17 +105,6 @@ __webpack_require__(/*! ./components/nested/index.marko?dependencies */ "./src/_
 
 
 
-/***/ }),
-
-/***/ "marko/components":
-/*!***********************************!*\
-  !*** external "marko/components" ***!
-  \***********************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-module.exports = marko/components;
-
 /***/ }),
 
 /***/ "marko/dist/runtime/components/defineComponent":

diff --git a/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/browser--test_nzzJ.js b/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/browser--test_nzzJ.js
@@ -50,11 +50,7 @@ marko_template.Component = marko_defineComponent(marko_component, marko_template
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-
-      const { register } = __webpack_require__(/*! marko/components */ "marko/components");
-      const component = __webpack_require__(/*! ./index.marko */ "./src/__tests__/fixtures/with-class-component-plugin/components/nested/index.marko");
-      register("/@marko/webpack-tests$x.x.x/fixtures/with-class-component-plugin/components/nested/index.marko", component);
-
+__webpack_require__(/*! ./index.marko */ "./src/__tests__/fixtures/with-class-component-plugin/components/nested/index.marko");
 __webpack_require__(/*! ./style.css */ "./src/__tests__/fixtures/with-class-component-plugin/components/nested/style.css");
 
 /***/ }),
@@ -107,17 +103,6 @@ __webpack_require__(/*! ./components/nested/index.marko?dependencies */ "./src/_
 
 
 
-/***/ }),
-
-/***/ "marko/components":
-/*!***********************************!*\
-  !*** external "marko/components" ***!
-  \***********************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-module.exports = marko/components;
-
 /***/ }),
 
 /***/ "marko/dist/runtime/components/defineComponent":

diff --git a/src/loader/index.ts b/src/loader/index.ts
@@ -92,7 +92,6 @@ export default function(source: string): string {
     babelConfig.caller
   );
 
-  const dependenciesOnly = this.resource.endsWith("?dependencies");
   const hydrate = this.resource.endsWith("?hydrate");
   const assets = this.resource.endsWith("?assets");
   let sourceMaps =
@@ -163,14 +162,22 @@ export default function(source: string): string {
       this.addDependency(dep)
     );
 
+    const dependenciesOnly = this.resource.endsWith("?dependencies");
     let dependencies = [];
 
     if (dependenciesOnly && meta.component) {
-      dependencies = dependencies.concat(`
-      ${loadStr("marko/components", "{ register }")}
-      ${loadStr(meta.component, "component")}
-      register(${JSON.stringify(meta.id)}, component);
-      `);
+      if (
+        path.join(path.dirname(this.resourcePath), meta.component) ===
+        this.resourcePath
+      ) {
+        dependencies.push(loadStr(meta.component));
+      } else {
+        dependencies = dependencies.concat(`
+        ${loadStr("marko/components", "{ register }")}
+        ${loadStr(meta.component, "component")}
+        register(${JSON.stringify(meta.id)}, component);
+        `);
+      }
     }
 
     if (meta.deps) {