Pushing latest changes - testing localhost content compat

storybookjs · Dec 21, 2019 · 9b30c78 · 9b30c78
1 parent 5298a02
commit 9b30c78
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 24 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -15,7 +15,7 @@
 				"--extensionDevelopmentPath=${workspaceFolder}"
 			],
 			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
+				"${workspaceFolder}/dist/**/*.js"
 			],
 			"preLaunchTask": "${defaultBuildTask}"
 		},
@@ -26,12 +26,12 @@
 			"runtimeExecutable": "${execPath}",
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+				"--extensionTestsPath=${workspaceFolder}/out/test/"
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/test/**/*.js"
 			],
-			"preLaunchTask": "${defaultBuildTask}"
+			"preLaunchTask": "npm: test-compile"
 		}
 	]
 }
diff --git a/.vscodeignore b/.vscodeignore
@@ -1,10 +1,10 @@
-.vscode/**
-.vscode-test/**
-out/test/**
-src/**
+.vscode
+node_modules
+out/
+src/
+tsconfig.json
+webpack.config.js
 .gitignore
 vsc-extension-quickstart.md
 **/tsconfig.json
-**/tslint.json
-**/*.map
-**/*.ts
+**/tslint.json
diff --git a/aesop-0.0.1.vsix b/aesop-0.0.1.vsix
diff --git a/dist/extension.js b/dist/extension.js
diff --git a/dist/extension.js.map b/dist/extension.js.map
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
 		"onCommand:extension.tollTheHour",
 		"onCommand:extension.getStories"
 	],
-	"main": "./out/extension.js",
+	"main": "./dist/extension",
 	"contributes": {
 		"commands": [
 			{
@@ -34,7 +34,10 @@
 		]
 	},
 	"scripts": {
-		"vscode:prepublish": "npm run compile",
+		"vscode:prepublish": "webpack --mode production",
+		"webpack": "webpack --mode development",
+		"webpack-dev": "webpack --mode development --watch",
+		"test-compile": "tsc -p ./",
 		"compile": "tsc -p ./",
 		"watch": "tsc -watch -p ./",
 		"pretest": "npm run compile",

diff --git a/src/extension.ts b/src/extension.ts
@@ -1,20 +1,19 @@
 import * as vscode from 'vscode';
-import * as express from 'express';
+// import * as express from 'express';
 
 //port should be variable to listen for action in the user's active terminal
-const PORT = 8509;
-const server = express();
+const PORT = 6006;
+// const server = express();
 
 // import MainUI from './toolbars/main_ui.ts';
 // import {server, PORT} from './server/server';
 
 export function activate(context: vscode.ExtensionContext) {
-	server.get('/', (req : Object, res : Object) => {
-		vscode.window.showInformationMessage('Aesop server online');
-		res.end();
-	});
-
-	server.listen(PORT);
+	// server.get('/', (req : Object, res : Object) => {
+	// 	vscode.window.showInformationMessage('Aesop server online');
+	// 	res.end();
+	// });
+	// server.listen(PORT);
 
 	//create disposable variable type, registers awaken command & opens webview
 	let disposable = vscode.commands.registerCommand('extension.aesopAwaken', () => {
@@ -43,7 +42,7 @@ export function activate(context: vscode.ExtensionContext) {
 
 		//access the first opened folder of the workspace array
 		//a potentially problematic assumption in multi-folder workspaces
-		const rootPath = vscode.workspace.workspaceFolders[0];
+		const rootPath : any = vscode.workspace.workspaceFolders[0];
 
 		//define a path to SB webpack bundle outputs (in user workspace /node_modules/ folder)
 		const distGlob = new vscode.RelativePattern(rootPath, "*/node_modules/@storybook/core/dist/public/");
@@ -85,7 +84,7 @@ export function activate(context: vscode.ExtensionContext) {
 				<style>
 				html { width: 100%, height: 100%, min-height: 100%; display: flex; padding: 0, margin: 0}
 				body { flex: 1; display: inline-flex; width: 100%, justify-content: center}
-				iframe { flex-fl: 1; border: none; background: white; width: 50%}
+				iframe { flex: 1; border: none; background: white; min-width: 50%; max-height: 80%; vertical-align: center;}
 		</style>
 		</head>
 		<body>

diff --git a/tsconfig.json b/tsconfig.json
@@ -8,7 +8,7 @@
 		],
 		"sourceMap": true,
 		"rootDir": "src",
-		"strict": true   /* enable all strict type-checking options */
+		"strict": false   /* enable all strict type-checking options */
 		/* Additional Checks */
 		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
 		// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */

diff --git a/webpack.config.js b/webpack.config.js
@@ -0,0 +1,39 @@
+//@ts-check
+
+'use strict';
+
+const path = require('path');
+
+/**@type {import('webpack').Configuration}*/
+const config = {
+  target: 'node',
+  entry: './src/extension.ts',
+  output: {
+    path: path.resolve(__dirname, 'dist'),
+    filename: 'extension.js',
+    libraryTarget: 'commonjs2',
+    devtoolModuleFilenameTemplate: '../[resource-path]'
+  },
+  devtool: 'source-map',
+  externals: {
+    vscode: 'commonjs vscode'
+  },
+  resolve: {
+    extensions: ['.ts', '.js']
+  },
+  module: {
+    rules: [
+      {
+        test: /\.ts$/,
+        exclude: /node_modules/,
+        use: [
+          {
+            loader: 'ts-loader'
+          }
+        ]
+      }
+    ]
+  }
+};
+
+module.exports = config;