Move vscode builtin production from yarn to npm

Also updates builtin to 1.94.0 fixes eclipse-theia#131 contributed on behalf of STMicroelectronics Signed-off-by: Remi Schnekenburger <[email protected]>
rschnekenbu · Oct 9, 2024 · ec31c74 · ec31c74
1 parent 5586e40
commit ec31c74
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 42 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "private": true,
     "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
     "scripts": {
-        "build:extensions": "yarn --cwd vscode && yarn compile:extensions && yarn bundle:extensions",
+        "build:extensions": "npm --prefix vscode install && yarn compile:extensions && yarn bundle:extensions",
         "compile:extensions": "cross-env NODE_OPTIONS=--max-old-space-size=8192 node ./src/compile.js",
         "bundle:extensions": "cross-env NODE_OPTIONS=--max-old-space-size=8192 node ./src/bundle.js",
         "publish:vsix": "node ./src/publish-vsix.js",

diff --git a/src/compile.js b/src/compile.js
@@ -41,9 +41,9 @@ async function createMissingLockFiles(extensionsPath) {
 
     for (let subFolderName of subFolderNames) {
         let subFolderPath = path.join(extensionsPath, subFolderName);
-        let yarnLockExists = fs.existsSync(path.join(subFolderPath, 'yarn.lock'));
-        if (!yarnLockExists) {
-            await run('yarn', ['install'], subFolderPath );
+        let packageLockExists = fs.existsSync(path.join(subFolderPath, 'package-lock.json'));
+        if (!packageLockExists) {
+            await run('npm', ['install'], subFolderPath );
         }
     }
 }
diff --git a/src/create-extension-pack.js b/src/create-extension-pack.js
@@ -98,11 +98,11 @@ const externalBuiltins = ['ms-vscode.js-debug-companion', 'ms-vscode.js-debug'];
     fs.writeFileSync(licensePath, generateLicense());
     fs.writeFileSync(readmePath, generateReadme());
 
-    await createYarnLock(packFolderPath);
+    await createPackageLock(packFolderPath);
     await vsce.createVSIX({
         'cwd': packFolderPath,
         'packagePath': dist(),
-        'useYarn': true
+        'useYarn': false
     });
 
     async function resolveExtensions(extensionsArr) {
@@ -163,8 +163,8 @@ const externalBuiltins = ['ms-vscode.js-debug-companion', 'ms-vscode.js-debug'];
 /**
  * @param {string} folderPath 
  */
-async function createYarnLock(folderPath) {
-    await run('yarn', ['install'], folderPath);
+async function createPackageLock(folderPath) {
+    await run('npm', ['install'], folderPath);
 }
 
 function generateLicense() {

diff --git a/src/package-vsix.js b/src/package-vsix.js
@@ -170,7 +170,7 @@ const repository = {
             await vsce.createVSIX({
                 'cwd': extensions(extension),
                 'packagePath': dist(),
-                'useYarn': true,
+                'useYarn': false,
                 'allowStarActivation': true
             });
             result.push('successfully packaged: ' + pck.name);

diff --git a/src/publish-vsix.js b/src/publish-vsix.js
@@ -83,7 +83,7 @@ async function publishExtension(vsix) {
             console.log(`Extension ${extension} v${version} is already published - skipping!`);
         } else {
             console.log('Publishing: ', dist(vsix), ' ...');
-            const results = await ovsx.publish({ extensionFile: dist(vsix), yarn: true });
+            const results = await ovsx.publish({ extensionFile: dist(vsix), yarn: false });
             for (const result of results) {
                 if (result.status === 'rejected') {
                     message = `Error(s) Generated when publishing ${extension} v${version}!`;

diff --git a/src/vscode-bundle.js b/src/vscode-bundle.js
@@ -18,44 +18,15 @@
 const rimraf = require('../vscode/node_modules/rimraf');
 const vfs = require('../vscode/node_modules/vinyl-fs');
 const ext = require('../vscode/build/lib/extensions');
-const { theiaExtension, extensions, run, vscodeExtensions } = require('./paths.js');
-
-const fs = require('fs');
-const path = require('path');
+const { theiaExtension, extensions, run } = require('./paths.js');
 
 rimraf.sync(extensions());
 (async () => {
     await new Promise((resolve, reject) => {
-        ext.packageLocalExtensionsStream(false)
+        ext.packageLocalExtensionsStream(false, false)
             .pipe(vfs.dest(theiaExtension()))
             .on('error', reject)
             .on('end', resolve);
     });
-    copyYarnLock(vscodeExtensions(), extensions())
     await run('yarn', ['install', '--production'], extensions('emmet'));
 })();
-
-/**
- * The 'yarn.lock' file is now required by the 'vsce' cli.
- * This method copies it from the given source folder to a corresponding
- * folder in the target.
- * 
- * The method assumes that for each subfolder in the target a corresponding
- * subfolder with the same name exists in the source folder.
- * 
- * @param {string} sourceDir - The path of the source folder.
- * @param {string} targetDir - The path of the destination folder.
- */
-function copyYarnLock(sourceDir, targetDir) {
-    let subFolderNames = fs.readdirSync(targetDir, { withFileTypes: true })
-        .filter(dirent => dirent.isDirectory())
-        .map(dirent => dirent.name);
-
-    for (let subFolderName of subFolderNames) {
-        let sourceYarnLockPath = path.join(sourceDir, subFolderName, 'yarn.lock');
-        if (fs.existsSync(sourceYarnLockPath)) {
-            console.log(`copying: ${sourceYarnLockPath} ${path.join(targetDir, subFolderName)}`);
-            fs.copyFileSync(sourceYarnLockPath, path.join(targetDir, subFolderName, 'yarn.lock'));
-        }
-    }
-}
diff --git a/vscode b/vscode