diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cac8cfac..33e8c623 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: - 20 os: - macos-latest - # - windows-latest + - windows-latest - ubuntu-latest runs-on: ${{ matrix.os }} steps: @@ -29,15 +29,25 @@ jobs: with: node-version: ${{ matrix.node }} cache: yarn + env: + # https://github.com/actions/setup-node/issues/531#issuecomment-1819151412 + SKIP_YARN_COREPACK_CHECK: 1 - name: Install Dependencies run: yarn --immutable + env: + SKIP_YARN_COREPACK_CHECK: 1 - name: Build, Lint and Test - run: yarn run-s build lint test typecov + run: | + yarn build + yarn lint + yarn test + yarn typecov env: EFF_NO_LINK_RULES: true PARSER_NO_WATCH: true + SKIP_YARN_COREPACK_CHECK: 1 - name: Codecov uses: codecov/codecov-action@v3 diff --git a/.gitignore b/.gitignore index 255f6834..8aa84974 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .type-coverage .vercel .yarn/* +!.yarn/patches !.yarn/plugins coverage lib diff --git a/.yarn/patches/vite-npm-5.0.6-d33c199e48.patch b/.yarn/patches/vite-npm-5.0.6-d33c199e48.patch new file mode 100644 index 00000000..4ccce7cc --- /dev/null +++ b/.yarn/patches/vite-npm-5.0.6-d33c199e48.patch @@ -0,0 +1,12 @@ +diff --git a/dist/node/constants.js b/dist/node/constants.js +index 334b9a0929295a440030a8bdb383c56a322e4301..7d133d3d87e9541508ce875a5656be22f430ea03 100644 +--- a/dist/node/constants.js ++++ b/dist/node/constants.js +@@ -107,6 +107,7 @@ const KNOWN_ASSET_TYPES = [ + 'webmanifest', + 'pdf', + 'txt', ++ 'md', + ]; + const DEFAULT_ASSETS_RE = new RegExp(`\\.(` + KNOWN_ASSET_TYPES.join('|') + `)(\\?.*)?$`); + const DEP_VERSION_RE = /[?&](v=[\w.-]+)\b/; diff --git a/package.json b/package.json index ee5f6b6a..e22ceaa8 100644 --- a/package.json +++ b/package.json @@ -12,12 +12,12 @@ ], "packageManager": "yarn@4.0.2", "scripts": { - "build": "run-p 'build:*'", + "build": "concurrently 'yarn:build:*'", "build:r": "r -f cjs", "build:tsc": "tsc -b", "clean": "rimraf -g 'packages/**/{lib,*.tsbuildinfo}'", "dev": "vite dev", - "lint": "run-p 'lint:*'", + "lint": "concurrently 'yarn:lint:*'", "lint:es": "eslint . --cache -f friendly", "lint:style": "stylelint . --cache", "lint:tsc": "tsc --noEmit", @@ -26,7 +26,7 @@ "serve": "sirv dist -s", "test": "vitest run --coverage", "typecov": "type-coverage", - "vercel-build": "yarn build && vite build", + "vercel-build": "vite build", "version": "changeset version && yarn --no-immutable" }, "devDependencies": { @@ -43,10 +43,10 @@ "@types/web": "^0.0.125", "@vitejs/plugin-react-swc": "^3.5.0", "@vitest/coverage-istanbul": "^1.0.2", + "concurrently": "^8.2.2", "eslint": "^8.55.0", "github-markdown-css": "^5.4.0", "lint-staged": "^15.2.0", - "npm-run-all": "^4.1.5", "pkg": "link:packages/pkg", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -69,7 +69,8 @@ "esbuild": "^0.19.8", "lint-staged": "^15.2.0", "prettier": "^2.8.8", - "rollup": "^4.6.1" + "rollup": "^4.6.1", + "vite": "patch:vite@npm%3A5.0.6#~/.yarn/patches/vite-npm-5.0.6-d33c199e48.patch" }, "commitlint": { "extends": "@1stg" diff --git a/yarn.lock b/yarn.lock index bf978923..e0c5fd35 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2052,7 +2052,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4": +"@babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4": version: 7.23.5 resolution: "@babel/runtime@npm:7.23.5" dependencies: @@ -6476,6 +6476,26 @@ __metadata: languageName: node linkType: hard +"concurrently@npm:^8.2.2": + version: 8.2.2 + resolution: "concurrently@npm:8.2.2" + dependencies: + chalk: "npm:^4.1.2" + date-fns: "npm:^2.30.0" + lodash: "npm:^4.17.21" + rxjs: "npm:^7.8.1" + shell-quote: "npm:^1.8.1" + spawn-command: "npm:0.0.2" + supports-color: "npm:^8.1.1" + tree-kill: "npm:^1.2.2" + yargs: "npm:^17.7.2" + bin: + conc: dist/bin/concurrently.js + concurrently: dist/bin/concurrently.js + checksum: dcb1aa69d9c611a7bda9d4fc0fe1e388f971d1744acec7e0d52dffa2ef55743f1266ec9292f414c5789b9f61734b3fce772bd005d4de9564a949fb121b97bae1 + languageName: node + linkType: hard + "config-chain@npm:^1.1.11": version: 1.1.13 resolution: "config-chain@npm:1.1.13" @@ -7019,6 +7039,15 @@ __metadata: languageName: node linkType: hard +"date-fns@npm:^2.30.0": + version: 2.30.0 + resolution: "date-fns@npm:2.30.0" + dependencies: + "@babel/runtime": "npm:^7.21.0" + checksum: 70b3e8ea7aaaaeaa2cd80bd889622a4bcb5d8028b4de9162cbcda359db06e16ff6e9309e54eead5341e71031818497f19aaf9839c87d1aba1e27bb4796e758a9 + languageName: node + linkType: hard + "dayjs@npm:^1.10.0": version: 1.11.10 resolution: "dayjs@npm:1.11.10" @@ -13995,10 +14024,10 @@ __metadata: "@types/web": "npm:^0.0.125" "@vitejs/plugin-react-swc": "npm:^3.5.0" "@vitest/coverage-istanbul": "npm:^1.0.2" + concurrently: "npm:^8.2.2" eslint: "npm:^8.55.0" github-markdown-css: "npm:^5.4.0" lint-staged: "npm:^15.2.0" - npm-run-all: "npm:^4.1.5" pkg: "link:packages/pkg" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" @@ -18020,6 +18049,15 @@ __metadata: languageName: node linkType: hard +"rxjs@npm:^7.8.1": + version: 7.8.1 + resolution: "rxjs@npm:7.8.1" + dependencies: + tslib: "npm:^2.1.0" + checksum: b10cac1a5258f885e9dd1b70d23c34daeb21b61222ee735d2ec40a8685bdca40429000703a44f0e638c27a684ac139e1c37e835d2a0dc16f6fc061a138ae3abb + languageName: node + linkType: hard + "sade@npm:^1.6.0, sade@npm:^1.7.3": version: 1.8.1 resolution: "sade@npm:1.8.1" @@ -18281,7 +18319,7 @@ __metadata: languageName: node linkType: hard -"shell-quote@npm:^1.6.1": +"shell-quote@npm:^1.6.1, shell-quote@npm:^1.8.1": version: 1.8.1 resolution: "shell-quote@npm:1.8.1" checksum: af19ab5a1ec30cb4b2f91fd6df49a7442d5c4825a2e269b3712eded10eedd7f9efeaab96d57829880733fc55bcdd8e9b1d8589b4befb06667c731d08145e274d @@ -18530,6 +18568,13 @@ __metadata: languageName: node linkType: hard +"spawn-command@npm:0.0.2": + version: 0.0.2 + resolution: "spawn-command@npm:0.0.2" + checksum: f13e8c3c63abd4a0b52fb567eba5f7940d480c5ed3ec61781d38a1850f179b1196c39e6efa2bbd301f82c1bf1cd7807abc8fbd8fc8e44bcaa3975a124c0d1657 + languageName: node + linkType: hard + "spawndamnit@npm:^2.0.0": version: 2.0.0 resolution: "spawndamnit@npm:2.0.0" @@ -19225,6 +19270,15 @@ __metadata: languageName: node linkType: hard +"supports-color@npm:^8.1.1": + version: 8.1.1 + resolution: "supports-color@npm:8.1.1" + dependencies: + has-flag: "npm:^4.0.0" + checksum: 157b534df88e39c5518c5e78c35580c1eca848d7dbaf31bbe06cdfc048e22c7ff1a9d046ae17b25691128f631a51d9ec373c1b740c12ae4f0de6e292037e4282 + languageName: node + linkType: hard + "supports-color@npm:^9.0.0": version: 9.4.0 resolution: "supports-color@npm:9.4.0" @@ -19599,6 +19653,15 @@ __metadata: languageName: node linkType: hard +"tree-kill@npm:^1.2.2": + version: 1.2.2 + resolution: "tree-kill@npm:1.2.2" + bin: + tree-kill: cli.js + checksum: 49117f5f410d19c84b0464d29afb9642c863bc5ba40fcb9a245d474c6d5cc64d1b177a6e6713129eb346b40aebb9d4631d967517f9fbe8251c35b21b13cd96c7 + languageName: node + linkType: hard + "trim-lines@npm:^3.0.0": version: 3.0.1 resolution: "trim-lines@npm:3.0.1" @@ -19681,7 +19744,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:1 || 2, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.5.3, tslib@npm:^2.6.0, tslib@npm:^2.6.1, tslib@npm:^2.6.2": +"tslib@npm:1 || 2, tslib@npm:^2.1.0, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.5.3, tslib@npm:^2.6.0, tslib@npm:^2.6.1, tslib@npm:^2.6.2": version: 2.6.2 resolution: "tslib@npm:2.6.2" checksum: bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca @@ -20620,7 +20683,7 @@ __metadata: languageName: node linkType: hard -"vite@npm:^5.0.0, vite@npm:^5.0.6": +"vite@npm:5.0.6": version: 5.0.6 resolution: "vite@npm:5.0.6" dependencies: @@ -20660,6 +20723,46 @@ __metadata: languageName: node linkType: hard +"vite@patch:vite@npm%3A5.0.6#~/.yarn/patches/vite-npm-5.0.6-d33c199e48.patch": + version: 5.0.6 + resolution: "vite@patch:vite@npm%3A5.0.6#~/.yarn/patches/vite-npm-5.0.6-d33c199e48.patch::version=5.0.6&hash=61acc3" + dependencies: + esbuild: "npm:^0.19.3" + fsevents: "npm:~2.3.3" + postcss: "npm:^8.4.32" + rollup: "npm:^4.2.0" + peerDependencies: + "@types/node": ^18.0.0 || >=20.0.0 + less: "*" + lightningcss: ^1.21.0 + sass: "*" + stylus: "*" + sugarss: "*" + terser: ^5.4.0 + dependenciesMeta: + fsevents: + optional: true + peerDependenciesMeta: + "@types/node": + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + bin: + vite: bin/vite.js + checksum: 197d9dd0e8dd2db16d1493aaee034bf4f1d4e5d5dd38b221f51ed75f98ca3a07f7e9a95ed6c7924f51fd9faae800207d195f742e46594757314c53309dab9848 + languageName: node + linkType: hard + "vitest@npm:^1.0.2": version: 1.0.2 resolution: "vitest@npm:1.0.2" @@ -21182,7 +21285,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^17.0.0, yargs@npm:^17.7.1": +"yargs@npm:^17.0.0, yargs@npm:^17.7.1, yargs@npm:^17.7.2": version: 17.7.2 resolution: "yargs@npm:17.7.2" dependencies: