Skip to content

Commit

Permalink
fix: add type module to bundler package
Browse files Browse the repository at this point in the history
  • Loading branch information
lainNao committed May 22, 2024
1 parent 6bd2b8c commit 53199b1
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "chord-progression-parser"
version = "0.6.1"
version = "0.6.2"
authors = ["lainNao"]
edition = "2021"
license = "MIT"
Expand Down
9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ build-wasm-bundler:
--out-dir ./pkg/pkg-bundler \
--target bundler
make generate-ts-declare-file-for-pkg-bundler
make add-package-json-type-module-for-pkg-bundler

# modify package-name
# append "-bundler" to package json "name" field
Expand Down Expand Up @@ -134,8 +135,8 @@ generate-ts-declare-file-for-pkg-bundler:
# Rewrite definition of return value of run function in pkg-bundler/chord_progression_parser.d.ts to "Ast"
sed -i.bak 's/any/ParsedResult/g' pkg/pkg-bundler/chord_progression_parser.d.ts && rm pkg/pkg-bundler/chord_progression_parser.d.ts.bak
# compile additinal files
npx tsc resources/error_code_message_map.ts --declaration --allowJs --module ES6 --outDir pkg/pkg-bundler
npx tsc resources/generatedTypes.ts --declaration --allowJs --module ES6 --outDir pkg/pkg-bundler
npx tsc resources/error_code_message_map.ts --declaration --allowJs --module NodeNext --moduleResolution nodenext --outDir pkg/pkg-bundler
npx tsc resources/generatedTypes.ts --declaration --allowJs --module NodeNext --moduleResolution nodenext --outDir pkg/pkg-bundler
# add to package.json "files"
sed -i.bak 's/"files": \[/"files": \[\
"error_code_message_map.js", "error_code_message_map.d.ts", /g' pkg/pkg-bundler/package.json && rm pkg/pkg-bundler/package.json.bak
Expand All @@ -144,6 +145,10 @@ generate-ts-declare-file-for-pkg-bundler:
# prepend contents of additionalType.ts.txt to pkg/pkg-bundler/chord_progression_parser.d.ts
cat resources/additionalType.ts.txt pkg/pkg-bundler/chord_progression_parser.d.ts > pkg/pkg-bundler/chord_progression_parser.d.ts.tmp && mv pkg/pkg-bundler/chord_progression_parser.d.ts.tmp pkg/pkg-bundler/chord_progression_parser.d.ts

# add package.json type module
add-package-json-type-module-for-pkg-bundler:
sed -i.bak 's/"name": "\(.*\)"/"name": "\1",\n "type": "module"/' pkg/pkg-bundler/package.json && rm pkg/pkg-bundler/package.json.bak

# generate types
generate-ts-types:
typeshare ./src \
Expand Down
Binary file modified e2e-test/bundler/bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion e2e-test/bundler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@playwright/test": "^1.39.0",
"bun-types": "latest",
"playwright": "^1.39.0",
"typescript": "^5.4.2",
"typescript": "^5.4.5",
"vite": "^4.4.5",
"vite-plugin-top-level-await": "^1.3.1",
"vite-plugin-wasm": "^3.2.2"
Expand Down
Binary file modified e2e-test/node/bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion e2e-test/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "module",
"devDependencies": {
"bun-types": "latest",
"typescript": "^5.4.2"
"typescript": "^5.4.5"
},
"peerDependencies": {
"typescript": "^5.0.0"
Expand Down
Binary file modified e2e-test/web/bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion e2e-test/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@playwright/test": "^1.39.0",
"http-server": "^14.1.1",
"playwright": "^1.39.0",
"typescript": "^5.4.2"
"typescript": "^5.4.5"
},
"dependencies": {
"@lainnao/chord-progression-parser-web": "../../pkg/pkg-web"
Expand Down
2 changes: 1 addition & 1 deletion resources/generatedTypes.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Generated by typeshare 1.7.0
Generated by typeshare 1.9.2
*/

export type SectionMeta =
Expand Down

0 comments on commit 53199b1

Please sign in to comment.