chore: cleanup vscode extension bundling

zenstackhq · Dec 24, 2023 · 2d48c7f · 2d48c7f
1 parent b0ef221
commit 2d48c7f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 97 deletions.
diff --git a/packages/schema/.vscodeignore b/packages/schema/.vscodeignore
@@ -1,3 +1,4 @@
+.env
 .vscode/**
 .vscode-test/**
 .gitignore
@@ -8,3 +9,5 @@ bin
 build
 jest.config.ts
 tsconfig.json
+dist
+README-global.md
diff --git a/packages/schema/build/bundle.js b/packages/schema/build/bundle.js
@@ -23,19 +23,7 @@ require('esbuild')
     })
     .then(() => {
         fs.cpSync('./src/res', 'bundle/res', { force: true, recursive: true });
-        fs.cpSync('./asset', 'bundle/asset', {
-            force: true,
-            recursive: true,
-        });
-        fs.cpSync('./README.md', 'bundle/README.md', {
-            force: true,
-        });
-        fs.cpSync('../../LICENSE', 'bundle/LICENSE', {
-            force: true,
-        });
-        fs.cpSync('./package.json', 'bundle/package.json', {
-            force: true,
-        });
+        fs.cpSync('../language/syntaxes', 'bundle/syntaxes', { force: true, recursive: true });
     })
     .then(() => console.log(success))
     .catch((err) => {

diff --git a/packages/schema/build/env-plugin.js b/packages/schema/build/env-plugin.js
diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -53,7 +53,7 @@
             {
                 "language": "zmodel",
                 "scopeName": "source.zmodel",
-                "path": "./syntaxes/zmodel.tmLanguage.json"
+                "path": "./bundle/syntaxes/zmodel.tmLanguage.json"
             }
         ]
     },
@@ -67,10 +67,10 @@
     "scripts": {
         "vscode:publish": "vsce publish --no-dependencies",
         "vscode:prepublish": "pnpm bundle",
-        "vscode:package": "vsce package --no-dependencies",
-        "clean": "rimraf bundle dist",
+        "vscode:package": "pnpm bundle && vsce package --no-dependencies",
+        "clean": "rimraf dist",
         "build": "pnpm clean && pnpm lint --max-warnings=0 && tsc && copyfiles -F \"bin/*\" dist && copyfiles ./README-global.md ./LICENSE ./package.json dist && renamer --replace \"README.md\" dist/README-global.md && copyfiles -u 1 \"src/res/*\" dist && node build/post-build.js && pnpm pack dist --pack-destination '../../../.build'",
-        "bundle": "pnpm clean && pnpm lint --max-warnings=0 && node build/bundle.js --minify",
+        "bundle": "rimraf bundle && pnpm lint --max-warnings=0 && node build/bundle.js --minify",
         "watch": "tsc --watch",
         "lint": "eslint src tests --ext ts",
         "test": "ZENSTACK_TEST=1 jest",

diff --git a/packages/schema/src/res/prism-zmodel.js b/packages/schema/src/res/prism-zmodel.js