Merge pull request #430 from messageformat/reorg-dirs

Reorganise files, adding mf1/ and mf2/ directories to root

Author: XM5jDcsHTyGJtQqlCi

.eslintignore

@@ -4,19 +4,18 @@ package.json
 package-lock.json
 /coverage/
 /docs/
-/examples/cli/*.mjs
-/examples/react/
-/packages/core/lib/*
-/packages/core/messageformat.*
-/packages/date-skeleton/lib/*
-/packages/mf2-*/lib/*
-/packages/number-skeleton/lib/*
-/packages/parser/lib/*
-/packages/react/lib/*
-/packages/react/src/__fixtures__/*
-/packages/rollup-plugin/lib/*
-/packages/runtime/esm/*
-/packages/runtime/lib/*
-/packages/test-utils/lib/*
+/mf1/examples/cli/*.mjs
+/mf1/examples/react/
+/mf1/packages/core/lib/*
+/mf1/packages/core/messageformat.*
+/mf1/packages/date-skeleton/lib/*
+/mf1/packages/number-skeleton/lib/*
+/mf1/packages/parser/lib/*
+/mf1/packages/react/lib/*
+/mf1/packages/react/src/__fixtures__/*
+/mf1/packages/rollup-plugin/lib/*
+/mf1/packages/runtime/esm/*
+/mf1/packages/runtime/lib/*
+/mf2/*/lib/*
 /test/messageformat-wg/
 /tmp/

.github/codeql/codeql-config.yml

@@ -1,4 +1,3 @@
 paths:
-  - examples
-  - packages
-  - scripts
+  - mf1
+  - mf2

.github/workflows/nodejs.yml

@@ -32,14 +32,14 @@ jobs:
       - run: npm run lint
       - run: npx prettier --check .
 
-  examples:
+  mf1-examples:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
       - run: npm ci
       - run: npm run build
       - run: npm install
-        working-directory: ./examples
+        working-directory: ./mf1/examples
       - run: npm run build
-        working-directory: ./examples
+        working-directory: ./mf1/examples

.gitignore

@@ -4,9 +4,8 @@ dist/
 node_modules/
 /docs/_site/
 /docs/Gemfile.lock
-/examples/cli/*.mjs
-/examples/package-lock.json
-/packages/mf2-*/lib/
-/packages/test-utils/lib/
+/mf1/examples/cli/*.mjs
+/mf1/examples/package-lock.json
+/mf2/*/lib/
 /test/browser/*.log
 /tmp/

.prettierignore

@@ -3,19 +3,19 @@ package-lock.json
 /coverage/
 /docs/*
 !/docs/*.md
-/examples/cli/*.mjs
-/packages/*/CHANGELOG.md
-/packages/core/lib/
-/packages/core/messageformat.*
-/packages/date-skeleton/lib/
-/packages/mf2-*/lib/
-/packages/number-skeleton/lib/
-/packages/parser/lib/
-/packages/react/lib/
-/packages/react/src/__fixtures__/
-/packages/rollup-plugin/lib/
-/packages/runtime/esm/
-/packages/runtime/lib/
-/packages/test-utils/lib/
+/mf1/examples/cli/*.mjs
+/mf1/packages/*/CHANGELOG.md
+/mf1/packages/core/lib/
+/mf1/packages/core/messageformat.*
+/mf1/packages/date-skeleton/lib/
+/mf1/packages/number-skeleton/lib/
+/mf1/packages/parser/lib/
+/mf1/packages/react/lib/
+/mf1/packages/react/src/__fixtures__/
+/mf1/packages/rollup-plugin/lib/
+/mf1/packages/runtime/esm/
+/mf1/packages/runtime/lib/
+/mf2/*/CHANGELOG.md
+/mf2/*/lib/
 /test/messageformat-wg/
 /tmp/

README.md

@@ -11,29 +11,29 @@ module.exports = {
   moduleFileExtensions: ['mjs', ...defaults.moduleFileExtensions],
   moduleNameMapper: {
     '^~/(.*)$': '<rootDir>/$1',
-    '^messageformat$': '<rootDir>/packages/mf2-messageformat/src/index.ts',
+    '^messageformat$': '<rootDir>/mf2/messageformat/src/index.ts',
     '^messageformat/functions$':
-      '<rootDir>/packages/mf2-messageformat/src/functions/index.ts',
+      '<rootDir>/mf2/messageformat/src/functions/index.ts',
     '^messageformat/functions/utils$':
-      '<rootDir>/packages/mf2-messageformat/src/functions/utils.ts',
-    '^@messageformat/core$': '<rootDir>/packages/core/src/messageformat.ts',
+      '<rootDir>/mf2/messageformat/src/functions/utils.ts',
+    '^@messageformat/core$': '<rootDir>/mf1/packages/core/src/messageformat.ts',
     '^@messageformat/core/compile-module$':
-      '<rootDir>/packages/core/src/compile-module.ts',
+      '<rootDir>/mf1/packages/core/src/compile-module.ts',
     '^@messageformat/date-skeleton$':
-      '<rootDir>/packages/date-skeleton/src/index.ts',
-    '^@messageformat/fluent$': '<rootDir>/packages/mf2-fluent/src/index.ts',
+      '<rootDir>/mf1/packages/date-skeleton/src/index.ts',
+    '^@messageformat/fluent$': '<rootDir>/mf2/fluent/src/index.ts',
     '^@messageformat/icu-messageformat-1$':
-      '<rootDir>/packages/mf2-icu-mf1/src/index.ts',
+      '<rootDir>/mf2/icu-messageformat-1/src/index.ts',
     '^@messageformat/number-skeleton$':
-      '<rootDir>/packages/number-skeleton/src/index.ts',
-    '^@messageformat/parser$': '<rootDir>/packages/parser/src/parser.ts',
-    '^@messageformat/react$': '<rootDir>/packages/react/src/index.ts',
-    '^@messageformat/runtime$': '<rootDir>/packages/runtime/src/runtime.ts',
-    '^@messageformat/runtime/lib/(.*)$': '<rootDir>/packages/runtime/src/$1.ts',
-    '^@messageformat/test-utils$': '<rootDir>/packages/test-utils/src/index.ts'
+      '<rootDir>/mf1/packages/number-skeleton/src/index.ts',
+    '^@messageformat/parser$': '<rootDir>/mf1/packages/parser/src/parser.ts',
+    '^@messageformat/react$': '<rootDir>/mf1/packages/react/src/index.ts',
+    '^@messageformat/runtime$': '<rootDir>/mf1/packages/runtime/src/runtime.ts',
+    '^@messageformat/runtime/lib/(.*)$':
+      '<rootDir>/mf1/packages/runtime/src/$1.ts'
   },
   resolver: 'jest-ts-webcompat-resolver',
-  testPathIgnorePatterns: ['/node_modules/', '<rootDir>/examples/react/'],
+  testPathIgnorePatterns: ['/node_modules/', '<rootDir>/mf1/examples/react/'],
   transform: { '\\.(js|mjs|ts|tsx)$': 'babel-jest' },
   transformIgnorePatterns: [
     '/node_modules/(?!make-plural|messageformat-(date|number)-skeleton)'