Update ci

rustq · Aug 20, 2023 · c928e20 · c928e20
1 parent 7db44ed
commit c928e20
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,13 +1,9 @@
-name: Rust
+name: CI
 
 on:
   push:
     branches:
-      - main
-      - '0\.*\.*'
-  pull_request:
-    branches:
-      - main
+      - '**'
 
 jobs:
   build:
@@ -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
diff --git a/.github/workflows/playground_use_latest.yml b/.github/workflows/playground_use_latest.yml
@@ -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/dist
+            !node_modules
diff --git a/vue-playground/package-ci.json b/vue-playground/package-ci.json
@@ -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"
+  }
+}
diff --git a/vue-playground/src/App.vue b/vue-playground/src/App.vue
@@ -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>

diff --git a/vue-skia-framework/launch.ts b/vue-skia-framework/launch.ts
@@ -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()();
                     }

diff --git a/vue-skia-framework/package-publish.json b/vue-skia-framework/package-publish.json
@@ -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.4.0"
+  }
+}
diff --git a/vue-skia-framework/package.json b/vue-skia-framework/package.json
@@ -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",