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.

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

Jquery refs #2348

Merged
merged 8 commits into from
Sep 30, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
Renames main.js to app.js
closes #2340
  • Loading branch information
roblarsen committed Sep 24, 2020
commit 3a444ca4471daee38c692501df932f6fc834f4a0
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 9.0.0 (TBD)

* Rename CSS file and JS file

## 8.0.0 (June 04, 2020)

* Add a sample package.json with basic Parcel commands ([#2227](https://github.com/h5bp/html5-boilerplate/pull/2229)), ([231e047](https://github.com/h5bp/html5-boilerplate/commit/231e047d270316b454156dc261e6e04da660e2a2))
Expand Down
2 changes: 1 addition & 1 deletion dist/doc/html.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ it before the other scripts in the bottom of the page:
<script src="js/vendor/modernizr-3.10.0.min.js"></script>
<script src="https://polyfill.io/v3/polyfill.min.js"></script>
<script src="js/plugins.js"></script>
<script src="js/main.js"></script>
<script src="js/app.js"></script>
</body>
```

Expand Down
2 changes: 1 addition & 1 deletion dist/doc/js.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ table of contents](TOC.md)

Information about the default JavaScript included in the project.

## main.js
## app.js

This file can be used to contain or reference your site/app JavaScript code. If
you're working on something more advanced you might replace this file entirely.
Expand Down
2 changes: 1 addition & 1 deletion dist/doc/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ A basic HTML5 Boilerplate site initially looks something like this:
├── doc
├── img
├── js
│ ├── main.js
│ ├── app.js
│ ├── plugins.js
│ └── vendor
│ └── modernizr.min.js
Expand Down
2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<p>Hello world! This is HTML5 Boilerplate.</p>
<script src="js/vendor/modernizr-3.11.3.min.js"></script>
<script src="js/plugins.js"></script>
<script src="js/main.js"></script>
<script src="js/app.js"></script>

<!-- Google Analytics: change UA-XXXXX-Y to be your site's ID. -->
<script>
Expand Down
2 changes: 1 addition & 1 deletion src/doc/html.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ it before the other scripts in the bottom of the page:
<script src="js/vendor/modernizr-3.10.0.min.js"></script>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not related to this PR - but we should update modernizr version here.

<script src="https://polyfill.io/v3/polyfill.min.js"></script>
<script src="js/plugins.js"></script>
<script src="js/main.js"></script>
<script src="js/app.js"></script>
</body>
```

Expand Down
2 changes: 1 addition & 1 deletion src/doc/js.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ table of contents](TOC.md)

Information about the default JavaScript included in the project.

## main.js
## app.js

This file can be used to contain or reference your site/app JavaScript code. If
you're working on something more advanced you might replace this file entirely.
Expand Down
2 changes: 1 addition & 1 deletion src/doc/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ A basic HTML5 Boilerplate site initially looks something like this:
├── doc
├── img
├── js
│ ├── main.js
│ ├── app.js
│ ├── plugins.js
│ └── vendor
│ └── modernizr.min.js
Expand Down
2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<p>Hello world! This is HTML5 Boilerplate.</p>
<script src="js/vendor/modernizr-{{MODERNIZR_VERSION}}.min.js"></script>
<script src="js/plugins.js"></script>
<script src="js/main.js"></script>
<script src="js/app.js"></script>

<!-- Google Analytics: change UA-XXXXX-Y to be your site's ID. -->
<script>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion test/file_existence.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const expectedFilesInDistDir = [
'index.html',

'js/',
'js/main.js',
'js/app.js',
'js/plugins.js',
'js/vendor/',
`js/vendor/modernizr-${pkg.devDependencies.modernizr}.min.js`,
Expand Down