@forge/bundler 4.6.8-next.5 → 4.7.0-next.6

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @forge/bundler
 
+## 4.7.0-next.6
+
+### Minor Changes
+
+- f0888c8: Add linting support for CSUIK frontend files
+
+### Patch Changes
+
+- @forge/cli-shared@3.11.2-next.3
+- @forge/lint@3.4.0-next.4
+
 ## 4.6.8-next.5
 
 ### Patch Changes

package/out/webpack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,GAAG,EAAU,MAAM,OAAO,CAAC;AACxD,OAAO,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAE5E,OAAO,EACL,OAAO,EAGP,OAAO,EAEP,aAAa,EACb,aAAa,EACb,YAAY,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAEL,gBAAgB,EAGhB,gBAAgB,EAGjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAA2B,UAAU,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAKtG,OAAO,EAAE,UAAU,EAAE,CAAC;AAQtB,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,GAC/B,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAkChC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,CAAC,EAAE,GAAG,GAAG,aAAa,CAiB9F;AAED,UAAU,eAAe;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,eAAO,MAAM,WAAW,kBAAmB,aAAa,YAAY,eAAe,KAAG,QAOrF,CAAC;AA6BF,eAAO,MAAM,SAAS,YAEZ,UAAU,+EAGjB,QAAQ,IAAI,CAuBd,CAAC;AAEF,eAAO,MAAM,KAAK,EAAE,OAwBnB,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAAE,SAAS,UAAU,GAAG,UAAU,EAC9D,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,aAAa,KAAK,mBAAmB,GACvF,OAAO,CAAC,EAAE,CAAC,CA8Bb;AAED,eAAO,MAAM,aAAa,EAAE,OAAuD,CAAC;AAEpF,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,mBAAmB,CAA4C,CAAC;AAEjG,eAAO,MAAM,cAAc,EAAE,aAkB5B,CAAC"}
+{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,GAAG,EAAU,MAAM,OAAO,CAAC;AACxD,OAAO,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAG5E,OAAO,EACL,OAAO,EAGP,OAAO,EAEP,aAAa,EACb,aAAa,EACb,YAAY,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAEL,gBAAgB,EAGhB,gBAAgB,EAGjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAA2B,UAAU,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAKtG,OAAO,EAAE,UAAU,EAAE,CAAC;AAQtB,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,GAC/B,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAkChC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,CAAC,EAAE,GAAG,GAAG,aAAa,CAiB9F;AAED,UAAU,eAAe;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,eAAO,MAAM,WAAW,kBAAmB,aAAa,YAAY,eAAe,KAAG,QAOrF,CAAC;AA6BF,eAAO,MAAM,SAAS,YAEZ,UAAU,+EAGjB,QAAQ,IAAI,CA+Bd,CAAC;AAEF,eAAO,MAAM,KAAK,EAAE,OAwBnB,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAAE,SAAS,UAAU,GAAG,UAAU,EAC9D,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,aAAa,KAAK,mBAAmB,GACvF,OAAO,CAAC,EAAE,CAAC,CA8Bb;AAED,eAAO,MAAM,aAAa,EAAE,OAAuD,CAAC;AAEpF,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,mBAAmB,CAA4C,CAAC;AAEjG,eAAO,MAAM,cAAc,EAAE,aAkB5B,CAAC"}

package/out/webpack.js

@@ -4,6 +4,7 @@ exports.nativeUiBundle = exports.nodeBundle = exports.sandboxBundle = exports.cr
 const tslib_1 = require("tslib");
 const memfs_1 = require("memfs");
 const webpack_1 = tslib_1.__importDefault(require("webpack"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const text_1 = require("./text");
 const cli_shared_1 = require("@forge/cli-shared");
 const lint_1 = require("@forge/lint");
@@ -92,15 +93,18 @@ class Monitor {
 }
 const runLinter = async (logger = { info: console.log }, fileSystemReader = new cli_shared_1.FileSystemReader(), fileSystemWriter = new cli_shared_1.FileSystemWriter()) => {
     logger.info(`\n${cli_shared_1.Text.tunnel.preBundleTask(cli_shared_1.Text.lint.running)}`);
-    const filesToLint = await fileSystemReader.recursiveReadDir('./src', [
-        ...(await (0, cli_shared_1.listGitIgnoreFiles)(fileSystemReader)),
-        '.git',
-        'node_modules'
-    ]);
+    const exclude = [...(await (0, cli_shared_1.listGitIgnoreFiles)(fileSystemReader)), '.git', 'node_modules'];
     const configFile = new cli_shared_1.ConfigFile(fileSystemReader, fileSystemWriter);
     const manifest = await configFile.readConfig();
+    const csuikResources = await configFile.getResources(['nativeUI']);
+    const csuikDirectories = csuikResources.map((resource) => path_1.default.dirname(resource.path));
+    const [filesToLint, ...csuikFilesByDirectory] = await Promise.all([
+        fileSystemReader.recursiveReadDir('./src', exclude),
+        ...csuikDirectories.map((directory) => fileSystemReader.recursiveReadDir(directory, exclude))
+    ]);
+    const csuikFilesToLint = csuikFilesByDirectory.reduce((allFiles, directoryFiles) => allFiles.concat(directoryFiles), []);
     try {
-        const lintResults = await (0, lint_1.lint)(filesToLint, manifest, 'development', logger);
+        const lintResults = await (0, lint_1.lint)([...filesToLint, ...csuikFilesToLint], manifest, 'development', logger);
         if (lintResults.some((result) => result.size())) {
             logger.info('');
             (0, lint_1.reportLintResults)(logger, lintResults);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.6.8-next.5",
+  "version": "4.7.0-next.6",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -20,8 +20,8 @@
     "@babel/preset-typescript": "^7.16.7",
     "@forge/api": "2.15.2",
     "@forge/babel-plugin-transform-ui": "1.1.2",
-    "@forge/cli-shared": "3.11.2-next.2",
-    "@forge/lint": "3.4.0-next.3",
+    "@forge/cli-shared": "3.11.2-next.3",
+    "@forge/lint": "3.4.0-next.4",
     "@forge/runtime": "4.3.3",
     "@forge/util": "1.2.3",
     "assert": "^1.1.1",