Upgrades Lingo to v8

.pre-commit-config.yaml

@@ -19,7 +19,6 @@ repos:
         name: eslint
         entry: npm run eslint:fix
         language: system
-        files: arches_lingo/src
       - id: typescript
         name: typescript
         entry: npm run ts:check

.prettierrc

@@ -1,4 +1,3 @@
 {
-    "singleAttributePerLine": true,
-    "tabWidth": 4
+    "singleAttributePerLine": true
 }

arches_lingo/media/js/views/components/etl_modules/migrate-to-lingo.js

@@ -41,7 +41,7 @@ define([
                             null,
                             function(){}
                         )
-                    )
+                    );
                 }).always(() => {
                     self.loading(false);
                 });

arches_lingo/src/App.vue

@@ -3,5 +3,5 @@ import Foo from "@/components/FooComponent.vue";
 </script>
 
 <template>
-    <Foo />
+  <Foo />
 </template>

arches_lingo/src/components/FooComponent.vue

@@ -3,5 +3,5 @@ console.log("hello world!");
 </script>
 
 <template>
-    <h1>Hello World!</h1>
+  <h1>Hello World!</h1>
 </template>

package.json

@@ -18,10 +18,10 @@
         "vitest": "vitest --run --coverage"
     },
     "devDependencies": {
-        "arches-dev-dependencies": "archesproject/arches-dev-dependencies#dev/7.6.x"
+        "arches-dev-dependencies": "archesproject/arches-dev-dependencies#dev/8.0.x"
     },
     "dependencies": {
-        "arches": "archesproject/arches#dev/7.6.x"
+        "arches": "archesproject/arches#controlled-list-item-editor"
     },
     "nodeModulesPaths": {
     },

webpack/webpack-utils/build-css-filepath-lookup.js

@@ -0,0 +1,43 @@
+const Path = require('path');
+const fs = require('fs');
+
+function buildCSSFilepathLookup(path, outerAcc, cssDirectoryPath) {
+    if (!fs.existsSync(path)) {
+        return;
+    }
+
+    return fs.readdirSync(path).reduce((acc, name) => {
+        const outerPath = cssDirectoryPath || path;   // original `path` arg is persisted through recursion
+
+        if (fs.lstatSync(Path.join(path, name)).isDirectory() ) {
+            return buildCSSFilepathLookup(
+                Path.join(path, name), 
+                acc, 
+                outerPath 
+            );
+        }
+        else {
+            let subPath = Path.join(path, name).split(/css(.*)/s)[1];  // splits only on first occurance
+            subPath = subPath.substring(1);
+            const parsedPath = Path.parse(subPath);
+
+            let pathName = parsedPath['name'];
+
+            if (parsedPath['dir']) {
+                pathName = Path.join(parsedPath['dir'], parsedPath['name']);
+            }
+
+            if (pathName.includes('.DS_Store')) {
+                return acc;
+            }
+            else {
+                return { 
+                    ...acc, 
+                    [Path.join('css', pathName.replace(/\\/g, '/'))]: { 'import': Path.join(outerPath, subPath) } 
+                };
+            }
+        }
+    }, outerAcc);
+};
+
+module.exports = { buildCSSFilepathLookup };

webpack/webpack-utils/build-image-filepath-lookup.js

@@ -0,0 +1,35 @@
+const Path = require('path');
+const fs = require('fs');
+
+const buildImageFilePathLookup = function(publicPath, path, outerAcc, imageDirectoryPath) {
+    if (!fs.existsSync(path)) {
+        return;
+    }
+
+    return fs.readdirSync(path).reduce((acc, name) => {
+        const outerPath = imageDirectoryPath || path;   // original `path` arg is persisted through recursion
+
+        if (fs.lstatSync(Path.join(path, name)).isDirectory() ) {
+            return buildImageFilePathLookup(
+                publicPath,
+                Path.join(path, name), 
+                acc, 
+                outerPath
+            );
+        }
+        else {
+            let subPath = Path.join(path, name).split(/img(.*)/s)[1];  // splits only on first occurance
+            subPath = subPath.substring(1);
+
+            const parsedPath = Path.parse(subPath);
+            const filename = parsedPath['dir'] ? Path.join(parsedPath['dir'], parsedPath['base']) : parsedPath['base'];
+
+            return { 
+                ...acc, 
+                [Path.join(publicPath, 'img', filename).replace(/\\/g, '/')]: Path.resolve(__dirname, Path.join(outerPath, subPath))
+            };
+        }
+    }, outerAcc);
+};
+
+module.exports = { buildImageFilePathLookup };

