Merge pull request #262 from cnblogs/revert-258-fix-compile-markdown-entry

Revert "chore: fix compile markdown.entry.ts"

Author: cnblogs-dudu

ui/tsconfig.json

@@ -16,8 +16,7 @@
             "@/*": ["../src/*"]
         },
         "lib": ["DOM", "ES2020"],
-        "strictBindCallApply": true,
-        "rootDir": "../"
+        "strictBindCallApply": true
     },
     "include": ["./**/*.ts", "./**/*.tsx", "./**/*.jsx", "./**/*.js", "*.mjs", "../src/model/*.ts"],
     "exclude": ["./dist"]

ui/webpack.config.mjs

@@ -18,7 +18,7 @@ const buildEntry = () => {
         .filter(x => x.isDirectory() && !['share', 'dist', 'lib'].includes(x.name))
         .map(x => x.name)
     for (let folder of folders) {
-        const key = `assets/ui/${folder}/index`
+        const key = `${folder}/index`
         entries[key] = `./ui/${folder}/index.tsx`
         cpSync(`./ui/${folder}/index.html`, `./dist/assets/ui/${folder}/index.html`, { force: true })
     }
@@ -28,8 +28,8 @@ const buildEntry = () => {
 
     cpSync('./node_modules/@fluentui/font-icons-mdl2/fonts/', './dist/assets/fonts/', { recursive: true })
 
-    entries['markdown'] = './src/markdown/markdown.entry.ts'
-    console.log(entries)
+    if (isDevEnv) console.log(entries)
+
     return entries
 }
 
@@ -39,16 +39,15 @@ const buildEntry = () => {
 const config = {
     entry: buildEntry(),
     output: {
-        path: path.resolve('dist'), //打包后的文件存放的地方
+        path: path.resolve('dist/assets/ui'), //打包后的文件存放的地方
         filename: '[name].js', //打包后输出文件的文件名
     },
     resolve: {
-        extensions: ['.tsx', '.ts', 'less', '.css', '.js', '.mjs'],
+        extensions: ['.tsx', '.ts', 'less', '.css', '.js'],
         plugins: [new TsconfigPathsPlugin({ configFile: './ui/tsconfig.json' })],
     },
     devtool: isDevEnv ? 'eval-source-map' : false,
     mode: isDevEnv ? 'development' : 'production',
-    target: 'web',
     module: {
         rules: [
             {
@@ -95,12 +94,6 @@ const config = {
                 test: /\.tsx?$/,
                 use: 'ts-loader',
             },
-            {
-                test: /\.mjs/,
-                resolve: {
-                    fullySpecified: false,
-                },
-            },
         ],
     },
     performance: {

webpack.config.mjs

@@ -52,7 +52,7 @@ export default (env, { mode }) => {
         target: 'node', // vscode extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/
         mode: mode, // this leaves the source code as close as possible to the original (when packaging we set this to 'production')
 
-        entry: { extension: './src/extension.ts' }, // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
+        entry: { extension: './src/extension.ts', markdown: './src/markdown/markdown.entry.ts' }, // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
         output: {
             // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/
             path: path.resolve(__dirname, 'dist'),