innetjs 2.4.0-alpha.13 → 2.4.0-alpha.15

package/_virtual/_rollup-plugin-process-env.js

@@ -1,7 +1,7 @@
 'use strict';
 
 ;(function () {
-  const env = {"__INNETJS__PACKAGE_VERSION":"2.4.0-alpha.13"};
+  const env = {"__INNETJS__PACKAGE_VERSION":"2.4.0-alpha.15"};
   if (typeof process === 'undefined') {
     globalThis.process = { env: env };
   } else if (process.env) {

package/_virtual/_rollup-plugin-process-env.mjs

@@ -1,5 +1,5 @@
 ;(function () {
-  const env = {"__INNETJS__PACKAGE_VERSION":"2.4.0-alpha.13"};
+  const env = {"__INNETJS__PACKAGE_VERSION":"2.4.0-alpha.15"};
   if (typeof process === 'undefined') {
     globalThis.process = { env: env };
   } else if (process.env) {

package/bin/innet

@@ -6,6 +6,7 @@ var tslib = require('tslib');
 var logger = require('@cantinc/logger');
 var commonjs = require('@rollup/plugin-commonjs');
 var eslint = require('@rollup/plugin-eslint');
+var image = require('@rollup/plugin-image');
 var json = require('@rollup/plugin-json');
 var pluginNodeResolve = require('@rollup/plugin-node-resolve');
 var address = require('address');
@@ -30,7 +31,6 @@ var externals = require('rollup-plugin-node-externals');
 var polyfill = require('rollup-plugin-polyfill-node');
 var rollupPluginPreserveShebangs = require('rollup-plugin-preserve-shebangs');
 var env = require('rollup-plugin-process-env');
-var staticImport = require('rollup-plugin-static-import');
 var styles = require('rollup-plugin-styles');
 var rollupPluginTerser = require('rollup-plugin-terser');
 var typescript = require('rollup-plugin-typescript2');
@@ -43,6 +43,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var logger__default = /*#__PURE__*/_interopDefaultLegacy(logger);
 var commonjs__default = /*#__PURE__*/_interopDefaultLegacy(commonjs);
 var eslint__default = /*#__PURE__*/_interopDefaultLegacy(eslint);
+var image__default = /*#__PURE__*/_interopDefaultLegacy(image);
 var json__default = /*#__PURE__*/_interopDefaultLegacy(json);
 var address__default = /*#__PURE__*/_interopDefaultLegacy(address);
 var autoprefixer__default = /*#__PURE__*/_interopDefaultLegacy(autoprefixer);
@@ -64,7 +65,6 @@ var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
 var externals__default = /*#__PURE__*/_interopDefaultLegacy(externals);
 var polyfill__default = /*#__PURE__*/_interopDefaultLegacy(polyfill);
 var env__default = /*#__PURE__*/_interopDefaultLegacy(env);
-var staticImport__default = /*#__PURE__*/_interopDefaultLegacy(staticImport);
 var styles__default = /*#__PURE__*/_interopDefaultLegacy(styles);
 var typescript__default = /*#__PURE__*/_interopDefaultLegacy(typescript);
 var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
@@ -75,26 +75,24 @@ const lintInclude = [
     '**/*.js',
     '**/*.jsx',
 ];
-const stringExcludeDom = [
-    '**/*.ts',
-    '**/*.tsx',
-    '**/*.js',
-    '**/*.jsx',
-    '**/*.json',
-    '**/*.css',
-    '**/*.scss',
-    '**/*.webp',
+const imageInclude = [
     '**/*.gif',
     '**/*.png',
     '**/*.jpeg',
     '**/*.jpg',
     '**/*.svg',
+    '**/*.webp',
+];
+const stringExcludeDom = [
+    ...lintInclude,
+    '**/*.json',
+    '**/*.css',
+    '**/*.scss',
+    '**/*.webp',
+    ...imageInclude,
 ];
 const stringExcludeNode = [
-    '**/*.ts',
-    '**/*.tsx',
-    '**/*.js',
-    '**/*.jsx',
+    ...lintInclude,
     '**/*.json',
 ];
 
@@ -189,6 +187,7 @@ const livereload = require('rollup-plugin-livereload');
 const { string } = require('rollup-plugin-string');
 const { exec, spawn } = require('child_process');
 const readline = require('readline');
+const importAssets = require('rollup-plugin-import-assets');
 const execAsync = node_util.promisify(exec);
 const copyFiles = node_util.promisify(fs__default["default"].copy);
 updateDotenv();
@@ -315,7 +314,7 @@ class InnetJS {
             else {
                 options.plugins.push(pluginNodeResolve.nodeResolve({
                     browser: true,
-                }), polyfill__default["default"](), staticImport__default["default"](), styles__default["default"]({
+                }), polyfill__default["default"](), image__default["default"](), styles__default["default"]({
                     mode: this.cssInJs ? 'inject' : 'extract',
                     url: true,
                     plugins: [autoprefixer__default["default"]()],
@@ -414,11 +413,11 @@ class InnetJS {
                         : undefined;
                 // @ts-expect-error
                 options.output.format = 'es';
-                options.plugins.push(staticImport__default["default"]({
-                    include: ['**/*.webp', '**/*.gif', '**/*.png', '**/*.jpeg', '**/*.jpg', '**/*.svg'],
+                options.plugins.push(importAssets({
+                    include: imageInclude.map(img => `src/${img}`),
                 }), pluginNodeResolve.nodeResolve({
                     browser: true,
-                }), polyfill__default["default"](), styles__default["default"]({
+                }), polyfill__default["default"](), image__default["default"](), styles__default["default"]({
                     mode: this.cssInJs ? 'inject' : 'extract',
                     url: true,
                     plugins: [autoprefixer__default["default"]()],
@@ -559,7 +558,7 @@ class InnetJS {
                             include: '**/*.*',
                             exclude: stringExcludeDom,
                         }),
-                        staticImport__default["default"](),
+                        image__default["default"](),
                         styles__default["default"]({
                             mode: this.cssInJs ? 'inject' : 'extract',
                             plugins: [autoprefixer__default["default"]()],
@@ -781,7 +780,7 @@ class InnetJS {
 }
 
 (function () {
-  const env = {"__INNETJS__PACKAGE_VERSION":"2.4.0-alpha.13"};
+  const env = {"__INNETJS__PACKAGE_VERSION":"2.4.0-alpha.15"};
   if (typeof process === 'undefined') {
     globalThis.process = { env: env };
   } else if (process.env) {

package/constants.d.ts

@@ -1,3 +1,4 @@
 export declare const lintInclude: string[];
+export declare const imageInclude: string[];
 export declare const stringExcludeDom: string[];
 export declare const stringExcludeNode: string[];

package/constants.js

@@ -8,29 +8,28 @@ const lintInclude = [
     '**/*.js',
     '**/*.jsx',
 ];
-const stringExcludeDom = [
-    '**/*.ts',
-    '**/*.tsx',
-    '**/*.js',
-    '**/*.jsx',
-    '**/*.json',
-    '**/*.css',
-    '**/*.scss',
-    '**/*.webp',
+const imageInclude = [
     '**/*.gif',
     '**/*.png',
     '**/*.jpeg',
     '**/*.jpg',
     '**/*.svg',
+    '**/*.webp',
+];
+const stringExcludeDom = [
+    ...lintInclude,
+    '**/*.json',
+    '**/*.css',
+    '**/*.scss',
+    '**/*.webp',
+    ...imageInclude,
 ];
 const stringExcludeNode = [
-    '**/*.ts',
-    '**/*.tsx',
-    '**/*.js',
-    '**/*.jsx',
+    ...lintInclude,
     '**/*.json',
 ];
 
+exports.imageInclude = imageInclude;
 exports.lintInclude = lintInclude;
 exports.stringExcludeDom = stringExcludeDom;
 exports.stringExcludeNode = stringExcludeNode;

package/constants.mjs

@@ -4,27 +4,25 @@ const lintInclude = [
     '**/*.js',
     '**/*.jsx',
 ];
-const stringExcludeDom = [
-    '**/*.ts',
-    '**/*.tsx',
-    '**/*.js',
-    '**/*.jsx',
-    '**/*.json',
-    '**/*.css',
-    '**/*.scss',
-    '**/*.webp',
+const imageInclude = [
     '**/*.gif',
     '**/*.png',
     '**/*.jpeg',
     '**/*.jpg',
     '**/*.svg',
+    '**/*.webp',
+];
+const stringExcludeDom = [
+    ...lintInclude,
+    '**/*.json',
+    '**/*.css',
+    '**/*.scss',
+    '**/*.webp',
+    ...imageInclude,
 ];
 const stringExcludeNode = [
-    '**/*.ts',
-    '**/*.tsx',
-    '**/*.js',
-    '**/*.jsx',
+    ...lintInclude,
     '**/*.json',
 ];
 
-export { lintInclude, stringExcludeDom, stringExcludeNode };
+export { imageInclude, lintInclude, stringExcludeDom, stringExcludeNode };

package/index.js

@@ -7,6 +7,7 @@ var tslib = require('tslib');
 var logger = require('@cantinc/logger');
 var commonjs = require('@rollup/plugin-commonjs');
 var eslint = require('@rollup/plugin-eslint');
+var image = require('@rollup/plugin-image');
 var json = require('@rollup/plugin-json');
 var pluginNodeResolve = require('@rollup/plugin-node-resolve');
 var address = require('address');
@@ -31,7 +32,6 @@ var externals = require('rollup-plugin-node-externals');
 var polyfill = require('rollup-plugin-polyfill-node');
 var rollupPluginPreserveShebangs = require('rollup-plugin-preserve-shebangs');
 var env = require('rollup-plugin-process-env');
-var staticImport = require('rollup-plugin-static-import');
 var styles = require('rollup-plugin-styles');
 var rollupPluginTerser = require('rollup-plugin-terser');
 var typescript = require('rollup-plugin-typescript2');
@@ -47,6 +47,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var logger__default = /*#__PURE__*/_interopDefaultLegacy(logger);
 var commonjs__default = /*#__PURE__*/_interopDefaultLegacy(commonjs);
 var eslint__default = /*#__PURE__*/_interopDefaultLegacy(eslint);
+var image__default = /*#__PURE__*/_interopDefaultLegacy(image);
 var json__default = /*#__PURE__*/_interopDefaultLegacy(json);
 var address__default = /*#__PURE__*/_interopDefaultLegacy(address);
 var autoprefixer__default = /*#__PURE__*/_interopDefaultLegacy(autoprefixer);
@@ -68,7 +69,6 @@ var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
 var externals__default = /*#__PURE__*/_interopDefaultLegacy(externals);
 var polyfill__default = /*#__PURE__*/_interopDefaultLegacy(polyfill);
 var env__default = /*#__PURE__*/_interopDefaultLegacy(env);
-var staticImport__default = /*#__PURE__*/_interopDefaultLegacy(staticImport);
 var styles__default = /*#__PURE__*/_interopDefaultLegacy(styles);
 var typescript__default = /*#__PURE__*/_interopDefaultLegacy(typescript);
 var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
@@ -77,6 +77,7 @@ const livereload = require('rollup-plugin-livereload');
 const { string } = require('rollup-plugin-string');
 const { exec, spawn } = require('child_process');
 const readline = require('readline');
+const importAssets = require('rollup-plugin-import-assets');
 const execAsync = node_util.promisify(exec);
 const copyFiles = node_util.promisify(fs__default["default"].copy);
 updateDotenv.updateDotenv();
@@ -203,7 +204,7 @@ class InnetJS {
             else {
                 options.plugins.push(pluginNodeResolve.nodeResolve({
                     browser: true,
-                }), polyfill__default["default"](), staticImport__default["default"](), styles__default["default"]({
+                }), polyfill__default["default"](), image__default["default"](), styles__default["default"]({
                     mode: this.cssInJs ? 'inject' : 'extract',
                     url: true,
                     plugins: [autoprefixer__default["default"]()],
@@ -302,11 +303,11 @@ class InnetJS {
                         : undefined;
                 // @ts-expect-error
                 options.output.format = 'es';
-                options.plugins.push(staticImport__default["default"]({
-                    include: ['**/*.webp', '**/*.gif', '**/*.png', '**/*.jpeg', '**/*.jpg', '**/*.svg'],
+                options.plugins.push(importAssets({
+                    include: constants.imageInclude.map(img => `src/${img}`),
                 }), pluginNodeResolve.nodeResolve({
                     browser: true,
-                }), polyfill__default["default"](), styles__default["default"]({
+                }), polyfill__default["default"](), image__default["default"](), styles__default["default"]({
                     mode: this.cssInJs ? 'inject' : 'extract',
                     url: true,
                     plugins: [autoprefixer__default["default"]()],
@@ -447,7 +448,7 @@ class InnetJS {
                             include: '**/*.*',
                             exclude: constants.stringExcludeDom,
                         }),
-                        staticImport__default["default"](),
+                        image__default["default"](),
                         styles__default["default"]({
                             mode: this.cssInJs ? 'inject' : 'extract',
                             plugins: [autoprefixer__default["default"]()],

package/index.mjs

@@ -3,6 +3,7 @@ import { __awaiter } from 'tslib';
 import logger from '@cantinc/logger';
 import commonjs from '@rollup/plugin-commonjs';
 import eslint from '@rollup/plugin-eslint';
+import image from '@rollup/plugin-image';
 import json from '@rollup/plugin-json';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import address from 'address';
@@ -27,13 +28,12 @@ import externals from 'rollup-plugin-node-externals';
 import polyfill from 'rollup-plugin-polyfill-node';
 import { preserveShebangs } from 'rollup-plugin-preserve-shebangs';
 import env from 'rollup-plugin-process-env';
-import staticImport from 'rollup-plugin-static-import';
 import styles from 'rollup-plugin-styles';
 import { terser } from 'rollup-plugin-terser';
 import typescript from 'rollup-plugin-typescript2';
 import tmp from 'tmp';
 import { promisify } from 'node:util';
-import { stringExcludeNode, stringExcludeDom, lintInclude } from './constants.mjs';
+import { stringExcludeNode, stringExcludeDom, imageInclude, lintInclude } from './constants.mjs';
 import { Extract } from './extract.mjs';
 import { reporter, convertIndexFile, getFile } from './helpers.mjs';
 import { updateDotenv } from './updateDotenv.mjs';
@@ -42,6 +42,7 @@ const livereload = require('rollup-plugin-livereload');
 const { string } = require('rollup-plugin-string');
 const { exec, spawn } = require('child_process');
 const readline = require('readline');
+const importAssets = require('rollup-plugin-import-assets');
 const execAsync = promisify(exec);
 const copyFiles = promisify(fs.copy);
 updateDotenv();
@@ -168,7 +169,7 @@ class InnetJS {
             else {
                 options.plugins.push(nodeResolve({
                     browser: true,
-                }), polyfill(), staticImport(), styles({
+                }), polyfill(), image(), styles({
                     mode: this.cssInJs ? 'inject' : 'extract',
                     url: true,
                     plugins: [autoprefixer()],
@@ -267,11 +268,11 @@ class InnetJS {
                         : undefined;
                 // @ts-expect-error
                 options.output.format = 'es';
-                options.plugins.push(staticImport({
-                    include: ['**/*.webp', '**/*.gif', '**/*.png', '**/*.jpeg', '**/*.jpg', '**/*.svg'],
+                options.plugins.push(importAssets({
+                    include: imageInclude.map(img => `src/${img}`),
                 }), nodeResolve({
                     browser: true,
-                }), polyfill(), styles({
+                }), polyfill(), image(), styles({
                     mode: this.cssInJs ? 'inject' : 'extract',
                     url: true,
                     plugins: [autoprefixer()],
@@ -412,7 +413,7 @@ class InnetJS {
                             include: '**/*.*',
                             exclude: stringExcludeDom,
                         }),
-                        staticImport(),
+                        image(),
                         styles({
                             mode: this.cssInJs ? 'inject' : 'extract',
                             plugins: [autoprefixer()],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "innetjs",
-  "version": "2.4.0-alpha.13",
+  "version": "2.4.0-alpha.15",
   "description": "CLI for innet boilerplate",
   "homepage": "https://github.com/d8corp/innetjs",
   "author": "Mikhail Lysikov <d8corp@mail.ru>",
@@ -52,6 +52,7 @@
     "@cantinc/logger": "^1.1.0",
     "@rollup/plugin-commonjs": "^23.0.2",
     "@rollup/plugin-eslint": "^9.0.1",
+    "@rollup/plugin-image": "^3.0.1",
     "@rollup/plugin-json": "^5.0.1",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "address": "^1.2.1",
@@ -72,7 +73,7 @@
     "rollup": "^2.79.1",
     "rollup-plugin-external-node-modules": "^1.0.1",
     "rollup-plugin-filesize": "^9.1.2",
-    "rollup-plugin-static-import": "^1.0.0",
+    "rollup-plugin-import-assets": "^1.1.1",
     "rollup-plugin-innet-jsx": "^1.3.2",
     "rollup-plugin-livereload": "^2.0.5",
     "rollup-plugin-node-externals": "^5.0.2",