8000 Allow pyscript package to contain multiple files by hoodmane · Pull Request #1262 · pyscript/pyscript · GitHub
[go: up one dir, main page]

Skip to content

Allow pyscript package to contain multiple files #1262

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

Closed
wants to merge 31 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1e34b4b
Allow pyscript package to contain multiple files
hoodmane Mar 8, 2023
b8d0835
Remove unused import
hoodmane Mar 8, 2023
564e1e1
Unvendor toml package
hoodmane Mar 8, 2023
19bfa96
Remove pyscript import
hoodmane Mar 8, 2023
04ae065
Fix many ESlint errors
hoodmane Mar 8, 2023
00f2d64
Merge branch 'fix-lints' into pyscript-package-2
hoodmane Mar 8, 2023
6ae4d7f
Put back Record
hoodmane Mar 8, 2023
21ea205
Merge branch 'fix-lints' into pyscript-package-2
hoodmane Mar 8, 2023
ea45633
Fix typescript compilation
hoodmane Mar 8, 2023
144efac
Fix typescript compilation
hoodmane Mar 8, 2023
09be677
Merge branch 'unvendor-toml' into fix-lints
hoodmane Mar 8, 2023
ad00491
Fix lints
hoodmane Mar 8, 2023
2e158d4
Try @iarna/toml instead
hoodmane Mar 8, 2023
ed61b1e
Fix import
hoodmane Mar 8, 2023
81b4c35
Use @ltd/j-toml
hoodmane Mar 8, 2023
81878c8
Update test
hoodmane Mar 8, 2023
dcdfc93
Use toml-j0.4
hoodmane Mar 8, 2023
6154b5c
Merge branch 'unvendor-toml' into fix-lints
hoodmane Mar 8, 2023
3c6fe2d
Some changes
hoodmane Mar 8, 2023
54ab4b3
Fix toml import
hoodmane Mar 9, 2023
8bb9ec4
Merge branch 'unvendor-toml' into fix-lints
hoodmane Mar 9, 2023
40324ab
Try adding eslint gha job
hoodmane Mar 9, 2023
d68c6e7
Add forgotten checkout action
hoodmane Mar 9, 2023
bcb9d92
Force CI to run
hoodmane Mar 9, 2023
336782a
Blah
hoodmane Mar 9, 2023
054ada0
Fix
hoodmane Mar 9, 2023
859f127
Revert changes to github workflow
hoodmane Mar 9, 2023
281328b
Merge branch 'main' into fix-lints
hoodmane Mar 9, 2023
06ea704
Fix lints
hoodmane Mar 9, 2023
d0c6815
Merge branch 'main' into pyscript-package-2
hoodmane Mar 9, 2023
7957814
Merge branch 'fix-lints' into pyscript-package-2
hoodmane Mar 9, 2023
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
Prev Previous commit
Next Next commit
Use @ltd/j-toml
  • Loading branch information
hoodmane committed Mar 8, 2023
commit 81b4c35e302461ebdf8ae1073c8a8cc02b5ab680
24 changes: 11 additions & 13 deletions pyscriptjs/package-lock.json

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

2 changes: 1 addition & 1 deletion pyscriptjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"test:watch": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --watch"
},
"devDependencies": {
"@iarna/toml": "^2.2.5",
"@jest/globals": "29.1.2",
"@rollup/plugin-commonjs": "22.0.2",
"@rollup/plugin-legacy": "2.2.0",
Expand Down Expand Up @@ -50,6 +49,7 @@
"@codemirror/state": "6.1.2",
"@codemirror/theme-one-dark": "6.1.0",
"@codemirror/view": "6.3.0",
"@ltd/j-toml": "^1.38.0",
"codemirror": "6.0.1"
}
}
2 changes: 0 additions & 2 deletions pyscriptjs/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import commonjs from '@rollup/plugin-commonjs';
import resolve from '@rollup/plugin-node-resolve';
import { terser } from 'rollup-plugin-terser';
import legacy from '@rollup/plugin-legacy';
import typescript from '@rollup/plugin-typescript';
import css from 'rollup-plugin-css-only';
import serve from 'rollup-plugin-serve';
Expand Down Expand Up @@ -46,7 +45,6 @@ export default {
string({
include: './src/**/*.py',
}),
legacy({ 'src/toml.js': 'toml' }),
resolve({
browser: true,
}),
Expand Down
2 changes: 1 addition & 1 deletion pyscriptjs/src/pyconfig.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as toml from '@iarna/toml';
import * as toml from '@ltd/j-toml';
import { getLogger } from './logger';
import { version } from './version';
import { getAttribute, readTextFromPath, htmlDecode, createDeprecationWarning } from './utils';
Expand Down
0