From d60300b54af486fbde38ffa6a8dfe9aa180cba51 Mon Sep 17 00:00:00 2001 From: Eduardo San Martin Morote Date: Tue, 17 Aug 2021 16:55:09 +0200 Subject: [PATCH] build: refactor to use multi package --- packages/pinia/api-extractor.json | 3 +-- packages/pinia/package.json | 27 +++---------------- packages/pinia/test-dts/actions.test-d.ts | 2 +- packages/pinia/test-dts/onAction.test-d.ts | 2 +- packages/pinia/test-dts/tsconfig.json | 2 +- packages/pinia/test-dts/typeHelpers.test-d.ts | 2 +- 6 files changed, 9 insertions(+), 29 deletions(-) diff --git a/packages/pinia/api-extractor.json b/packages/pinia/api-extractor.json index ca11cda8..9d27602f 100644 --- a/packages/pinia/api-extractor.json +++ b/packages/pinia/api-extractor.json @@ -1,8 +1,7 @@ -// this the shared base config for all packages. { "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", - "mainEntryPointFilePath": "./dist/src/index.d.ts", + "mainEntryPointFilePath": "./dist/packages/pinia/src/index.d.ts", "apiReport": { "enabled": true, diff --git a/packages/pinia/package.json b/packages/pinia/package.json index dd9759dd..f95464c6 100644 --- a/packages/pinia/package.json +++ b/packages/pinia/package.json @@ -25,19 +25,16 @@ "scripts": { "docs": "vitepress dev docs", "docs:build": "vitepress build docs", - "build": "rimraf dist && rollup -c rollup.config.js", + "build": "rimraf dist && rollup -c ../../rollup.config.js --environment TARGET:pinia", "build:dts": "api-extractor run --local --verbose", "size": "rollup -c size-checks/rollup.config.js && node scripts/check-size.mjs", "release": "bash scripts/release.sh", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1", - "lint": "prettier -c --parser typescript \"{src,__tests__,e2e}/**/*.[jt]s?(x)\"", - "lint:fix": "yarn run lint --write", + "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path . -l pinia -r 1", "test:dts": "tsc -p ./test-dts/tsconfig.json", - "test:types": "tsc --build tsconfig.json", - "test:unit": "jest --coverage", + "test:types": "tsc --build ../../tsconfig.json", "dev": "yarn run test:unit --watchAll", "play": "yarn vite", - "test": "yarn run test:types && yarn run test:unit && yarn run build && yarn run build:dts && yarn test:dts" + "test": "yarn run test:types && yarn run build && yarn run build:dts && yarn test:dts" }, "files": [ "dist/*.js", @@ -72,8 +69,6 @@ "@rollup/plugin-commonjs": "^20.0.0", "@rollup/plugin-node-resolve": "^13.0.4", "@rollup/plugin-replace": "^3.0.0", - "@sucrase/jest-plugin": "^2.1.1", - "@types/jest": "^27.0.1", "@types/lodash.kebabcase": "^4.1.6", "@types/node": "^16.4.3", "@vitejs/plugin-vue": "^1.4.0", @@ -85,8 +80,6 @@ "codecov": "^3.8.3", "conventional-changelog-cli": "^2.1.1", "globby": "^12.0.0", - "jest": "^27.0.6", - "jest-mock-warn": "^1.1.0", "lint-staged": "^11.1.2", "lodash.kebabcase": "^4.1.1", "mande": "^1.0.0", @@ -123,18 +116,6 @@ "optional": true } }, - "gitHooks": { - "pre-commit": "lint-staged", - "commit-msg": "node scripts/verifyCommit.js" - }, - "lint-staged": { - "*.js": [ - "prettier --write" - ], - "*.ts?(x)": [ - "prettier --parser=typescript --write" - ] - }, "repository": { "type": "git", "url": "git+https://github.com/posva/pinia.git" diff --git a/packages/pinia/test-dts/actions.test-d.ts b/packages/pinia/test-dts/actions.test-d.ts index d23d720c..dcf0002e 100644 --- a/packages/pinia/test-dts/actions.test-d.ts +++ b/packages/pinia/test-dts/actions.test-d.ts @@ -1,4 +1,4 @@ -import { defineStore, expectType } from '.' +import { defineStore, expectType } from './' const useStore = defineStore({ id: 'name', diff --git a/packages/pinia/test-dts/onAction.test-d.ts b/packages/pinia/test-dts/onAction.test-d.ts index 483f9ffa..c7d7543f 100644 --- a/packages/pinia/test-dts/onAction.test-d.ts +++ b/packages/pinia/test-dts/onAction.test-d.ts @@ -1,4 +1,4 @@ -import { defineStore, expectType } from '.' +import { defineStore, expectType } from './' const useStore = defineStore({ id: 'main', diff --git a/packages/pinia/test-dts/tsconfig.json b/packages/pinia/test-dts/tsconfig.json index 937f5669..ed2449ef 100644 --- a/packages/pinia/test-dts/tsconfig.json +++ b/packages/pinia/test-dts/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.json", + "extends": "../../../tsconfig.json", "compilerOptions": { "noEmit": true, "declaration": true, diff --git a/packages/pinia/test-dts/typeHelpers.test-d.ts b/packages/pinia/test-dts/typeHelpers.test-d.ts index 383c5c41..2bd7c9eb 100644 --- a/packages/pinia/test-dts/typeHelpers.test-d.ts +++ b/packages/pinia/test-dts/typeHelpers.test-d.ts @@ -1,4 +1,4 @@ -import { StoreDefinition } from 'dist/pinia' +import { StoreDefinition } from './' import { computed, ref } from 'vue' import { StoreState, -- 2.47.3