From 4e93c72ace5b71af247a87d63ff7cf9b6cf520a5 Mon Sep 17 00:00:00 2001 From: Eduardo San Martin Morote Date: Fri, 10 Jun 2022 18:49:04 +0200 Subject: [PATCH] refactor: move playground --- .prettierignore | 3 +- package.json | 13 +- {playground => packages/playground}/App.vue | 2 +- .../shim.d.ts => packages/playground/env.d.ts | 3 + .../playground}/index.html | 3 +- packages/playground/package.json | 22 + packages/playground/src/App.vue | 233 ++++++++++ .../playground/src}/AppLink.vue | 5 +- packages/playground/src/api/index.js | 8 + .../playground/src}/api/index.ts | 0 packages/playground/src/main.js | 17 + .../playground/src}/main.ts | 4 +- packages/playground/src/router.js | 401 ++++++++++++++++++ .../playground/src}/router.ts | 33 +- packages/playground/src/scrollWaiter.js | 18 + .../playground/src}/scrollWaiter.ts | 0 packages/playground/src/store.js | 4 + .../playground/src}/store.ts | 0 .../src}/views/ComponentWithData.vue | 2 +- .../playground/src}/views/Dynamic.vue | 0 .../playground/src}/views/Generic.vue | 0 .../src}/views/GuardedWithLeave.vue | 2 +- .../playground/src}/views/Home.vue | 0 .../playground/src}/views/LongView.vue | 2 +- .../playground/src}/views/Nested.vue | 0 .../playground/src}/views/NestedWithId.vue | 0 .../playground/src}/views/NotFound.vue | 2 +- .../playground/src}/views/RepeatedParams.vue | 2 +- .../playground/src}/views/User.vue | 0 packages/playground/tsconfig.config.json | 8 + packages/playground/tsconfig.json | 18 + .../playground/vite.config.ts | 16 +- packages/router/package.json | 17 +- packages/router/src/RouterLink.ts | 3 +- playground/tsconfig.json | 20 - pnpm-lock.yaml | 72 +++- 36 files changed, 831 insertions(+), 102 deletions(-) rename {playground => packages/playground}/App.vue (99%) rename playground/shim.d.ts => packages/playground/env.d.ts (57%) rename {playground => packages/playground}/index.html (96%) create mode 100644 packages/playground/package.json create mode 100644 packages/playground/src/App.vue rename {playground => packages/playground/src}/AppLink.vue (91%) create mode 100644 packages/playground/src/api/index.js rename {playground => packages/playground/src}/api/index.ts (100%) create mode 100644 packages/playground/src/main.js rename {playground => packages/playground/src}/main.ts (84%) create mode 100644 packages/playground/src/router.js rename {playground => packages/playground/src}/router.ts (91%) create mode 100644 packages/playground/src/scrollWaiter.js rename {playground => packages/playground/src}/scrollWaiter.ts (100%) create mode 100644 packages/playground/src/store.js rename {playground => packages/playground/src}/store.ts (100%) rename {playground => packages/playground/src}/views/ComponentWithData.vue (93%) rename {playground => packages/playground/src}/views/Dynamic.vue (100%) rename {playground => packages/playground/src}/views/Generic.vue (100%) rename {playground => packages/playground/src}/views/GuardedWithLeave.vue (91%) rename {playground => packages/playground/src}/views/Home.vue (100%) rename {playground => packages/playground/src}/views/LongView.vue (93%) rename {playground => packages/playground/src}/views/Nested.vue (100%) rename {playground => packages/playground/src}/views/NestedWithId.vue (100%) rename {playground => packages/playground/src}/views/NotFound.vue (86%) rename {playground => packages/playground/src}/views/RepeatedParams.vue (95%) rename {playground => packages/playground/src}/views/User.vue (100%) create mode 100644 packages/playground/tsconfig.config.json create mode 100644 packages/playground/tsconfig.json rename playground/vite.config.js => packages/playground/vite.config.ts (50%) delete mode 100644 playground/tsconfig.json diff --git a/.prettierignore b/.prettierignore index 197fddc69..0442789cf 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,2 +1,3 @@ -e2e/__build__ +__build__ dist +coverage diff --git a/package.json b/package.json index 8b87ead2c..fd18d089c 100644 --- a/package.json +++ b/package.json @@ -15,11 +15,16 @@ "docs:build": "pnpm run -r docs:build --filter ./packages/docs", "play": "pnpm run -r play", "build:size": "pnpm run -r build:size", - "lint": "prettier -c --parser typescript \"packages/*/{src,__tests__,e2e}/**/*.[jt]s?(x)\"", - "lint:fix": "pnpm run lint --write", + "lint": "pnpm run lint:script && pnpm run lint:html", + "lint:script": "prettier -c --parser typescript \"packages/*/{src,__tests__,e2e}/**/*.[jt]s?(x)\"", + "lint:html": "prettier -c --parser html \"packages/**/*.html\"", + "lint:fix": "pnpm run lint:script --write && pnpm run lint:html --write", "test": "pnpm run -r test" }, "devDependencies": { + "@vue/compiler-sfc": "^3.2.31", + "@vue/server-renderer": "^3.2.37", + "@vue/test-utils": "^2.0.0-rc.3", "brotli": "^1.3.3", "chalk": "^4.1.2", "enquirer": "^2.3.6", @@ -28,7 +33,11 @@ "lint-staged": "^13.0.0", "minimist": "^1.2.6", "p-series": "^3.0.0", + "prettier": "^2.4.1", "semver": "^7.3.7", + "typescript": "~4.7.2", + "vue": "^3.2.37", + "vue-tsc": "^0.37.2", "yorkie": "^2.0.0" }, "gitHooks": { diff --git a/playground/App.vue b/packages/playground/App.vue similarity index 99% rename from playground/App.vue rename to packages/playground/App.vue index 1e25a4d86..050146168 100644 --- a/playground/App.vue +++ b/packages/playground/App.vue @@ -186,7 +186,7 @@ + diff --git a/packages/playground/package.json b/packages/playground/package.json new file mode 100644 index 000000000..48a2d2856 --- /dev/null +++ b/packages/playground/package.json @@ -0,0 +1,22 @@ +{ + "name": "@vue/router-playground", + "private": true, + "version": "0.0.0", + "scripts": { + "dev": "vite", + "build": "vite build", + "preview": "vite preview --port 4173" + }, + "dependencies": { + "vue": "^3.2.36" + }, + "devDependencies": { + "@types/node": "^16.11.36", + "@vitejs/plugin-vue": "^2.3.3", + "@vue/tsconfig": "^0.1.3", + "typescript": "~4.7.2", + "vite": "^2.9.9", + "vue-router": "workspace:*", + "vue-tsc": "^0.37.2" + } +} diff --git a/packages/playground/src/App.vue b/packages/playground/src/App.vue new file mode 100644 index 000000000..050146168 --- /dev/null +++ b/packages/playground/src/App.vue @@ -0,0 +1,233 @@ + + + diff --git a/playground/AppLink.vue b/packages/playground/src/AppLink.vue similarity index 91% rename from playground/AppLink.vue rename to packages/playground/src/AppLink.vue index b28476a09..8132ff20a 100644 --- a/playground/AppLink.vue +++ b/packages/playground/src/AppLink.vue @@ -27,13 +27,12 @@