Merge branch 'main' into added-bin-script

Author: GrabowskiM

.gitignore

@@ -2,7 +2,10 @@ node_modules/
 yarn.lock
 yarn-error.log
 package-lock.json
+.vscode
 storybook-static/
 coverage/
 dist/
+tsconfig.tsbuildinfo
+tsconfig.build.tsbuildinfo
 .env.local

.storybook/main.js

@@ -65,7 +65,7 @@ const config = {
             '@ids-hooks': path.resolve(__dirname, '../packages/components/src/hooks'),
             '@ids-partials': path.resolve(__dirname, '../packages/components/src/partials'),
             '@ids-shared': path.resolve(__dirname, '../packages/components/src/shared'),
-            '@ids-core': path.resolve(__dirname, '../packages/components/src/core'),
+            '@ids-core': path.resolve(__dirname, '../packages/core/src'),
         };
 
         webpackConfig.plugins.push(new NodePolyfillPlugin());

bin/prepare_ds_symlinks.mjs

@@ -8,29 +8,11 @@ const getSourceDir = (packageName) => {
     const currFileDir = path.dirname(fileURLToPath(import.meta.url));
     const dsDir = path.join(currFileDir, '..');
 
-    return path.join(dsDir, 'packages', packageName, 'src');
+    return path.join(dsDir, 'packages', packageName);
 }
 const createSymlink = (source, target) => {
     execSync(`mkdir -p ${target} && rm -rf ${target} && ln -s ${source} ${target}`);
 }
