Move tests to root directories

.babelrc.build.js

@@ -0,0 +1,4 @@
+module.exports = {
+  extends: "./.babelrc.js",
+  ignore: [/^.*(.test.)[j|t]sx?$/]
+};

.eslintrc.js

@@ -32,12 +32,26 @@ module.exports = {
     "jest/globals": true
   },
   overrides: [
+    {
+      files: ["**/*.test.*", "./test/**/*"],
+      rules: {
+        "react/sort-comp": "off",
+        "no-magic-numbers": 0,
+        "max-statements": 0,
+        "import/no-unresolved": 0,
+        "no-undef": "off",
+        "max-nested-callbacks": "off",
+        "@typescript-eslint/no-empty-function": "off",
+        "react/prop-types": "off"
+      }
+    },
     {
       files: ["*.ts", "*.tsx"],
       excludedFiles: ["*.d.ts"],
       parser: "@typescript-eslint/parser",
       parserOptions: {
         project: ["./tsconfig.base.json"],
+        // eslint-disable-next-line no-undef
         tsconfigRootDir: __dirname
       },
       plugins: ["@typescript-eslint"],

jest-config.js

@@ -2,13 +2,16 @@ module.exports = {
   preset: "ts-jest",
   testEnvironment: "jsdom",
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
-  testMatch: ["**/jest/**/?(*.)+(test).[jt]s?(x)"],
-  testPathIgnorePatterns: ["victory-native"],
+  testPathIgnorePatterns: [
+    "victory-native",
+    "node_modules",
+    "config",
+    "/es/",
+    "/lib/"
+  ],
   transform: {
-    "^.+/test/.+\\.(ts|tsx|js|jsx)$": [
-      "babel-jest",
-      { configFile: "./.babelrc.js" }
-    ]
+    "^.+test.*[jt]sx?$": ["babel-jest", { configFile: "./.babelrc.js" }]
   },
+  transformIgnorePatterns: ["/node_modules/", "/es/", "/lib/"],
   setupFilesAfterEnv: ["<rootDir>/test/jest-setup.js"]
 };

jest-native-config.js

@@ -1,6 +1,6 @@
 module.exports = {
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
-  testMatch: ["**/jest/victory-native/**/?(*.)+(spec|test).[jt]s?(x)"],
+  testMatch: ["**/*/victory-native/**/?(*.)+(spec|test).[jt]s?(x)"],
   transform: {
     // TODO(2215): Switch over to only transpiling from within `/test/`
     // https://github.com/FormidableLabs/victory/issues/2215

package-scripts.js

@@ -68,16 +68,28 @@ module.exports = {
     },
     typecheck: {
       default: npsUtils.series.nps("typecheck.packages", "typecheck.test"),
-      base: "tsc --noEmit",
-      core: "lerna exec --scope victory-core -- nps typecheck.base",
+      src: "tsc --noEmit",
       demo: "tsc -p ./demo/tsconfig.json --noEmit",
       test: "tsc -p ./test/tsconfig.json --noEmit",
-      packages: "lerna exec --ignore victory-vendor -- nps typecheck.base"
+      core: "lerna exec --scope victory-core -- nps typecheck.src",
+      packages: "lerna exec --ignore victory-vendor -- nps typecheck.src"
     },
     types: {
-      base: "tsc --emitDeclarationOnly --rootDir src",
-      lib: "nps types.base -- -- --outDir lib",
-      es: "nps types.base -- -- --outDir es"
+      lib: npsUtils.concurrent.nps("types.create-lib", "types.copy-lib"),
+      es: npsUtils.concurrent.nps("types.create-es", "types.copy-es"),
+      create:
+        "tsc -p ./tsconfig.build.json --emitDeclarationOnly --rootDir src",
+      "create-lib":
+        'nps types.create -- -- --outDir lib || echo "Ignoring TypeScript Errors"',
+      "create-es":
+        'nps types.create -- -- --outDir es || echo "Ignoring TypeScript Errors"',
+      "create-lib-watch": "nps types.create -- -- --outDir lib --watch",
+      "create-es-watch": "nps types.create -- -- --outDir es --watch",
+      copy: "cpx 'src/**/*.d.ts'",
+      "copy-lib": "nps types.copy -- -- lib",
+      "copy-es": "nps types.copy -- -- es",
+      "copy-lib-watch": "nps types.copy -- -- lib --watch",
+      "copy-es-watch": "nps types.copy -- -- es --watch"
     },
     check: {
       ci: npsUtils.series.nps(
@@ -95,14 +107,19 @@ module.exports = {
       default: npsUtils.series.nps("lint", "test")
     },
     watch: {
-      es: "lerna exec --parallel --ignore victory-native --ignore victory-vendor -- cross-env BABEL_ENV=es babel src --out-dir es --config-file ../../.babelrc.js --copy-files --extensions .tsx,.ts,.jsx,.js --watch",
-      lib: "lerna exec --parallel --ignore victory-native --ignore victory-vendor -- cross-env BABEL_ENV=commonjs babel src --out-dir lib --config-file ../../.babelrc.js --copy-files --extensions .tsx,.ts,.jsx,.js --watch",
-      core: npsUtils.concurrent.nps("watch.es", "watch.lib"),
       // `victory-vendor` is built 1x up front and not watched.
-      default: npsUtils.series.nps(
-        "clean.all",
-        "build-package-libs-vendor",
-        "watch.core"
+      default: npsUtils.series.nps("build-package-libs-vendor", "watch.all"),
+      all: 'lerna exec --parallel --ignore victory-native --ignore victory-vendor "nps watch.core"',
+      core: npsUtils.concurrent.nps("watch.es", "watch.lib"),
+      lib: npsUtils.concurrent.nps(
+        "babel-lib-watch",
+        "types.create-lib-watch",
+        "types.copy-lib-watch"
+      ),
+      es: npsUtils.concurrent.nps(
+        "babel-es-watch",
+        "types.create-es-watch",
+        "types.copy-es-watch"
       )
     },
     clean: {
@@ -117,9 +134,11 @@ module.exports = {
       "lerna version --no-git-tag-version --no-push --loglevel silly",
     // TODO: organize build scripts once build perf is sorted out
     "babel-es":
-      "cross-env BABEL_ENV=es babel src --out-dir es --config-file ../../.babelrc.js --copy-files --extensions .tsx,.ts,.jsx,.js --source-maps",
+      "cross-env BABEL_ENV=es babel src --out-dir es --config-file ../../.babelrc.js --extensions .tsx,.ts,.jsx,.js --source-maps",
     "babel-lib":
-      "cross-env BABEL_ENV=commonjs babel src --out-dir lib --config-file ../../.babelrc.js --copy-files --extensions .tsx,.ts,.jsx,.js --source-maps",
+      "cross-env BABEL_ENV=commonjs babel src --out-dir lib --config-file ../../.babelrc.js --extensions .tsx,.ts,.jsx,.js --source-maps",
+    "babel-es-watch": "nps babel-es -- -- --watch",
+    "babel-lib-watch": "nps babel-lib -- -- --watch",
     "build-es": npsUtils.series.nps("clean.es", "babel-es", "types.es"),
     "build-lib": npsUtils.series.nps("clean.lib", "babel-lib", "types.lib"),
     "build-libs": npsUtils.series.nps("build-lib", "build-es"),

package.json

@@ -83,6 +83,7 @@
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-preset-react-native": "^4.0.1",
     "chromatic": "^5.0.0",
+    "cpx2": "^4.2.0",
     "cross-env": "^7.0.3",
     "emotion-theming": "^10.0.27",
     "eslint": "^7.32.0",

packages/victory-area/.npmignore

@@ -1,10 +1,11 @@
 /*
 !/dist
-*.map
 !/es
 !/lib
 !/src
 !LICENSE.txt
 !CHANGELOG.md
 !README.md
 !package.json
+*.map
+**/*.test.*

test/jest/victory-area/victory-area.test.js → packages/victory-area/src/victory-area.test.js

@@ -4,7 +4,7 @@ import React from "react";
 import { Area, VictoryArea } from "victory-area";
 import { VictoryChart } from "victory-chart";
 import { curveCatmullRom } from "victory-vendor/d3-shape";
-import { calculateD3Path } from "../../svg-test-helper";
+import { calculateD3Path } from "../../../test/helpers";
 
 describe("components/victory-area", () => {
   describe("default component rendering", () => {

packages/victory-area/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*", "es", "lib"]
+}

packages/victory-area/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "../../tsconfig.base.json"
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["es", "lib"]
 }

packages/victory-axis/.npmignore

@@ -1,10 +1,11 @@
 /*
 !/dist
-*.map
 !/es
 !/lib
 !/src
 !LICENSE.txt
 !CHANGELOG.md
 !README.md
 !package.json
+*.map
+**/*.test.*

packages/victory-axis/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*", "es", "lib"]
+}

packages/victory-axis/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "../../tsconfig.base.json"
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["es", "lib"]
 }

packages/victory-bar/.npmignore

@@ -1,10 +1,11 @@
 /*
 !/dist
-*.map
 !/es
 !/lib
 !/src
 !LICENSE.txt
 !CHANGELOG.md
 !README.md
 !package.json
+*.map
+**/*.test.*

test/jest/victory-bar/bar.test.js → packages/victory-bar/src/bar.test.js

@@ -3,7 +3,7 @@ import { render } from "@testing-library/react";
 import * as d3Scale from "victory-vendor/d3-scale";
 import { VictoryContainer } from "victory-core";
 import { Bar } from "victory-bar";
-import { getBarShape } from "../../svg-test-helper";
+import { getBarShape } from "../../../test/helpers";
 
 describe("victory-primitives/bar", () => {
   const baseProps = {

test/jest/victory-bar/victory-bar.test.js → packages/victory-bar/src/victory-bar.test.js

@@ -1,11 +1,9 @@
-/*eslint-disable max-nested-callbacks */
-
-import React from "react";
+import * as React from "react";
 import { render, fireEvent, screen } from "@testing-library/react";
 import { range } from "lodash";
 import { VictoryChart } from "victory-chart";
-import { VictoryBar, Bar } from "victory-bar";
-import { isBar, getBarHeight } from "../../svg-test-helper";
+import { Bar, VictoryBar } from "victory-bar";
+import { isBar, getBarHeight } from "../../../test/helpers";
 
 describe("components/victory-bar", () => {
   describe("default component rendering", () => {

packages/victory-bar/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*", "es", "lib"]
+}

packages/victory-bar/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "../../tsconfig.base.json"
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["es", "lib"]
 }

packages/victory-box-plot/.npmignore

@@ -1,10 +1,11 @@
 /*
 !/dist
-*.map
 !/es
 !/lib
 !/src
 !LICENSE.txt
 !CHANGELOG.md
 !README.md
 !package.json
+*.map
+**/*.test.*

test/jest/victory-box-plot/victory-box-plot.test.js → packages/victory-box-plot/src/victory-box-plot.test.js

@@ -1,4 +1,3 @@
-/*eslint-disable react/prop-types */
 import { render, screen } from "@testing-library/react";
 import React from "react";
 import { VictoryBoxPlot } from "victory-box-plot";

packages/victory-box-plot/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*", "es", "lib"]
+}

packages/victory-box-plot/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "../../tsconfig.base.json"
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["es", "lib"]
 }

packages/victory-brush-container/.npmignore

@@ -1,10 +1,11 @@
 /*
 !/dist
-*.map
 !/es
 !/lib
 !/src
 !LICENSE.txt
 !CHANGELOG.md
 !README.md
 !package.json
+*.map
+**/*.test.*

test/jest/victory-brush-container/brush-helpers.test.js → packages/victory-brush-container/src/brush-helpers.test.js

@@ -1,8 +1,7 @@
-import { BrushHelpers } from "victory-brush-container";
+import Helpers from "victory-brush-container/lib/brush-helpers";
 
 describe("containers/brush-helpers", () => {
-  const { withinBounds, constrainBox } = BrushHelpers;
-
+  const { withinBounds, constrainBox } = Helpers;
   describe("withinBounds", () => {
     it("returns true when within bounds", () => {
       const point = { x: 1, y: 1 };

packages/victory-brush-container/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*", "es", "lib"]
+}

packages/victory-brush-container/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "../../tsconfig.base.json"
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["es", "lib"]
 }

packages/victory-brush-line/.npmignore

@@ -1,10 +1,11 @@
 /*
 !/dist
-*.map
 !/es
 !/lib
 !/src
 !LICENSE.txt
 !CHANGELOG.md
 !README.md
 !package.json
+*.map
+**/*.test.*

packages/victory-brush-line/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*", "es", "lib"]
+}

packages/victory-brush-line/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "../../tsconfig.base.json"
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["es", "lib"]
 }

packages/victory-candlestick/.npmignore

@@ -1,10 +1,11 @@
 /*
 !/dist
-*.map
 !/es
 !/lib
 !/src
 !LICENSE.txt
 !CHANGELOG.md
 !README.md
 !package.json
+*.map
+**/*.test.*

test/jest/victory-candlestick/helper-methods.test.js → packages/victory-candlestick/src/helper-methods.test.js

@@ -1,4 +1,3 @@
-/* eslint max-nested-callbacks: 0 */
 import { range } from "lodash";
 import { fromJS } from "immutable";
 import { getData, getDomain } from "victory-candlestick/lib/helper-methods";

test/jest/victory-candlestick/victory-candlestick.test.js → packages/victory-candlestick/src/victory-candlestick.test.js

@@ -1,4 +1,3 @@
-/*eslint-disable max-nested-callbacks */
 import { fireEvent, render, screen } from "@testing-library/react";
 import { range } from "lodash";
 import React from "react";

packages/victory-candlestick/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*", "es", "lib"]
+}

packages/victory-candlestick/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "../../tsconfig.base.json"
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["es", "lib"]
 }

packages/victory-canvas/.npmignore

@@ -1,10 +1,11 @@
 /*
 !/dist
-*.map
 !/es
 !/lib
 !/src
 !LICENSE.txt
 !CHANGELOG.md
 !README.md
 !package.json
+*.map
+**/*.test.*

packages/victory-canvas/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*", "es", "lib"]
+}

packages/victory-canvas/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "../../tsconfig.base.json"
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["es", "lib"]
 }