Merge pull request #252 from performant-software/feature/rc251_peripleo_components

RC #251 - Peripleo components

Author: dleadbetter

.eslintrc.json

@@ -6,6 +6,7 @@
   },
   "extends": [
     "plugin:flowtype/recommended",
+    "plugin:import/recommended",
     "plugin:react/recommended",
     "airbnb"
   ],
@@ -36,6 +37,7 @@
     "max-len": ["error", { "code": 120, "ignoreStrings": true }],
     "no-underscore-dangle": "off",
     "no-use-before-define": "off",
+    "import/no-unresolved": ["error", { "ignore": ["@samvera/clover-iiif.*"] }],
     "import/prefer-default-export": "off",
     "react/no-array-index-key": "off",
     "react/default-props-match-prop-types": "off",

.flowconfig

@@ -1,5 +1,7 @@
 [ignore]
 <PROJECT_ROOT>/types/.*
+<PROJECT_ROOT>/build/.*
+<PROJECT_ROOT>/dist/.*
 ./node_modules/
 
 [include]

.github/workflows/storybook.yml

@@ -1,8 +1,10 @@
 name: Build and Deploy GitHub pages
+
 on:
-  pull_request:
+  push:
     branches:
       - master # Trigger the action only on PR merges into master
+
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
@@ -16,10 +18,10 @@ jobs:
           yarn install
           yarn build-storybook
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@3.6.2
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages # The branch the action should deploy to.
-          FOLDER: packages/storybook/storybook-static # The folder that the build-storybook script generates files.
-          CLEAN: true # Automatically remove deleted files from the deploy branch
-          TARGET_FOLDER: docs # The folder that we serve our Storybook files from
+          branch: gh-pages # The branch the action should deploy to.
+          folder: packages/storybook/storybook-static # The folder that the build-storybook script generates files.
+          clean: true # Automatically remove deleted files from the deploy branch
+          clean-exclude: '["docs/.nojekyll"]'
+          target-folder: docs # The folder that we serve our Storybook files from

.gitignore

@@ -1,4 +1,5 @@
 build/
+dist/
 node_modules/
 .env
 .vscode/launch.json

package.json

@@ -7,9 +7,8 @@
     "packages/*"
   ],
   "scripts": {
-    "build-semantic": "yarn --cwd packages/semantic-ui build",
-    "build-shared": "yarn --cwd packages/shared build",
-    "build-storybook": "yarn build-shared && yarn build-semantic && yarn --cwd packages/storybook build",
+    "build-all": "node --experimental-json-modules ./scripts/build.js",
+    "build-storybook": "yarn build-all && yarn --cwd packages/storybook build",
     "flow": "flow",
     "storybook": "yarn --cwd packages/storybook storybook",
     "test": "jest",
@@ -23,7 +22,7 @@
     "eslint": "^7.1.0",
     "eslint-config-airbnb": "^18.1.0",
     "eslint-plugin-flowtype": "^5.9.0",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jest": "^26.1.4",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-react": "^7.19.0",

packages/controlled-vocabulary/package.json

@@ -1,30 +1,38 @@
 {
   "name": "@performant-software/controlled-vocabulary",
-  "version": "1.1.6",
+  "version": "2.0.0",
   "description": "A package of components to allow user to configure dropdown elements. Use with the \"controlled_vocabulary\" gem.",
   "license": "MIT",
-  "main": "./build/index.js",
-  "style": [
-    "./build/main.css",
-    "./build/semantic-ui.css"
-  ],
+  "main": "./dist/index.cjs.js",
+  "module": "./dist/index.es.js",
+  "style": "./dist/style.css",
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.cjs.js"
+    },
+    "./style.css": "./dist/style.css"
+  },
   "scripts": {
-    "build": "webpack --mode production && flow-copy-source -v src types"
+    "build": "vite build && flow-copy-source -v src types"
   },
   "dependencies": {
-    "@performant-software/semantic-components": "^1.1.6",
-    "@performant-software/shared-components": "^1.1.6",
     "i18next": "^21.9.2",
     "semantic-ui-react": "^2.1.2",
     "underscore": "^1.13.2"
   },
   "peerDependencies": {
+    "@performant-software/semantic-components": "^2.0.0",
+    "@performant-software/shared-components": "^2.0.0",
     "react": ">= 16.13.1 < 19.0.0",
     "react-dom": ">= 16.13.1 < 19.0.0"
   },
   "devDependencies": {
-    "@performant-software/webpack-config": "^1.0.0",
+    "@bunchtogether/vite-plugin-flow": "^1.0.2",
+    "@vitejs/plugin-react": "^4.2.1",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "vite": "^5.1.4"
   }
 }

packages/controlled-vocabulary/vite.config.js

@@ -0,0 +1,39 @@
+// @flow
+
+import { flowPlugin, esbuildFlowPlugin } from '@bunchtogether/vite-plugin-flow';
+import react from '@vitejs/plugin-react';
+import { defineConfig } from 'vite';
+import * as packageJson from './package.json';
+
+export default defineConfig(() => ({
+  esbuild: {
+    include: /\.js$/,
+    exclude: [],
+    loader: 'jsx',
+  },
+  optimizeDeps: {
+    esbuildOptions: {
+      plugins: [esbuildFlowPlugin()]
+    }
+  },
+  plugins: [
+    react(),
+    flowPlugin()
+  ],
+  build: {
+    sourcemap: true,
+    lib: {
+      entry: './src/index.js',
+      formats: ['es', 'cjs'],
+      fileName: (format) => `index.${format}.js`
+    },
+    rollupOptions: {
+      external: [
+        ...Object.keys(packageJson.peerDependencies)
+      ],
+      output: {
+        preserveModules: true
+      }
+    }
+  }
+}));

packages/controlled-vocabulary/webpack.config.js

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Performant Software Solutions LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.