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

Release v4.6.0 #97

Merged
merged 42 commits into from
Jul 28, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
aedd5ea
fix release-it config
sgratzl Jun 15, 2020
c230ce8
configure up to use LineUp as is - in an external library way
sgratzl Jun 30, 2020
cc5a922
Merge pull request #61 from lineupjs/sgratzl/buildexternal
thinkh Jul 7, 2020
ec5df16
use dynamic lineup version instead of build one
sgratzl Jul 8, 2020
26653d3
Merge pull request #62 from lineupjs/sgratzl/externalversion
thinkh Jul 20, 2020
502eac5
build(deps): audit dependencies and update lineup
sgratzl Feb 19, 2021
cbbf02a
build: upgrade setup
sgratzl Mar 1, 2021
78cff9f
feat: finish upgrade
sgratzl Mar 1, 2021
11093dc
ci: support publishing to website
sgratzl Mar 1, 2021
5a1d3bd
build(linting): fix
sgratzl Mar 1, 2021
676c74e
ci: fix wrong script
sgratzl Mar 1, 2021
db07d5a
Merge pull request #68 from lineupjs/sgratzl/audit
sgratzl Mar 10, 2021
c8b4cf8
build: remove old lock file
sgratzl Mar 10, 2021
99dbeeb
Merge pull request #70 from lineupjs/sgratzl/upgrade
sgratzl Mar 11, 2021
9317120
build(deps): upgrade
sgratzl Apr 8, 2021
0aba14c
ci: add release helper workflows
sgratzl Apr 8, 2021
6b8dfb7
ci: fix linting
sgratzl Apr 8, 2021
9f310c1
Merge remote-tracking branch 'origin/main' into develop
sgratzl May 21, 2021
21e1b12
Merge branch 'develop' into sgratzl/upgrade
sgratzl May 21, 2021
f8ab81e
build(deps): update deps
sgratzl May 21, 2021
2955651
ci: sync workflows for release
sgratzl May 21, 2021
bc96c41
fix: linting
sgratzl May 21, 2021
9f39129
build: update deps
sgratzl Aug 27, 2021
b13931a
build: downgrade to ts 4.3
sgratzl Aug 27, 2021
3d0a6a9
build: fix add missing imports
sgratzl Aug 27, 2021
af68252
docs: dummy change to trigger netlify
sgratzl Aug 30, 2021
ffdf7c6
ci: fix extract step
sgratzl Nov 19, 2021
df0daf9
build: upgrade setup
sgratzl May 7, 2022
250cd04
build: update versions
sgratzl May 7, 2022
47dd2ad
build: upgrade webpack
sgratzl May 7, 2022
9fb451c
ci: improve workflows
sgratzl May 7, 2022
89253d4
build: unify version
sgratzl May 7, 2022
d0e3394
fix: single quote again
sgratzl May 7, 2022
f7bf981
Merge pull request #82 from lineupjs/sgratzl/update_deps
sgratzl Jul 22, 2022
84017d3
build: upgrade dependencies
sgratzl Jul 22, 2022
d72d54e
fix: codesandbox export
sgratzl Jul 22, 2022
75803c9
Merge pull request #95 from lineupjs/sgratzl/upgradex
sgratzl Jul 26, 2022
87ae445
build(deps): bump actions/setup-node from 2.4.0 to 3.4.1
dependabot[bot] Jul 26, 2022
8671114
Merge pull request #96 from lineupjs/dependabot/github_actions/develo…
sgratzl Jul 26, 2022
d357472
chore: release v4.6.0
sgratzl Jul 28, 2022
50a302e
Merge remote-tracking branch 'origin/main' into develop
sgratzl Jul 28, 2022
62d7c05
Merge branch 'develop' into release/v4.6.0
sgratzl Jul 28, 2022
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
11 changes: 6 additions & 5 deletions src/export.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import {exportCSV} from './data/loader_csv';
import {exportDump} from './data/loader_dump';
import LZString from 'lz-string';

