mirror of
https://github.com/microsoft/vscode.git
synced 2026-02-15 07:28:05 +00:00
Revert codicon change (#289683)
Revert "Copy codicons file as part of the build (#289411)"
This reverts commit 08d958aa2b.
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -6,7 +6,6 @@ node_modules/
|
||||
.build/
|
||||
.vscode/extensions/**/out/
|
||||
extensions/**/dist/
|
||||
src/vs/base/browser/ui/codicons/codicon/codicon.ttf
|
||||
/out*/
|
||||
/extensions/**/out/
|
||||
build/node_modules
|
||||
|
||||
@@ -36,14 +36,6 @@ const BUNDLED_FILE_HEADER = [
|
||||
].join('\n');
|
||||
|
||||
const extractEditorSrcTask = task.define('extract-editor-src', () => {
|
||||
// Ensure codicon.ttf is copied from node_modules (needed when node_modules is cached and postinstall doesn't run)
|
||||
const codiconSource = path.join(root, 'node_modules', '@vscode', 'codicons', 'dist', 'codicon.ttf');
|
||||
const codiconDest = path.join(root, 'src', 'vs', 'base', 'browser', 'ui', 'codicons', 'codicon', 'codicon.ttf');
|
||||
if (fs.existsSync(codiconSource)) {
|
||||
fs.mkdirSync(path.dirname(codiconDest), { recursive: true });
|
||||
fs.copyFileSync(codiconSource, codiconDest);
|
||||
}
|
||||
|
||||
const apiusages = monacoapi.execute().usageContent;
|
||||
const extrausages = fs.readFileSync(path.join(root, 'build', 'monaco', 'monaco.usage.recipe')).toString();
|
||||
standalone.extractEditor({
|
||||
|
||||
@@ -184,21 +184,3 @@ for (const dir of dirs) {
|
||||
|
||||
child_process.execSync('git config pull.rebase merges');
|
||||
child_process.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
|
||||
|
||||
// Copy codicon.ttf from @vscode/codicons package
|
||||
const codiconSource = path.join(root, 'node_modules', '@vscode', 'codicons', 'dist', 'codicon.ttf');
|
||||
const codiconDest = path.join(root, 'src', 'vs', 'base', 'browser', 'ui', 'codicons', 'codicon', 'codicon.ttf');
|
||||
|
||||
if (!fs.existsSync(codiconSource)) {
|
||||
console.error(`ERR codicon.ttf not found at ${codiconSource}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
try {
|
||||
fs.mkdirSync(path.dirname(codiconDest), { recursive: true });
|
||||
fs.copyFileSync(codiconSource, codiconDest);
|
||||
log('.', `Copied codicon.ttf to ${codiconDest}`);
|
||||
} catch (error) {
|
||||
console.error(`ERR Failed to copy codicon.ttf from ${codiconSource} to ${codiconDest}:`, error);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
7
package-lock.json
generated
7
package-lock.json
generated
@@ -15,7 +15,6 @@
|
||||
"@microsoft/1ds-post-js": "^3.2.13",
|
||||
"@parcel/watcher": "^2.5.4",
|
||||
"@types/semver": "^7.5.8",
|
||||
"@vscode/codicons": "^0.0.44",
|
||||
"@vscode/deviceid": "^0.1.1",
|
||||
"@vscode/iconv-lite-umd": "0.7.1",
|
||||
"@vscode/native-watchdog": "^1.4.6",
|
||||
@@ -2947,12 +2946,6 @@
|
||||
"win32"
|
||||
]
|
||||
},
|
||||
"node_modules/@vscode/codicons": {
|
||||
"version": "0.0.44",
|
||||
"resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.44.tgz",
|
||||
"integrity": "sha512-F7qPRumUK3EHjNdopfICLGRf3iNPoZQt+McTHAn4AlOWPB3W2kL4H0S7uqEqbyZ6rCxaeDjpAn3MCUnwTu/VJQ==",
|
||||
"license": "CC-BY-4.0"
|
||||
},
|
||||
"node_modules/@vscode/deviceid": {
|
||||
"version": "0.1.4",
|
||||
"resolved": "https://registry.npmjs.org/@vscode/deviceid/-/deviceid-0.1.4.tgz",
|
||||
|
||||
@@ -78,7 +78,6 @@
|
||||
"@microsoft/1ds-post-js": "^3.2.13",
|
||||
"@parcel/watcher": "^2.5.4",
|
||||
"@types/semver": "^7.5.8",
|
||||
"@vscode/codicons": "^0.0.44",
|
||||
"@vscode/deviceid": "^0.1.1",
|
||||
"@vscode/iconv-lite-umd": "0.7.1",
|
||||
"@vscode/native-watchdog": "^1.4.6",
|
||||
|
||||
7
remote/web/package-lock.json
generated
7
remote/web/package-lock.json
generated
@@ -10,7 +10,6 @@
|
||||
"dependencies": {
|
||||
"@microsoft/1ds-core-js": "^3.2.13",
|
||||
"@microsoft/1ds-post-js": "^3.2.13",
|
||||
"@vscode/codicons": "^0.0.44",
|
||||
"@vscode/iconv-lite-umd": "0.7.1",
|
||||
"@vscode/tree-sitter-wasm": "^0.3.0",
|
||||
"@vscode/vscode-languagedetection": "1.0.21",
|
||||
@@ -72,12 +71,6 @@
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz",
|
||||
"integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ=="
|
||||
},
|
||||
"node_modules/@vscode/codicons": {
|
||||
"version": "0.0.44",
|
||||
"resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.44.tgz",
|
||||
"integrity": "sha512-F7qPRumUK3EHjNdopfICLGRf3iNPoZQt+McTHAn4AlOWPB3W2kL4H0S7uqEqbyZ6rCxaeDjpAn3MCUnwTu/VJQ==",
|
||||
"license": "CC-BY-4.0"
|
||||
},
|
||||
"node_modules/@vscode/iconv-lite-umd": {
|
||||
"version": "0.7.1",
|
||||
"resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.1.tgz",
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
"dependencies": {
|
||||
"@microsoft/1ds-core-js": "^3.2.13",
|
||||
"@microsoft/1ds-post-js": "^3.2.13",
|
||||
"@vscode/codicons": "^0.0.44",
|
||||
"@vscode/iconv-lite-umd": "0.7.1",
|
||||
"@vscode/tree-sitter-wasm": "^0.3.0",
|
||||
"@vscode/vscode-languagedetection": "1.0.21",
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
# Codicons
|
||||
|
||||
## Where does the codicon.ttf come from?
|
||||
|
||||
It is added via the `@vscode/codicons` npm package, then copied to this directory during the postinstall script.
|
||||
BIN
src/vs/base/browser/ui/codicons/codicon/codicon.ttf
Normal file
BIN
src/vs/base/browser/ui/codicons/codicon/codicon.ttf
Normal file
Binary file not shown.
Reference in New Issue
Block a user