Remove additional JS filembuck/custom-elements-js-initializer-alternative

3 files changed, 5 insertions, 6 deletions

diff --git a/src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj b/src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj
index 95c2b5ab32..3290fcedce 100644
--- a/src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj
+++ b/src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <YarnInputs Include="$(YarnWorkingDir)**" Exclude="$(YarnWorkingDir)node_modules\**;$(YarnWorkingDir)*.d.ts;$(YarnWorkingDir)dist\**" />
-    <YarnOutputs Include="$(YarnWorkingDir)dist\$(Configuration)\BlazorCustomElements.js" />
+    <YarnOutputs Include="$(YarnWorkingDir)dist\$(Configuration)\Microsoft.AspNetCore.Components.CustomElements.lib.module.js" />
 
     <Content Remove="$(YarnWorkingDir)**" />
     <None Include="$(YarnWorkingDir)*" Exclude="$(YarnWorkingDir)node_modules\**" />
@@ -47,7 +47,7 @@
     <ItemGroup>
       <FileWrites Include="$(JsCompilationCacheFile)" />
     </ItemGroup>
-    
+
   </Target>
 
   <Target Name="CompileJs" Condition="'$(BuildNodeJS)' != 'false' AND '$(DesignTimeBuild)' != 'true'" Inputs="$(JsCompilationCacheFile)" Outputs="@(YarnOutputs)">
@@ -59,13 +59,13 @@
 
   </Target>
 
-  <Target Name="IncludeCompileJsOutput">
+  <Target Name="IncludeCompileJsOutput" BeforeTargets="_ResolveJsModuleInputs">
     <ItemGroup>
       <_JsBuildOutput Include="$(YarnWorkingDir)dist\$(Configuration)\**" Exclude="$(YarnWorkingDir)dist\.gitignore" />
     </ItemGroup>
 
     <DefineStaticWebAssets Condition="'@(_JsBuildOutput)' != ''"
-      SourceType="Computed"
+      SourceType="Discovered"
       SourceId="$(PackageId)"
       ContentRoot="$(YarnWorkingDir)dist\$(Configuration)\"
       BasePath="_content\$(PackageId)"
diff --git a/src/Components/CustomElements/src/js/webpack.config.js b/src/Components/CustomElements/src/js/webpack.config.js
index 5dacdcf860..6de6802110 100644
--- a/src/Components/CustomElements/src/js/webpack.config.js
+++ b/src/Components/CustomElements/src/js/webpack.config.js
@@ -12,7 +12,7 @@ module.exports = (env, args) => ({
         rules: [{ test: /\.ts?$/, loader: 'ts-loader' }]
     },
     entry: {
-        'BlazorCustomElements': './BlazorCustomElements.ts',
+        'Microsoft.AspNetCore.Components.CustomElements.lib.module': './BlazorCustomElements.ts',
     },
     output: { path: path.join(__dirname, 'dist', args.mode == 'development' ? 'Debug' : 'Release'), filename: '[name].js' },
     performance: {
diff --git a/src/Components/CustomElements/src/wwwroot/Microsoft.AspNetCore.Components.CustomElements.lib.module.js b/src/Components/CustomElements/src/wwwroot/Microsoft.AspNetCore.Components.CustomElements.lib.module.js
deleted file mode 100644
index 75a150b742..0000000000
--- a/src/Components/CustomElements/src/wwwroot/Microsoft.AspNetCore.Components.CustomElements.lib.module.js
+++ /dev/null
@@ -1 +0,0 @@
-import './BlazorCustomElements.js';