Skip to content

Commit c33a754

Browse files
build: support for webpack and editors (#56)
# Motivation It was reported that the library does not work with Next.JS but, we were not abole to reproduce the issue. However, the developer is using a custom Webpack, that's why we can actually assume that the issue related to this bundle. On another side, the issue does not seems to reside solely in the build but, also when imported in an editor as Webstorm or VS Code does not seem able to understand the lib is modular. That's why, there are various things we should do to fix the problem. # Webpack Webpack seems to require a `sideEffects` flag in `package.json` to enable tree shaking for a library ([documentation](https://webpack.js.org/guides/tree-shaking/)). This was, for example, introduced in [three.js](mrdoob/three.js#16059). I'm also unsure whether Webpack requires a `main` field. This PR adds the main entry, even though it will still resolve to an index that throws an error, since we are providing a modular library. # Import and validation When using `exports` in `package.json` it seems that editor have troube understanding that the modules are not shipped at the root of the library. I did not find a solution therefore decided to adapt the way we provide the information by moving `package.json`, and other metadata files` to the `dist` folder. That way the package can reference files at the same level. ⚠️ This comes with an important change. The library after `npm run build` should not be published anymore from the root of the library but, from the `dist` folder. That is why the pipelines had to be updated. # Other changes While fixing those issues I noticed few other minor problems. The `mocks.ts` was packaged in the lib and the file `LICENSE` was missing.
1 parent b74c746 commit c33a754

File tree

8 files changed

+302
-53
lines changed

8 files changed

+302
-53
lines changed

.github/actions/prepare/action.yml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Prepare
2+
3+
description: Checkout, install dependencies, build and test JS library
4+
5+
inputs:
6+
folder:
7+
description: 'The folder in which to run npm ci'
8+
required: false
9+
default: '.'
10+
11+
runs:
12+
using: composite
13+
steps:
14+
- uses: actions/setup-node@v4
15+
with:
16+
node-version: 20
17+
registry-url: 'https://registry.npmjs.org'
18+
19+
- name: Install dependencies
20+
shell: bash
21+
run: npm ci
22+
working-directory: ${{ inputs.folder }}
23+
24+
- name: Build
25+
shell: bash
26+
run: npm run build
27+
working-directory: ${{ inputs.folder }}
28+
29+
- name: Test
30+
shell: bash
31+
run: npm run test
32+
working-directory: ${{ inputs.folder }}

.github/workflows/nightly.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,27 @@ jobs:
1111
id-token: write
1212
env:
1313
working-directory: js-library
14+
dist-directory: js-library/dist
1415

1516
steps:
1617
- name: Checkout
1718
uses: actions/checkout@v4
18-
- uses: actions/setup-node@v4
19+
20+
- name: Prepare and Build JS Library
21+
uses: ./.github/actions/prepare
1922
with:
20-
node-version: "20.x"
21-
registry-url: "https://registry.npmjs.org"
23+
folder: ${{env.working-directory}}
24+
2225
- name: Package next
2326
working-directory: ${{env.working-directory}}
2427
run: ./scripts/package-next
28+
2529
- name: Set up npm
26-
working-directory: ${{env.working-directory}}
30+
working-directory: ${{env.dist-directory}}
2731
run: printf '%s\n' '//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}' registry=https://registry.npmjs.org/ always-auth=true >> .npmrc
32+
2833
- name: Publish
29-
working-directory: ${{env.working-directory}}
34+
working-directory: ${{env.dist-directory}}
3035
run: npm publish --provenance --tag next
3136
env:
3237
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.github/workflows/publish.yml

+9-13
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,24 @@ jobs:
1212
id-token: write
1313
env:
1414
working-directory: js-library
15+
dist-directory: js-library/dist
1516

1617
steps:
1718
- name: Checkout
1819
uses: actions/checkout@v4
1920
- uses: actions/setup-node@v4
21+
22+
- name: Prepare and Build JS Library
23+
uses: ./.github/actions/prepare
2024
with:
21-
node-version: "20.x"
22-
registry-url: "https://registry.npmjs.org"
23-
- name: Install Dependencies
24-
working-directory: ${{env.working-directory}}
25-
run: npm ci
26-
- name: Build
27-
working-directory: ${{env.working-directory}}
28-
run: npm run build
29-
- name: Test
30-
working-directory: ${{env.working-directory}}
31-
run: npm test
25+
folder: ${{env.working-directory}}
26+
3227
- name: Set up npm
33-
working-directory: ${{env.working-directory}}
28+
working-directory: ${{env.dist-directory}}
3429
run: printf '%s\n' '//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}' registry=https://registry.npmjs.org/ always-auth=true >> .npmrc
30+
3531
- name: Publish
36-
working-directory: ${{env.working-directory}}
32+
working-directory: ${{env.dist-directory}}
3733
run: ./scripts/publish-npm.sh
3834
env:
3935
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

js-library/LICENSE

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2021 DFINITY LLC.
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

js-library/esbuild.mjs

+33-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import esbuild from "esbuild";
22
import {
3+
copyFileSync,
34
existsSync,
45
mkdirSync,
56
readFileSync,
@@ -8,15 +9,19 @@ import {
89
} from "node:fs";
910
import { join } from "node:path";
1011

11-
const peerDependencies = (packageJson) => {
12+
const PACKAGE_JSON = "package.json";
13+
14+
const readPackageJson = () => {
15+
const packageJson = join(process.cwd(), PACKAGE_JSON);
1216
const json = readFileSync(packageJson, "utf8");
13-
const { peerDependencies } = JSON.parse(json);
14-
return peerDependencies ?? {};
17+
const { peerDependencies, files } = JSON.parse(json);
18+
return {
19+
workspacePeerDependencies: peerDependencies ?? {},
20+
packageJsonFiles: files ?? [],
21+
};
1522
};
1623

17-
const workspacePeerDependencies = peerDependencies(
18-
join(process.cwd(), "package.json"),
19-
);
24+
const { workspacePeerDependencies, packageJsonFiles } = readPackageJson();
2025

2126
const dist = join(process.cwd(), "dist");
2227

@@ -26,17 +31,17 @@ const createDistFolder = () => {
2631
}
2732
};
2833

29-
const bundleFiles = () => {
30-
const entryPoints = readdirSync(join(process.cwd(), "src"))
31-
.filter(
32-
(file) =>
33-
!file.includes("test") &&
34-
!file.includes("spec") &&
35-
!file.includes("mock") &&
36-
statSync(join(process.cwd(), "src", file)).isFile(),
37-
)
38-
.map((file) => `src/${file}`);
34+
const entryPoints = readdirSync(join(process.cwd(), "src"))
35+
.filter(
36+
(file) =>
37+
!file.includes("test") &&
38+
!file.includes("spec") &&
39+
!file.includes("mock") &&
40+
statSync(join(process.cwd(), "src", file)).isFile(),
41+
)
42+
.map((file) => `src/${file}`);
3943

44+
const buildBrowser = () => {
4045
// esm output bundles with code splitting
4146
esbuild
4247
.build({
@@ -56,9 +61,19 @@ const bundleFiles = () => {
5661
.catch(() => process.exit(1));
5762
};
5863

59-
export const build = () => {
64+
const copyFiles = () => {
65+
const copyFile = (filename) =>
66+
copyFileSync(join(process.cwd(), filename), join(dist, filename));
67+
68+
packageJsonFiles.filter((entry) => !entry.includes("*")).forEach(copyFile);
69+
70+
copyFile(PACKAGE_JSON);
71+
};
72+
73+
const build = () => {
6074
createDistFolder();
61-
bundleFiles();
75+
buildBrowser();
76+
copyFiles();
6277
};
6378

6479
build();

0 commit comments

Comments
 (0)