-const updateIbexaTSConfigFile = () => {
-    const tsConfigFilePath = path.resolve('ibexa.tsconfig.json');
-    const tsConfigContent = JSON.parse(fs.readFileSync(tsConfigFilePath, 'utf-8'));
-
-    tsConfigContent.compilerOptions ??= {};
-    tsConfigContent.compilerOptions.paths ??= {};
-    tsConfigContent.compilerOptions.paths['@ids-assets/*'] = [
-        `${getSourceDir('assets')}/*`,
-    ];
-    tsConfigContent.compilerOptions.paths['@ids-components/*'] = [
-        `${getSourceDir('components')}/*`,
-    ];
-    tsConfigContent.compilerOptions.paths['@ids-core/*'] = [
-        `${getSourceDir('core')}/*`,
-    ];
-
-    fs.writeFileSync(tsConfigFilePath, JSON.stringify(tsConfigContent, null, 4));
-}
 const createSymlinks = () => {
     const composerJsonFilePath = path.resolve('composer.json');
     const composerJsonContent = JSON.parse(fs.readFileSync(composerJsonFilePath, 'utf-8'));
@@ -40,14 +22,35 @@ const createSymlinks = () => {
     const componentsSourcePath = getSourceDir('components');
     const coreSourcePath = getSourceDir('core');
     const assetsSourcePath = getSourceDir('assets');
-    const componentsSymlinkPath = path.join(assetsDirPath, 'ids-components/dist');
-    const coreSymlinkPath = path.join(assetsDirPath, 'ids-core/dist');
-    const assetsSymlinkPath = path.join(assetsDirPath, 'ids-assets/dist');
+    const componentsSymlinkPath = path.join(assetsDirPath, 'ids-components');
+    const coreSymlinkPath = path.join(assetsDirPath, 'ids-core');
+    const assetsSymlinkPath = path.join(assetsDirPath, 'ids-assets');
 
     createSymlink(assetsSourcePath, assetsSymlinkPath);
     createSymlink(componentsSourcePath, componentsSymlinkPath);
     createSymlink(coreSourcePath, coreSymlinkPath);
 }
 
-updateIbexaTSConfigFile();
 createSymlinks();
+
+/* eslint-disable no-console */
+console.log(
+    '\x1b[32m%s\x1b[0m',
+    '+-----------------------------------------------------------------+',
+);
+console.log(
+    '\x1b[32m%s\x1b[0m',
+    '|                 Symlinks created successfully.                  |',
+);
+console.log(
+    '\x1b[32m%s\x1b[0m',
+    '|   Go to admin-ui-assets/src/bundle/Resources/public/vendors     |',
+);
+console.log(
+    '\x1b[32m%s\x1b[0m',
+    '|  and double check if directories ids-X are properly symlinked.  |',
+);
+console.log(
+    '\x1b[32m%s\x1b[0m',
+    '+-----------------------------------------------------------------+',
+);

bin/prepare_release.sh

@@ -44,9 +44,6 @@ check_process()
 check_command "git"
 check_command "yarn"
 
-ASSETS_DIR="packages/assets"
-COMPONENTS_DIR="packages/components"
-
 CURRENT_BRANCH=`git branch | grep '*' | cut -d ' ' -f 2`
 TMP_BRANCH="version_$VERSION"
 TAG="v$VERSION"
@@ -55,27 +52,8 @@ echo "# Switching to $BRANCH and updating"
 git checkout -q $BRANCH > /dev/null && git pull > /dev/null
 check_process "switch to $BRANCH"
 
-echo "# Removing the assets"
-yarn run packages:remove-dist
-
-echo "# Removing yarn.lock"
-rm -rf "yarn.lock"
-
-echo "# Installing dependendencies"
-yarn install
-yarn run packages:build
-
-echo "# Removing Storybook and dev files"
-rm -rf ".storybook" "scripts" "src" "stories" "types" "eslint.config.js" "tsconfig.json"
-check_process "clean storybook dev"
-
-echo "# Removing components dev files"
-rm -rf "$COMPONENTS_DIR/scripts" "$COMPONENTS_DIR/src" "$COMPONENTS_DIR/.babelrc" "$COMPONENTS_DIR/tsconfig.build.json" "$COMPONENTS_DIR/tsconfig.json"
-check_process "clean components dev"
-
-echo "# Removing assets dev files"
-rm -rf "$ASSETS_DIR/src"
-check_process "clean assets dev"
+./bin/prepare_release_files.sh
+check_process "prepare the release files"
 
 echo "# Creating the custom branch: $TMP_BRANCH"
 git checkout -q -b "$TMP_BRANCH" > /dev/null

bin/prepare_release_files.sh

@@ -0,0 +1,42 @@
+#! /bin/sh
+# Script to prepare design system module release files
+
+check_command()
+{
+    $1 --version 2>&1 > /dev/null
+    check_process "find '$1' in the PATH, is it installed?"
+}
+
+check_process()
+{
+    [ $? -ne 0 ] && echo "Fail to $1" && exit 3
+}
+
+check_command "yarn"
+
+ASSETS_DIR="packages/assets"
+COMPONENTS_DIR="packages/components"
+
+echo "# Removing the assets"
+yarn run packages:remove-dist
+
+echo "# Removing yarn.lock"
+rm -rf "yarn.lock"
+
+echo "# Installing dependendencies"
+yarn install
+yarn run packages:build
+
+echo "# Removing Storybook and dev files"
+rm -rf ".storybook" "scripts" "src" "stories" "types" "eslint.config.js" "tsconfig.json"
+check_process "clean storybook dev"
+
+echo "# Removing components dev files"
+rm -rf "$COMPONENTS_DIR/scripts" "$COMPONENTS_DIR/src" "$COMPONENTS_DIR/.babelrc" "$COMPONENTS_DIR/tsconfig.build.json" "$COMPONENTS_DIR/tsconfig.json"
+check_process "clean components dev"
+
+echo "# Removing assets dev files"
+rm -rf "$ASSETS_DIR/src"
+check_process "clean assets dev"
+
+exit 0

package.json

@@ -64,13 +64,16 @@
     "components:fix": "cd packages/components; yarn fix",
     "components:extract-translations": "cd packages/components; yarn extract-translations",
     "components:build": "cd packages/components; yarn build",
+    "components:watch": "cd packages/components; yarn watch",
     "core:test": "cd packages/core; yarn test",
     "core:fix": "cd packages/core; yarn fix",
     "core:build": "cd packages/core; yarn build",
+    "core:watch": "cd packages/core; yarn watch",
     "packages:test": "yarn components:test && yarn assets:test && yarn core:test",
     "packages:fix": "yarn components:fix && yarn assets:fix && yarn core:fix",
     "packages:remove-dist": "rm -rf packages/assets/dist && rm -rf packages/components/dist && rm -rf packages/core/dist",
     "packages:build": "yarn components:build && yarn assets:build && yarn core:build",
+    "packages:watch": "yarn core:watch & yarn components:watch",
     "infra:prettier-test": "yarn prettier \"./{.storybook,src,stories}/**/*.{js,ts,jsx,tsx}\" --check",
     "infra:prettier-fix": "yarn infra:prettier-test --write",
     "infra:eslint-test": "eslint \"./{.storybook,src,stories}/**/*.{js,ts,jsx,tsx}\"",
@@ -82,5 +85,9 @@
     "build-storybook": "storybook build",
     "test-storybook": "test-storybook"
   },
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]",
+  "dependencies": {
+    "@popperjs/core": "^2.11.8",
+    "react-popper": "^2.3.0"
+  }
 }