webpack/webpack-utils/build-javascript-filepath-lookup.js

@@ -0,0 +1,43 @@
+const Path = require('path');
+const fs = require('fs');
+
+function buildJavascriptFilepathLookup(path, outerAcc, javascriptDirectoryPath) {
+    if (!fs.existsSync(path)) {
+        return;
+    }
+
+    return fs.readdirSync(path).reduce((acc, name) => {
+        const outerPath = javascriptDirectoryPath || path;   // original `path` arg is persisted through recursion
+
+        if (fs.lstatSync(Path.join(path, name)).isDirectory() ) {
+            return buildJavascriptFilepathLookup(
+                Path.join(path, name), 
+                acc, 
+                outerPath 
+            );
+        }
+        else {
+            let subPath = Path.join(path, name).split(/js(.*)/s)[1];  // splits only on first occurance
+            subPath = subPath.substring(1);
+            const parsedPath = Path.parse(subPath);
+
+            let pathName = parsedPath['name'];
+
+            if (parsedPath['dir']) {
+                pathName = Path.join(parsedPath['dir'], parsedPath['name']);
+            }
+
+            if (pathName.includes('.DS_Store')) {
+                return acc;
+            }
+            else {
+                return { 
+                    ...acc, 
+                    [pathName.replace(/\\/g, '/')]: { 'import': Path.join(outerPath, subPath), 'filename': Path.join('js', '[name].js') } 
+                };
+            }
+        }
+    }, outerAcc);
+};
+
+module.exports = { buildJavascriptFilepathLookup };

webpack/webpack-utils/build-template-filepath-lookup.js

@@ -0,0 +1,39 @@
+const Path = require('path');
+const fs = require('fs');
+
+const buildTemplateFilePathLookup = function(path, outerAcc, templateDirectoryPath) {
+    if (!fs.existsSync(path)) {
+        return;
+    }
+
+    return fs.readdirSync(path).reduce((acc, name) => {
+        const outerPath = templateDirectoryPath || path;   // original `path` arg is persisted through recursion
+
+        if (fs.lstatSync(Path.join(path, name)).isDirectory() ) {
+            return buildTemplateFilePathLookup(
+                Path.join(path, name), 
+                acc, 
+                outerPath
+            );
+        }
+        else {
+            let subPath = (Path.join(path, name)).split(/templates(.*)/s)[1];  // splits only on first occurance
+            subPath = subPath.substring(1);
+
+            const parsedPath = Path.parse(subPath);
+            const filename = parsedPath['dir'] ? Path.join(parsedPath['dir'], parsedPath['base']) : parsedPath['base'];
+
+            if (filename.includes('.DS_Store')) {
+                return acc;
+            }
+            else {
+                return { 
+                    ...acc, 
+                    [Path.join('templates', filename).replace(/\\/g, '/')]: Path.resolve(__dirname, Path.join(outerPath, subPath))
+                };
+            }
+        }
+    }, outerAcc);
+};
+
+module.exports = { buildTemplateFilePathLookup };

webpack/webpack.common.js

@@ -12,7 +12,10 @@ const { spawn } = require("child_process");
 const { VueLoaderPlugin } = require("vue-loader");
 
 const { findFile } = require('./webpack-utils/find-file');
