Merge branch 'main' into chore/jest-migrate-bundler-and-ci

Author: gnbm

src/client/client-host-ref.ts

@@ -1,4 +1,5 @@
 import { BUILD } from '@app-data';
+import { CMP_FLAGS } from '@utils/constants';
 import { reWireGetterSetter } from '@utils/es2022-rewire-class-members';
 
 import type * as d from '../declarations';
@@ -29,7 +30,7 @@ export const registerInstance = (lazyInstance: any, hostRef: d.HostRef) => {
   lazyInstance.__stencil__getHostRef = () => hostRef;
   hostRef.$lazyInstance$ = lazyInstance;
 
-  if (BUILD.modernPropertyDecls && (BUILD.state || BUILD.prop)) {
+  if (hostRef.$cmpMeta$.$flags$ & CMP_FLAGS.hasModernPropertyDecls && (BUILD.state || BUILD.prop)) {
     reWireGetterSetter(lazyInstance, hostRef);
   }
 };
@@ -69,7 +70,7 @@ export const registerHost = (hostElement: d.HostElement, cmpMeta: d.ComponentRun
   const ref = hostRef;
   hostElement.__stencil__getHostRef = () => ref;
 
-  if (!BUILD.lazyLoad && BUILD.modernPropertyDecls && (BUILD.state || BUILD.prop)) {
+  if (!BUILD.lazyLoad && cmpMeta.$flags$ & CMP_FLAGS.hasModernPropertyDecls && (BUILD.state || BUILD.prop)) {
     reWireGetterSetter(hostElement, hostRef);
   }
 

src/compiler/app-core/app-data.ts

@@ -40,7 +40,6 @@ export const getBuildFeatures = (cmps: ComponentCompilerMeta[]): BuildFeatures =
     member: cmps.some((c) => c.hasMember),
     method: cmps.some((c) => c.hasMethod),
     mode: cmps.some((c) => c.hasMode),
-    modernPropertyDecls: cmps.some((c) => c.hasModernPropertyDecls),
     observeAttribute: cmps.some((c) => c.hasAttribute || c.hasWatchCallback || c.hasDeserializer),
     prop: cmps.some((c) => c.hasProp),
     propBoolean: cmps.some((c) => c.hasPropBoolean),

src/compiler/output-targets/dist-lazy/lazy-build-conditionals.ts

@@ -18,7 +18,6 @@ export const getLazyBuildConditionals = (
 
   const hasHydrateOutputTargets = config.outputTargets.some(isOutputTargetHydrate);
   build.hydrateClientSide = hasHydrateOutputTargets;
-  build.modernPropertyDecls = cmps.some((c) => c.hasModernPropertyDecls);
 
   updateBuildConditionals(config, build);
 

src/compiler/transformers/static-to-meta/component.ts

@@ -183,12 +183,7 @@ export const parseStaticComponentMeta = (
   visitComponentChildNode(cmpNode, buildCtx);
   parseClassMethods(classMethods, cmp);
 
-  if (!moduleFile.isCollectionDependency) {
-    // collection dependencies can cause 'modern class prop declaration' false positives;
-    // the end result will be compiled by rollup and the modern class props will be stripped
-    cmp.hasModernPropertyDecls = detectModernPropDeclarations(cmpNode);
-  }
-
+  cmp.hasModernPropertyDecls = detectModernPropDeclarations(cmpNode) || doesExtend;
   cmp.htmlAttrNames = unique(cmp.htmlAttrNames);
   cmp.htmlTagNames = unique(cmp.htmlTagNames);
   cmp.potentialCmpRefs = unique(cmp.potentialCmpRefs);

src/compiler/transformers/test/native-component.spec.ts

@@ -71,7 +71,7 @@ describe('nativeComponentTransform', () => {
     });
 
     expect(await formatCode(transpiledModule.outputText)).toContain(
-      await c`__stencil_defineCustomElement(CmpA, [0, 'cmp-a', { baz: [2], bar: [2], foo: [2] }])`,
+      await c`__stencil_defineCustomElement(CmpA, [512, 'cmp-a', { baz: [2], bar: [2], foo: [2] }])`,
     );
 
     expect(await formatCode(transpiledModule.outputText)).toContain(

src/declarations/stencil-private.ts

@@ -153,7 +153,6 @@ export interface BuildFeatures {
   reflect: boolean;
 
   taskQueue: boolean;
-  modernPropertyDecls: boolean;
 }
 
 export interface BuildConditionals extends Partial<BuildFeatures> {

src/hydrate/platform/index.ts

@@ -2,6 +2,7 @@ import { BUILD } from '@app-data';
 import { reWireGetterSetter } from '@utils/es2022-rewire-class-members';
 
 import type * as d from '../../declarations';
+import { CMP_FLAGS } from '@utils/constants';
 
 let customError: d.ErrorHandler;
 
@@ -139,7 +140,7 @@ export const registerInstance = (lazyInstance: any, hostRef: d.HostRef) => {
   lazyInstance.__stencil__getHostRef = () => hostRef;
   hostRef.$lazyInstance$ = lazyInstance;
 
-  if (BUILD.modernPropertyDecls && (BUILD.state || BUILD.prop)) {
+  if (hostRef.$cmpMeta$.$flags$ & CMP_FLAGS.hasModernPropertyDecls && (BUILD.state || BUILD.prop)) {
     reWireGetterSetter(lazyInstance, hostRef);
   }
   return hostRef;

src/utils/constants.ts

@@ -124,6 +124,11 @@ export const enum CMP_FLAGS {
    * Determines if a component has a render function.
    */
   hasRenderFn = 1 << 8,
+
+  /**
+   * Determines if a component uses modern class property declarations.
+   */
+  hasModernPropertyDecls = 1 << 9,
 }
 
 /**

src/utils/format-component-runtime-meta.ts

@@ -41,12 +41,16 @@ export const formatComponentRuntimeMeta = (
   if (compilerMeta.hasMode) {
     flags |= CMP_FLAGS.hasMode;
   }
+  if (compilerMeta.hasModernPropertyDecls) {
+    flags |= CMP_FLAGS.hasModernPropertyDecls;
+  }
 
   const members = formatComponentRuntimeMembers(compilerMeta, includeMethods);
   const hostListeners = formatHostListeners(compilerMeta);
   const watchers = formatComponentRuntimeReactiveHandlers(compilerMeta, 'watchers');
   const serializers = formatComponentRuntimeReactiveHandlers(compilerMeta, 'serializers');
   const deserializers = formatComponentRuntimeReactiveHandlers(compilerMeta, 'deserializers');
+
   return trimFalsy([
     flags,
     compilerMeta.tagName,