fix imports in examples, improve eslint config

BrainJS · Sep 4, 2020 · e575f106d91e5f80f1d8af91456da70cf3337046 · e575f10
1 parent 6a5c625
commit e575f106d91e5f80f1d8af91456da70cf3337046
diff --git a/.eslintignore b/.eslintignore
@@ -23,7 +23,4 @@ test/e2e/*.js
 **.min.js
 dist/
 __coverage__/
-rollup.config.js
-rollup.config.browser.js
-
 index.d.ts
diff --git a/__tests__/.eslintrc.json b/__tests__/.eslintrc.json
@@ -4,41 +4,6 @@
     "jest": true,
     "node": true
   },
-  "extends": [
-    "eslint:recommended",
-    "standard-with-typescript",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:prettier/recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "project": "./tsconfig.json",
-    "sourceType": "module"
-  },
-  "plugins": ["prettier", "@typescript-eslint", "jest"],
-  "root": true,
-  "rules": {
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/interface-name-prefix": "off",
-    "@typescript-eslint/member-delimiter-style": "off",
-    "@typescript-eslint/no-empty-function": "off",
-    "@typescript-eslint/no-var-requires": "off",
-    "@typescript-eslint/semi": "off",
-    "@typescript-eslint/space-before-function-paren": "off",
-    "arrow-parens": "off",
-    "class-methods-use-this": "off",
-    "max-classes-per-file": "off",
-    "standard/no-callback-literal": "off",
-    "no-continue": "off",
-    "no-empty-function": "off",
-    "no-multi-assign": "off",
-    "no-param-reassign": "off",
-    "no-plusplus": "off",
-    "no-prototype-builtins": "off",
-    "no-restricted-globals": "off",
-    "no-underscore-dangle": "off",
-    "prettier/prettier": "error",
-    "semi": "off"
-  }
+  "extends": "../.eslintrc.json",
+  "plugins": ["prettier", "@typescript-eslint", "jest"]
 }
diff --git a/examples/.eslintrc.json b/examples/.eslintrc.json
@@ -0,0 +1,11 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "node": true
+  },
+  "extends": "../.eslintrc.json",
+  "parserOptions": {
+    "project": "./tsconfig.json"
+  }
+}
diff --git a/examples/javascript/childrens-book.js b/examples/javascript/childrens-book.js
@@ -1,4 +1,4 @@
-const brain = require('../../src');
+const brain = require('../../dist/brain');
 
 const trainingData = [
   'Jane saw Doug.',

diff --git a/examples/javascript/cross-validate.js b/examples/javascript/cross-validate.js
@@ -1,5 +1,5 @@
 const assert = require('assert');
-const brain = require('../../src');
+const brain = require('../../dist/brain');
 
 const trainingData = [
   // xor data, repeating to simulate that we have a lot of data

diff --git a/examples/javascript/gpu-fallback.js b/examples/javascript/gpu-fallback.js
@@ -1,4 +1,4 @@
-const brain = require('../../src');
+const brain = require('../../dist/brain');
 const net = new brain.NeuralNetworkGPU();
 
 const xorTrainingData = [

diff --git a/examples/javascript/gpu.html b/examples/javascript/gpu.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <script src="../../dist/brain-browser.js"></script>
+    <script src="https://unpkg.com/brain.js"></script>
     <script>
       const net = new brain.NeuralNetworkGPU();
 

diff --git a/examples/javascript/learn-math.js b/examples/javascript/learn-math.js
@@ -1,4 +1,4 @@
-const brain = require('../../src');
+const brain = require('../../dist/brain');
 
 const LSTM = brain.recurrent.LSTM;
 const net = new LSTM();

diff --git a/examples/javascript/predict-numbers.js b/examples/javascript/predict-numbers.js
@@ -1,5 +1,5 @@
 const assert = require('assert');
-const brain = require('../../src');
+const brain = require('../../dist/brain');
 
 const net = new brain.recurrent.LSTMTimeStep({
   inputSize: 2,

diff --git a/examples/javascript/predict-tense.js b/examples/javascript/predict-tense.js
@@ -1,4 +1,4 @@
-const brain = require('brain.js');
+const brain = require('../../dist/brain');
 
 // create configuration for training
 const config = {

diff --git a/examples/javascript/recommendation-engine/index.html b/examples/javascript/recommendation-engine/index.html
@@ -25,7 +25,7 @@
   </head>
 
   <body onLoad="nextTry();">
-    <script src="../../../dist/brain-browser.min.js"></script>
+    <script src="https://unpkg.com/brain.js"></script>
     <script src="itemsInStock.js"></script>
     <script>
       const color_normalization_factor = 100;

diff --git a/examples/javascript/rendering-svg.html b/examples/javascript/rendering-svg.html
@@ -77,7 +77,7 @@
         padding-left: 100px;
       }
     </style>
-    <script src="../../dist/brain-browser.js"></script>
+    <script src="https://unpkg.com/brain.js"></script>
   </head>
   <body>
     <div class="flex-container">
@@ -86,16 +86,16 @@
           <div class="input-wrapper">
             <div class="input-label">Network type</div>
             <select name="network-type">
-              <option value="NeuralNetwork"
-                >FeedForward (brain.NeuralNetwork)</option
-              >
+              <option value="NeuralNetwork">
+                FeedForward (brain.NeuralNetwork)
+              </option>
               <option value="RNN">Recurrent (brain.recurrent.RNN)</option>
-              <option value="RNNTimeStep"
-                >Recurrent Time Step (brain.recurrent.RNNTimeStep)</option
-              >
-              <option value="FeedForward"
-                >FeedForward (brain.FeedForward)</option
-              >
+              <option value="RNNTimeStep">
+                Recurrent Time Step (brain.recurrent.RNNTimeStep)
+              </option>
+              <option value="FeedForward">
+                FeedForward (brain.FeedForward)
+              </option>
               <option value="Recurrent">Recurrent (brain.Recurrent)</option>
             </select>
           </div>
@@ -208,7 +208,9 @@
               name="inp-labels"
               cols="23"
               placeholder="inputs' labels separated by commas"
-            >a,b,c,d,e,f,g,h,i,j</textarea>
+            >
+a,b,c,d,e,f,g,h,i,j</textarea
+            >
           </div>
           <div class="input-wrapper">
             <label class="input-label"

diff --git a/examples/javascript/stream-example.js b/examples/javascript/stream-example.js
@@ -1,5 +1,5 @@
 const assert = require('assert');
-const brain = require('../../src');
+const brain = require('../../dist/brain');
 
 const net = new brain.NeuralNetwork();
 const xor = [

diff --git a/examples/javascript/string-classification.js b/examples/javascript/string-classification.js
@@ -1,4 +1,4 @@
-const brain = require('../../src');
+const brain = require('../../dist/brain');
 
 // create configuration for training
 const config = {

diff --git a/examples/javascript/which-letter-simple.js b/examples/javascript/which-letter-simple.js
@@ -1,5 +1,5 @@
 const assert = require('assert');
-const brain = require('../../src');
+const brain = require('../../dist/brain');
 
 /**
  * Return 0 or 1 for '#'

diff --git a/package.json b/package.json
@@ -112,7 +112,7 @@
     "dist": "npm run build",
     "lint": "run-p lint:**",
     "lint:eslint": "eslint --fix --ext .js,.ts __tests__ src",
-    "lint:typecheck": "tsc",
+    "lint:typecheck": "tsc --project tsconfig.source.json",
     "postinstall": "npm rebuild gpu.js",
     "test": "jest",
     "watch": "run-p watch:**",

diff --git a/rollup.config.browser.js b/rollup.config.browser.js
@@ -13,7 +13,7 @@ export default {
 
   // Specify here external modules which you don't want to include in your bundle (for instance: 'lodash', 'moment' etc.)
   // https://rollupjs.org/guide/en#external-e-external
-  // external: ['gpu.js'],
+  external: [],
 
   plugins: [
     // Allows node_modules resolution
@@ -23,13 +23,13 @@ export default {
       extensions,
     }),
 
+    // Allow bundling cjs modules. Rollup doesn't understand cjs
+    commonjs(),
+
     // Allows the node builtins to be required/imported.
     globals(),
     builtins(),
 
-    // Allow bundling cjs modules. Rollup doesn't understand cjs
-    commonjs(),
-
     // Compile TypeScript/JavaScript files
     babel({
       extensions,

diff --git a/rollup.config.js b/rollup.config.js
@@ -22,13 +22,13 @@ export default {
       extensions,
     }),
 
+    // Allow bundling cjs modules. Rollup doesn't understand cjs
+    commonjs(),
+
     // Allows the node builtins to be required/imported.
     globals(),
     builtins(),
 
-    // Allow bundling cjs modules. Rollup doesn't understand cjs
-    commonjs(),
-
     // Compile TypeScript/JavaScript files
     babel({
       extensions,

diff --git a/tsconfig.json b/tsconfig.json
@@ -4,7 +4,6 @@
     "allowSyntheticDefaultImports": true,
     "checkJs": false,
     "esModuleInterop": true,
-    "incremental": true,
     "module": "esnext",
     "moduleResolution": "node",
     "noEmit": true,
@@ -15,6 +14,5 @@
     "strict": true,
     "target": "esnext"
   },
-  "exclude": ["node_modules", "**/*.json", "**/*.config.js", "**/*.d.ts"],
-  "include": ["./src", "./__tests__"]
+  "exclude": ["node_modules", "**/*.json", "**/*.d.ts", "./dist"]
 }
diff --git a/tsconfig.source.json b/tsconfig.source.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "allowJs": true,
+    "allowSyntheticDefaultImports": true,
+    "checkJs": false,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "noEmit": true,
+    "noEmitOnError": true,
+    "outDir": "./dist",
+    "rootDir": "./",
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "esnext"
+  },
+  "exclude": ["node_modules", "**/*.json", "**/*.d.ts", "./dist"],
+  "include": ["./src"]
+}