-const { buildFilepathLookup } = require('./webpack-utils/build-filepath-lookup');
+const { buildImageFilePathLookup } = require('./webpack-utils/build-image-filepath-lookup');
+const { buildJavascriptFilepathLookup } = require('./webpack-utils/build-javascript-filepath-lookup');
+const { buildTemplateFilePathLookup } = require('./webpack-utils/build-template-filepath-lookup');
+const { buildCSSFilepathLookup } = require('./webpack-utils/build-css-filepath-lookup');
 
 module.exports = () => {
     return new Promise((resolve, _reject) => {
@@ -30,13 +33,13 @@ module.exports = () => {
             // END workaround for handling node_modules paths in arches-core vs projects
             // BEGIN create entry point configurations
 
-            const archesCoreEntryPointConfiguration = buildFilepathLookup(Path.resolve(__dirname, ROOT_DIR, 'app', 'media', 'js'));
-            const projectEntryPointConfiguration = buildFilepathLookup(Path.resolve(__dirname, APP_ROOT, 'media', 'js'));
+            const archesCoreEntryPointConfiguration = buildJavascriptFilepathLookup(Path.resolve(__dirname, ROOT_DIR, 'app', 'media', 'js'), {});
+            const projectEntryPointConfiguration = buildJavascriptFilepathLookup(Path.resolve(__dirname, APP_ROOT, 'media', 'js'), {});
 
             const archesApplicationsEntrypointConfiguration = ARCHES_APPLICATIONS.reduce((acc, archesApplication) => {
                 return {
                     ...acc,
-                    ...buildFilepathLookup(Path.resolve(__dirname, ARCHES_APPLICATIONS_PATHS[archesApplication], 'media', 'js'))
+                    ...buildJavascriptFilepathLookup(Path.resolve(__dirname, ARCHES_APPLICATIONS_PATHS[archesApplication], 'media', 'js'), {})
                 };
             }, {});
 
@@ -153,13 +156,13 @@ module.exports = () => {
             // END create node modules aliases
             // BEGIN create template filepath lookup
 
-            const coreArchesTemplatePathConfiguration = buildFilepathLookup(Path.resolve(__dirname, ROOT_DIR, 'app', 'templates'));
-            const projectTemplatePathConfiguration = buildFilepathLookup(Path.resolve(__dirname, APP_ROOT, 'templates'));
+            const coreArchesTemplatePathConfiguration = buildTemplateFilePathLookup(Path.resolve(__dirname, ROOT_DIR, 'app', 'templates'), {});
+            const projectTemplatePathConfiguration = buildTemplateFilePathLookup(Path.resolve(__dirname, APP_ROOT, 'templates'), {});
 
             const archesApplicationsTemplatePathConfiguration = ARCHES_APPLICATIONS.reduce((acc, archesApplication) => {
                 return {
                     ...acc,
-                    ...buildFilepathLookup(Path.resolve(__dirname, ARCHES_APPLICATIONS_PATHS[archesApplication], 'templates'))
+                    ...buildTemplateFilePathLookup(Path.resolve(__dirname, ARCHES_APPLICATIONS_PATHS[archesApplication], 'templates'), {})
                 };
             }, {});
 
@@ -173,13 +176,13 @@ module.exports = () => {
             // END create template filepath lookup
             // BEGIN create image filepath lookup
 
-            const coreArchesImagePathConfiguration = buildFilepathLookup(Path.resolve(__dirname, ROOT_DIR, 'app', 'media', 'img'), STATIC_URL);
-            const projectImagePathConfiguration = buildFilepathLookup(Path.resolve(__dirname, APP_ROOT, 'media', 'img'), STATIC_URL);
+            const coreArchesImagePathConfiguration = buildImageFilePathLookup(STATIC_URL, Path.resolve(__dirname, ROOT_DIR, 'app', 'media', 'img'), {});
+            const projectImagePathConfiguration = buildImageFilePathLookup(STATIC_URL, Path.resolve(__dirname, APP_ROOT, 'media', 'img'), {});
 
             const archesApplicationsImagePathConfiguration = ARCHES_APPLICATIONS.reduce((acc, archesApplication) => {
                 return {
                     ...acc,
-                    ...buildFilepathLookup(Path.resolve(__dirname, ARCHES_APPLICATIONS_PATHS[archesApplication], 'media', 'img'), STATIC_URL)
+                    ...buildImageFilePathLookup(STATIC_URL, Path.resolve(__dirname, ARCHES_APPLICATIONS_PATHS[archesApplication], 'media', 'img'), {})
                 };
             }, {});
 
@@ -193,8 +196,8 @@ module.exports = () => {
             // END create image filepath lookup
             // BEGIN create CSS filepath lookup
 
-            const coreArchesCSSFilepathConfiguration = buildFilepathLookup(Path.resolve(__dirname, ROOT_DIR, 'app', 'media', 'css'));
-            const projectCSSFilepathConfiguration = buildFilepathLookup(Path.resolve(__dirname, APP_ROOT, 'media', 'css'));
+            const coreArchesCSSFilepathConfiguration = buildCSSFilepathLookup(Path.resolve(__dirname, ROOT_DIR, 'app', 'media', 'css'), {});
+            const projectCSSFilepathConfiguration = buildCSSFilepathLookup(Path.resolve(__dirname, APP_ROOT, 'media', 'css'), {});
 
             const archesApplicationsCSSFilepaths = [];
             const archesApplicationsCSSFilepathConfiguration = ARCHES_APPLICATIONS.reduce((acc, archesApplication) => {
@@ -203,7 +206,7 @@ module.exports = () => {
 
                 return {
                     ...acc,
-                    ...buildFilepathLookup(path)
+                    ...buildCSSFilepathLookup(path, {})
                 };
             }, {});