done migrate test/core to packages/core/test

ohze · Apr 22, 2019 · 9b2bc10 · 9b2bc10
1 parent 73ab457
commit 9b2bc10
Show file tree

Hide file tree

Showing 17 changed files with 94 additions and 112 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,8 @@ node_modules
 *.test.d.ts
 /test/*.d.ts
 !/test/typings.d.ts
-/test/qunit-ex.js*
+/packages/core/test/qunit-ex.js*
+/packages/core/test/qunit-ex.d.ts
 /packages/*/lib/
 !/packages/*/lib/types/types.d.ts
 yarn-error.log
diff --git a/packages/classapplier/src/tsconfig.json b/packages/classapplier/src/tsconfig.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "src",
-    "declarationDir": "lib/types",
-    "outDir": "lib/esm2015",
-    "target": "es2018"
+    "declarationDir": "../lib/types",
+    "outDir": "../lib/esm2015"
   },
-  "references": [{"path": "../core"}]
+  "references": [
+    {"path": "../../core/src"}
+  ]
 }
diff --git a/packages/core/src/tsconfig.json b/packages/core/src/tsconfig.json
@@ -1,9 +1,7 @@
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "src",
-    "declarationDir": "lib/types",
-    "outDir": "lib/esm2015",
-    "target": "es2018"
+    "declarationDir": "../lib/types",
+    "outDir": "../lib/esm2015"
   }
 }
diff --git a/packages/core/test/dom.test.ts b/packages/core/test/dom.test.ts
@@ -1,4 +1,4 @@
-import * as rangy from "rangy2";
+import * as rangy from "@rangy/core";
 
 QUnit.module("Range");
 

diff --git a/packages/core/test/feature.test.html b/packages/core/test/feature.test.html
@@ -7,10 +7,10 @@
     <title>Rangy - Features Tests</title>
 
     <!-- load rangy2 here in `head` to verify that rangy2 can init without need dom ready -->
-    <script src="../../dist/core/bundles/index.umd.js"></script>
-    <script src="../../node_modules/qunit/qunit/qunit.js"></script>
-    <link rel="stylesheet" href="../../node_modules/qunit/qunit/qunit.css">
-    <script src="../qunit-ex.js"></script>
+    <script src="../lib/bundles/index.umd.js"></script>
+    <script src="../../../node_modules/qunit/qunit/qunit.js"></script>
+    <link rel="stylesheet" href="../../../node_modules/qunit/qunit/qunit.css">
+    <script src="qunit-ex.js"></script>
 </head>
 <body>
     <div id="qunit"></div>

diff --git a/packages/core/test/feature.test.ts b/packages/core/test/feature.test.ts
@@ -1,4 +1,4 @@
-import * as rangy from "rangy2";
+import * as rangy from "@rangy/core";
 import Bowser from "bowser";
 
 const browser = Bowser.getParser(window.navigator.userAgent);

diff --git a/packages/core/test/index.html b/packages/core/test/index.html
@@ -6,10 +6,10 @@
     <meta name="referrer" content="no-referrer" />
     <title>QUnit Example</title>
     <!-- load rangy2 here in `head` to verify that rangy2 can init without need dom ready -->
-    <script src="../../dist/core/bundles/index.umd.js"></script>
-    <script src="../../node_modules/qunit/qunit/qunit.js"></script>
-    <link rel="stylesheet" href="../../node_modules/qunit/qunit/qunit.css">
-    <script src="../qunit-ex.js"></script>
+    <script src="../lib/bundles/index.umd.js"></script>
+    <script src="../../../node_modules/qunit/qunit/qunit.js"></script>
+    <link rel="stylesheet" href="../../../node_modules/qunit/qunit/qunit.css">
+    <script src="qunit-ex.js"></script>
 </head>
 <body>
 <div id="qunit"></div>

diff --git a/packages/core/test/range.test.ts b/packages/core/test/range.test.ts
@@ -1,7 +1,7 @@
-import * as rangy from "rangy2";
-import {DomRange, RangyRange, DOMException, WrappedRange} from "rangy2";
+import * as rangy from "@rangy/core";
+import {DomRange, RangyRange, DOMException, WrappedRange} from "@rangy/core";
 
-import "../qunit-ex";
+import "./qunit-ex";
 
 var hasNativeDomRange = "createRange" in document;
 

diff --git a/packages/core/test/selection.test.ts b/packages/core/test/selection.test.ts
@@ -1,5 +1,5 @@
-import * as rangy from "rangy2";
-import {RangyRangeEx, WrappedSelection} from "rangy2";
+import * as rangy from "@rangy/core";
+import {RangyRangeEx, WrappedSelection} from "@rangy/core";
 
 var hasNativeGetSelection = "getSelection" in window;
 var hasNativeDomRange = "createRange" in document;

diff --git a/packages/core/test/tsconfig.json b/packages/core/test/tsconfig.json
@@ -1,28 +1,6 @@
 {
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "esModuleInterop": true,
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "stripInternal": true,
-    "baseUrl": ".",
-    "paths": {
-      "rangy2": ["../dist/core"],
-      "rangy-classapplier": ["../dist/classapplier"],
-      "rangy-highlighter": ["../dist/highlighter"],
-      "rangy-selectionsaverestore": ["../dist/selectionsaverestore"],
-      "rangy-serializer": ["../dist/serializer"],
-      "rangy-util": ["../dist/util"]
-    }
-  },
-//  "references": [
-//    { "path": "../src/core"},
-//    { "path": "../src/classapplier"},
-//    { "path": "../src/highlighter"},
-//    { "path": "../src/selectionsaverestore"},
-//    { "path": "../src/serializer"},
-//    { "path": "../src/util"}
-//  ]
-//  "include": ["./**/*.ts"]
+  "extends": "../../tsconfig.base.json",
+  "references": [
+    { "path": "../src"}
+  ]
 }
