Skip to content

Commit

Permalink
chore: remove 'shamefully-hoist = true' setting from .npmrc (#2080)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dominikg
dominikg authored Aug 3, 2021
1 parent 7826832 commit d88ef45
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 72 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
runs-on: ${{ matrix.os }}
timeout-minutes: 6
strategy:
fail-fast: false
matrix:
node-version: [14]
os: [ubuntu-latest, macOS-latest, windows-latest]
Expand Down
1 change: 0 additions & 1 deletion .npmrc
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
link-workspace-packages = true
shamefully-hoist = true
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "kit",
"version": "0.0.1",
"description": "",
"main": "index.js",
"description": "monorepo for @sveltejs/kit and friends",
"private": true,
"scripts": {
"build": "pnpm build --filter=\"@sveltejs/*\" --filter=\"create-svelte\"",
"test": "pnpm -r test --workspace-concurrency=1",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-begin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",
"dev": "rollup -cw",
"build": "rollup -c",
"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",
"format": "npm run check-format -- --write",
"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
"prepublishOnly": "npm run build"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-cloudflare-workers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
],
"scripts": {
"lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",
"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",
"format": "npm run check-format -- --write",
"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-netlify/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
],
"scripts": {
"lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",
"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",
"format": "npm run check-format -- --write",
"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"build": "rollup -c",
"test": "c8 uvu tests",
"lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",
"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",
"format": "npm run check-format -- --write",
"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
"prepublishOnly": "npm run build"
},
Expand Down
6 changes: 4 additions & 2 deletions packages/adapter-static/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@
"scripts": {
"lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",
"check": "tsc",
"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",
"format": "npm run check-format -- --write",
"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
"test": "uvu test test.js"
},
"devDependencies": {
"@sveltejs/kit": "workspace:*",
"playwright-chromium": "^1.10.0",
"port-authority": "^1.1.2",
"sirv": "^1.0.12"
"sirv": "^1.0.12",
"svelte": "^3.40.0",
"uvu": "^0.5.1"
}
}
2 changes: 1 addition & 1 deletion packages/adapter-vercel/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
],
"scripts": {
"lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",
"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",
"format": "npm run check-format -- --write",
"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore"
},
"dependencies": {
Expand Down
5 changes: 3 additions & 2 deletions packages/create-svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
"prettier": "^2.2.1",
"prettier-plugin-svelte": "^2.2.0",
"sucrase": "^3.18.1",
"svelte": "^3.40.0",
"svelte-preprocess": "^4.7.3",
"tiny-glob": "^0.2.8"
},
"scripts": {
"build": "npm run format && node scripts/build-templates",
"check": "tsc",
"lint": "eslint --ignore-path .gitignore --ignore-path ../../.gitignore \"./*.js\" && npm run check-format",
"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore --ignore-path ../../.gitignore --plugin prettier-plugin-svelte",
"check-format": "prettier --check . --config ../../.prettierrc --ignore-path ../../.gitignore --ignore-path .gitignore --plugin prettier-plugin-svelte",
"format": "npm run check-format -- --write",
"check-format": "prettier --check . --config ../../.prettierrc --ignore-path ../../.gitignore --ignore-path .gitignore --plugin prettier-plugin-svelte --plugin-search-dir=.",
"prepublishOnly": "npm run build"
},
"files": [
Expand Down
8 changes: 4 additions & 4 deletions packages/create-svelte/templates/default/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"start": "svelte-kit start"
},
"devDependencies": {
"@sveltejs/adapter-cloudflare-workers": "next",
"@sveltejs/adapter-netlify": "next",
"@sveltejs/adapter-vercel": "next",
"@sveltejs/kit": "next",
"@sveltejs/adapter-cloudflare-workers": "workspace:*",
"@sveltejs/adapter-netlify": "workspace:*",
"@sveltejs/adapter-vercel": "workspace:*",
"@sveltejs/kit": "workspace:*",
"svelte": "^3.40.0",
"svelte-preprocess": "^4.7.3",
"typescript": "^4.3.5"
Expand Down
3 changes: 2 additions & 1 deletion packages/kit/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"kleur": "^4.1.4",
"locate-character": "^2.0.5",
"marked": "^2.0.3",
"mime": "^2.5.2",
"node-fetch": "^3.0.0-beta.9",
"port-authority": "^1.1.2",
"rimraf": "^3.0.2",
Expand Down Expand Up @@ -55,7 +56,7 @@
"dev": "rollup -cw",
"lint": "eslint --ignore-path .gitignore --ignore-pattern \"src/core/make_package/test/**\" \"src/**/*.{ts,mjs,js,svelte}\" && npm run check-format",
"check": "tsc && svelte-check --ignore \"src/core/make_package/test\"",
"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",
"format": "npm run check-format -- --write",
"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
"prepublishOnly": "npm run build",
"test": "npm run test:unit && npm run test:integration",
Expand Down
71 changes: 16 additions & 55 deletions pnpm-lock.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d88ef45

Please sign in to comment.