Merge pull request #4 from incubateur-ademe/maj-publicodes-pkg

pkg: MAJ Publicodes

.github/dependabot.yml

@@ -0,0 +1,27 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: 'npm' # See documentation for possible values
+    directory: '/' # Location of package manifests
+    target-branch: 'preprod'
+    schedule:
+      interval: 'daily'
+    groups:
+      publicodes-dependencies:
+        patterns:
+          - '@incubateur-ademe/*'
+          - '@publicodes/*'
+          - 'publicodes'
+      dev-dependencies:
+        patterns:
+          - 'prettier'
+    allow:
+      - dependency-name: publicodes-dependencies
+    ignore:
+      - dependency-name: dev-dependencies
+    labels:
+      - 'dependencies'

.github/workflows/build.yaml

@@ -7,14 +7,16 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.ref }}
-      - name: Set-up bun
-        uses: oven-sh/setup-bun@v1
+      - uses: actions/setup-node@v3
         with:
-          bun-version: latest
-      - name: Install dependencies and build
-        run: bun i --frozen-lockfile
-      - name: Build
-        run: bun run build
+          node-version: 18
+          cache: 'yarn'
+      - run: yarn install --immutable
+      - run: git log | head && git status
+      - id: build
+        name: Build
+        run: yarn run build

.github/workflows/packaging.yaml

@@ -67,12 +67,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set-up bun
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: latest
-      - run: bun i --frozen-lockfile && bun i --frozen-lockfile --cwd doc
-      - run: bun run doc:build
+      - name: Install dependencies and build
+        run: yarn install --immutable && yarn install --immutable --cwd doc
+      - run: yarn run doc:build
       - name: Deploy
         uses: crazy-max/ghaction-github-pages@v3
         with:
@@ -91,17 +88,13 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.ref }}
-      - name: Set-up bun
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: latest
       - name: Setup .npmrc file to publish to npm
         uses: actions/setup-node@v3
         with:
           node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'
       - name: Install dependencies and build
-        run: bun i --frozen-lockfile && bun run build
+        run: yarn install --immutable && yarn build
       - name: Publish to NPM
         run: npm publish
         env:

.gitignore

@@ -3,3 +3,4 @@ node_modules
 publicodes-impact-livraison.model.json
 index.d.ts
 index.js
+.DS_Store

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "bracketSpacing": true,
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "none"
+}

README.md

@@ -25,7 +25,7 @@ ligne](https://incubateur-ademe.github.io/publicodes-impact-livraison/).
 Ajouter le paquet à vos dépendances :
 
 ```
-bun add @incubateur-ademe/publicodes-impact-livraison
+yarn add @incubateur-ademe/publicodes-impact-livraison
 ```
 
 Instancier un nouveau moteur Publicode :
@@ -44,7 +44,7 @@ Utiliser certaines règles dans un autre modèle publicodes :
 ```yaml
 importer!:
   depuis:
-    nom: "@incubateur-ademe/publicodes-impact-livraison"
+    nom: '@incubateur-ademe/publicodes-impact-livraison'
     url: https://github.com/incubateur-ademe/publicodes-impact-livraison
   dans: modèle livraison
   les règles:
@@ -63,7 +63,7 @@ Pour installer les dépendances et compiler tous les fichiers `.publicodes` en
 un seul fichier JSON, il suffit d'exécuter la commande suivante :
 
 ```
-bun && bun run build
+yarn && yarn run build
 ```
 
 #### Lancer la documentation
@@ -75,9 +75,9 @@ Pour lancer l'app React en local permettant de parcourir la documentation du
 modèle, il suffit d'exécuter la commande suivante :
 
 ```
-bun i --cwd doc
+yarn i --cwd doc
 
-bun run doc:start
+yarn run doc
 ```
 
 #### Lancer l'API
@@ -89,10 +89,10 @@ Pour lancer le serveur Node permettant d'utiliser l'API REST, il faut utiliser l
 suivantes :
 
 ```
-bun run api
+yarn run api
 
 # En watch-mode
-bun run api:watch
+yarn run api:watch
 ```
 
 ## Publier une nouvelle version

api/package.json

@@ -9,7 +9,7 @@
     "index.js"
   ],
   "scripts": {
-    "build": "bun run index.js"
+    "build": "node index.js"
   },
   "repository": "git@github.com:incubateur-ademe/publicodes-impact-livraison.git",
   "homepage": "https://github.com/incubateur-ademe/publicodes-impact-livraison#readme",
@@ -19,15 +19,15 @@
   "authors": [],
   "license": "MIT",
   "devDependencies": {
-    "@incubateur-ademe/publicodes-tools": "^0.2.1",
-    "@publicodes/api": "^1.0.0-beta.71",
+    "@publicodes/api": "^1.0.0-beta.77",
+    "@publicodes/tools": "^1.0.6",
     "nodemon": "^3.0.1"
   },
   "dependencies": {
     "@koa/cors": "^4.0.0",
     "@koa/router": "^12.0.0",
     "koa": "^2.14.2",
-    "publicodes": "^1.0.0-beta.71"
+    "publicodes": "^1.1.1"
   },
   "publishConfig": {
     "access": "public"

build.js

@@ -1,6 +1,6 @@
 import { writeFileSync } from 'fs'
-import { getModelFromSource } from '@incubateur-ademe/publicodes-tools/compilation'
-import { disabledLogger } from '@incubateur-ademe/publicodes-tools'
+import { getModelFromSource } from '@publicodes/tools/compilation'
+import { disabledLogger } from '@publicodes/tools'
 import Engine from 'publicodes'
 
 const srcFiles = 'rules/**/*.publicodes'