Merge branch 'feature/source-maps-20' into develop

vankeisb · Sep 1, 2020 · ad06d47 · ad06d47
2 parents af657c5 + 43af4fd
commit ad06d47
Show file tree

Hide file tree

Showing 8 changed files with 1,594 additions and 1,097 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 'lts/dubnium'
+  - 'lts/erbium'
 
 install:
   - echo "//registry.npmjs.org/:_authToken=${CI_TOKEN}" > ~/.npmrc

diff --git a/core/tsconfig.json b/core/tsconfig.json
@@ -6,7 +6,9 @@
     "declaration": true,
     "outDir": "./dist",
     "strict": true,
-    "jsx": "react"
+    "inlineSourceMap": true,
+    "inlineSources": true,
+    "esModuleInterop": false
   },
   "compileOnSave": true,
   "exclude": ["node_modules", "dist"]

diff --git a/package.json b/package.json
@@ -3,8 +3,7 @@
     "private": true,
     "workspaces": ["core", "tea-cup", "samples"],
     "devDependencies": {
-        "@types/jest": "24.0.15",
-        "jest": "24.7.1",
+        "jest": "24.9.0",
         "prettier": "2.0.5",
         "rimraf": "^2.6.3",
         "ts-jest": "24.0.2",

diff --git a/samples/package.json b/samples/package.json
@@ -10,7 +10,7 @@
     "jest-enzyme": "^7.1.1",
     "react": "^16.7.0",
     "react-dom": "^16.7.0",
-    "react-scripts": "3.0.1",
+    "react-scripts": "3.4.1",
     "react-tea-cup": "1.0.0"
   },
   "scripts": {

diff --git a/samples/tsconfig.json b/samples/tsconfig.json
@@ -1,7 +1,11 @@
 {
   "compilerOptions": {
-    "target": "es5",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "target": "es6",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -13,7 +17,11 @@
     "resolveJsonModule": true,
     "noEmit": true,
     "jsx": "preserve",
-    "isolatedModules": true
+    "isolatedModules": true,
+    "inlineSourceMap": true,
+    "inlineSources": true
   },
-  "include": ["src", "../src"]
+  "include": [
+    "src"
+  ]
 }
diff --git a/tea-cup/src/TeaCup/Program.ts b/tea-cup/src/TeaCup/Program.ts
@@ -47,7 +47,7 @@ interface ProgramState<Model> {
 class Guid {
   static newGuid() {
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-      var r = (Math.random() * 16) | 0,
+      const r = (Math.random() * 16) | 0,
         v = c == 'x' ? r : (r & 0x3) | 0x8;
       return v.toString(16);
     });
@@ -155,7 +155,7 @@ export class Program<Model, Msg> extends Component<ProgramProps<Model, Msg>, Pro
   }
 
   setModel(model: Model, withSubs: boolean) {
-    this.setState((state, props) => {
+    this.setState(state => {
       let newSub: Sub<Msg>;
       if (withSubs) {
         newSub = this.props.subscriptions(model);

diff --git a/tea-cup/tsconfig.json b/tea-cup/tsconfig.json
@@ -6,7 +6,10 @@
     "declaration": true,
     "outDir": "./dist",
     "strict": true,
-    "jsx": "react"
+    "jsx": "react",
+    "inlineSourceMap": true,
+    "inlineSources": true,
+    "esModuleInterop": true
   },
   "compileOnSave": true,
   "exclude": ["node_modules", "dist"]