fix: revert alias support

pateketrueke · May 27, 2022 · 8e1b907 · 8e1b907
1 parent 77e30d8
commit 8e1b907
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 18 deletions.
diff --git a/components.js b/components.js
@@ -0,0 +1,5 @@
+export { default as Router } from './src/lib/Router.svelte';
+export { default as Route } from './src/lib/Route.svelte';
+export { default as Link } from './src/lib/Link.svelte';
+
+export { navigateTo, router } from './src/lib/utils';
diff --git a/e2e/components/Import.svelte b/e2e/components/Import.svelte
@@ -1,6 +1,5 @@
 <script>
-  import Router from '../../src/lib/Router.svelte';
-  import Route from '../../src/lib/Route.svelte';
+  import { Router, Route } from 'yrv';
 
   function delay(promise) {
     return new Promise(ok => setTimeout(() => ok(promise), 500));

diff --git a/e2e/components/Main.svelte b/e2e/components/Main.svelte
@@ -1,8 +1,5 @@
 <script>
-  import Router from '../../src/lib/Router.svelte';
-  import Route from '../../src/lib/Route.svelte';
-  import Link from '../../src/lib/Link.svelte';
-  import { router } from '../../src/lib/utils';
+  import { Router, Route, Link, router } from 'yrv';
 
   import Testing from './Testing.svelte';
 

diff --git a/e2e/components/Testing.svelte b/e2e/components/Testing.svelte
@@ -1,8 +1,7 @@
 <script>
-  import Router from '../../src/lib/Router.svelte';
-  import Route from '../../src/lib/Route.svelte';
-  import Link from '../../src/lib/Link.svelte';
-  import { navigateTo } from '../../src/lib/utils';
+  import {
+    Router, Route, Link, navigateTo,
+  } from 'yrv';
 
   export let router = null;
 

diff --git a/e2e/components/nested-routers/App.svelte b/e2e/components/nested-routers/App.svelte
@@ -1,7 +1,5 @@
 <script>
-  import Router from '../../../src/lib/Router.svelte';
-  import Route from '../../../src/lib/Route.svelte';
-  import Link from '../../../src/lib/Link.svelte';
+  import { Router, Route, Link } from 'yrv';
 
   import Home from './Home.svelte';
   import Players from './Players.svelte';

diff --git a/e2e/components/nested-routers/Players.svelte b/e2e/components/nested-routers/Players.svelte
@@ -1,7 +1,5 @@
 <script>
-  import Router from '../../../src/lib/Router.svelte';
-  import Route from '../../../src/lib/Route.svelte';
-  import Link from '../../../src/lib/Link.svelte';
+  import { Router, Route, Link } from 'yrv';
 
   import List from './List.svelte';
   import NewTeam from './NewTeam.svelte';

diff --git a/package.json b/package.json
@@ -21,13 +21,13 @@
     "prebuild": "rm -rf build",
     "copy:vendor": "cp build/src/vendor.js build/dev/ && cp build/src/vendor.js build/dist/",
     "copy:index": "cp src/index.js build/dev/ && cp src/index.js build/dist/",
-    "mortero": "mortero USE_HASH_CHANGE=$HASHCHANGE DEBUG=true --platform browser",
+    "mortero": "mortero -ayrv:./components USE_HASH_CHANGE=$HASHCHANGE DEBUG=true --platform browser",
     "build:module": "npm run mortero -- src -Xtest -Dbuild/src -Nsvelte -fyindex.js --format esm",
     "build:debug": "npm run mortero -- src/lib -Xtest -fKDbuild/dev --format esm",
     "build:test": "npm run mortero -- src e2e -X{lib,cases,components} -Xhelpers.js -X'**/_*'",
     "build:all": "mortero src/lib -fKXtest -Dbuild/dist --format esm --platform browser",
     "build": "npm run build:all && npm run build:debug && npm run build:module",
-    "test": "npm run build:test -- -fyjs && testcafe ${BROWSER:-chrome:headless} -q -a 'npm run dev' e2e/cases"
+    "test": "npm run build:test -- -fyjs && testcafe ${BROWSER:-chrome:headless} --color -q -a 'npm run dev' e2e/cases"
   },
   "mortero": {
     "bundle": [