@atls/code-service 0.0.10 → 0.0.13

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/service.js

@@ -23,7 +23,7 @@ class Service {
                     }
                     else {
                         resolve({
-                            errors: [{ message: error.message }],
+                            errors: [error],
                             warnings: [],
                         });
                     }
@@ -31,8 +31,8 @@ class Service {
                 else if (stats) {
                     const { errors = [], warnings = [] } = stats.toJson();
                     resolve({
-                        errors: errors.map((error) => ({ message: error.message })),
-                        warnings: warnings.map((warning) => ({ message: warning.message })),
+                        errors,
+                        warnings,
                     });
                 }
                 else {
@@ -76,18 +76,18 @@ class Service {
             if (error) {
                 callback({
                     severityText: 'ERROR',
-                    body: error.message || error,
+                    body: error,
                 });
             }
             else if (stats) {
                 const { errors = [], warnings = [] } = stats.toJson();
                 warnings.forEach((warning) => callback({
                     severityText: 'WARN',
-                    body: warning.message,
+                    body: warning,
                 }));
                 errors.forEach((err) => callback({
                     severityText: 'ERROR',
-                    body: err.message,
+                    body: err,
                 }));
             }
         });

package/dist/webpack.config.js

@@ -4,13 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebpackConfig = void 0;
-const node_path_1 = require("node:path");
 const promises_1 = require("node:fs/promises");
-const core_1 = require("@yarnpkg/core");
-const core_2 = require("@yarnpkg/core");
-const cli_1 = require("@yarnpkg/cli");
+const node_path_1 = require("node:path");
 const webpack_chain_1 = __importDefault(require("webpack-chain"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
+const find_up_1 = __importDefault(require("find-up"));
 const webpack_1 = require("webpack");
 const config_typescript_1 = __importDefault(require("@atls/config-typescript"));
 const webpack_externals_1 = require("./webpack.externals");
@@ -20,14 +18,11 @@ class WebpackConfig {
         this.cwd = cwd;
     }
     async build(environment = 'production', plugins = []) {
-        const root = process.cwd();
-        const configuration = await core_1.Configuration.find(root, (0, cli_1.getPluginConfiguration)());
-        const { project } = await core_2.Project.find(configuration, root);
         const config = new webpack_chain_1.default();
         this.applyCommon(config, environment);
         this.applyPlugins(config, environment);
         this.applyModules(config);
-        config.externals(await this.getExternals(configuration, project));
+        config.externals(await this.getExternals());
         plugins.forEach((plugin) => {
             config.plugin(plugin.name).use(plugin.use, plugin.args);
         });
@@ -68,8 +63,12 @@ class WebpackConfig {
             .use('proto')
             .loader(require.resolve('@atls/webpack-proto-imports-loader'));
     }
-    async getUnpluggedDependencies(configuration) {
-        const pnpUnpluggedFolder = configuration.get('pnpUnpluggedFolder');
+    async getUnpluggedDependencies() {
+        const yarnFolder = await (0, find_up_1.default)('.yarn');
+        if (!yarnFolder) {
+            return Promise.resolve(new Set());
+        }
+        const pnpUnpluggedFolder = (0, node_path_1.join)(yarnFolder, 'unplugged');
         const dependenciesNames = new Set();
         const entries = await (0, fast_glob_1.default)('*/node_modules/*/package.json', {
             cwd: pnpUnpluggedFolder,
@@ -87,10 +86,19 @@ class WebpackConfig {
         }));
         return dependenciesNames;
     }
-    async getExternals(configuration, project) {
-        const workspace = project.getWorkspaceByFilePath(this.cwd);
-        const workspaceExternals = Object.keys(workspace?.manifest?.raw?.externalDependencies || {});
-        const unpluggedExternals = Array.from(await this.getUnpluggedDependencies(configuration));
+    async getWorkspaceExternals() {
+        try {
+            const content = await (0, promises_1.readFile)((0, node_path_1.join)(this.cwd, 'package.json'), 'utf-8');
+            const { externalDependencies = {} } = JSON.parse(content);
+            return new Set(Object.keys(externalDependencies));
+        }
+        catch {
+            return Promise.resolve(new Set());
+        }
+    }
+    async getExternals() {
+        const workspaceExternals = Array.from(await this.getWorkspaceExternals());
+        const unpluggedExternals = Array.from(await this.getUnpluggedDependencies());
         return Array.from(new Set([...workspaceExternals, ...unpluggedExternals, ...webpack_externals_2.UNUSED_EXTERNALS])).reduce((result, dependency) => ({
             ...result,
             [dependency]: `commonjs2 ${dependency}`,

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@atls/code-service",
-  "version": "0.0.10",
+  "version": "0.0.13",
   "license": "BSD-3-Clause",
   "main": "dist/index.js",
   "files": [
-    "dist"
+    "dist",
+    "tsconfig.stub.json"
   ],
   "scripts": {
     "build": "yarn library build",
@@ -13,24 +14,25 @@
   },
   "dependencies": {
     "@atls/config-typescript": "0.0.1",
-    "@atls/webpack-proto-imports-loader": "0.0.6",
-    "@atls/webpack-start-server-plugin": "0.0.4",
-    "@yarnpkg/cli": "^3.2.0-rc.8",
-    "@yarnpkg/core": "^3.2.0-rc.8",
-    "fast-glob": "^3.2.7",
-    "string-replace-loader": "^3.0.3",
-    "ts-loader": "^9.2.6",
-    "typescript": "^4.5.4",
-    "webpack": "^5.65.0",
+    "@atls/webpack-proto-imports-loader": "0.0.8",
+    "@atls/webpack-start-server-plugin": "0.0.5",
+    "@yarnpkg/cli": "^3.2.0",
+    "@yarnpkg/core": "^3.2.0",
+    "fast-glob": "^3.2.11",
+    "find-up": "^5.0.0",
+    "string-replace-loader": "^3.1.0",
+    "ts-loader": "^9.2.8",
+    "typescript": "^4.6.2",
+    "webpack": "^5.70.0",
     "webpack-chain": "^6.5.1"
   },
   "devDependencies": {
-    "@types/jest": "^27.0.3",
-    "@types/node": "^16.11.12",
+    "@types/jest": "^27.4.1",
+    "@types/node": "^17.0.21",
     "@types/protocol-buffers-schema": "3.4.1",
     "@types/wait-for-localhost": "3.1.0",
     "@types/webpack": "^5.28.0",
-    "@yarnpkg/fslib": "^2.6.1-rc.3",
+    "@yarnpkg/fslib": "^2.6.1",
     "wait-for-localhost": "^3.3.0"
   },
   "publishConfig": {

package/dist/webpack/externals.js

@@ -1,78 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExternals = exports.getUnpluggedDependencies = exports.unusedExternals = void 0;
-const core_1 = require("@yarnpkg/core");
-const core_2 = require("@yarnpkg/core");
-const cli_1 = require("@yarnpkg/cli");
-const fast_glob_1 = __importDefault(require("fast-glob"));
-const path_1 = __importDefault(require("path"));
-const fs_1 = require("fs");
-const FORCE_UNPLUGGED_PACKAGES = new Set([
-    'nan',
-    'node-gyp',
-    'node-pre-gyp',
-    'node-addon-api',
-    'fsevents',
-    'core-js',
-    'core-js-pure',
-    'protobufjs',
-]);
-exports.unusedExternals = [
-    'cli-color',
-    'flaschenpost',
-    'amqp-connection-manager',
-    'kafkajs',
-    'amqplib',
-    'redis',
-    'mqtt',
-    'nats',
-    '@nestjs/websockets',
-    'typeorm-aurora-data-api-driver',
-    'react-native-sqlite-storage',
-    '@sap/hana-client',
-    'better-sqlite3',
-    'mongodb',
-    'oracledb',
-    'pg-native',
-    'mysql',
-    'ioredis',
-    'hdb-pool',
-    'mysql2',
-    'mssql',
-    'sql.js',
-    'pnpapi',
-    'next',
-];
-const getUnpluggedDependencies = async () => {
-    const configuration = await core_1.Configuration.find(process.cwd(), (0, cli_1.getPluginConfiguration)());
-    const pnpUnpluggedFolder = configuration.get('pnpUnpluggedFolder');
-    const dependenciesNames = new Set();
-    const entries = await (0, fast_glob_1.default)('*/node_modules/*/package.json', {
-        cwd: pnpUnpluggedFolder,
-    });
-    await Promise.all(entries
-        .map((entry) => path_1.default.join(pnpUnpluggedFolder, entry))
-        .map(async (entry) => {
-        try {
-            const { name } = JSON.parse((await fs_1.promises.readFile(entry)).toString());
-            if (name && !FORCE_UNPLUGGED_PACKAGES.has(name)) {
-                dependenciesNames.add(name);
-            }
-        }
-        catch { }
-    }));
-    return dependenciesNames;
-};
-exports.getUnpluggedDependencies = getUnpluggedDependencies;
-const getExternals = async (cwd) => {
-    const configuration = await core_1.Configuration.find(process.cwd(), (0, cli_1.getPluginConfiguration)());
-    const { project } = await core_2.Project.find(configuration, process.cwd());
-    const workspace = project.getWorkspaceByFilePath(cwd);
-    const workspaceExternals = Object.keys(workspace?.manifest?.raw?.externalDependencies || {});
-    const unpluggedExternals = Array.from(await (0, exports.getUnpluggedDependencies)());
-    return Array.from(new Set([...workspaceExternals, ...unpluggedExternals, ...exports.unusedExternals]));
-};
-exports.getExternals = getExternals;

package/dist/webpack/index.js

@@ -1,13 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./webpack.config"), exports);

package/dist/webpack/resolve.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResolveAliases = void 0;
-const core_1 = require("@yarnpkg/core");
-const core_2 = require("@yarnpkg/core");
-const cli_1 = require("@yarnpkg/cli");
-const getResolveAliases = async (cwd) => {
-    const configuration = await core_1.Configuration.find(process.cwd(), (0, cli_1.getPluginConfiguration)());
-    const { project } = await core_2.Project.find(configuration, process.cwd());
-    const workspace = project.getWorkspaceByFilePath(cwd);
-    return workspace?.manifest?.raw?.resolve?.alias || [];
-};
-exports.getResolveAliases = getResolveAliases;

package/dist/webpack/webpack.config.js

@@ -1,58 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createWebpackConfig = void 0;
-const node_path_1 = __importDefault(require("node:path"));
-const webpack_chain_1 = __importDefault(require("webpack-chain"));
-const webpack_1 = __importDefault(require("webpack"));
-const config_typescript_1 = __importDefault(require("@atls/config-typescript"));
-const externals_1 = require("./externals");
-const resolve_1 = require("./resolve");
-const createWebpackConfig = async (cwd, environment, plugins = []) => {
-    const externals = (await (0, externals_1.getExternals)(cwd)).reduce((result, dependency) => ({
-        ...result,
-        [dependency]: `commonjs2 ${dependency}`,
-    }), {});
-    const config = new webpack_chain_1.default();
-    config
-        .mode(environment)
-        .bail(environment === 'production')
-        .target('async-node')
-        .optimization.minimize(false);
-    config.node.set('__dirname', false).set('__filename', false);
-    config.entry('index').add(node_path_1.default.join(cwd, 'src/index'));
-    config.output.path(node_path_1.default.join(cwd, 'dist')).filename('[name].js');
-    config.resolve.extensions.add('.tsx').add('.ts').add('.js');
-    const aliases = await (0, resolve_1.getResolveAliases)(cwd);
-    aliases.forEach((target) => {
-        config.resolve.alias.set(target, require.resolve(target, { paths: [cwd] }));
-    });
-    config.externals(externals);
-    config.when(environment === 'development', () => {
-        config.plugin('hot').use(webpack_1.default.HotModuleReplacementPlugin);
-    });
-    plugins.forEach((plugin) => {
-        config.plugin(plugin.name).use(plugin.use, plugin.args);
-    });
-    config.module
-        .rule('ts')
-        .test(/.tsx?$/)
-        .use('ts')
-        .loader(require.resolve('ts-loader'))
-        .options({
-        transpileOnly: true,
-        experimentalWatchApi: true,
-        compilerOptions: { ...config_typescript_1.default.compilerOptions, sourceMap: true },
-        configFile: node_path_1.default.join(__dirname, '../../tsconfig.stub.json'),
-    });
-    config.module
-        .rule('protos')
-        .test(/\.proto$/)
-        .use('proto')
-        .loader(require.resolve('@atls/webpack-proto-imports-loader'));
-    config.devtool(environment === 'production' ? 'source-map' : 'eval-cheap-module-source-map');
-    return config.toConfig();
-};
-exports.createWebpackConfig = createWebpackConfig;