Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: support for webpack and editors #56

Merged
merged 13 commits into from
Sep 10, 2024
32 changes: 32 additions & 0 deletions .github/actions/prepare/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Prepare

description: Checkout, install dependencies, build and test JS library

inputs:
folder:
description: 'The folder in which to run npm ci'
required: false
default: '.'

runs:
using: composite
steps:
- uses: actions/setup-node@v4
with:
node-version: 20
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
shell: bash
run: npm ci
working-directory: ${{ inputs.folder }}

- name: Build
shell: bash
run: npm run build
working-directory: ${{ inputs.folder }}

- name: Test
shell: bash
run: npm run test
working-directory: ${{ inputs.folder }}
15 changes: 10 additions & 5 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,27 @@ jobs:
id-token: write
env:
working-directory: js-library
dist-directory: js-library/dist

steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v4

- name: Prepare and Build JS Library
uses: ./.github/actions/prepare
with:
node-version: "20.x"
registry-url: "https://registry.npmjs.org"
folder: ${{env.working-directory}}

- name: Package next
working-directory: ${{env.working-directory}}
run: ./scripts/package-next

- name: Set up npm
working-directory: ${{env.working-directory}}
working-directory: ${{env.dist-directory}}
run: printf '%s\n' '//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}' registry=https://registry.npmjs.org/ always-auth=true >> .npmrc

- name: Publish
working-directory: ${{env.working-directory}}
working-directory: ${{env.dist-directory}}
run: npm publish --provenance --tag next
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
22 changes: 9 additions & 13 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,24 @@ jobs:
id-token: write
env:
working-directory: js-library
dist-directory: js-library/dist

steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v4

- name: Prepare and Build JS Library
uses: ./.github/actions/prepare
with:
node-version: "20.x"
registry-url: "https://registry.npmjs.org"
- name: Install Dependencies
working-directory: ${{env.working-directory}}
run: npm ci
- name: Build
working-directory: ${{env.working-directory}}
run: npm run build
- name: Test
working-directory: ${{env.working-directory}}
run: npm test
folder: ${{env.working-directory}}

- name: Set up npm
working-directory: ${{env.working-directory}}
working-directory: ${{env.dist-directory}}
run: printf '%s\n' '//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}' registry=https://registry.npmjs.org/ always-auth=true >> .npmrc

- name: Publish
working-directory: ${{env.working-directory}}
working-directory: ${{env.dist-directory}}
run: ./scripts/publish-npm.sh
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
201 changes: 201 additions & 0 deletions js-library/LICENSE
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is already a LICENSE in the root directory. Why is this also needed here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However, I'm not sure about publishing from the dist directory. It seems a brittle thing easy to forget or ignore. I think that I prefer to drop the index raising an error instead.

As far as I know, it's also common practice to release a flattened library "from the dist directory", such as in Angular libraries or noble-hashes, which we used as inspiration to componse this library.

Do you have it in Webstorm in Oisy?

I have a similar issue in WebStorm, like the one reported in issue #48.

This problem doesn't seem to happen in the canary version of NextJS when I tested it.

Did you test it using the reporter's project or with a sample repository?

The issue is not with Next.js, but with webpack. I couldn't reproduce the issue with a sample Next.js repository either.

Removing the throwin an error in the index simplifies things.

This might work as a workaround fix for this library, but in my opinion, it's not a long-term solution for the foundation, especially considering we have other projects like the Oisy Signer library, which aim to be modular without requiring multiple libraries to be published on npm. Additionally, this approach would limit the library to being a single entity, restricting future extensions or additions.

There is already a LICENSE in the root directory. Why is this also needed here?

The LICENSE in the root directory is not included when the library is shipped. You can check the node_modules folder or the "Code" tab on npm to verify this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that if your concern is publishing from the js-directory folder, we can add a prepublishOnly hook or set the private: true field to prevent this from happening. I think it's a valid concern and we can/should do that.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know, it's also common practice to release a flattened library "from the dist directory", such as in Angular libraries or noble-hashes, which we used as inspiration to componse this library.

Where do you see noble/hashes publishing from the build directory? Their publish action seems to run from the root directory: https://github.com/paulmillr/noble-hashes/blob/main/.github/workflows/publish-npm.yml#L20

