Skip to content

Commit 4deeaec

Browse files
kateinoigakukunkateinoigakukun
authored
Merge pull request #325 from ruby/katei/rename-package-names
Move npm packages under @ruby org
2 parents c7e4191 + ed36890 commit 4deeaec

File tree

21 files changed

+802
-2059
lines changed

21 files changed

+802
-2059
lines changed

‎README.md

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Create and save `index.html` page with the following contents:
1515

1616
```html
1717
<html>
18-
<script src="https://cdn.jsdelivr.net/npm/ruby-3_2[email protected]/dist/browser.script.iife.js"></script>
18+
<script src="https://cdn.jsdelivr.net/npm/@ruby/3.2[email protected]/dist/browser.script.iife.js"></script>
1919
<script type="text/ruby">
2020
puts "Hello, world!"
2121
</script>
@@ -28,18 +28,18 @@ Dependencies: [wasi-vfs](https://github.com/kateinoigakukun/wasi-vfs), [wasmtime
2828

2929
```console
3030
# Download a prebuilt Ruby release
31-
$ curl -LO https://github.com/ruby/ruby.wasm/releases/latest/download/ruby-3_2-wasm32-unknown-wasi-full.tar.gz
32-
$ tar xfz ruby-3_2-wasm32-unknown-wasi-full.tar.gz
31+
$ curl -LO https://github.com/ruby/ruby.wasm/releases/latest/download/ruby-3.2-wasm32-unknown-wasi-full.tar.gz
32+
$ tar xfz ruby-3.2-wasm32-unknown-wasi-full.tar.gz
3333

3434
# Extract ruby binary not to pack itself
35-
$ mv 3_2-wasm32-unknown-wasi-full/usr/local/bin/ruby ruby.wasm
35+
$ mv 3.2-wasm32-unknown-wasi-full/usr/local/bin/ruby ruby.wasm
3636

3737
# Put your app code
3838
$ mkdir src
3939
$ echo "puts 'Hello'" > src/my_app.rb
4040

4141
# Pack the whole directory under /usr and your app dir
42-
$ wasi-vfs pack ruby.wasm --mapdir /src::./src --mapdir /usr::./3_2-wasm32-unknown-wasi-full/usr -o my-ruby-app.wasm
42+
$ wasi-vfs pack ruby.wasm --mapdir /src::./src --mapdir /usr::./3.2-wasm32-unknown-wasi-full/usr -o my-ruby-app.wasm
4343

4444
# Run the packed scripts
4545
$ wasmtime my-ruby-app.wasm -- /src/my_app.rb
@@ -60,19 +60,19 @@ See the `README.md` of each package for more detail and its usage.
6060
</thead>
6161
<tbody>
6262
<tr>
63-
<td><a href="/packages/npm-packages/ruby-3_2-wasm-wasi">ruby-3_2-wasm-wasi</a></td>
63+
<td><a href="/packages/npm-packages/ruby-3.2-wasm-wasi">@ruby/3.2-wasm-wasi</a></td>
6464
<td>CRuby 3.2 built on WASI with JS interop support</td>
65-
<td><a href="https://badge.fury.io/js/ruby-3_2-wasm-wasi" rel="nofollow"><img src="https://badge.fury.io/js/ruby-3_2-wasm-wasi.svg" alt="npm version" style="max-width: 100%;"></a></td>
65+
<td><a href="https://badge.fury.io/js/@ruby/3.2-wasm-wasi" rel="nofollow"><img src="https://badge.fury.io/js/@ruby/3.2-wasm-wasi.svg" alt="npm version" style="max-width: 100%;"></a></td>
6666
</tr>
6767
<tr>
68-
<td><a href="/packages/npm-packages/ruby-head-wasm-wasi">ruby-head-wasm-wasi</a></td>
68+
<td><a href="/packages/npm-packages/ruby-head-wasm-wasi">@ruby/head-wasm-wasi</a></td>
6969
<td>HEAD CRuby built on WASI with JS interop support</td>
70-
<td><a href="https://badge.fury.io/js/ruby-head-wasm-wasi" rel="nofollow"><img src="https://badge.fury.io/js/ruby-head-wasm-wasi.svg" alt="npm version" style="max-width: 100%;"></a></td>
70+
<td><a href="https://badge.fury.io/js/@ruby/head-wasm-wasi" rel="nofollow"><img src="https://badge.fury.io/js/@ruby/head-wasm-wasi.svg" alt="npm version" style="max-width: 100%;"></a></td>
7171
</tr>
7272
<tr>
73-
<td><a href="/packages/npm-packages/ruby-head-wasm-emscripten">ruby-head-wasm-emscripten</a></td>
73+
<td><a href="/packages/npm-packages/ruby-head-wasm-emscripten">@ruby/head-wasm-emscripten</a></td>
7474
<td>HEAD CRuby built on Emscripten (not well tested)</td>
75-
<td><a href="https://badge.fury.io/js/ruby-head-wasm-emscripten" rel="nofollow"><img src="https://badge.fury.io/js/ruby-head-wasm-emscripten.svg" alt="npm version" style="max-width: 100%;"></a></td>
75+
<td><a href="https://badge.fury.io/js/@ruby/head-wasm-emscripten" rel="nofollow"><img src="https://badge.fury.io/js/@ruby/head-wasm-emscripten.svg" alt="npm version" style="max-width: 100%;"></a></td>
7676
</tr>
7777
</tbody>
7878
</table>
@@ -132,8 +132,6 @@ A _build_ is a combination of ruby version, _profile_, and _target_.
132132
</tbody>
133133
</table>
134134

135-
Note: `*` is a wildcard that represents any other profile name except for itself, applied recursively. For example, `minimal-full-js-debug` is a valid profile.
136-
137135
## Notable Limitations
138136

139137
The current WASI target build does not yet support `Thread` related APIs. Specifically, WASI does not yet have an API for creating and managing threads yet.

‎Rakefile

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ BUILD_SOURCES = {
1515
rev: "master",
1616
patches: Dir["./patches/*.patch"].map { |p| File.expand_path(p) }
1717
},
18-
"3_2" => {
18+
"3.2" => {
1919
type: "github",
2020
repo: "ruby/ruby",
2121
rev: "v3_2_0"
@@ -48,16 +48,6 @@ BUILD_PROFILES = {
4848
default_exts: "",
4949
user_exts: []
5050
},
51-
"minimal-js" => {
52-
debug: false,
53-
default_exts: "",
54-
user_exts: %w[js witapi]
55-
},
56-
"minimal-js-debug" => {
57-
debug: true,
58-
default_exts: "",
59-
user_exts: %w[js witapi]
60-
},
6151
"full" => {
6252
debug: false,
6353
default_exts: FULL_EXTS,
@@ -118,8 +108,8 @@ NPM_PACKAGES = [
118108
target: "wasm32-unknown-wasi"
119109
},
120110
{
121-
name: "ruby-3_2-wasm-wasi",
122-
build: "3_2-wasm32-unknown-wasi-full-js-debug",
111+
name: "ruby-3.2-wasm-wasi",
112+
build: "3.2-wasm32-unknown-wasi-full-js-debug",
123113
target: "wasm32-unknown-wasi"
124114
}
125115
]

0 commit comments

Comments
 (0)