Skip to content

Commit a8585ff

Browse files
committed
Fix up rustjswasm
1 parent f3ffa74 commit a8585ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+565
-313
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- js
2929
- jupyter
3030
- rust
31-
# - rustjswasm
31+
- rustjswasm
3232
os:
3333
- ubuntu-latest
3434
- macos-latest

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ test-rust:
8888
cd ../python-template-rust && make test
8989

9090
test-rustjswasm:
91-
cd ../python-template-rust && git config --global user.name "github-actions" && git config --global user.email "41898282+github-actions[bot]@users.noreply.github.c@example.com" && git init && git add . && git commit -m "initial commit"
92-
cd ../python-template-rust && make develop
93-
cd ../python-template-rust && git add Cargo.lock && git commit -m "lockfile"
94-
cd ../python-template-rust && make lint
95-
cd ../python-template-rust && make checks
96-
cd ../python-template-rust && make test
91+
cd ../python-template-rustjswasm && git config --global user.name "github-actions" && git config --global user.email "41898282+github-actions[bot]@users.noreply.github.c@example.com" && git init && git add . && git commit -m "initial commit"
92+
cd ../python-template-rustjswasm && make develop
93+
cd ../python-template-rustjswasm && git add Cargo.lock && git commit -m "lockfile"
94+
cd ../python-template-rustjswasm && make lint
95+
cd ../python-template-rustjswasm && make checks
96+
cd ../python-template-rustjswasm && make test
9797

9898

cpp/.gitignore.jinja

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ js/coverage
138138
js/dist
139139
js/lib
140140
js/node_modules
141+
js/test-results
142+
js/playwright-report
141143
js/*.tgz
142144
{{module}}/extension
143145

cpp/Makefile.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ major: ## bump a major version
113113
########
114114
.PHONY: dist dist-py dist-check publish
115115

116-
dist-py: # build python dists
116+
dist-py: ## build python dists
117117
python -m build -w -s
118118

119119
dist-check: ## run python dist checker with twine
120120
python -m twine check dist/*
121121

122122
dist: clean build dist-js dist-py dist-check ## build all dists
123123

124-
publish: dist # publish python assets
124+
publish: dist ## publish python assets
125125

126126
#########
127127
# CLEAN #

js/.gitignore.jinja

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ js/coverage
138138
js/dist
139139
js/lib
140140
js/node_modules
141+
js/test-results
142+
js/playwright-report
141143
js/*.tgz
142144
{{module}}/extension
143145

js/Makefile.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ major: ## bump a major version
134134
########
135135
.PHONY: dist dist-py dist-js dist-check publish
136136

137-
dist-py: # build python dists
137+
dist-py: ## build python dists
138138
python -m build -w -s
139139

140140
dist-js: # build js dists
@@ -145,7 +145,7 @@ dist-check: ## run python dist checker with twine
145145

146146
dist: clean build dist-js dist-py dist-check ## build all dists
147147

148-
publish: dist # publish python assets
148+
publish: dist ## publish python assets
149149

150150
#########
151151
# CLEAN #

js/js/.prettierignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

js/js/package.json.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"build": "node build.mjs",
3131
"clean": "rm -rf dist playwright-report ../{{module}}/extension",
3232
"dev": "npm-run-all -p start watch",
33-
"lint": "prettier --check \"src/**/*\" \"tests/**/*\" \"*.mjs\" \"*.json\"",
34-
"fix": "prettier --write \"src/**/*\" \"tests/**/*\" \"*.mjs\" \"*.json\"",
33+
"lint": "prettier --check \"src/**/*.{js,ts,jsx,tsx,less,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
34+
"fix": "prettier --write \"src/**/*.{js,ts,jsx,tsx,less,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
3535
"preinstall": "npx only-allow pnpm",
3636
"prepack": "npm run build",
3737
"start": "http-server -p 3000 -o examples/",

js/pyproject.toml.jinja

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,7 @@ exclude = [
113113

114114
[tool.hatch.build.targets.wheel]
115115
packages = ["{{module}}"]
116-
exclude = [
117-
"/js"
118-
]
116+
exclude = ["/js"]
119117

120118
[tool.hatch.build.hooks.hatch-js]
121119
path = "js"

jupyter/.gitignore.jinja

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ js/coverage
138138
js/dist
139139
js/lib
140140
js/node_modules
141+
js/test-results
142+
js/playwright-report
141143
js/*.tgz
142144
{{module}}/extension
143145

0 commit comments

Comments
 (0)