Skip to content

Commit

Permalink
feat: upgrade to sveltekit 329 (#161)
Browse files Browse the repository at this point in the history
* docs: update documentation, lint files

* fix integration tests

* fix: route generation, 

* fix e2e tests

* use node v16 for e2e tests

* update java to 18

* use firebase-tools from npm for e2e test
  • Loading branch information
Nushio authored May 14, 2022
1 parent f855bfb commit bf7c2e9
Show file tree
Hide file tree
Showing 22 changed files with 3,714 additions and 2,250 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ jobs:
params:
- {
test_dir: "functions_single_site",
validation_app_dir: "public/about/index.html",
validation_app_dir: "public/_app/manifest.json",
validation_compute_dir: "functions/sveltekit/index.js",
nested_dir: ".",
}
- {
test_dir: "nested_app_dirs",
validation_app_dir: "public/about/index.html",
validation_app_dir: "public/_app/manifest.json",
validation_compute_dir: "functions/sveltekit/index.js",
nested_dir: "app",
}
- {
test_dir: "run_service_id",
validation_app_dir: "public/about/index.html",
validation_app_dir: "public/_app/manifest.json",
validation_compute_dir: "functions/cloudrun/index.js",
nested_dir: ".",
}
Expand Down
8 changes: 5 additions & 3 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
firebase 9.18.0
nodejs 14.17.5
firebase 10.9.2
nodejs 16.14.2
pnpm 6.13.0

# use for Firebase Emulator
java openjdk-14.0.2

java openjdk-18.0.1.1
143 changes: 53 additions & 90 deletions CHANGELOG.md

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ In your standard SvelteKit project:
export default {
kit: {
+ adapter: firebase(),
target: "#svelte",
},
};
```
Expand All @@ -87,6 +86,7 @@ the Adapter and SvelteKit becoming incompatible. Here is a compatibility table:

| Adapter Version | SvelteKit Version |
| --------------- | -------------------- |
| `0.14.0` | `1.0.0-next.330` |
| `0.13.1` | `1.0.0-next.180` |
| `0.13.0` | `1.0.0-next.168` |
| `0.12.x` | `1.0.0-next.165` |
Expand Down Expand Up @@ -216,7 +216,6 @@ import firebase from "svelte-adapter-firebase";
export default {
kit: {
adapter: firebase({ target: "blog" }),
target: "#svelte",
},
};
```
Expand All @@ -238,10 +237,9 @@ export default {
adapter: firebase({
esbuildBuildOptions: (defaultOptions: BuildOptions) => Promise<BuildOptions> | BuildOptions,
firebaseJsonPath: "",
target: "",
target: "svelte-func-single-site",
sourceRewriteMatch: "",
}),
target: "#svelte",
},
};
```
Expand All @@ -265,15 +263,15 @@ import firebase from "svelte-adapter-firebase";
export default {
kit: {
adapter: firebase({
target: "svelte-func-single-site",
esbuildBuildOptions(defaultOptions) {
return {
...defaultOptions,
target: "esm"
plugins: [],
};
},
}),
target: "#svelte",
})
},
};
```
Expand Down Expand Up @@ -323,8 +321,10 @@ import firebase from "svelte-adapter-firebase";
/** @type {import('@sveltejs/kit').Config} */
export default {
kit: {
adapter: firebase({ firebaseJsonPath: "../firebase.json" }),
target: "#svelte",
adapter: firebase({
target: "svelte-func-single-site",
firebaseJsonPath: "../firebase.json",
}),
},
};
```
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"serverless",
"ssr"
],
"version": "0.13.1",
"version": "0.14.0",
"type": "module",
"exports": {
".": {
Expand All @@ -38,18 +38,18 @@
"node": "^14.13.1 || >= 16"
},
"dependencies": {
"esbuild": "^0.12.28"
"esbuild": "^0.14.39"
},
"peerDependencies": {
"@sveltejs/kit": "^1.0.0-next.180"
"@sveltejs/kit": "^1.0.0-next.330"
},
"devDependencies": {
"@sveltejs/kit": "^1.0.0-next.180",
"@sveltejs/kit": "^1.0.0-next.330",
"@types/express": "^4.17.13",
"@types/node": "^14.17.15",
"@types/node": "^17.0.33",
"ava": "^3.15.0",
"firebase-functions": "^3.15.5",
"xo": "^0.44.0"
"firebase-functions": "^3.21.1",
"xo": "^0.48.0"
},
"scripts": {
"fix": "xo --fix",
Expand Down
Loading

0 comments on commit bf7c2e9

Please sign in to comment.