Skip to content

Commit

Permalink
Fix backwards-incompatible package structure
Browse files Browse the repository at this point in the history
Build output is now put in the project root instead of dist/ to maintain backwards compatibility with the old package structure.

Fixes #719
  • Loading branch information
jonthornton committed May 6, 2020
1 parent 0ae47e4 commit 15a7415
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -290,7 +290,7 @@ Development guidelines

After cloning, install dev dependencies with `npm install`.

* `npm run build`: compile timepicker and place updated output in `dist/`
* `npm run build`: compile timepicker and place updated output in the project root
* `npm run watch`: rebuild every time one of the source files changes
* `npm run format`: apply code formatting rules
* `npm run test`: run the jest test suite
Expand Down
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "jt.timepicker",
"version": "1.13.6",
"version": "1.13.7",
"description": "A jQuery timepicker plugin inspired by Google Calendar.",
"homepage": "http://jonthornton.github.com/jquery-timepicker",
"main": ["./jquery.timepicker.js", "./jquery.timepicker.css"],
Expand Down
4 changes: 2 additions & 2 deletions index.html
Expand Up @@ -6,8 +6,8 @@
<title>Timepicker for jQuery &ndash; Demos and Documentation</title>
<meta name="description" content="A lightweight, customizable jQuery timepicker plugin inspired by Google Calendar. Add a user-friendly javascript timepicker dropdown to your app in minutes." />
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script type="text/javascript" src="dist/jquery.timepicker.js"></script>
<link rel="stylesheet" type="text/css" href="src/static/jquery.timepicker.css" />
<script type="text/javascript" src="jquery.timepicker.js"></script>
<link rel="stylesheet" type="text/css" href="jquery.timepicker.css" />
<script type="text/javascript" src="documentation-assets/bootstrap-datepicker.js"></script>
<link rel="stylesheet" type="text/css" href="documentation-assets/bootstrap-datepicker.css" />
<script type="text/javascript" src="documentation-assets/site.js"></script>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion dist/jquery.timepicker.js → jquery.timepicker.js
@@ -1,5 +1,5 @@
/*!
* jquery-timepicker v1.13.6 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
* jquery-timepicker v1.13.7 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
* Copyright (c) 2020 Jon Thornton - https://www.jonthornton.com/jquery-timepicker/
* License: MIT
*/
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion jt.timepicker.jquery.json
@@ -1,6 +1,6 @@
{
"name": "jt.timepicker",
"version": "1.13.6",
"version": "1.13.7",
"title": "jquery-timepicker",
"description": "A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

10 changes: 7 additions & 3 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "timepicker",
"version": "1.13.6",
"version": "1.13.7",
"title": "jquery-timepicker",
"author": {
"name": "Jon Thornton",
Expand All @@ -27,8 +27,12 @@
"rollup-plugin-copy": "^3.3.0",
"rollup-plugin-terser": "^5.3.0"
},
"main": "dist/jquery.timepicker.min.js",
"files": "dist/",
"main": "jquery.timepicker.min.js",
"files": [
"jquery.timepicker.min.js",
"jquery.timepicker.js",
"jquery.timepicker.css"
],
"description": "A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.",
"keywords": [
"timepicker",
Expand Down
6 changes: 3 additions & 3 deletions rollup.config.js
Expand Up @@ -12,20 +12,20 @@ export default {
input: 'src/jquery.timepicker.js',
output: [
{
file: 'dist/jquery.timepicker.js',
file: 'jquery.timepicker.js',
format: 'iife',
banner: banner
},
{
file: 'dist/jquery.timepicker.min.js',
file: 'jquery.timepicker.min.js',
format: 'iife',
plugins: [terser()]
}
],
plugins: [
copy({
targets: [
{ src: 'src/static/jquery.timepicker.css', dest: 'dist/' },
{ src: 'src/static/jquery.timepicker.css', dest: './' },
]
})
]
Expand Down

0 comments on commit 15a7415

Please sign in to comment.