Skip to content

Commit 76555d7

Browse files
authored
Merge pull request #26 from Ultimaker/NP-1311
Add option to give extra included files
2 parents b940020 + 5d7ac41 commit 76555d7

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

recipes/npmpackage/all/conanfile.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ def sanitize_version(version):
1111
return version.replace("+", "-")
1212

1313

14-
def generate_package_json(conanfile: ConanFile, entry_point, **kwargs):
14+
def generate_package_json(conanfile: ConanFile, entry_point, extra_files = [], **kwargs):
15+
files = [ str(Path(entry_point).parent), "package.json" ] + extra_files
1516
package_json = {
1617
"name": f"@{conanfile.author.lower()}/{conanfile.name.lower()}js",
1718
"version": f"{sanitize_version(conanfile.version)}",
@@ -24,18 +25,16 @@ def generate_package_json(conanfile: ConanFile, entry_point, **kwargs):
2425
"author": conanfile.author,
2526
"license": conanfile.license,
2627
"keywords": conanfile.topics,
27-
"files": [
28-
str(Path(entry_point).parent),
29-
"package.json"
30-
]
28+
"files": files
3129
}
3230
package_json |= kwargs
3331
return package_json
3432

3533

36-
def conf_package_json(conanfile: ConanFile, **kwargs):
34+
def conf_package_json(conanfile: ConanFile, extra_files = [], **kwargs):
3735
package_json = generate_package_json(conanfile,
3836
os.path.join(conanfile.cpp.package.bindirs[0], conanfile.cpp.package.bin[0]),
37+
extra_files,
3938
**kwargs)
4039
conanfile.conf_info.define(f"user.{conanfile.name.lower()}:package_json", package_json)
4140

recipes/npmpackage/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
versions:
2-
"1.1.0":
2+
"1.2.0":
33
folder: "all"

0 commit comments

Comments
 (0)