Merge pull request #7 from cortex-command-community/development

fix: resolve webpack build issues, start server correctly

Author: traunts

.github/workflows/release.yaml

@@ -36,3 +36,11 @@ jobs:
 
       - name: 'Semantic Release'
         run: npx semantic-release
+
+      - name: Update dev branch.
+        run: |
+          git fetch --unshallow
+          git checkout development
+          git pull
+          git merge main
+          git push

package-lock.json

@@ -15,8 +15,7 @@
         "main": "packages/client/src/extension.ts",
         "tsConfig": "packages/client/tsconfig.app.json",
         "webpackConfig": "packages/client/webpack.config.js",
-        "target": "node",
-        "outputFileName": "extension.js"
+        "target": "node"
       },
       "configurations": {
         "production": {}

packages/client/project.json

@@ -16,7 +16,7 @@ import {
 
 export function activate(context: ExtensionContext): void {
   const serverModule = context.asAbsolutePath(
-    path.join('dist', 'packages', 'server', 'src', 'sampleServer.js')
+    path.join('dist', 'packages', 'server', 'src', 'extension.js')
   );
   const serverOptions: ServerOptions = {
     run: {

packages/client/src/extension.ts

@@ -20,7 +20,7 @@ module.exports = composePlugins(withNx(), withWeb(), (config) => {
         configFile: path.join(__dirname, 'tsconfig.app.json'),
       }),
     ],
-    mainFields: ['module', 'main'],
+    mainFields: ['module', 'browser', 'main'],
     extensions: ['.ts', '.js'], // support ts-files and js-files
   };
 
@@ -48,7 +48,17 @@ module.exports = composePlugins(withNx(), withWeb(), (config) => {
     vscode: 'commonjs vscode', // ignored because it doesn't exist
   };
 
-  config.output.libraryTarget = 'commonjs';
+  config.output.libraryTarget = 'commonjs2';
+  // config.output.filename = 'extension.js';
+
+  config.output.publicPath = path.join(
+    __dirname,
+    'dist',
+    'packages',
+    'client',
+    'src',
+    'extension.js'
+  );
 
   // yes, really source maps
   config.devtool = 'source-map';

packages/client/webpack.config.js

@@ -12,11 +12,10 @@
       "options": {
         "outputPath": "dist/packages/server/src",
         "compiler": "babel",
-        "main": "packages/server/src/sampleServer.ts",
+        "main": "packages/server/src/extension.ts",
         "tsConfig": "packages/server/tsconfig.app.json",
         "webpackConfig": "packages/server/webpack.config.js",
-        "target": "node",
-        "outputFileName": "server.js"
+        "target": "node"
       },
       "configurations": {
         "production": {}
@@ -27,7 +26,7 @@
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/packages/server",
-        "main": "packages/server/src/sampleServer.ts",
+        "main": "packages/server/src/extension.ts",
         "tsConfig": "packages/server/tsconfig.app.json"
       }
     },

packages/server/project.json

@@ -47,14 +47,24 @@ module.exports = composePlugins(withNx(), withWeb(), (config) => {
     vscode: 'commonjs vscode', // ignored because it doesn't exist
   };
 
-  config.output.libraryTarget = 'commonjs';
+  config.output.libraryTarget = 'commonjs2';
+  // config.output.filename = 'extension.js';
+
+  config.output.publicPath = path.join(
+    __dirname,
+    'dist',
+    'packages',
+    'server',
+    'src',
+    'extension.js'
+  );
 
   // yes, really source maps
   config.devtool = 'source-map';
 
   config.context = path.join(__dirname);
   config.entry = {
-    extension: './src/sampleServer.ts',
+    extension: './src/extension.ts',
   };
 
   return config;

packages/server/src/sampleServer.ts renamed to packages/server/src/extension.ts

@@ -10,7 +10,13 @@ DataModule
 	Test = ContentFile
 
 		FilePath = test
+
 	Test = Color
+	aadad
+		StartOffset
+
+
+s
 		R = 4
 		G = -2
 		B = 3