Skip to content

Commit

Permalink
Update dependencies (#44)
Browse files Browse the repository at this point in the history
* update husky@6

* update to vite 2.3 and esbuild 0.11, update other dependencies

* handle test paths correctly on windows, improve exception handling in test setup

* remove stylelint to get rid of postcss7

* fix lint scripts

* bump vite to 2.3.1

* override trim dependency version of remark-parse to fix audit error

* ci: prune pnpm store on lockfile change

* update dependencies again (test pruning in ci)

* update kit playground

* another round of updates, exlucing esbuild and jest

* update to jest27

* update to vite 2.3.5 and esbuild 0.12

* update vite to 2.3.6 and force vite version to workspace version for all packages

* chore: update subdependencies

* chore: update @sveltejs/kit and @sveltejs/adapter-* to greatest available version in update-deps script as ncu currently does not pick up -next

* increase hmr update timeout on windows CI

* increase global timeout for win on CI and try more often instead of waiting longer

* add screenshot and log output to tests

* another stab at fixing windows CI. change file content on retrys by adding empty newlines

* update deps

* wait for vite WS connection in beforeAll of dev tests

* update changeset

* update engines and remove unused devDependencies
  • Loading branch information
dominikg committed Jun 3, 2021
1 parent 93ca647 commit 24ae093
Show file tree
Hide file tree
Showing 30 changed files with 1,680 additions and 2,931 deletions.
5 changes: 5 additions & 0 deletions .changeset/calm-buses-cheat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/vite-plugin-svelte': patch
---

update to esbuild 0.12 and vite 2.3.6
5 changes: 5 additions & 0 deletions .changeset/gorgeous-monkeys-brake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/vite-plugin-svelte': patch
---

update engines.node to "^12.20 || ^14.13.1 || >= 16"
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ jobs:
- name: install
if: steps.pnpm-store.outputs.cache-hit != 'true'
run: pnpm install --frozen-lockfile --prefer-offline --ignore-scripts
- name: prune store
if: steps.pnpm-store.outputs.cache-hit != 'true'
run: pnpm store prune
- name: check store
if: steps.pnpm-store.outputs.cache-hit != 'true'
run: pnpm store status
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
node_modules
dist
dist-ssr
build
TODOs.md
*.log
temp
Expand All @@ -15,6 +16,7 @@ packages/**/package-lock.json
packages/**/yarn.lock
packages/**/dist
packages/**/dist-ssr
packages/**/build
packages/**/node_modules
temp/**/*
.pnpm-store
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

pnpx --no-install lint-staged
3 changes: 1 addition & 2 deletions .ncurc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
module.exports = {
packageFile: ['package.json', 'packages/**/package.json'],
reject: ['husky', 'esbuild', 'slash']
packageFile: ['package.json', 'packages/**/package.json']
};
5 changes: 5 additions & 0 deletions .pnpmfile.cjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const viteVersion = require('./package.json').devDependencies.vite;
function readPackage(pkg) {
for (const section of [
'dependencies',
Expand All @@ -9,6 +10,10 @@ function readPackage(pkg) {
if (pkg[section]['@sveltejs/vite-plugin-svelte']) {
pkg[section]['@sveltejs/vite-plugin-svelte'] = 'workspace:*';
}
// enforce use of workspace vite
if(pkg[section]['vite']) {
pkg[section]['vite'] = viteVersion;
}
}
return pkg;
}
Expand Down
19 changes: 0 additions & 19 deletions .stylelintrc.json

This file was deleted.

4 changes: 3 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
const isBuildTest = !!process.env.VITE_TEST_BUILD;
const isWin = process.platform === 'win32';
const isCI = !!process.env.CI;
module.exports = {
preset: 'ts-jest',
testMatch: process.env.VITE_TEST_BUILD
? ['**/playground/**/*.spec.[jt]s?(x)']
: ['**/*.spec.[jt]s?(x)'],
testTimeout: process.env.CI ? 30000 : 10000,
testTimeout: isCI ? (isWin ? 45000 : 30000) : 10000,
globalSetup: './scripts/jestGlobalSetup.js',
globalTeardown: './scripts/jestGlobalTeardown.js',
testEnvironment: './scripts/jestEnv.js',
Expand Down
77 changes: 32 additions & 45 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,83 +14,70 @@
"test:ci": "run-s test:ci:serve test:ci:build",
"test:ci:serve": "cross-env VITE_PRESERVE_BUILD_ARTIFACTS=1 jest --verbose --no-cache --runInBand --force-exit --ci --json --outputFile=\"temp/serve/jest-results.json\"",
"test:ci:build": "cross-env VITE_TEST_BUILD=1 VITE_PRESERVE_BUILD_ARTIFACTS=1 jest --verbose --no-cache --runInBand --force-exit --ci --json --outputFile=\"temp/build/jest-results.json\"",
"lint": "run-p lint:script lint:style",
"lint:script": "eslint --ignore-path .gitignore '**/*.{js,ts,svelte,html,svx,md}'",
"lint:style": "stylelint --ignore-path .gitignore '**/*.{css,scss,svelte,html,js,ts,svx,md}'",
"lint:fix": "run-s lint:fix:script lint:fix:style",
"lint:fix:script": "pnpm lint:script -- --fix",
"lint:fix:style": "pnpm lint:style -- --fix",
"lint": "eslint --ignore-path .gitignore '**/*.{js,ts,svelte,html,svx,md}'",
"lint:fix": "pnpm lint -- --fix",
"format": "prettier --ignore-path .gitignore '**/*.{css,scss,svelte,html,js,ts,svx,md}' --check",
"format:fix": "pnpm format -- --write",
"fixup": "run-s lint:fix format:fix",
"update-deps": "ncu -u",
"release": "pnpm run build && pnpx --no changeset publish"
"update-deps": "ncu -u && ncu -f \"/^@sveltejs\\/(?:kit|adapter)/\" --target=greatest -u",
"release": "pnpm run build && pnpx --no changeset publish",
"prepare": "husky install"
},
"devDependencies": {
"@changesets/changelog-github": "^0.4.0",
"@changesets/cli": "^2.16.0",
"@microsoft/api-extractor": "^7.14.0",
"@microsoft/api-extractor": "^7.15.2",
"@types/fs-extra": "^9.0.11",
"@types/jest": "^26.0.22",
"@types/node": "^14.14.41",
"@types/semver": "^7.3.5",
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0",
"@types/jest": "^26.0.23",
"@types/node": "^15.12.0",
"@types/semver": "^7.3.6",
"@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0",
"chalk": "^4.1.1",
"cross-env": "^7.0.3",
"enquirer": "^2.3.6",
"esbuild": "~0.9.7",
"eslint": "^7.25.0",
"esbuild": "~0.12.5",
"eslint": "^7.27.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-html": "^6.1.2",
"eslint-plugin-jest": "^24.3.6",
"eslint-plugin-markdown": "^2.1.0",
"eslint-plugin-markdown": "^2.2.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-svelte3": "^3.2.0",
"execa": "^5.0.0",
"fs-extra": "^9.1.0",
"husky": "^4.3.8",
"jest": "^26.6.3",
"jest-environment-node": "^26.6.2",
"jest-junit": "^12.0.0",
"lint-staged": "^10.5.4",
"execa": "^5.1.0",
"fs-extra": "^10.0.0",
"husky": "^6.0.0",
"jest": "^27.0.4",
"jest-environment-node": "^27.0.3",
"jest-junit": "^12.1.0",
"lint-staged": "^11.0.0",
"minimist": "^1.2.5",
"node-fetch": "^2.6.1",
"npm-check-updates": "^11.5.1",
"npm-check-updates": "^11.6.0",
"npm-run-all": "^4.1.5",
"playwright-core": "^1.10.0",
"pnpm": "^6.2.1",
"prettier": "^2.2.1",
"prettier-plugin-svelte": "^2.2.0",
"playwright-core": "^1.11.1",
"pnpm": "^6.6.2",
"prettier": "^2.3.0",
"prettier-plugin-svelte": "^2.3.0",
"rimraf": "^3.0.2",
"semver": "^7.3.5",
"sirv": "^1.0.11",
"slash": "^3.0.0",
"stylelint": "^13.13.0",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-recommended": "^5.0.0",
"svelte": "^3.37.0",
"ts-jest": "^26.5.5",
"typescript": "^4.2.4",
"vite": "^2.2.3"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
"sirv": "^1.0.12",
"svelte": "^3.38.2",
"ts-jest": "^27.0.2",
"typescript": "^4.3.2",
"vite": "^2.3.6"
},
"lint-staged": {
"*.{js,ts,svelte,html,md,svx}": "eslint --fix",
"*.{css,scss,svelte,html,js,ts,svx,md}": [
"stylelint --fix",
"prettier --write"
]
},
"engines": {
"pnpm": ">=6",
"yarn": "forbidden, use pnpm",
"npm": "forbidden, use pnpm",
"node": ">=12.17.0"
"node": "^12.20 || ^14.13.1 || >= 16"
}
}
12 changes: 6 additions & 6 deletions packages/playground/autoprefixer-browerslist/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"autoprefixer": "^10.2.5",
"postcss": "^8.2.12",
"autoprefixer": "^10.2.6",
"postcss": "^8.3.0",
"postcss-load-config": "^3.0.1",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.2",
"svelte-preprocess": "^4.7.2",
"vite": "^2.2.3"
"svelte": "^3.38.2",
"svelte-hmr": "^0.14.4",
"svelte-preprocess": "^4.7.3",
"vite": "^2.3.6"
}
}
6 changes: 3 additions & 3 deletions packages/playground/big/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.2",
"vite": "^2.2.3"
"svelte": "^3.38.2",
"svelte-hmr": "^0.14.4",
"vite": "^2.3.6"
}
}
8 changes: 4 additions & 4 deletions packages/playground/configfile-custom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.2",
"svelte-preprocess": "^4.7.2",
"vite": "^2.2.3"
"svelte": "^3.38.2",
"svelte-hmr": "^0.14.4",
"svelte-preprocess": "^4.7.3",
"vite": "^2.3.6"
}
}
8 changes: 4 additions & 4 deletions packages/playground/configfile-esm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.2",
"svelte-preprocess": "^4.7.2",
"vite": "^2.2.3"
"svelte": "^3.38.2",
"svelte-hmr": "^0.14.4",
"svelte-preprocess": "^4.7.3",
"vite": "^2.3.6"
},
"type": "module"
}
14 changes: 7 additions & 7 deletions packages/playground/default-svelte-template-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"@tsconfig/svelte": "^1.0.10",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.2",
"vite": "^2.2.3",
"svelte-check": "^1.5.1",
"svelte-preprocess": "^4.7.2",
"typescript": "^4.2.4",
"@tsconfig/svelte": "^2.0.1",
"svelte": "^3.38.2",
"svelte-hmr": "^0.14.4",
"vite": "^2.3.6",
"svelte-check": "^2.1.0",
"svelte-preprocess": "^4.7.3",
"typescript": "^4.3.2",
"tslib": "^2.2.0"
}
}
6 changes: 3 additions & 3 deletions packages/playground/default-svelte-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.2",
"vite": "^2.2.3"
"svelte": "^3.38.2",
"svelte-hmr": "^0.14.4",
"vite": "^2.3.6"
}
}
6 changes: 3 additions & 3 deletions packages/playground/hmr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.2",
"vite": "^2.2.3",
"svelte": "^3.38.2",
"svelte-hmr": "^0.14.4",
"vite": "^2.3.6",
"node-fetch": "^2.6.1"
}
}
9 changes: 4 additions & 5 deletions packages/playground/kit-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@
"preview": "svelte-kit preview"
},
"devDependencies": {
"@sveltejs/adapter-node": "^1.0.0-next.16",
"@sveltejs/kit": "^1.0.0-next.88",
"svelte": "^3.37.0",
"vite": "^2.2.3"
"@sveltejs/adapter-node": "^1.0.0-next.24",
"@sveltejs/kit": "^1.0.0-next.113",
"svelte": "^3.38.2"
},
"type": "module",
"engines": {
"node": ">= 12.17.0"
"node": "^12.20 || ^14.13.1 || >= 16"
}
}
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
const node = require('@sveltejs/adapter-node');
const pkg = require('./package.json');
import node from '@sveltejs/adapter-node';

/** @type {import('@sveltejs/kit').Config} */
module.exports = {
const config = {
kit: {
// By default, `npm run build` will create a standard Node app.
// You can create optimized builds for different platforms by
// specifying a different adapter
adapter: node(),
adapter: node({}),

// hydrate the <div id="svelte"> element in src/app.html
target: '#svelte',

vite: {
ssr: {
noExternal: Object.keys(pkg.dependencies || {})
},
server: {
watch: {
// During tests we edit the files too fast and sometimes chokidar
// misses change events, so enforce polling for consistency
usePolling: true,
interval: 100
}
},
}
}
}
};
export default config;
8 changes: 4 additions & 4 deletions packages/playground/preprocess-with-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"sass": "^1.32.11",
"sass": "^1.34.1",
"stylus": "^0.54.8",
"svelte": "^3.37.0",
"svelte-hmr": "^0.14.2",
"vite": "^2.2.3"
"svelte": "^3.38.2",
"svelte-hmr": "^0.14.4",
"vite": "^2.3.6"
}
}
Loading

0 comments on commit 24ae093

Please sign in to comment.