@superdesk/build-tools 1.0.18 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdesk/build-tools",
-  "version": "1.0.18",
+  "version": "1.1.0",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,6 @@
     "gettext-extractor": "3.5.3",
     "gettext.js": "0.9.0",
     "glob": "7.1.7",
-    "lodash": "4.17.19",
     "rimraf": "3.0.2"
   }
 }

package/src/extensions/extract-translations.js

@@ -12,7 +12,7 @@ function extractTranslations(clientDir) {
         const paths = _.get(package, 'superdeskExtension.translations-extract-paths');
 
         if (paths == null || !Array.isArray(paths)) {
-            return null;
+            continue;
         }
 
         const pathsAbsolute = paths.map((p) => path.join(extensionRootPath, p));

package/src/extensions/get-extension-directories-sync.js

@@ -110,7 +110,7 @@ function getExtensionDirectoriesSync(clientPath) {
                     .then((res) => res.default),
         }
      */
-    var extensionRegistrationPattern = /id:\W*'(.*)',\W*load:\W*import\('(.+?)'/g;
+    var extensionRegistrationPattern = /id:\W*['"](.*)['"],\W*load:\W*import\(['"](.+?)['"]/g;
 
     const matches = [];
 

package/src/extensions/install-extensions.js

@@ -83,6 +83,24 @@ module.exports = function installExtensions(clientDir) {
     directories.forEach(({extensionRootPath, extensionSrcPath}) => {
         // if src dir doesn't exist, assume that the extension is already built (e.g. when installed from npm)
         if (fs.existsSync(extensionSrcPath)) {
+            const pkgPath = path.join(extensionRootPath, 'package.json');
+            const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+
+            // Extensions whose `main` points at TypeScript source are consumed
+            // directly by webpack's ts-loader. Skip compile and the legacy
+            // `correct*` fixups. Still install runtime `dependencies` so webpack
+            // can resolve them via the extension's nested node_modules walk.
+            // (When workspaces land, this per-extension install goes away.)
+            if (typeof pkg.main === 'string' && /\.(ts|tsx)$/.test(pkg.main)) {
+                if (pkg.dependencies && Object.keys(pkg.dependencies).length > 0) {
+                    execSync(
+                        'npm install --no-audit --omit=dev',
+                        {stdio: 'inherit', cwd: extensionRootPath}
+                    );
+                }
+                return;
+            }
+
             correctApiDefinitionsPath(extensionRootPath, clientDir);
 
             execSync(

package/src/index.js

@@ -9,7 +9,6 @@ const installExtensions = require('./extensions/install-extensions');
 const {mergeTranslationsFromExtensions} = require('./extensions/translations');
 const {extractTranslations} = require('./extensions/extract-translations');
 const {namespaceCSS, watchCSS} = require('./extensions/css');
-const {generateInstanceConfigurationSchema} = require('./generate-instance-configuration-schema');
 
 const {Command} = require('commander');
 const program = new Command();
@@ -27,14 +26,6 @@ program.configureHelp({
     },
 });
 
-program.command('generate-instance-configuration-schema <main-client-dir>')
-    .description('reads typescript interfaces and generates JSON schema that will be used to generate the UI')
-    .action((mainClientDir) => {
-        const clientDirAbs = path.join(currentDir, mainClientDir);
-
-        generateInstanceConfigurationSchema(clientDirAbs);
-    });
-
 program.command('po-to-json <source-dir-po> <output-dir-json>')
     .description('convert .po files in the directory to .json format that is used by Superdesk')
     .action((sourcePo, outputJson) => {
@@ -48,6 +39,8 @@ program.command('build-root-repo <main-client-dir>')
     .description('executes all actions required to prepare the main repo for usage')
     .action((mainClientDir) => {
         const clientDirAbs = path.join(currentDir, mainClientDir);
+        const poDir = path.join(clientDirAbs, 'node_modules/superdesk-core/po');
+        const translationsDir = path.join(currentDir, mainClientDir, 'dist/languages');
 
         // build will fail if extensions are not installed
         installExtensions(clientDirAbs);
@@ -58,9 +51,6 @@ program.command('build-root-repo <main-client-dir>')
             {stdio: 'inherit'}
         );
 
-        const poDir = path.join(clientDirAbs, 'node_modules/superdesk-core/po');
-        const translationsDir = path.join(currentDir, mainClientDir, 'dist/languages');
-
         // translationsDir is only created after the build and would get removed if created before build
         poToJson(poDir, translationsDir);
         mergeTranslationsFromExtensions(clientDirAbs);

package/src/po-to-json/index.js

@@ -1,7 +1,6 @@
 var fs = require('fs');
 var path = require('path');
 var execSync = require('child_process').execSync;
-var _ = require('lodash');
 const {isDirectory} = require('../utils');
 
 function getModuleDir(moduleName) {
@@ -90,7 +89,7 @@ function compileTranslationsPoToJson(translationsPoDir, translationsJsonDir) {
             return;
         }
 
-        if (_.endsWith(filename, '.po') !== true) {
+        if (filename.endsWith('.po') !== true) {
             return;
         }
 

package/src/generate-instance-configuration-schema.js

@@ -1,71 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-var execSync = require('child_process').execSync;
-var _ = require('lodash');
-
-function escapeSingleQuoteAsHtml(str) {
-    return str.replace(/'/g, ''');
-}
-
-function unescapeSingleQuoteAsHtml(str) {
-    return str.replace(/'/g, '\\\'');
-}
-
-function addTranslations(branch) {
-    if (branch.properties == null) {
-        return branch;
-    }
-
-    branch.translations = Object.keys(branch.properties).reduce((acc, property) => {
-        // gettext call will be unwrapped from the string later with regex
-        acc[property] = `gettext('${_.lowerCase(escapeSingleQuoteAsHtml(property))}')`;
-
-        return acc;
-    }, {});
-
-    for (const property of Object.keys(branch.properties)) {
-        // handle nested properties
-        branch.properties[property] = addTranslations(branch.properties[property]);
-
-        // handle nested properties inside arrays
-        if (branch.properties[property].items != null && branch.properties[property].items.properties != null) {
-            branch.properties[property].items = addTranslations(branch.properties[property].items);
-        }
-
-        // translate description
-        if (typeof branch.properties[property].description === 'string') {
-            branch.properties[property].description =
-                `gettext('${escapeSingleQuoteAsHtml(branch.properties[property].description)}')`;
-        }
-    }
-
-    return branch;
-}
-
-function generateInstanceConfigurationSchema(clientDirAbs) {
-    const file = path.join(clientDirAbs, 'node_modules/superdesk-core/scripts/core/superdesk-api.d.ts');
-    const configFile = path.join(
-        clientDirAbs,
-        'node_modules/superdesk-core/scripts/instance-settings.generated.ts'
-    );
-    const generatedSchema = JSON.parse(
-        execSync(`npx typescript-json-schema "${file}" IInstanceSettings --strictNullChecks --required`).toString()
-    );
-    const schemaWithTranslations = unescapeSingleQuoteAsHtml(
-        JSON.stringify(addTranslations(generatedSchema), null, 4)
-            .replace(/"(gettext.+?)"/g, '$1')
-    );
-
-    const contents =
-`/* eslint-disable quotes, comma-dangle */
-/* tslint:disable: trailing-comma max-line-length */
-
-export const getInstanceConfigSchema = (gettext) => (${schemaWithTranslations});
-`;
-
-    fs.writeFileSync(configFile, contents, 'utf-8');
-}
-
-module.exports = {
-    generateInstanceConfigurationSchema,
-};