I'm not familia with this practice and I'm afraid it can lead to unknown issues in the future. That's why I'm skeptical.

But if you say it's a common practice it's ok for me. That probably means there are not many unknowns ahead.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where do you see noble/hashes publishing from the build directory?

Right, they build to the root directory.

They generate JS files at the root: https://github.com/paulmillr/noble-hashes/blob/f51bab49ec460e227706ffcc1eeec85db31053aa/tsconfig.json#L5

They clean the root directory before build: https://github.com/paulmillr/noble-hashes/blob/f51bab49ec460e227706ffcc1eeec85db31053aa/package.json#L17

They also ignore JS files at the root: https://github.com/paulmillr/noble-hashes/blob/f51bab49ec460e227706ffcc1eeec85db31053aa/.gitignore#L4

As a result, the library they ship also contains the src folder.

Output: https://www.npmjs.com/package/@noble/hashes?activeTab=code

Shipping from dist does sound familiar to me and cleaner, I rather like when I develop locally to not have those bundled files in the root of my environment, but if you prefer an approach where it builds to the root, I’m not opposed. Ultimately, for the Oisy Signer (and in general), I think we should move towards a more modular approach, happy to adapt the rest.

Let me know WDYT!

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shipping from dist seems cleaner than all that, I agree.

Interesting that they build twice with different tsconfigs: tsc & tsc -p tsconfig.esm.json

The esm tsconfig: https://github.com/paulmillr/jsbt/blob/main/tsconfig.esm.json

the other one: https://github.com/paulmillr/jsbt/blob/main/tsconfig.cjs.json

I wonder whether we should do something similar? Not in this PR though.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wonder whether we should do something similar?

If I remember correctly you told me this library only works in the browser? If that's correct, we do not need that approach. On the contrary sure we can also ship for Node but, i would ship esm as well (event if Node is going to support cjs again soon, I guess they gonna keep esm as default, we can double check).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We also discussed this offline.

Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2021 DFINITY LLC.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
51 changes: 33 additions & 18 deletions js-library/esbuild.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import esbuild from "esbuild";
import {
copyFileSync,
existsSync,
mkdirSync,
readFileSync,
Expand All @@ -8,15 +9,19 @@ import {
} from "node:fs";
import { join } from "node:path";

const peerDependencies = (packageJson) => {
const PACKAGE_JSON = "package.json";

const readPackageJson = () => {
const packageJson = join(process.cwd(), PACKAGE_JSON);
const json = readFileSync(packageJson, "utf8");
const { peerDependencies } = JSON.parse(json);
return peerDependencies ?? {};
const { peerDependencies, files } = JSON.parse(json);
return {
workspacePeerDependencies: peerDependencies ?? {},
packageJsonFiles: files ?? [],
};
};

const workspacePeerDependencies = peerDependencies(
join(process.cwd(), "package.json"),
);
const { workspacePeerDependencies, packageJsonFiles } = readPackageJson();

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

Expand All @@ -26,17 +31,17 @@ const createDistFolder = () => {
}
};

const bundleFiles = () => {
const entryPoints = readdirSync(join(process.cwd(), "src"))
.filter(
(file) =>
!file.includes("test") &&
!file.includes("spec") &&
!file.includes("mock") &&
statSync(join(process.cwd(), "src", file)).isFile(),
)
.map((file) => `src/${file}`);
const entryPoints = readdirSync(join(process.cwd(), "src"))
.filter(
(file) =>
!file.includes("test") &&
!file.includes("spec") &&
!file.includes("mock") &&
statSync(join(process.cwd(), "src", file)).isFile(),
)
.map((file) => `src/${file}`);

const buildBrowser = () => {
// esm output bundles with code splitting
esbuild
.build({
Expand All @@ -56,9 +61,19 @@ const bundleFiles = () => {
.catch(() => process.exit(1));
};

export const build = () => {
const copyFiles = () => {
const copyFile = (filename) =>
copyFileSync(join(process.cwd(), filename), join(dist, filename));

packageJsonFiles.filter((entry) => !entry.includes("*")).forEach(copyFile);

copyFile(PACKAGE_JSON);
};

const build = () => {
createDistFolder();
bundleFiles();
buildBrowser();
copyFiles();
};

build();
Loading
Loading