diff --git a/packages/highlighter/src/tsconfig.json b/packages/highlighter/src/tsconfig.json
@@ -1,13 +1,11 @@
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "src",
-    "declarationDir": "lib/types",
-    "outDir": "lib/esm2015",
-    "target": "es2018"
+    "declarationDir": "../lib/types",
+    "outDir": "../lib/esm2015"
   },
   "references": [
-    {"path": "../core"},
-    {"path": "../classapplier"}
+    {"path": "../../core/src"},
+    {"path": "../../classapplier/src"}
   ]
 }
diff --git a/packages/selectionsaverestore/src/tsconfig.json b/packages/selectionsaverestore/src/tsconfig.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "src",
-    "declarationDir": "lib/types",
-    "outDir": "lib/esm2015",
-    "target": "es2018"
+    "declarationDir": "../lib/types",
+    "outDir": "../lib/esm2015"
   },
-  "references": [{"path": "../core"}]
+  "references": [
+    {"path": "../../core/src"}
+  ]
 }
diff --git a/packages/serializer/src/tsconfig.json b/packages/serializer/src/tsconfig.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "src",
-    "declarationDir": "lib/types",
-    "outDir": "lib/esm2015",
-    "target": "es2018"
+    "declarationDir": "../lib/types",
+    "outDir": "../lib/esm2015"
   },
-  "references": [{"path": "../core"}]
+  "references": [
+    {"path": "../../core/src"}
+  ]
 }
diff --git a/packages/tsconfig.base.json b/packages/tsconfig.base.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "moduleResolution": "node",
     "module": "esnext",
+    "target": "es2018",
     "lib": [
       "dom",
       "es2018"

diff --git a/packages/util/src/tsconfig.json b/packages/util/src/tsconfig.json
@@ -1,10 +1,11 @@
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "src",
-    "declarationDir": "lib/types",
-    "outDir": "lib/esm2015",
+    "declarationDir": "../lib/types",
+    "outDir": "../lib/esm2015",
     "target": "es2018"
   },
-  "references": [{"path": "../core"}]
+  "references": [
+    {"path": "../../core/src"}
+  ]
 }
diff --git a/scripts/rollup.config.test.ts b/scripts/rollup.config.test.ts
@@ -7,18 +7,13 @@ import nodeResolve from 'rollup-plugin-node-resolve';
 import commonjs from 'rollup-plugin-commonjs';
 import * as glob from 'glob';
 import typescript from 'rollup-plugin-typescript2'
-import {packages, projectRoot} from "./util";
+import {packages, packagesDir} from "./util";
 import {resolve, join} from "path";
 import {ModuleFormat, RollupOptions} from "rollup";
 
-const testDir = resolve(projectRoot, 'test');
-
-const plugins = [
+const commonPlugins = [
     nodeResolve(),
-    commonjs(),
-    typescript({
-        tsconfig: resolve(testDir, 'tsconfig.json')
-    }),
+    commonjs()
 ];
 
 //all rangy modules are external dependencies to test code
@@ -28,27 +23,37 @@ const external = packages.map(n => '@rangy/' + n);
 const globals = {};
 external.forEach(n => Object.assign(globals, {[n]: 'rangy'}));
 
-function config(f: string, format: ModuleFormat = 'iife'): RollupOptions {
-    f = join(testDir, f);
-    return {
-        input: [f],
-        output: {
-            format,
-            file: f.replace(/\.ts$/, format == 'iife'? '.js' : `.${format}.js`),
-            name: 'unnamed',
-            globals,
-            sourcemap: true
-        },
-        external,
-        plugins,
+function configsFor(module: string) {
+    const cwd = resolve(packagesDir, module, 'test');
+    const plugins = [...commonPlugins, typescript({
+        tsconfig: resolve(cwd, 'tsconfig.json')
+    })];
+    function config(f: string, format: ModuleFormat = 'iife'): RollupOptions {
+        f = join(cwd, f);
+        return {
+            input: [f],
+            output: {
+                format,
+                file: f.replace(/\.ts$/, format == 'iife'? '.js' : `.${format}.js`),
+                name: 'unnamed',
+                globals,
+                sourcemap: true
+            },
+            external,
+            plugins,
+        }
     }
-}
+    const configs = glob
+        .sync('**/*.ts', {cwd})
+        .filter(f => !f.endsWith('.d.ts'))
+        .map(f => config(f));
 
-const configs = glob
-    .sync('**/*.ts', {cwd: testDir})
-    .filter(f => !f.endsWith('.d.ts'))
-    .map(f => config(f));
-// push amdTestExampleConfig
-configs.push(config("classapplier/index.test.ts", 'amd'));
+    if (module == 'classapplier') {
+        // push amdTestExampleConfig
+        configs.push(config("index.test.ts", 'amd'));
+    }
+    return configs;
+}
 
-export default configs;
+// export default packages.flatMap(configsFor);
+export default configsFor('core');
diff --git a/tsconfig.json b/tsconfig.json
@@ -3,12 +3,12 @@
     "composite": true
   },
   "references": [
-    { "path": "packages/core"},
-    { "path": "packages/classapplier"},
-    { "path": "packages/highlighter"},
-    { "path": "packages/selectionsaverestore"},
-    { "path": "packages/serializer"},
-    { "path": "packages/util"}
+    { "path": "packages/core/src"},
+    { "path": "packages/classapplier/src"},
+    { "path": "packages/highlighter/src"},
+    { "path": "packages/selectionsaverestore/src"},
+    { "path": "packages/serializer/src"},
+    { "path": "packages/util/src"}
   ],
   "files": []
 }