declare const __LINEUP_VERSION__: string;

declare const LineUpJS: {version: string};


export default function initExport() {
Expand Down Expand Up @@ -59,8 +60,8 @@ export default function initExport() {
js: shared.dataset!.buildScript(`document.querySelector('#data').textContent`, 'document.body', `JSON.parse(document.querySelector('#dump').textContent)`),
js_pre_processor: 'babel',
js_modernizr: false,
css_external: `https://unpkg.com/lineupjs@${__LINEUP_VERSION__}/build/LineUpJS.css`,
js_external: `https://unpkg.com/lineupjs@${__LINEUP_VERSION__}/build/LineUpJS.js;https://unpkg.com/papaparse`
css_external: `https://unpkg.com/lineupjs@${LineUpJS.version}/build/LineUpJS.css`,
js_external: `https://unpkg.com/lineupjs@${LineUpJS.version}/build/LineUpJS.js;https://unpkg.com/papaparse`
};

const json = JSON.stringify(data)
Expand Down Expand Up @@ -88,7 +89,7 @@ export default function initExport() {
setInput('html', `<script id="data" type="text/csv">${shared.dataset!.rawData}</script>\n\n<script id="dump" type="application/json">${JSON.stringify(shared.lineup!.dump(), null, ' ')}</script>`);
setInput('css', CODEPEN_CSS);
setInput('js', shared.dataset!.buildScript(`document.querySelector('#data').textContent`, 'document.body', `JSON.parse(document.querySelector('#dump').textContent)`));
setInput('resources', `https://unpkg.com/lineupjs@${__LINEUP_VERSION__}/build/LineUpJS.css,https://unpkg.com/lineupjs@${__LINEUP_VERSION__}/build/LineUpJS.js,https://unpkg.com/papaparse`);
setInput('resources', `https://unpkg.com/lineupjs@${LineUpJS.version}/build/LineUpJS.css,https://unpkg.com/lineupjs@${LineUpJS.version}/build/LineUpJS.js,https://unpkg.com/papaparse`);

createJSFiddleHelper.submit();
});
Expand Down Expand Up @@ -140,7 +141,7 @@ ${shared.dataset!.buildScript(`exportData.default`, 'document.body', `exportDump
name: document.title,
description: shared.dataset!.description,
dependencies: {
lineupjs: __LINEUP_VERSION__,
lineupjs: LineUpJS.version,
papaparse: '^4.6.2'
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {IDataset, fromFile, allDatasets, ISession, PRELOADED_TYPE, createCard} f
import {storeDataset, storeSession, deleteDataset, editDataset} from './data/db';
import {saveDialog, areyousure} from './ui';

declare const __LINEUP_VERSION__: string;
declare const LineUpJS: {version: string};

function forEach(selector: string, callback: (d: HTMLElement)=>void) {
Array.from(document.querySelectorAll<HTMLElement>(selector)).forEach(callback);
Expand Down Expand Up @@ -255,7 +255,7 @@ Tooltip.init(document.querySelectorAll('.tooltipped'));

{
// update version info
document.querySelector<HTMLElement>('.version-info')!.innerHTML = `LineUp.js v${__LINEUP_VERSION__}`;
document.querySelector<HTMLElement>('.version-info')!.innerHTML = `LineUp.js v${LineUpJS.version}`;
}

document.querySelector<HTMLElement>('.save-session')!.onclick = (evt) => {
Expand Down
1 change: 0 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ module.exports = (_env, options) => {
__VERSION__: JSON.stringify(pkg.version),
__LICENSE__: JSON.stringify(pkg.license),
__BUILD_ID__: JSON.stringify(buildId),
__LINEUP_VERSION__: JSON.stringify(pkgLock.dependencies.lineupjs.version)
}),
new MiniCssExtractPlugin({
// Options similar to the same options in webpackOptions.output
Expand Down