Skip to content

Commit 50ff26f

Browse files
committed
fix #429 - move client JS to top of src/ dir
1 parent 718ca9b commit 50ff26f

28 files changed

+39
-25
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
npm install -g npm@latest
6868
npm --version
6969
- name: Test Javascript
70-
working-directory: ./src/idom/client
70+
working-directory: ./src/client
7171
run: |
7272
npm install
7373
npm test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ pip-wheel-metadata
3939
# --- JS ---
4040

4141
node_modules
42+
src/idom/client

MANIFEST.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
recursive-include src/idom *
2-
recursive-exclude src/idom/client/node_modules *
1+
recursive-include src/idom/client *
32
include requirements/prod.txt
43
include requirements/extras.txt

docs/source/custom_js/package-lock.json

Lines changed: 21 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/source/custom_js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"rollup-plugin-replace": "^2.2.0"
1616
},
1717
"dependencies": {
18-
"idom-client-react": "file:../../../src/idom/client/packages/idom-client-react"
18+
"idom-client-react": "file:../../../src/client/packages/idom-client-react"
1919
}
2020
}

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class Command(cls):
119119
def run(self):
120120
log.info("Installing Javascript...")
121121
try:
122-
js_dir = str(package_dir / "client")
122+
js_dir = str(src_dir / "client")
123123
npm = shutil.which("npm") # this is required on windows
124124
if npm is None:
125125
raise RuntimeError("NPM is not installed.")
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module.exports = {
22
workspaceRoot: false,
33
testOptions: { files: ["**/tests/**/*", "**/*.test.*"] },
4+
buildOptions: { out: "../idom/client" },
45
};

src/idom/__init__.py

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,21 @@
2222

2323

2424
__all__ = [
25-
"run",
26-
"component",
27-
"Component",
28-
"event",
29-
"Events",
30-
"dialect",
25+
"config",
3126
"html",
27+
"log",
28+
"web",
3229
"hooks",
30+
"Component",
31+
"component",
32+
"Events",
33+
"event",
3334
"Layout",
34-
"server",
35-
"Ref",
35+
"VdomDict",
3636
"vdom",
37+
"run",
38+
"Ref",
39+
"html_to_vdom",
3740
"hotswap",
3841
"multiview",
39-
"html_to_vdom",
40-
"VdomDict",
41-
"widgets",
42-
"client",
43-
"install",
44-
"log",
45-
"config",
46-
"web",
4742
]

src/idom/server/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from .proto import ServerFactory
1414

1515

16-
CLIENT_BUILD_DIR = Path(idom.__file__).parent / "client" / "build"
16+
CLIENT_BUILD_DIR = Path(idom.__file__).parent / "client"
1717

1818
_SUPPORTED_PACKAGES = [
1919
"sanic",

0 commit comments

Comments
 (0)