fix(build): vscode chrome debugger + webpack prod build should both work

ghiscoding · Mar 17, 2020 · e148090 · e148090
1 parent 6c3ab52
commit e148090
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 94 deletions.
diff --git a/packages/common/.vscode/launch.json b/packages/common/.vscode/launch.json
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -2,13 +2,18 @@
   "name": "@slickgrid-universal/common",
   "version": "0.0.2",
   "description": "SlickGrid-Universal Common Code",
-  "main": "src/index.ts",
-  "typings": "dist/es2020/index.d.ts",
+  "browser": "src/index.ts",
+  "main": "dist/es2015/index.js",
+  "typings": "dist/es2015/index.d.ts",
   "author": "Ghislain B.",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
+  "files": [
+    "src",
+    "dist"
+  ],
   "scripts": {
     "build": "cross-env tsc --build",
     "build:watch": "cross-env tsc --incremental --watch",

diff --git a/packages/common/tsconfig.build.json b/packages/common/tsconfig.build.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
-    "module": "es2015",
+    "module": "es2020",
     "moduleResolution": "node",
-    "target": "es5",
+    "target": "es2015",
     "lib": [
-      "es2017",
+      "es2020",
       "dom"
     ],
     "typeRoots": [

diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json
@@ -3,8 +3,8 @@
   "compileOnSave": false,
   "compilerOptions": {
     "rootDir": "src",
-    "declarationDir": "dist/es2020",
-    "outDir": "dist/es2020",
+    "declarationDir": "dist/es2015",
+    "outDir": "dist/es2015",
     "target": "es2017",
     "module": "es2015",
     "sourceMap": true,
@@ -37,4 +37,4 @@
     "src/**/*.ts",
     "src/typings/**/*.ts"
   ]
-}
+}
diff --git a/packages/vanilla-bundle/package.json b/packages/vanilla-bundle/package.json
@@ -2,11 +2,13 @@
   "name": "@slickgrid-universal/vanilla-bundle",
   "version": "0.0.2",
   "description": "Vanilla Slick Grid Bundle - Framework agnostic the output is to be used in vanilla JS/TS - Written in TypeScript and we also use WebPack to bundle everything into 1 JS file.",
+  "browser": "src/index.ts",
   "main": "src/index.ts",
-  "typings": "dist/es2020/index.d.ts",
-  "directories": {
-    "src": "src"
-  },
+  "typings": "dist/es2015/index.d.ts",
+  "files": [
+    "src",
+    "dist"
+  ],
   "scripts": {
     "test": "echo testing slickgrid-universal slickgrid-vanilla-bundle code",
     "dev": "webpack --env.development",

diff --git a/packages/vanilla-bundle/tsconfig.build.json b/packages/vanilla-bundle/tsconfig.build.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
-    "module": "es2015",
+    "module": "es2020",
     "moduleResolution": "node",
-    "target": "es5",
+    "target": "es2015",
     "lib": [
-      "es2017",
+      "es2020",
       "dom"
     ],
     "typeRoots": [

diff --git a/packages/vanilla-bundle/tsconfig.json b/packages/vanilla-bundle/tsconfig.json
@@ -3,8 +3,8 @@
   "compileOnSave": false,
   "compilerOptions": {
     "rootDir": "src",
-    "declarationDir": "dist/es2020",
-    "outDir": "dist/es2020",
+    "declarationDir": "dist/es2015",
+    "outDir": "dist/es2015",
     "target": "es2017",
     "module": "es2015",
     "sourceMap": true,

diff --git a/packages/vanilla-bundle/webpack.config.js b/packages/vanilla-bundle/webpack.config.js
@@ -9,26 +9,28 @@ const outDir = path.resolve(__dirname, 'dist');
 const srcDir = path.resolve(__dirname, 'src');
 const nodeModulesDir = path.resolve(__dirname, 'node_modules');
 
-module.exports = ({ production } = {}, { port, host } = {}) => ({
+module.exports = ({ production } = {}) => ({
   mode: production ? 'production' : 'development',
   entry: {
     app: [`${srcDir}/index.ts`],
   },
   stats: {
     warnings: false
   },
+  devtool: production ? 'nosources-source-map' : 'cheap-module-eval-source-map',
   output: {
     path: `${outDir}/bundle`,
     publicPath: baseUrl,
-    filename: production ? 'slickgrid-vanilla-bundle.js' : 'slickgrid-vanilla-bundle.js',
-    sourceMapFilename: production ? 'slickgrid-vanilla-bundle.map' : 'slickgrid-vanilla-bundle.map',
+    filename: 'slickgrid-vanilla-bundle.js',
+    sourceMapFilename: 'slickgrid-vanilla-bundle.map',
     libraryTarget: 'umd',
     library: 'MyLib',
     umdNamedDefine: true
   },
   resolve: {
     extensions: ['.ts', '.js'],
     modules: [srcDir, 'node_modules'],
+    mainFields: production ? ['module', 'main'] : ['browser', 'module'],
     alias: {
       moment$: 'moment/moment.js'
     }
@@ -38,5 +40,4 @@ module.exports = ({ production } = {}, { port, host } = {}) => ({
       { test: /\.ts?$/, use: 'ts-loader', exclude: nodeModulesDir, },
     ],
   },
-  devtool: production ? 'nosources-source-map' : 'cheap-module-eval-source-map',
 });