Merge pull request #152 from scalprum/manifest-cache

chore: update dependencies

Author: Hyperkid123

examples/test-app/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "rootDir": "../../",
     "jsx": "react-jsx",
     "allowJs": false,
     "esModuleInterop": false,

federation-cdn-mock/package-lock.json

@@ -7,7 +7,7 @@
     "serve": "wait-on dist && http-server dist -p 8001 -c-1 --cors=*"
   },
   "devDependencies": {
-    "@module-federation/enhanced": "^0.6.1",
+    "@module-federation/enhanced": "^0.10.0",
     "http-server": "^14.1.1",
     "swc-loader": "^0.2.6",
     "wait-on": "^7.2.0",

federation-cdn-mock/package.json

@@ -25,7 +25,7 @@
     "@emotion/styled": "11.11.0",
     "@mui/icons-material": "^5.14.19",
     "@mui/material": "^5.14.19",
-    "@nx/devkit": "17.1.3",
+    "@nx/devkit": "20.6.1",
     "@openshift/dynamic-plugin-sdk-webpack": "^4.1.0",
     "@swc/helpers": "~0.5.2",
     "concurrently": "^8.2.2",
@@ -39,32 +39,32 @@
   "devDependencies": {
     "@babel/core": "^7.14.5",
     "@babel/preset-react": "^7.14.5",
-    "@commitlint/cli": "^17.8.1",
-    "@commitlint/config-conventional": "^17.8.1",
-    "@cypress/webpack-dev-server": "^2.0.0",
+    "@commitlint/cli": "^19.8.0",
+    "@commitlint/config-conventional": "^19.8.0",
+    "@cypress/webpack-dev-server": "^3.0.0",
     "@emotion/babel-plugin": "11.11.0",
-    "@jscutlery/semver": "^4.1.0",
-    "@module-federation/enhanced": "^0.2.1",
-    "@nx/cypress": "17.1.3",
-    "@nx/eslint": "17.1.3",
-    "@nx/eslint-plugin": "17.1.3",
-    "@nx/jest": "17.1.3",
-    "@nx/js": "17.1.3",
-    "@nx/plugin": "17.1.3",
-    "@nx/react": "17.1.3",
-    "@nx/web": "17.1.3",
-    "@nx/webpack": "17.1.3",
-    "@nx/workspace": "17.1.3",
+    "@jscutlery/semver": "^5.6.0",
+    "@module-federation/enhanced": "^0.10.0",
+    "@nx/cypress": "20.6.1",
+    "@nx/eslint": "20.6.1",
+    "@nx/eslint-plugin": "20.6.1",
+    "@nx/jest": "20.6.1",
+    "@nx/js": "20.6.1",
+    "@nx/plugin": "20.6.1",
+    "@nx/react": "20.6.1",
+    "@nx/web": "20.6.1",
+    "@nx/webpack": "20.6.1",
+    "@nx/workspace": "20.6.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/commit-analyzer": "^11.1.0",
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/release-notes-generator": "^12.1.0",
     "@svgr/webpack": "^8.0.1",
-    "@swc-node/register": "~1.6.7",
-    "@swc/cli": "~0.1.62",
-    "@swc/core": "~1.3.85",
+    "@swc-node/register": "^1.10.10",
+    "@swc/cli": "^0.6.0",
+    "@swc/core": "^1.11.11",
     "@testing-library/react": "14.0.0",
     "@types/jest": "^29.4.0",
     "@types/node": "18.14.2",
@@ -88,9 +88,9 @@
     "jest": "^29.4.1",
     "jest-environment-jsdom": "^29.4.1",
     "jest-environment-node": "^29.4.1",
-    "ngx-deploy-npm": "8.0.0",
+    "ngx-deploy-npm": "8.4.0",
     "npm-run-all": "^4.1.5",
-    "nx": "17.1.3",
+    "nx": "20.6.1",
     "prettier": "^3.1.0",
     "react-refresh": "^0.10.0",
     "replace-json-property": "^1.9.0",
@@ -100,7 +100,7 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "~5.2.2",
     "url-loader": "^4.1.1",
-    "verdaccio": "^5.31.1",
+    "verdaccio": "^6.0.5",
     "wait-on": "^7.2.0",
     "webpack-cli": "^5.1.4",
     "webpack-merge": "^5.10.0",

package-lock.json

@@ -0,0 +1,77 @@
+const path = require('path');
+const { ModuleFederationPlugin } = require('@module-federation/enhanced');
+
+const ShellConfig = new ModuleFederationPlugin({
+  name: 'shell',
+  filename: 'shell.[contenthash].js',
+  library: {
+    type: 'global',
+    name: 'shell',
+  },
+  shared: [
+    {
+      react: {
+        singleton: true,
+      },
+      'react-dom': {
+        singleton: true,
+      },
+      '@scalprum/react-core': {
+        singleton: true,
+      },
+      '@openshift/dynamic-plugin-sdk': {
+        singleton: true,
+      },
+    },
+  ],
+});
+
+const config = {
+  component: {
+    videosFolder: '../../dist/cypress/packages/react-core/videos',
+    screenshotsFolder: '../../dist/cypress/packages/react-core/screenshots',
+    chromeWebSecurity: false,
+    specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}',
+    devServer: {
+      framework: 'react',
+      bundler: 'webpack',
+      webpackConfig: () => {
+        return {
+          resolve: {
+            extensions: ['.tsx', '.ts', '.js'],
+            alias: {
+              '@scalprum/core': path.resolve(__dirname, '../core/src/index.ts'),
+            }
+          },
+          module: {
+            rules: [
+              {
+                test: /\.(js|ts)x?$/,
+                exclude: /node_modules/,
+                use: {
+                  loader: 'swc-loader',
+                  options: {
+                    jsc: {
+                      parser: {
+                        syntax: 'typescript',
+                        tsx: true,
+                      },
+                    },
+                  },
+                },
+              },
+              {
+                test: /\.css$/,
+                use: ['style-loader', 'css-loader'],
+              },
+            ],
+          },
+          plugins: [ShellConfig]
+        };
+      }
+    }
+  },
+};
+
+
+module.exports = config;

package.json

@@ -58,7 +58,7 @@
     "component-test": {
       "executor": "@nx/cypress:cypress",
       "options": {
-        "cypressConfig": "packages/react-core/cypress.config.ts",
+        "cypressConfig": "packages/react-core/cypress.config.js",
         "testingType": "component",
         "devServerTarget": "test-app:build",
         "skipServe": true

packages/react-core/cypress.config.js

@@ -65,7 +65,7 @@ describe('<ScalprumComponent />', () => {
       manifestLocation: '/errorRepairSuccess,js',
     },
   };
-  const getAppDataSpy = jest.spyOn(ScalprumCore, 'getAppData').mockReturnValue(mockInitScalprumConfig.appOne);
+  const getAppDataSpy = jest.spyOn(ScalprumCore, 'getAppData').mockReturnValue(mockInitScalprumConfig['appOne']);
   const processManifestSpy = jest.spyOn(ScalprumCore, 'processManifest');
   let loadComponentSpy: jest.SpyInstance;
 
@@ -118,7 +118,7 @@ describe('<ScalprumComponent />', () => {
 
   test('should retrieve manifest location', async () => {
     processManifestSpy.mockImplementationOnce(() => Promise.resolve());
-    getAppDataSpy.mockReturnValueOnce(mockInitScalpumConfigManifest.appOne);
+    getAppDataSpy.mockReturnValueOnce(mockInitScalpumConfigManifest['appOne']);
     ScalprumCore.initialize({ appsConfig: mockInitScalpumConfigManifest });
     await act(async () => {
       await render(<ScalprumComponent scope="appOne" module="test" />);
@@ -128,7 +128,7 @@ describe('<ScalprumComponent />', () => {
   });
 
   test('should inject manifest and mount app if it was not initialized before', async () => {
-    getAppDataSpy.mockReturnValueOnce(mockInitScalpumConfigManifest.appOne);
+    getAppDataSpy.mockReturnValueOnce(mockInitScalpumConfigManifest['appOne']);
     ScalprumCore.initialize({ appsConfig: mockInitScalpumConfigManifest });
     processManifestSpy.mockImplementationOnce(() => {
       return Promise.resolve();
@@ -163,7 +163,7 @@ describe('<ScalprumComponent />', () => {
 
   test('should render test component with manifest', async () => {
     jest.useFakeTimers();
-    getAppDataSpy.mockReturnValueOnce(mockInitScalpumConfigManifest.appOne);
+    getAppDataSpy.mockReturnValueOnce(mockInitScalpumConfigManifest['appOne']);
     ScalprumCore.initialize({ appsConfig: mockInitScalprumConfig });
     processManifestSpy.mockImplementationOnce(() => {
       return Promise.resolve();