Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] migrate to latest svelte, sapper, and sveltestrap #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[master] migrate to latest svelte, sapper, and sveltestrap #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,854 changes: 2,753 additions & 101 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"compression": "^1.7.1",
"polka": "next",
"sirv": "^0.4.0",
"sveltestrap": "^3.3.2"
"sveltestrap": "^5.0.2"
},
"devDependencies": {
"@babel/core": "^7.0.0",
Expand All @@ -28,11 +28,11 @@
"@rollup/plugin-node-resolve": "^7.0.0",
"@rollup/plugin-replace": "^2.2.0",
"npm-run-all": "^4.1.5",
"rollup": "^1.20.0",
"rollup": "^2.47.0",
"rollup-plugin-babel": "^4.0.2",
"rollup-plugin-svelte": "^5.0.1",
"rollup-plugin-terser": "^4.0.4",
"sapper": "^0.27.0",
"svelte": "^3.18.1"
"rollup-plugin-svelte": "^6.1.1",
"rollup-plugin-terser": "^7.0.2",
"sapper": "^0.29.1",
"svelte": "^3.38.1"
}
}
7 changes: 5 additions & 2 deletions rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ const mode = process.env.NODE_ENV;
const dev = mode === 'development';
const legacy = !!process.env.SAPPER_LEGACY_BUILD;

const onwarn = (warning, onwarn) => (warning.code === 'CIRCULAR_DEPENDENCY' && /[/\\]@sapper[/\\]/.test(warning.message)) || onwarn(warning);
const onwarn = (warning, onwarn) =>
(warning.code === 'MISSING_EXPORT' && /'preload'/.test(warning.message)) ||
(warning.code === 'CIRCULAR_DEPENDENCY' && /[/\\]@sapper[/\\]/.test(warning.message)) ||
onwarn(warning);

export default {
client: {
Expand Down Expand Up @@ -54,7 +57,7 @@ export default {
module: true
})
],

preserveEntrySignatures: 'strict',
onwarn,
},

Expand Down
4 changes: 2 additions & 2 deletions src/components/Footer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<a href="https://geekyants.com/">GeekyAnts</a>
</div>
<div>
<a href="#">Privacy Policy</a>
<a href={"#"}>Privacy Policy</a>
&middot;
<a href="#">Terms &amp; Conditions</a>
<a href={"#"}>Terms &amp; Conditions</a>
</div>
</div>
</Container>
Expand Down
12 changes: 5 additions & 7 deletions src/components/Navbar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@
import NavItem from "sveltestrap/src/NavItem.svelte";
import NavLink from "sveltestrap/src/NavLink.svelte";
import Collapse from "sveltestrap/src/Collapse.svelte";
import UncontrolledDropdown from "sveltestrap/src/UncontrolledDropdown.svelte";
import Dropdown from "sveltestrap/src/Dropdown.svelte";
import DropdownToggle from "sveltestrap/src/DropdownToggle.svelte";
import DropdownMenu from "sveltestrap/src/DropdownMenu.svelte";
import DropdownItem from "sveltestrap/src/DropdownItem.svelte";
import ListGroup from "sveltestrap/src/ListGroup.svelte";
import Form from "sveltestrap/src/Form.svelte";
import InputGroup from "sveltestrap/src/InputGroup.svelte";
import InputGroupAddon from "sveltestrap/src/InputGroupAddon.svelte";
import Label from "sveltestrap/src/Label.svelte";
import Input from "sveltestrap/src/Input.svelte";
import CustomInput from "sveltestrap/src/CustomInput.svelte";
import Button from "sveltestrap/src/Button.svelte";

export let color;
Expand All @@ -37,15 +35,15 @@
name="search"
id="exampleSearch"
placeholder="Search for..." />
<InputGroupAddon addonType={'append'}>
<InputGroup addonType={'append'}>
<Button color="primary" on:click={searchHandle}>
<i class="fas fa-search" />
</Button>
</InputGroupAddon>
</InputGroup>
</InputGroup>
</Form>
<ListGroup class="ml-auto ml-md-0">
<UncontrolledDropdown nav inNavbar>
<Dropdown nav inNavbar>
<DropdownToggle nav caret>
<i class="fas fa-user fa-fw ml-3" />
</DropdownToggle>
Expand All @@ -63,7 +61,7 @@
</a>
</DropdownItem>
</DropdownMenu>
</UncontrolledDropdown>
</Dropdown>
</ListGroup>
</Nav>
</Navbar>
3 changes: 1 addition & 2 deletions src/routes/pages/authentication/login.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import FormGroup from "sveltestrap/src/FormGroup.svelte";
import Label from "sveltestrap/src/Label.svelte";
import Input from "sveltestrap/src/Input.svelte";
import CustomInput from "sveltestrap/src/CustomInput.svelte";
import Button from "sveltestrap/src/Button.svelte";
</script>

Expand Down Expand Up @@ -37,7 +36,7 @@
placeholder="Enter password" />
</FormGroup>
<FormGroup>
<CustomInput
<Input
type="checkbox"
id="exampleCustomCheckbox"
label="Remember password" />
Expand Down
3 changes: 1 addition & 2 deletions src/routes/settings.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import FormGroup from "sveltestrap/src/FormGroup.svelte";
import Label from "sveltestrap/src/Label.svelte";
import Input from "sveltestrap/src/Input.svelte";
import CustomInput from "sveltestrap/src/CustomInput.svelte";
import Button from "sveltestrap/src/Button.svelte";
</script>

Expand Down Expand Up @@ -53,7 +52,7 @@
placeholder="Enter password" />
</FormGroup>
<FormGroup>
<CustomInput
<Input
type="checkbox"
id="exampleCustomCheckbox"
label="Remember password" />
Expand Down