Skip to content

Use TypeScript compiler for Hypergrid JS build #6

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

Merged
merged 3 commits into from
Feb 3, 2021
Merged

Use TypeScript compiler for Hypergrid JS build #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f087d9d
Initial pass at compiling Hypergrid JS files with TypeScript
aaronbloom Oct 12, 2020
f0cd98a
Allow TS declaration emit
aaronbloom Feb 2, 2021
5b42556
4.0.0-beta.0
Feb 2, 2021
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@

/node_modules
/lib
/dist
3 changes: 1 addition & 2 deletions .npmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ build
/*.sh
/*.md

/src/behaviors/index.js
/src/lib/index.js
/src
78 changes: 39 additions & 39 deletions css/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
'use strict';

exports.grid = [
'.hypergrid-container {',
' position: relative;',
' height: 500px;',
'}',
'.hypergrid-container > div:first-child {',
' position: absolute;',
' left: 0;',
' top: 0;',
' right: 0;',
' bottom: 0;',
'}',
'.hypergrid-container > div:first-child > div.info {',
' position: absolute;',
' display: none; /* initially hidden */',
' margin-top: 150px; /* to place below headers */',
' color: #eee;',
' text-shadow: 1px 1px #ccc;',
' font-size: 36pt;',
' font-weight: bold;',
' text-align: center;',
' top: 0; right: 0; bottom: 0; left: 0;',
'}',
'.hypergrid-textfield {',
' position: absolute;',
' font-size: 12px;',
' color: black;',
' background-color: ivory;',
' box-sizing: border-box;',
' margin: 0;',
' padding: 0 5px;',
' border: 0; /*border: 1px solid #777;*/',
' outline: 0;',
'}',
'',
'.hypergrid {',
' touch-action: none;',
'}'
].join('\n');
exports.grid = `
.hypergrid-container {
position: relative;
height: 500px;
}
.hypergrid-container > div:first-child {
position: absolute;
left: 0;
top: 0;
right: 0;
bottom: 0;
}
.hypergrid-container > div:first-child > div.info {
position: absolute;
display: none; /* initially hidden */
margin-top: 150px; /* to place below headers */
color: #eee;
text-shadow: 1px 1px #ccc;
font-size: 36pt;
font-weight: bold;
text-align: center;
top: 0; right: 0; bottom: 0; left: 0;
}
.hypergrid-textfield {
position: absolute;
font-size: 12px;
color: black;
background-color: ivory;
box-sizing: border-box;
margin: 0;
padding: 0 5px;
border: 0; /*border: 1px solid #777;*/
outline: 0;
}

.hypergrid {
touch-action: none;
}
`;
21 changes: 2 additions & 19 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,25 +91,8 @@ function swallowImages() {
function templates(src, type) {
return gulp.src(src)
.pipe($$.each(function(content, file, callback) {
var filename = path.basename(file.path, "." + type),
member = /[^\w]/.test(filename) ? "['" + filename + "']" : "." + filename;

// convert (groups of) 4 space chars at start of lines to tab(s)
do {
var len = content.length;
content = content.replace(/\n(( )*) (.*)/, "\n$1\t$3");
} while (content.length < len);

// quote each line and join them into a single string
content = 'exports' + member + " = [\n'" + content
.replace(/\\/g, "\\\\") // escape all backslashes
.replace(/'/g, "\\'") // escape all single-quotes
.replace(/\n/g, "',\n'") + "'\n].join('\\n');\n";

// remove possible blank line at end of each
content = content.replace(/,\n''\n]/g, "\n]");

callback(null, content); // the first argument is an error, if you encounter one
let filename = path.basename(file.path, "." + type);
callback(null, `exports.${filename} = \`\n${content}\`;\n`); // the first argument is an error, if you encounter one
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Updated to use ` string literals as previously it would output an bad format.

Generally this gulp file should be removed and replace with independent common commands for linting etc.

}))
.pipe($$.concat("index.js"))
.pipe($$.header("'use strict';\n\n"))
Expand Down
3 changes: 2 additions & 1 deletion images/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// @ts-nocheck
/* eslint-env browser */

/**
Expand Down Expand Up @@ -96,7 +97,7 @@ images['checkbox-off'] = images.unchecked;
* Possible styles must be one of those listed in {*link https://github.com/joneit/svg-themer/blob/master/README.md#cssimagepropertynames svgThemer.cssImagePropertyNames} (which you can extend if needed).
* * Will be automatically themed when the grid is themed (which is the whole point).
*
* @see {@link https://github.com/joneit/svg-themer}
* {@link https://github.com/joneit/svg-themer}
* @memberOf module:images
*/
function add(name, img, themeable, setSvgProps, styles) {
Expand Down
Loading