Skip to content

Commit

Permalink
Merge wasm files (#31)
Browse files Browse the repository at this point in the history
Refactor wasm files to merge all login in one wasm.
Optimize output file.
  • Loading branch information
evg4b authored Dec 15, 2024
1 parent 2e75472 commit 7a39aa8
Show file tree
Hide file tree
Showing 66 changed files with 317 additions and 382 deletions.
16 changes: 8 additions & 8 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/.yarn/** linguist-vendored
/.yarn/releases/* binary
/.yarn/plugins/**/* binary
/.pnp.* binary linguist-generated
/tokenizer/tokenizer.wasm binary
/.github/*.psd binary
/.github/*.png binary
/assets/*.png binary
/.yarn/** linguist-vendored
/.yarn/releases/* binary
/.yarn/plugins/**/* binary
/.pnp.* binary linguist-generated
/worker-core/worker-core.wasm binary
/.github/*.psd binary
/.github/*.png binary
/assets/**/*.png binary
18 changes: 7 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CI (nodejs and golang)

on:
push:
branches: ['main']
branches: [ 'main' ]
pull_request:
branches: ['main']
branches: [ 'main' ]

jobs:
build:
Expand All @@ -19,17 +19,13 @@ jobs:
with:
go-version: '1.23.0'

- name: Build JSON Tokenizer
working-directory: ./packages
run: GOOS=js GOARCH=wasm go build -o tokenizer.wasm -v ./tokenizer

- name: Build JQ
working-directory: ./packages
run: GOOS=js GOARCH=wasm go build -o tokenizer.wasm -v ./jq
- name: Build worker wasm
working-directory: ./worker-core
run: GOOS=js GOARCH=wasm go build -o worker.wasm -v .

- name: Test GO code
working-directory: ./packages
run: go test -v -timeout 1m -coverprofile=coverage.out -json ./pkg/... > test-report.out
working-directory: ./worker-core
run: go test -v -timeout 1m -coverprofile=coverage.out -json ./internal/... > test-report.out

- name: Use Node.js
uses: actions/setup-node@v3
Expand Down
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ dist

# vuepress v2.x temp and cache directory
.temp
.cache

# Docusaurus cache and generated files
.docusaurus
Expand Down Expand Up @@ -131,5 +130,5 @@ dist
.idea
.DS_Store
*.zip
packages/coverage.out
packages/test-report.out
worker-core/coverage.out
worker-core/test-report.out
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ coverage
.yarn
.idea
media_data/data/**/*.json
packages/wasm_exec.js
worker-core/wasm_exec.js
14 changes: 8 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
default: build-packages build-extension pack-extension
default: build-worker-core build-extension pack-extension

check:
@echo "Checking packages..."
Expand All @@ -9,11 +9,13 @@ check:
build-extension:
yarn build:production

build-packages:
build-worker-core:
@echo "Building wasms..."
cd packages && $(MAKE)
cd worker-core && $(MAKE)

pack-extension:
cd ./dist && zip -r -X ../extention.zip *
cat ./dist/manifest.json | jq 'del(.key)' > ./dist/manifest.json
cd ./dist && zip -r -X ../extention-msdn.zip *
@echo "Packing extension for Chrome Store..."
@cd ./dist && zip -r -X ../extention.zip *
@echo "Packing extension for Microsoft Store..."
@cat ./dist/manifest.json | jq 'del(.key)' > ./dist/manifest.json
@cd ./dist && zip -r -X ../extention-msdn.zip *
2 changes: 1 addition & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default tseslint.config(
'dist/',
'jest.config.js',
'media_data/',
'packages/wasm_exec.js',
'worker-core/wasm_exec.js',
'eslint.config.mjs',
'coverage/',
'tsup.config.mjs',
Expand Down
5 changes: 1 addition & 4 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ module.exports = {
setupFiles: ['<rootDir>/jest.setup.ts'],
verbose: true,
moduleNameMapper: {
'^@packages/jq/(.*)$': '<rootDir>packages/jq/$1',
'^@packages/tokenizer/(.*)$': '<rootDir>packages/tokenizer/$1',
'^@packages/jq$': '<rootDir>packages/jq',
'^@packages/tokenizer$': '<rootDir>packages/tokenizer',
'^@worker-core$': '<rootDir>worker-core',
'^@core/(.*)$': '<rootDir>src/core/$1',
'^@testing/(.*)$': '<rootDir>testing/$1',
'^@testing$': '<rootDir>testing',
Expand Down
2 changes: 1 addition & 1 deletion jest.setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ import '@webcomponents/custom-elements';
import { TextDecoder, TextEncoder } from 'text-encoding';
global.TextDecoder = TextDecoder;
global.TextEncoder = TextEncoder;
import './packages/wasm_exec.js';
import './worker-core/wasm_exec.js';
52 changes: 0 additions & 52 deletions packages/Makefile

This file was deleted.

14 changes: 0 additions & 14 deletions packages/jq/index.ts

This file was deleted.

19 changes: 0 additions & 19 deletions packages/jq/jq.test.ts

This file was deleted.

34 changes: 0 additions & 34 deletions packages/jq/main.go

This file was deleted.

1 change: 0 additions & 1 deletion packages/jq/types.d.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/shared/index.ts

This file was deleted.

2 changes: 0 additions & 2 deletions packages/tokenizer/index.ts

This file was deleted.

55 changes: 0 additions & 55 deletions packages/tokenizer/main.go

This file was deleted.

22 changes: 0 additions & 22 deletions packages/tokenizer/tokenize.ts

This file was deleted.

19 changes: 0 additions & 19 deletions packages/tokenizer/tokenizer.test.ts

This file was deleted.

Binary file removed packages/tokenizer/tokenizer.wasm
Binary file not shown.
12 changes: 6 additions & 6 deletions sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ sonar.links.issue=https://github.com/evg4b/modern-json-formatter/issues
# Code properties
# =====================================================
sonar.exclusions=**/node_modules/**,**/.idea/,testing/**
sonar.sources=src/,packages/
sonar.test.inclusions=src/**/*.test.ts,packages/**/*_test.go,packages/**/*.test.ts
sonar.sources=src/,worker-core/
sonar.test.inclusions=src/**/*.test.ts,worker-core/**/*_test.go,worker-core/**/*.test.ts
sonar.typescript.lcov.reportPaths=coverage/lcov.info
sonar.typescript.tsconfigPaths=tsconfig.ext.json
sonar.go.tests.reportPaths=packages/test-report.out
sonar.go.coverage.reportPaths=packages/coverage.out
sonar.coverage.exclusions=packages/**/*_test.go,src/**/*.test.ts,src/**/*.scss,src/**/*.json,packages/,src/jest.setup.ts,packages/wasm_exec.js,packages/tokenizer/main.go,packages/jq/main.go
sonar.cpd.exclusions=packages/**/*_test.go,packages/jq/main.go,src/**/*.test.ts
sonar.go.tests.reportPaths=worker-core/test-report.out
sonar.go.coverage.reportPaths=worker-core/coverage.out
sonar.coverage.exclusions=worker-core/**/*_test.go,src/**/*.test.ts,src/**/*.scss,src/**/*.json,worker-core/,src/jest.setup.ts,worker-core/wasm_exec.js,worker-core/tokenizer/main.go,worker-core/jq/main.go
sonar.cpd.exclusions=worker-core/**/*_test.go,worker-core/jq/main.go,src/**/*.test.ts
Loading

0 comments on commit 7a39aa8

Please sign in to comment.