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

0.0.6 #15

Merged
merged 2 commits into from
Aug 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
name: Rust
name: CI

on:
push:
branches:
- main
- '0\.*\.*'
pull_request:
branches:
- main
- '**'

jobs:
build:
Expand Down Expand Up @@ -47,15 +43,23 @@ jobs:
cd vue-playground
pnpm i
pnpm build

- name: Archive vue-skia-framework artifacts
uses: actions/upload-artifact@v3
with:
name: vue-skia-framework
path: |
vue-skia-framework
!node_modules
- name: Archive vue-playground results
vue-skia-framework/lib
vue-skia-framework/type.d.ts
vue-skia-framework/main.js
vue-skia-framework/main.d.ts
vue-skia-framework/components
vue-skia-framework/LICENSE
vue-skia-framework/package-publish.json

- name: Archive soft-skia-wasm artifacts
uses: actions/upload-artifact@v3
with:
name: vue-playground
path: vue-playground/dist
name: soft-skia-wasm
path: |
soft-skia-wasm/pkg
37 changes: 37 additions & 0 deletions .github/workflows/playground_use_latest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Playground Use Latest

on:
push:
branches:
- main
- '0\.*\.*'
pull_request:
branches:
- main

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: clippy
override: true

- name: vue-playground
run: |
cd vue-playground
cp package-ci.json package.json
npm i
npm run build

- name: Archive vue-playground results
uses: actions/upload-artifact@v3
with:
name: vue-playground-use-latest
path: |
vue-playground
!vue-playground/node_modules
2 changes: 1 addition & 1 deletion soft-skia-wasm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "soft-skia-wasm"
version = "0.4.0"
version = "0.6.0"
authors = ["meloalright <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion soft-skia/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "soft_skia"
version = "0.4.0"
version = "0.6.0"
edition = "2021"
description="software rasterization skia binding"
license = "MIT"
Expand Down
36 changes: 36 additions & 0 deletions vue-playground/package-ci.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"name": "vue-playground",
"version": "0.6.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"dependencies": {
"@uivjs/vue-github-corners": "^1.0.1",
"core-js": "^3.8.3",
"prism-themes": "^1.9.0",
"prismjs": "^1.29.0",
"vue": "^3.2.13",
"vue-live": "^2.5.4",
"vue-skia": "latest"
},
"devDependencies": {
"@types/node": "^20.5.0",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-eslint": "~5.0.0",
"@vue/cli-plugin-typescript": "~5.0.0",
"@vue/cli-service": "~5.0.0",
"@vue/eslint-config-typescript": "^9.1.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-vue": "^8.0.3",
"prettier": "^2.4.1",
"typescript": "~4.5.5",
"url-loader": "^4.1.1"
}
}
2 changes: 1 addition & 1 deletion vue-playground/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<p class="description">
This super cool editor is based on <em>vue-live</em> !
</p>
<div class="livebox">
<div class="livebox" v-if="!debug">
<div class="hint">
You can edit <a title="copy code to clipboard" @click="copy">this</a>
<span>-></span>
Expand Down
2 changes: 1 addition & 1 deletion vue-skia-framework/launch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const launch = function () {
const wasm = import("soft-skia-wasm/soft_skia_wasm.js");
wasm.then((ssw) => {
ssw.default().then(() => {
global.ssw = ssw;
window.ssw = ssw;
while (SSWInitialHelper.initialSucceedCallbackQueue.length) {
SSWInitialHelper.initialSucceedCallbackQueue.pop()();
}
Expand Down
18 changes: 18 additions & 0 deletions vue-skia-framework/package-publish.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "vue-skia",
"version": "0.0.6",
"files": [
"lib",
"type.d.ts",
"main.js",
"main.d.ts",
"components",
"LICENSE"
],
"license": "MIT",
"main": "./main.js",
"module": "./main.js",
"dependencies": {
"soft-skia-wasm": "0.6.0"
}
}
7 changes: 4 additions & 3 deletions vue-skia-framework/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{
"name": "vue-skia",
"version": "0.0.4",
"version": "0.0.0",
"private": "true",
"files": [
"lib",
"soft-skia-wasm/pkg",
"type.d.ts",
"main.js",
"main.d.ts",
"components",
"LICENSE"
],
"scripts": {
"build": "rm -rf lib; tsc;cp main.js main.d.ts"
"build": "rm -rf lib; tsc; cp main.js main.d.ts; cp type.ts type.d.ts"
},
"license": "MIT",
"main": "./main.js",
Expand Down