From d2276264732ddb27bb90cf65a6222640568a57fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20=C3=85str=C3=B6m?= Date: Thu, 2 Oct 2025 18:55:27 +0200 Subject: [PATCH] chore: fix mixin and external mod (#1817) * chore: fix mixin and external mod * chore: add back to root * chore: add systemjs build of stardust * chore: trigger diff * fix: remove typo import --- apis/nucleus/package.json | 2 +- apis/stardust/package.json | 2 +- commands/build/lib/config.js | 6 ++-- commands/build/lib/systemjs.js | 1 + commands/build/package.json | 1 - rollup.config.js | 51 ++++++++++++++++++++++++++-------- yarn.lock | 23 ++++++++------- 7 files changed, 56 insertions(+), 30 deletions(-) diff --git a/apis/nucleus/package.json b/apis/nucleus/package.json index b1e4aa096..432d11f2f 100644 --- a/apis/nucleus/package.json +++ b/apis/nucleus/package.json @@ -13,7 +13,7 @@ "@nebula.js/supernova": "^6.0.0", "@nebula.js/theme": "^6.0.0", "@nebula.js/ui": "^6.0.0", - "@qlik/api": "1.44.0", + "@qlik/api": "1.46.0", "@testing-library/dom": "^10.4.1", "@testing-library/react": "^16.3.0", "extend": "3.0.2", diff --git a/apis/stardust/package.json b/apis/stardust/package.json index 9dcb83047..a52015cfc 100644 --- a/apis/stardust/package.json +++ b/apis/stardust/package.json @@ -52,7 +52,7 @@ "@nebula.js/supernova": "^6.0.0", "@nebula.js/theme": "^6.0.0", "@nebula.js/ui": "^6.0.0", - "@qlik/api": "1.44.0", + "@qlik/api": "1.46.0", "@scriptappy/cli": "0.10.0", "@scriptappy/from-jsdoc": "0.19.0", "@scriptappy/to-dts": "1.0.0", diff --git a/commands/build/lib/config.js b/commands/build/lib/config.js index b750bdff0..ce4086b74 100644 --- a/commands/build/lib/config.js +++ b/commands/build/lib/config.js @@ -7,7 +7,6 @@ const json = require('@rollup/plugin-json'); const { nodeResolve } = require('@rollup/plugin-node-resolve'); const commonjs = require('@rollup/plugin-commonjs'); const terser = require('@rollup/plugin-terser'); -const jsxPlugin = require('@babel/plugin-transform-react-jsx'); const babelPreset = require('@babel/preset-env'); const { visualizer } = require('rollup-plugin-visualizer'); const browsersList = require('@qlik/browserslist-config'); @@ -153,7 +152,7 @@ const config = ({ }, }, ], - [babelPresetReact], + [babelPresetReact, { runtime: 'automatic' }], ]; if (typescript) { @@ -195,6 +194,7 @@ const config = ({ postcss({ exclude: /\.module\.css$/, }), + // Handle all CSS with conditional modules processing postcss({ include: /\.module\.css$/, modules: true, @@ -204,7 +204,6 @@ const config = ({ ignoreTryCatch: false, // Avoids problems with require() inside try catch (https://github.com/rollup/plugins/issues/1004) }), json(), - // Handle all CSS with conditional modules processing babel({ babelHelpers: 'bundled', @@ -212,7 +211,6 @@ const config = ({ inputSourceMap: sourcemap, extensions, presets: babelPresets, - plugins: [[jsxPlugin]], }), ...[ mode === 'production' diff --git a/commands/build/lib/systemjs.js b/commands/build/lib/systemjs.js index 5cec14b1c..b0d228ff5 100644 --- a/commands/build/lib/systemjs.js +++ b/commands/build/lib/systemjs.js @@ -6,6 +6,7 @@ const systemjsBehaviours = { 'picasso-plugin-q', 'react', 'react-dom', + '@qlik-trial/sprout-css-modules', /^(?!@qlik-trial\/qmfe-data-client-parcels)(@qlik-trial\/qmfe-)/, ]; const { external } = cfg.systemjs || {}; diff --git a/commands/build/package.json b/commands/build/package.json index 708c2ca8e..23cb2febf 100644 --- a/commands/build/package.json +++ b/commands/build/package.json @@ -23,7 +23,6 @@ "dependencies": { "@babel/cli": "7.28.3", "@babel/core": "7.28.4", - "@babel/plugin-transform-react-jsx": "7.27.1", "@babel/preset-env": "7.28.3", "@babel/preset-react": "7.27.1", "@babel/preset-typescript": "7.27.1", diff --git a/rollup.config.js b/rollup.config.js index bcff1d8c8..32c472f53 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -94,6 +94,7 @@ const config = ({ format = 'umd', debug = false, file, targetPkg }) => { // peers that are not devDeps should be externals for full bundle // const bundleExternals = peers.filter((p) => typeof (pkg.devDependencies || {})[p] === 'undefined'); + const useDirectoryOutput = format === 'systemjs'; const external = peers; const globals = {}; @@ -123,17 +124,28 @@ const config = ({ format = 'umd', debug = false, file, targetPkg }) => { warn(warning); }, input: path.resolve(cwd, 'src', 'index'), - output: { - // file: path.resolve(targetDir, getFileName(isEsm ? 'esm' : '', dev)), - file, - format, - exports: ['test-utils', 'stardust'].indexOf(targetName) !== -1 ? 'named' : 'default', - name: umdName, - sourcemap: true, - banner, - globals, - inlineDynamicImports: true, - }, + output: useDirectoryOutput + ? { + dir: path.dirname(file), + entryFileNames: path.basename(file), + chunkFileNames: 'chunks/[name]-[hash].js', + format, + exports: ['test-utils', 'stardust'].indexOf(targetName) !== -1 ? 'named' : 'default', + sourcemap: true, + banner, + globals, + inlineDynamicImports: false, + } + : { + file, + format, + exports: ['test-utils', 'stardust'].indexOf(targetName) !== -1 ? 'named' : 'default', + name: umdName, + sourcemap: true, + banner, + globals, + inlineDynamicImports: true, + }, external, plugins: [ replace({ @@ -227,6 +239,23 @@ let dist = [ }) : false, + targetName === 'stardust' + ? config({ + format: 'systemjs', + targetPkg: pkg, + file: path.resolve(targetDir, getFileName('systemjs', false)), + }) + : false, + + targetName === 'stardust' + ? config({ + debug: true, + format: 'systemjs', + targetPkg: pkg, + file: path.resolve(targetDir, getFileName('systemjs', true)), + }) + : false, + // core esm corePkg && corePkg.module ? config({ diff --git a/yarn.lock b/yarn.lock index 3eeb52f66..25391dbd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4313,7 +4313,6 @@ __metadata: dependencies: "@babel/cli": "npm:7.28.3" "@babel/core": "npm:7.28.4" - "@babel/plugin-transform-react-jsx": "npm:7.27.1" "@babel/preset-env": "npm:7.28.3" "@babel/preset-react": "npm:7.27.1" "@babel/preset-typescript": "npm:7.27.1" @@ -4469,7 +4468,7 @@ __metadata: "@nebula.js/supernova": "npm:^6.0.0" "@nebula.js/theme": "npm:^6.0.0" "@nebula.js/ui": "npm:^6.0.0" - "@qlik/api": "npm:1.44.0" + "@qlik/api": "npm:1.46.0" "@testing-library/dom": "npm:^10.4.1" "@testing-library/react": "npm:^16.3.0" extend: "npm:3.0.2" @@ -4506,7 +4505,7 @@ __metadata: "@nebula.js/supernova": "npm:^6.0.0" "@nebula.js/theme": "npm:^6.0.0" "@nebula.js/ui": "npm:^6.0.0" - "@qlik/api": "npm:1.44.0" + "@qlik/api": "npm:1.46.0" "@scriptappy/cli": "npm:0.10.0" "@scriptappy/from-jsdoc": "npm:0.19.0" "@scriptappy/to-dts": "npm:1.0.0" @@ -5105,16 +5104,16 @@ __metadata: languageName: node linkType: hard -"@qlik/api@npm:1.44.0": - version: 1.44.0 - resolution: "@qlik/api@npm:1.44.0" +"@qlik/api@npm:1.46.0": + version: 1.46.0 + resolution: "@qlik/api@npm:1.46.0" dependencies: enigma.js: "npm:^2.14.0" extend: "npm:3.0.2" lodash: "npm:^4.17.21" - nanoid: "npm:^5.1.5" + nanoid: "npm:^5.1.6" ws: "npm:^8.18.3" - checksum: 10c0/f92bf7333f4fcfb3698cb4b17f1e1c96fa0b220ecf71e6ec7974d3bba36980943d39eaeb9963b35f9371629e4c7df2ca4ccc7466e1eeecb0ff4d3d01f8c5dfbe + checksum: 10c0/5f0993cb0e8880a7f89c4410354db4b945e0f8624db7d4b604165adcd42a59b2292b1de926749bf5bc0842e424731cccca4ffc7d808987a689ce24b7bba3ddac languageName: node linkType: hard @@ -15996,12 +15995,12 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^5.1.5": - version: 5.1.5 - resolution: "nanoid@npm:5.1.5" +"nanoid@npm:^5.1.6": + version: 5.1.6 + resolution: "nanoid@npm:5.1.6" bin: nanoid: bin/nanoid.js - checksum: 10c0/e6004f1ad6c7123eeb037062c4441d44982037dc043aabb162457ef6986e99964ba98c63c975f96c547403beb0bf95bc537bd7bf9a09baf381656acdc2975c3c + checksum: 10c0/27b5b055ad8332cf4f0f9f6e2a494aa7e5ded89df4cab8c8490d4eabefe72c4423971d2745d22002868b1d50576a5e42b7b05214733b19f576382323282dd26e languageName: node linkType: hard