feat(build): tweak build to use tsc and test with sf lwc

ghiscoding · Mar 16, 2020 · e4964b3 · e4964b3
1 parent 6416507
commit e4964b3
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 131 deletions.
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -44,6 +44,7 @@
     "flatpickr": "^4.6.3",
     "jquery": "^3.4.1",
     "jquery-ui-dist": "^1.12.1",
+    "lodash.isequal": "^4.5.0",
     "moment-mini": "^2.24.0",
     "multiple-select-adapted": "^1.3.0",
     "slickgrid": "^2.4.19"
@@ -54,7 +55,6 @@
     "@types/jquery": "^3.3.33",
     "@types/moment": "^2.13.0",
     "@types/node": "^13.9.0",
-    "@types/webpack": "^4.41.7",
     "autoprefixer": "^9.7.4",
     "copyfiles": "^2.2.0",
     "cross-env": "^7.0.2",
@@ -78,8 +78,7 @@
     "ts-jest": "^25.2.1",
     "ts-loader": "^6.2.1",
     "typescript": "^3.8.3",
-    "url-loader": "^3.0.0",
-    "webpack": "^4.42.0"
+    "url-loader": "^3.0.0"
   },
   "engines": {
     "node": ">=10.16.0",

diff --git a/packages/common/typings/global.d.ts b/packages/common/typings/global.d.ts
@@ -0,0 +1 @@
+import 'jest-extended';
diff --git a/packages/common/typings/lodash.isequal/index.d.ts b/packages/common/typings/lodash.isequal/index.d.ts
@@ -0,0 +1 @@
+declare module 'lodash.isequal';
diff --git a/packages/common/webpack.config.js b/packages/common/webpack.config.js
diff --git a/packages/vanilla-bundle/package.json b/packages/vanilla-bundle/package.json
@@ -10,11 +10,12 @@
   "scripts": {
     "test": "echo testing slickgrid-universal slickgrid-vanilla-bundle code",
     "dev": "webpack --env.development",
-    "dev:watch": "webpack --env.development --watch",
-    "build": "webpack --env.development",
+    "dev:watch": "run-p build:watch",
+    "build": "cross-env tsc --build",
+    "build:watch": "cross-env tsc --incremental --watch",
     "bundle:commonjs": "tsc --project tsconfig.build.json --outDir dist/commonjs --module commonjs",
     "bundle:es2020": "cross-env tsc --project tsconfig.build.json --outDir dist/es2020 --module es2015 --target es2020",
-    "bundle": "npm-run-all webpack:prod bundle:commonjs bundle:es2020",
+    "bundle": "npm-run-all bundle:commonjs bundle:es2020 webpack:prod",
     "prebundle": "npm-run-all delete:dist delete:zip",
     "postbundle": "npm-run-all zip:dist",
     "delete:dist": "cross-env rimraf dist",

diff --git a/packages/vanilla-bundle/tsconfig.json b/packages/vanilla-bundle/tsconfig.json
@@ -1,40 +1,40 @@
 {
-    "extends": "../tsconfig-build.json",
-    "compileOnSave": false,
-    "compilerOptions": {
-        "rootDir": "src",
-        "declarationDir": "dist",
-        "outDir": "dist/esnext",
-        "target": "es2017",
-        "module": "es2015",
-        "sourceMap": true,
-        "lib": [
-            "esnext",
-            "dom"
-        ],
-        "types": [
-            "moment",
-            "jquery",
-            "node"
-        ],
-        "typeRoots": [
-            "node_modules/@types",
-            "src/typings"
-        ]
-    },
-    "exclude": [
-        "cypress",
-        "dist",
-        "node_modules",
-        "**/*.spec.ts"
+  "extends": "../tsconfig-build.json",
+  "compileOnSave": false,
+  "compilerOptions": {
+    "rootDir": "src",
+    "declarationDir": "dist/es2020",
+    "outDir": "dist/es2020",
+    "target": "es2017",
+    "module": "es2015",
+    "sourceMap": true,
+    "lib": [
+      "es2020",
+      "dom"
     ],
-    "filesGlob": [
-        "./src/**/*.ts",
-        "./test/**/*.ts",
-        "./custom_typings/**/*.d.ts"
+    "types": [
+      "moment",
+      "jquery",
+      "node"
     ],
-    "include": [
-        "src/**/*.ts",
-        "src/typings/**/*.ts"
+    "typeRoots": [
+      "node_modules/@types",
+      "src/typings"
     ]
-}
+  },
+  "exclude": [
+    "cypress",
+    "dist",
+    "node_modules",
+    "**/*.spec.ts"
+  ],
+  "filesGlob": [
+    "./src/**/*.ts",
+    "./test/**/*.ts",
+    "./custom_typings/**/*.d.ts"
+  ],
+  "include": [
+    "src/**/*.ts",
+    "src/typings/**/*.ts"
+  ]
+}